From 2ca9a65bae4abb25d6d1089cba655596e0794c9f Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 13 Apr 2014 11:43:19 +0200 Subject: refaktorisiere load() --- js/.index.js.swp | Bin 0 -> 36864 bytes js/index.js | 62 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 js/.index.js.swp diff --git a/js/.index.js.swp b/js/.index.js.swp new file mode 100644 index 0000000..3d3eeee Binary files /dev/null and b/js/.index.js.swp differ 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{ } -- cgit v1.3.1