diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-05-07 16:19:27 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2016-08-15 20:01:27 +0200 |
| commit | e094850c59279d98b2ae291dc125fbd9092ff1de (patch) | |
| tree | 70b4ee3bad4c89931e19ef031f99dd7c4c83c243 /js/index.js | |
| parent | c81d14d53f5b079035165401adc8e0ed113ccb87 (diff) | |
| download | wvs-vplan-e094850c59279d98b2ae291dc125fbd9092ff1de.tar.gz wvs-vplan-e094850c59279d98b2ae291dc125fbd9092ff1de.zip | |
zeige geladene Pläne für den aktuellen Tag
Diffstat (limited to 'js/index.js')
| -rw-r--r-- | js/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/index.js b/js/index.js index f1b8821..c586b71 100644 --- a/js/index.js +++ b/js/index.js @@ -266,7 +266,7 @@ function checkeKlasse(nutzerklasse, klasse){ /* konvertiert die extrahierten Strings in ein lesbares Format und filtert nach relevanten Vertretungen */ function parseVertretungen(str, username){ //Klasse Stunde Entfall Vertreter Fach Raum Art Lehrer Info - var vertretungenRe = new RegExp('(\\w+)\\s+(\\d(?:\\s+-\\s+\\d)?)\\s+((?:x\\s+)?)(\\S+)\\s+(\\w+|---)\\s+(\\w+|---)\\s+(.*?)\\s+(\\S+)(?:\\s+)?(.*?)'); + var vertretungenRe = new RegExp('(\\w+)\\s+(\\d(?:\\s+-\\s+\\d)?)\\s+((?:x\\s+)?)(\\S+)\\s+(\\w+|---)\\s+(\\w+|---)\\s+(\\S*)\\s+(\\S+)(?:\\s+)?(\\S*)'); var res; var vertretungen = []; @@ -733,7 +733,7 @@ function getActual(entries){ var results = decodeURIComponent(entry.name).match(fnameRe); var fdate = moment(results[1], 'YYYY-MM-DD'); - if(today.isBefore(fdate)){ + if(today.isBefore(fdate) || today.isSame(fdate, 'day')){ actual.push(entry); } }); |
