From ff2e8e3e190848e45200a0f4d283f8793efebbfc Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 23 Apr 2014 17:03:07 +0200
Subject: behebe Fehler mit Ergänzungen; zeige Plan des aktuellen Tages an
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/index.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/index.js b/js/index.js
index ca86a93..557d789 100644
--- a/js/index.js
+++ b/js/index.js
@@ -229,15 +229,29 @@ function removelogintab(){
     $('#vplantabs').tabs('refresh');
 }
 
+function replaceUmlauts(umlautstr){
+    tr = {'ä': 'ae', 'ü': 'ue', 'ö': 'oe', 'ß': 'ss'};
+
+    return umlautstr.replace(/[äöüß]/g, function($0) { return tr[$0]; });
+}
+
 /* fügt die lokale URL des Plans ein und ruft die Seite zum Rendering auf */
 function addplanattr(fileEntry, wasdownloaded){
     var sPath = fileEntry.toURL();
     var name = fileEntry.name;
     console.log('Dateiname: ' + name);
 
-    var fname_re = new RegExp('.*?(\\d{4})-(\\d{2})-(\\d{2}).*?\\.pdf');
+    var fname_re = new RegExp('.*?(\\d{4})-(\\d{2})-(\\d{2})(.*?)\\.pdf');
     var results = name.match(fname_re);
-    name = results[3] + "_" + results[2] + "_" + results[1];
+
+    if(results[4] !== null){
+        results[4] = results[4].replace(/[ ,]/g, '-').replace(/-{2}/g, '-');
+    }
+
+    name = results[3] + '_' + results[2] + '_' + results[1] + results[4];
+    name = replaceUmlauts(name); // TODO
+
+    console.log(name);
 
     if(!$(name).length){
         $('#vplannavbar').find('*').andSelf().each(function(){
@@ -464,6 +478,11 @@ function getactual(entries){
     var today = new Date();
     var actual = [];
 
+    today.setHours(0);
+    today.setMinutes(0);
+    today.setSeconds(0);
+    today.setMilliseconds(0);
+
     entries.forEach(function(entry){
         console.log(entry.name);
         var results = entry.name.match(fname_re);
@@ -491,7 +510,7 @@ function load(){
             function(entries){
                 var actual = getactual(entries);
 
-                console.log("Im Speicher: " + actual.length + " Pläne");
+                console.log('Im Speicher: ' + actual.length + ' Pläne');
 
                 if(actual.length > 0){
                     $('#noplans').hide('slow');
-- 
cgit v1.3.1