Merge branch 'al_new' into 'developing'

fix error on rendering part



See merge request !9

@@ -19,13 +19,21 @@ router.get('/', function(req, res, next) {
   // 이전 10분간 데이터 찾기
   // 이전 10분간 데이터 찾기
   sql = "SELECT * FROM weatherInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
   sql = "SELECT * FROM weatherInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
   db.query(sql, function(err, rows, fields){
   db.query(sql, function(err, rows, fields){
-  if (err) {
+    if(err)
+    {
       console.log(err);
       console.log(err);
-  } else {
-    if (rows.length == 0) {
+    }
+    else
+    {
+      if (rows.length == 0)
+      {
         empty = 1;
         empty = 1;
-    } else {
-      for (var i = rows.length - 1; i >= 0; i--){
+      }
+      else
+      {
+        for(var i = rows.length - 1; i >= 0; i--)
+        {
+          console.log('kk');
           probArr.unshift(rows[i].prob);
           probArr.unshift(rows[i].prob);
           time.unshift(rows[i].time);
           time.unshift(rows[i].time);
           ptArr.unshift(rows[i].temperature);
           ptArr.unshift(rows[i].temperature);
@@ -37,6 +45,7 @@ router.get('/', function(req, res, next) {
             break;
             break;
           }
           }
         }
         }
+      }
 
 
       dataLen = probArr.length;
       dataLen = probArr.length;
       res.render('index', {
       res.render('index', {
@@ -49,8 +58,7 @@ router.get('/', function(req, res, next) {
         dataLen
         dataLen
       });
       });
     }
     }
-  }
-});
+  });
 });
 });
 
 
 module.exports = router;
 module.exports = router;