2 files changed, 37 insertions, 25 deletions

diff --git a/js/.index.js.swp b/js/.index.js.swp
new file mode 100644
index 0000000..3d3eeee
--- /dev/null
+++ b/js/.index.js.swp
diff --git a/js/index.js b/js/index.js
index 19e63aa..7346265 100644
--- a/js/index.js
+++ b/js/index.js
@@ -313,6 +313,41 @@ function trylogin(){
     }
 }
 
+function countactual(entries){
+    var fname_re = new RegExp('([^-]{4})-([^-]{2})-([^-]{2})(.*?)\.pdf'); // \d funktioniert nicht
+    var actual = 0;
+    var today = new Date();
+
+    for(j = 0; j < entries.length; j++){
+        var name = entries[j].name;
+        console.log(name);
+        var results = name.match(fname_re);
+        var fdate = new Date(parseInt(results[1]), parseInt(results[2]) - 1, parseInt(results[3]));
+        
+        if(fdate >= today){
+            actual++;
+        }
+        console.log(actual);
+    }
+
+    return actual;
+}
+
+function addactual(entries){
+    var fname_re = new RegExp('([^-]{4})-([^-]{2})-([^-]{2})(.*?)\.pdf'); // \d funktioniert nicht
+    var actual = 0;
+    var today = new Date();
+
+    for(j = 0; j < entries.length; j++){
+        var results = entries[j].name.match(fname_re);
+        var fdate = new Date(parseInt(results[1]), parseInt(results[2]) - 1, parseInt(results[3]));
+        
+        if(fdate >= today){
+            addplanattr(entries[j], actual++);
+        }
+    }
+}
+
 function load(){
     window.requestFileSystem(
     LocalFileSystem.PERSISTENT, 0,
@@ -323,36 +358,13 @@ function load(){
 
             dirReader.readEntries(
             function(entries){
-                var actual = 0;
-                var today = new Date();
-                var fname_re = new RegExp('([^-]{4})-([^-]{2})-([^-]{2})(.*?)\.pdf'); // \d funktioniert nicht
-
-                for(j = 0; j < entries.length; j++){
-                    var name = entries[j].name;
-                    console.log(name);
-                    var results = name.match(fname_re);
-                    var fdate = new Date(parseInt(results[1]), parseInt(results[2]) - 1, parseInt(results[3]));
-                    
-                    if(fdate >= today){
-                        actual++;
-                    }
-                    console.log(actual);
-                }
+                var actual = countactual(entries);
 
                 console.log("Im Speicher: " + actual + " Pläne");
 
                 if(actual > 0){
                     prepare_html(actual);
-                    actual = 0;
-
-                    for(j = 0; j < entries.length; j++){
-                        var results = entries[j].name.match(fname_re);
-                        var fdate = new Date(parseInt(results[1]), parseInt(results[2]) - 1, parseInt(results[3]));
-                        
-                        if(fdate >= today){
-                            addplanattr(entries[j], actual++);
-                        }
-                    }
+                    addactual(entries);
                 }else{
 
                 }