Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter.git into databank

src/main/webapp/WEB-INF/jsp/api/monitor/list.jsp

@@ -44,11 +44,12 @@ function getExcel(){
     
     newForm.attr( "id", "excelForm" );
     newForm.attr( "method", "post" );
-    newForm.attr( "action", "./excel" );
+    newForm.attr( "action", "./statisticsExcel" );
     newForm.attr( "target", "_blank" );
     newForm.hide();
     
     $( document.body ).append( newForm );
+    newForm.append( $("#downMemo").clone() );
     newForm.submit();
     $( "button.close" ).click();
     $( "#downMemo" ).val( "" );
@@ -62,7 +63,7 @@ function getExcel(){
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">생활치료센터 리스트 Excel 다운로드</h5>
+                    <h5 class="modal-title">생활치료센터 오픈API 통계 Excel 다운로드</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span> </button>
                 </div>

src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -47,6 +47,7 @@ function getExcel(){
     newForm.hide();
     
     $( document.body ).append( newForm );
+    newForm.append( $("#downMemo").clone() );
     newForm.submit();
     $( "button.close" ).click();
     $( "#downMemo" ).val( "" );

src/main/webapp/WEB-INF/jsp/mobile/health/health1.jsp

@@ -56,7 +56,7 @@ $( function(){
  * 공통 이벤트 처리는 -> health.js
  */
 var phrLocalStorageName = "bluetoothHealth1";
-var phrCallBackType     = "temperature";
+var phrCallBackType     = "thermometer";
 </script>
 <style>
 /* Rounded sliders */

src/main/webapp/WEB-INF/jsp/mobile/health/health2.jsp

@@ -129,7 +129,7 @@ $( function(){
  * 공통 이벤트 처리는 -> health.js
  */
 var phrLocalStorageName = "bluetoothHealth2";
-var phrCallBackType     = "bloodPressure";
+var phrCallBackType     = "bloodpressure";
 </script>
 <style>
 /* Rounded sliders */

src/main/webapp/WEB-INF/jsp/mobile/health/health3.jsp

@@ -51,7 +51,7 @@ $( function(){
  * 공통 이벤트 처리는 -> health.js
  */
 var phrLocalStorageName = "bluetoothHealth3";
-var phrCallBackType     = "oxygenSaturation";
+var phrCallBackType     = "oxysaturation";
 </script>
 <style>
 /* Rounded sliders */

src/main/webapp/WEB-INF/jsp/mobile/health/health4.jsp

@@ -51,7 +51,7 @@ $( function(){
  * 공통 이벤트 처리는 -> health.js
  */
 var phrLocalStorageName = "bluetoothHealth4";
-var phrCallBackType     = "bloodSugar";
+var phrCallBackType     = "bloodsugar";
 </script>
 <style>
 /* Rounded sliders */