diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-06-18 19:54:20 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2016-08-15 20:02:43 +0200 |
| commit | ca3aeec385e43004ca040c5d8f7a0185e5a1aa2a (patch) | |
| tree | 6478fd48e470546edbd4530a7327ecf8bab9abdc | |
| parent | a815954bf900dc62a32e6a59267bad58f3bcd09f (diff) | |
| download | wvs-vplan-ca3aeec385e43004ca040c5d8f7a0185e5a1aa2a.tar.gz wvs-vplan-ca3aeec385e43004ca040c5d8f7a0185e5a1aa2a.zip | |
fixe Regex für "Statt-Vertretungen"
| -rw-r--r-- | www/js/index.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/index.js b/www/js/index.js index eb83488..2925839 100644 --- a/www/js/index.js +++ b/www/js/index.js @@ -352,17 +352,17 @@ function parseVertretungen(str, username){ * (?:(?:(\d+|---)[ ]*->[ ]*(\d+|---))|(?:()(\d+|---))) * Alter Raum -> neuer Raum | neuer Raum * - * ([\wäöü]+|---|[+.]) + * ([\wäöü-]+|---|[+.]) * Art-Text * * (?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+))) * Alter Lehrer -> Neuer Lehrer | Neuer Lehrer * - * ([\wäöü]*) + * ([\wäöü-]*) * Info-Text */ - var vertretungenRe = /([\wäöü]+)[ ]+(\d+(?:[ ]*-[ ]*\d+)?)[ ]+(x?)[ ]*(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]+(?:(?:(\d+|---)[ ]*->[ ]*(\d+|---))|(?:()(\d+|---)))[ ]+([\wäöü]+|---|[+.])[ ]+(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]*([\wäöü]*)/i; + var vertretungenRe = /([\wäöü]+)[ ]+(\d+(?:[ ]*-[ ]*\d+)?)[ ]+(x?)[ ]*(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]+(?:(?:(\d+|---)[ ]*->[ ]*(\d+|---))|(?:()(\d+|---)))[ ]+([\wäöü-]+|---|[+.])[ ]+(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]*([\wäöü-]*)/i; var res; var vertretungen = []; var nutzerklasse; |