From ca3aeec385e43004ca040c5d8f7a0185e5a1aa2a Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 18 Jun 2014 19:54:20 +0200
Subject: fixe Regex für "Statt-Vertretungen"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'www')

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;
-- 
cgit v1.3.1