Merge branch 'chart' into 'developing'

ejs



See merge request !6

@@ -106,15 +106,11 @@
           {
           {
             name: "사망률",
             name: "사망률",
             data: (function() {
             data: (function() {
-              // generate an array of random data
-              var data = [],
-                time = new Date().getTime(),
-                i;
-
-              var deathArr = new Arr();
-              length= <%=dataLen%>;
+              var deathArr = [],
+                  time = new Date().getTime();
+              var length= <%=dataLen%>;
               var i=-9;
               var i=-9;
-              for(var i;i<length;i++)
+              for(i;i<-9+length;i++)
               {
               {
                 deathArr.push({
                 deathArr.push({
                  x: time + i * 60000,
                  x: time + i * 60000,
@@ -122,27 +118,20 @@
               }) 
               }) 
               }
               }
 
 
-
               <%probArr.forEach((probArr)=>{%>
               <%probArr.forEach((probArr)=>{%>
                 temp;
                 temp;
                 temp= <%=probArr%>;
                 temp= <%=probArr%>;
                 
                 
-                for(var j=length;i<10;j++)
+                for(i+1;i<=0;i++)
                 {
                 {
                   deathArr.push({
                   deathArr.push({
-                  x: time + j * 60000,
-                  y: 
+                  x: time + i * 60000,
+                  y: temp
                 }) 
                 }) 
                 }
                 }
               <%})%>
               <%})%>
 
 
-              for (i = -19; i <= 0; i += 1) {
-                data.push({
-                  x: time + i * 60000,
-                  y: 0
-                });
-              }
-              return data;
+              return deathArr;
             })()
             })()
           }
           }
         ]
         ]