[title] refactiring the code structure

Change-Id: I81f8ed77208e98babafd94eb820da2ef7b51637b

diff --git a/js/main.js b/js/main.js
index 9c0d49d..aa01336 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -93,52 +93,29 @@ function getStorage() {
     $afterHtml[0].innerHTML = "";\r
     $pDate.append("Today (" + year + "." + month + "." + date + ")");\r
 \r
-    // After task Complete, call the data temporarily stored in sessionStorage\r
-    // to maintain the data until the browser (App) is re-executed\r
-    for ( var i = 0; i < session.length; i++) {\r
-\r
-        // Import sessionStorage key to compare with the current date\r
-        taskDate = session.key(i).substring(0, 8);\r
+    \r
+    // Call Task data stored in localStorage\r
+    for ( var i = 0; i < local.length; i++) {\r
+        \r
+        // Import localStorage key to compared with the current date\r
+        taskDate = local.key(i).substring(0, 8);\r
 \r
         // Today Task\r
         if (currentDate == taskDate) {\r
-            $todayHtml.append(getHtmlToStorage(i, session));\r
+            $todayHtml.append(getHtmlToStorage(i, local));\r
             // Previous Task\r
         } else if (currentDate > taskDate) {\r
-            $beforeHtml.append(getHtmlToStorage(i, session));\r
+            $beforeHtml.append(getHtmlToStorage(i, local));\r
             // After Task\r
         } else {\r
-            $afterHtml.append(getHtmlToStorage(i, session));\r
+            $afterHtml.append(getHtmlToStorage(i, local));\r
         }\r
 \r
-        // Shows Task Completed data until the browser (App) is re-executed\r
-        $("#list_" + session.key(i)).addClass("del");\r
-        $("#" + session.key(i)).attr("checked", true);\r
-    }\r
-\r
-    // Call Task data stored in localStorage\r
-    for ( var i = 0; i < local.length; i++) {\r
-        var isAppend = true;\r
-        // Import localStorage key to compared with the current date\r
-        taskDate = local.key(i).substring(0, 8);\r
-\r
         for ( var j = 0; j < session.length; j++) {\r
             if (local.key(i) == session.key(j)) {\r
-                isAppend = false;\r
-                break;\r
-            }\r
-        }\r
-\r
-        if (isAppend) {\r
-            // Today Task\r
-            if (currentDate == taskDate) {\r
-                $todayHtml.append(getHtmlToStorage(i, local));\r
-                // Previous Task\r
-            } else if (currentDate > taskDate) {\r
-                $beforeHtml.append(getHtmlToStorage(i, local));\r
-                // After Task\r
-            } else {\r
-                $afterHtml.append(getHtmlToStorage(i, local));\r
+                // Shows Task Completed data until the browser (App) is re-executed\r
+                $("#list_" + session.key(j)).addClass("del");\r
+                $("#" + session.key(j)).attr("checked", true);\r
             }\r
         }\r
     }\r
@@ -174,6 +151,7 @@ function taskComplete(key) {
  */\r
 function getKeyToDate(date) {\r
     if (date) {\r
-        return (date.replace(/\-/g, "") + Math.random()).replace(/\./g, "");\r
+        var time = new Date();\r
+        return (date.replace(/\-/g, "") + time.getHours() + time.getMinutes() + time.getSeconds()).replace(/\./g, "");\r
     }\r
 }\r