countKcal 기능 안정화

김동진
Commit d39c25c987621ec4cff6cee7d183373686dca0b6 d39c25c9 1 parent 0d30c2cd
Showing 8 changed files with 44 additions and 40 deletions
.gitignore
lib/appkey.js
lib/countKcal.js
lib/foodInfo.js
lib/home.js
lib/searchGym.js
lib/template.js
main.js
--- a/.gitignore
View file @d39c25c
+++ b/.gitignore
View file @d39c25c
@@ -117,3 +117,7 @@ dist
 package-lock.json
+
+#db
+lib/db.js
+lib/appkey.js
\ No newline at end of file
--- a/lib/appkey.js
View file @d39c25c
+++ b/lib/appkey.js
View file @d39c25c
 var key = {
     kakaomapKey : "900b1f5dd2fee32f1ee91d18266bbfe4",
-    kakaoRestKey : "ab6b32bc5d4705f517ee753c63be465c",
 };
 module.exports = key; //key을 바깥에서 사용할 수 있도록 exports한다.
--- a/lib/countKcal.js
View file @d39c25c
+++ b/lib/countKcal.js
View file @d39c25c
 var qs = require('querystring');
 var template = require('./template.js');
 var db = require('./db.js');
+const { type } = require('jquery');
 exports.countKcal = function(request, response){
     var title = '칼로리 계산';
     var description = '맞춤 권장 칼로리와 섭취 음식 칼로리 중 하나를 선택해 주세요.';
@@ -22,12 +23,6 @@ exports.countKcal = function(request, response){
             }
         </style>
      </head>
- 
- 
- 
-     <br><br>
-     <hr width = "100%" color ="#213b19">
-     <br><br>
      <style type="text/css">
          div{
@@ -73,7 +68,6 @@ exports.countKcal_body = function(request, response){
     var title = '칼로리 계산';
     var description = '개인의 신체 정보에 맞는 일일 권장 섭취량(kcal)를 알려드립니다!';
     var html = template.html(title,`
-    <br><br><br>
     <div style= "font-size:20px;">
         <h2><font color="black">${title}<br><div style= "font-size:20px;"><br>${description}</font></div></h2>
@@ -121,6 +115,7 @@ exports.countKcal_body_process = function(request, response){
         var targetWeight = post.targetWeight;          
         var BMR; //기초대사량(bmr) Harris-BenedictEquation(B.E.E) 방법
         var BMI = (weight/(height*height)*10000).toFixed(1); //비만도
+        BMI = Number(BMI);
         var BMI_msg = '';
         if(BMI >= 30){
             BMI_msg += '고도비만';
@@ -153,12 +148,13 @@ exports.countKcal_body_process = function(request, response){
             <option value="woman" selected>여자</option>`;
             BMR = (655. + 9.563*weight + 1.85*height - 4.676*age).toFixed(1);
         }
-        var std_weight = (height*height/10000*((gender =="man") ? 22 : 21)).toFixed(1); //남자면 22, 여자면 21을 곱함.
+        BMR = Number(BMR);
+        var std_weight = Number((height*height/10000*((gender =="man") ? 22 : 21)).toFixed(1)); //남자면 22, 여자면 21을 곱함.
         var activity = post.activity;
         var activity_idx;
-        var TDEE; //Total Daily Energy Expenditure 현재 체중을 유지하기 위한 열량
+        var TDEE = 0; //Total Daily Energy Expenditure 현재 체중을 유지하기 위한 열량
         var activity_default = '';
-        var weight_gap = (weight - std_weight).toFixed(1);
+        var weight_gap = Number((weight - std_weight).toFixed(1));
         var weightMsg = "";
         if(weight_gap > 0){
             weightMsg += `표준 체중보다 ${weight_gap}kg 많습니다.`
@@ -197,36 +193,48 @@ exports.countKcal_body_process = function(request, response){
                 <option value="high" selected>많은 활동(농업노동자 또는 매일 2시간동안 수영을 함)</option>
                ` 
         }
+        TDEE = Number(TDEE);
         var totalKcal; //빼거나 쪄야할 총 칼로리
         var foodKcal; //하루에 더 먹거나 덜 먹어야할 칼로리
-        var kcalMsg = '하루에 먹어야할 '
+        var kcalMsg = '하루에 먹어야할 ';
         if(weight > targetWeight){
             totalKcal =  (weight - targetWeight)*7700; //빼야할 총 칼로리/다이어트
-            foodKcal = (totalKcal/targetDay).toFixed(1);
+            foodKcal = Number((totalKcal/targetDay).toFixed(1));
             kcalMsg += `다이어트 칼로리 : ${(TDEE - foodKcal).toFixed(1)}kcal`;
         }
         else if(weight == targetWeight) {
-             
             kcalMsg ="";
         }
         else if(weight < targetWeight) {
             totalKcal = (targetWeight-weight)*7700; //쩌야할 총 칼로리/벌크업
-            foodKcal = (totalKcal/targetDay).toFixed(1);
+            foodKcal = Number((totalKcal/targetDay).toFixed(1));
-            kcalMsg += `벌크업 칼로리 : ${(TDEE - foodKcal).toFixed(1)}kcal`;
+            var bulkUpKcal = foodKcal+TDEE;
+
+            kcalMsg += `벌크업 칼로리 : ${(bulkUpKcal)}kcal`;
         }
         var html = template.html(title,`
         <h2>${title}</h2>
         <p>${description}</p>
+        <script>
+        var msg = '${kcalMsg}';
+        
+        if(msg==""){
+            msg = '현재 체중 유지를 위한 열량 : ${TDEE}kcal'
+        }
+        sessionStorage.setItem('KcalMsg', msg);
+        </script>
         <form action="/countKcal_body_process" method="post" >
+            나이(세) : <br />
+            <input type="text" name="age" value="${age}"/><br />
             성별 :<br />
             <select name="gender">
                 ${gender_default}
             </select>
             <br />
-            키(cm) : <br /><input type="text" name="height" placeholder="${height}" /><br />
+            키(cm) : <br /><input type="text" name="height" value="${height}" /><br />
-            몸무게(kg) : <br /><input type="text" name="weight" placeholder="${weight}"/><br />
+            몸무게(kg) : <br /><input type="text" name="weight" value="${weight}"/><br />
-            목표체중(kg) : <br /><input type="text" name="targetWeight" placeholder="${targetWeight}"/><br />
+            목표체중(kg) : <br /><input type="text" name="targetWeight" value="${targetWeight}"/><br />
-            목표기간(일) : <br /><input type="text" name="targetDay" placeholder="${targetDay}"/><br />
+            목표기간(일) : <br /><input type="text" name="targetDay" value="${targetDay}"/><br />
             활동량 :<br />
             <select name="activity">
                ${activity_default}
@@ -254,7 +262,6 @@ exports.countKcal_food = function(request,response){
     var title = '음식 칼로리 계산';
     var description = '오늘 먹은 음식의 총 칼로리를 계산해드립니다!';
     var html = template.html(title,`
-    <br><br><br>
     <h2>${title}</h2>
     <p>${description}</p>
     <form action="/countKcal_food_process" method="post">
@@ -391,7 +398,7 @@ function foodTable(foodInfo, list, num){
                                 +'</td><td>'+kcal+'</td></tr>';  
                             var str = sessionStorage.getItem('table');
                             str = str.replace(table,'');
-                            console.log("str:"+str)
+                            //console.log("str:"+str)
                             sessionStorage.setItem('table',str);
                             clickedRow.remove();
                             cntRm += 1;                                         
@@ -411,7 +418,12 @@ function foodTable(foodInfo, list, num){
                         var td = tr.children();  
                         totalKcal +=Number(td.eq(5).text())
                     });
-                    $("#selectedFood").after("<p>총 칼로리 : "+ totalKcal.toFixed(2) +"kcal</p>");
+                    var KcalMsg = sessionStorage.getItem('KcalMsg');
+                    //console.log("kcalMsg:"+KcalMsg);
+                    if (KcalMsg == null){
+                        KcalMsg = "<a href='/countKcal_body'>맞춤 권장 칼로리 계산하러 가기</a>"
+                    }
+                    $("#WriteTotalKcal").html("<p>총 칼로리 : "+ Number(totalKcal.toFixed(2)) +"kcal</p><p>"+KcalMsg+"</p>")
                     //console.log("totalKcal:"+totalKcal);
                 });
                 //console.log(sessionStorage.getItem('table'));
@@ -434,6 +446,8 @@ function foodTable(foodInfo, list, num){
                     <td>칼로리(kcal)</td>
                 </tr>   
             </table>          
+            
+            <div id = "WriteTotalKcal" style=text-align:left;></div>
                 <style>
                     table{
                         border-collapse: collapse;
--- a/lib/foodInfo.js
View file @d39c25c
+++ b/lib/foodInfo.js
View file @d39c25c
@@ -5,18 +5,15 @@ exports.foodInfo = function(request, response){
     var title = '음식 영양정보';
     var description = '음식을 검색하면 음식의 칼로리, 탄수화물, 단백질, 지방, 나트륨의 정보를 알려드립니다!';
     var html = template.html(title,`
-    <br><br><br>
         <h2>${title}</h2>
         <p>${description}</p>
         <form action="/foodInfo_search" method="post">
             <input type = 'text' name = 'search' placeholder = '검색어 입력' maxlength = 255 value = "" autocomplete = "off">
             <button type = "submit" name = "click">검색</button>
         </form>
-
     `);
     response.writeHead(200);
     response.end(html);
-
 }
 function foodTable(foodInfo, list, num){
     var tag = '';
@@ -61,7 +58,6 @@ function foodTable(foodInfo, list, num){
     `;
     return tag;
 }
-
 exports.foodInfo_search = function(request, response){
     var body = ''; 
     request.on('data', function(data){
@@ -85,7 +81,6 @@ exports.foodInfo_search = function(request, response){
                 }
             }
             var html = template.html(title,`
-            <br><br><br>
                 <h2>${title}</h2>
                 <p>${description}</p>
                 <form action="/foodInfo_search" method="post">
--- a/lib/home.js
View file @d39c25c
+++ b/lib/home.js
View file @d39c25c
@@ -3,9 +3,6 @@ exports.home = function(request, response){
     var title = 'HealthProtector란?';
     var description = '개개인의 신체 정보에 따라 일일 권장 섭취량을 알려주고, 좋아하는 음식을 검색하면 영양정보를 알려주는 사이트 입니다.';
     var html = template.html(title,`
-
-    <br><br><br>
-    
     <style>
         @import url('https://fonts.googleapis.com/css2?family=Do+Hyeon&display=swap');
@@ -28,8 +25,6 @@ exports.home = function(request, response){
             }
             </div>
     </style>
-
-
     <div style= font-size:40px;background-image:url("https://source.unsplash.com/jFCViYFYcus");padding:50px;>
         <h1 style=font-family: 'Do Hyeon', sans-serif;><a href="/"><font color="white">HealthProtector</font></a></h1>
@@ -38,9 +33,7 @@ exports.home = function(request, response){
     <div style= font-size:20px;text-align:left;width: 100%;float:left:>
         <h2><font color="black">&nbsp &nbsp &nbspOur Services</font></h2>
     </div>
-
-
     <div style= width:30%;float:left;padding:5px;>
         <div style="color : gray";>
         <i class="fas fa-calculator fa-3x"></i>
--- a/lib/searchGym.js
View file @d39c25c
+++ b/lib/searchGym.js
View file @d39c25c
@@ -7,9 +7,7 @@ exports.searchGym = function(request, response){
     <style>
         @import url('https://fonts.googleapis.com/css2?family=Do+Hyeon&display=swap');
     </style>
-    <br><br>
     <div style= "font-size:25px; background-color:#ffffff">
-    
         <h2><font color="black">${title}<br><div style= "font-size:20px;font-family: 'Do Hyeon', sans-serif;">${description}</font></div></h2>
         </div>
         <style>
--- a/lib/template.js
View file @d39c25c
+++ b/lib/template.js
View file @d39c25c
@@ -18,7 +18,6 @@ module.exports = {
             <style type="text/css">
             div{
-
                 text-align:center;
                 border:1px solid none;
                 margin:0px 0px 0px 0px;
@@ -28,7 +27,6 @@ module.exports = {
             }
             </div>
             </style>
-
             <div style="font-family: 'Do Hyeon', sans-serif;";>
                 <h3 style=width:180px;float:left;><a href="/"><font color="black">HealthProtector</font></a></h3>
@@ -38,7 +36,7 @@ module.exports = {
                 <h3 style=width:150px;float:right;><a href="/"><font color="black">About us</font></a></h3>
             </div>
-              
+            <hr width = "100%" color ="#213b19" style=margin:0px;>
                 ${body}
             <div style= width:100%;font-size:9px;position:fixed;bottom:0;float:left;padding:0px;background-color:#213b19;>
                 <h5><font color="white" font size = 2px;>Copyright(C) HealThProtector 2020</font></h5>
--- a/main.js
View file @d39c25c
+++ b/main.js
View file @d39c25c
@@ -43,6 +43,9 @@ var app = http.createServer(function(request,response){
     else if(pathname === '/countKcal_food_process'){
         countKcal.countKcal_food_process(request,response);
     }
+    else if(pathname === '/aboutUs'){
+        home.aboutUs(request, response);
+    }
     else{
     response.writeHead(404);
     response.end("Not found");