diff --git a/Praktikum1_Kai/webteams/content/webteams.css b/Praktikum1_Kai/webteams/content/webteams.css
index 577a9e3..9fac126 100644
--- a/Praktikum1_Kai/webteams/content/webteams.css
+++ b/Praktikum1_Kai/webteams/content/webteams.css
@@ -1,72 +1 @@
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-   padding: 0;
-   margin: 0;
-}
-
-td {
-   border: 1px solid black;
-}
-
-th {
-	height: 50px;
-	border: 1px solid black;
-}
-
-li {	
-}
-
-ul {
-    padding-left: 30px;
-    list-style-type: square;
-    margin-bottom: 50px;
-}
-
-label {
-	padding-left: 15px;
-}
-
-input {
-    width: 200px;
-    border: none;
-    border-bottom: 2px solid black;
-    font-size: 12pt;
-}
-
-input.button {
-	background-color: #eeeeee;
-    color: black;
-    padding: 5px 10px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    border: none;
-}
-
-input.button:hover, input.button:active {
-    background-color: #e7e7e7;
-}
-
-idWTForm {
-}
-
-
-
-a:link, a:visited {
-    background-color: #eeeeee;
-    color: black;
-    padding: 5px 10px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-}
-
-
-a:hover, a:active {
-    background-color: #e7e7e7;
-}
-
-a.clDelete {
-}
-
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}td{border:1px solid black;}th{height:50px;border:1px solid black;}li{}ul{padding-left:30px;list-style-type:square;margin-bottom:50px;}label{padding-left:15px;}input{width:200px;border:none;border-bottom:2px solid black;font-size:12pt;}input.button{background-color:#eeeeee;color:black;padding:5px 10px;text-align:center;text-decoration:none;display:inline-block;border:none;}input.button:hover,input.button:active{background-color:#e7e7e7;}idWTForm{}a:link,a:visited{background-color:#eeeeee;color:black;padding:5px 10px;text-align:center;text-decoration:none;display:inline-block;}a:hover,a:active{background-color:#e7e7e7;}a.clDelete{}
\ No newline at end of file
diff --git a/Praktikum2/AufgabePrak2A.pdf b/Praktikum2/AufgabePrak2A.pdf
new file mode 100644
index 0000000..a875c5b
Binary files /dev/null and b/Praktikum2/AufgabePrak2A.pdf differ
diff --git a/Praktikum2/ppm1/app/__init__.py b/Praktikum2/ppm1/app/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Praktikum2/ppm1/app/__pycache__/__init__.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..245d099
Binary files /dev/null and b/Praktikum2/ppm1/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc
new file mode 100644
index 0000000..ae068d7
Binary files /dev/null and b/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc differ
diff --git a/Praktikum2/ppm1/app/__pycache__/database.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/database.cpython-35.pyc
new file mode 100644
index 0000000..64a1314
Binary files /dev/null and b/Praktikum2/ppm1/app/__pycache__/database.cpython-35.pyc differ
diff --git a/Praktikum2/ppm1/app/__pycache__/view.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/view.cpython-35.pyc
new file mode 100644
index 0000000..4e41b53
Binary files /dev/null and b/Praktikum2/ppm1/app/__pycache__/view.cpython-35.pyc differ
diff --git a/Praktikum2/ppm1/app/application.py b/Praktikum2/ppm1/app/application.py
new file mode 100644
index 0000000..528176a
--- /dev/null
+++ b/Praktikum2/ppm1/app/application.py
@@ -0,0 +1,284 @@
+import cherrypy
+from .database import Database_cl
+from .view import View_cl
+import collections
+orderedDict = collections.OrderedDict()
+from collections import OrderedDict
+
+#----------------------------------------------------------
+class Application_cl(object): 
+#----------------------------------------------------------
+
+#-------------------------------------------------------
+# Request Processing
+#-------------------------------------------------------
+
+    #-------------------------------------------------------
+    def __init__(self):
+    #-------------------------------------------------------
+        # spezielle Initialisierung können hier eingetragen werden
+        self.db = Database_cl()
+        self.view = View_cl()
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def index(self):
+    #-------------------------------------------------------
+        print("Index\n")
+        return self.GenerateIndex()
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def category(self, cat=None):
+    #-------------------------------------------------------
+        print("Category: ", cat, "\n")
+        if(cat==None):
+            return self.GenerateIndex()
+        else:
+            return self.GenerateList(cat)
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def choice(self):
+    #-------------------------------------------------------
+        print("Choice \n")
+        return self.GenerateListChoice()
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def eval(self, cat):
+    #-------------------------------------------------------
+        print("Eval \n")
+        self.db.CheckDates()
+        return self.GenerateListEval(cat)
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def detail(self, cat=None, id=None):
+    #-------------------------------------------------------
+        if(cat!=None):
+            if(id!=None):
+                print("Cat=", cat, " id=", id)
+                return self.GenerateDetail(cat, id)
+            else:
+                print("ID=None Cat=", cat)
+                return self.GenerateDetail(cat)
+        else:
+            return self.GenerateIndex()
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def detailchoice(self, id):
+    #-------------------------------------------------------
+        print("id=", id)
+        return self.GenerateDetailChoice(id)
+
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def save(self, cat=None, **data):
+    #-------------------------------------------------------
+        print("Save: ", cat)
+        dataTmp = data
+        return self.GenerateSave(dataTmp, cat)
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def saveChoice(self, **data):
+    #-------------------------------------------------------
+        print("Save: Choice")
+        dataTmp = data
+        return self.GenerateSaveChoice(dataTmp)
+    @cherrypy.expose
+
+    #-------------------------------------------------------
+    def delete(self, cat=None, id=None): 
+    #-------------------------------------------------------
+        print("Delete",cat,id)
+        return self.GenerateDelete(cat, id)
+    @cherrypy.expose
+    
+    #-------------------------------------------------------
+    def default(self, *arguments, **kwargs): 
+    #-------------------------------------------------------
+        msg_s = "unbekannte Anforderung: " + \
+                str(arguments) + \
+                ''+ \
+                str(kwargs)
+        raise cherrypy.HTTPError(404, msg_s)
+    default.exposed= True
+
+#-------------------------------------------------------
+# Functions
+#-------------------------------------------------------
+
+    #-------------------------------------------------------
+    def GenerateIndex(self):
+    #-------------------------------------------------------
+        return self.view.CreateIndex()
+
+    #-------------------------------------------------------
+    def GenerateList(self, category):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        data['content'] = {}
+        data['headings'] = {}
+        data['category'] = category
+        data['content'] = self.db.data[category]
+        if(len(data['content']) != 0):
+            print(len(data['content']))
+            contentFirst = list(data['content'].keys())[0]
+            data['headings'] = list(data['content'][contentFirst].keys())
+        print(data)
+        return self.view.CreateList(data)
+
+    #-------------------------------------------------------
+    def GenerateListChoice(self):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        data['content'] = {}
+        offerings = self.db.data['Angebote']
+        for key, value in offerings.items():
+            for key2, value2 in value.items():
+                if(key2 == 'Status'):
+                    if(value2 == 'Angebot'):
+                        data['content'][key] = value              
+
+        print(data)
+        return self.view.CreateListChoice(data)
+
+    #-------------------------------------------------------
+    def GenerateDetail(self, category, id=None):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        data['category'] = category
+        print("Detail",category,id)
+        if(id != None):
+            data['id'] = id
+            data['content'] = self.db.ReadEntry(category, id)
+        else:
+            data['id'] = None
+            data['content'] = self.db.GetDefault(category)
+            print(data['content'])
+        if(category == 'Angebote'):
+            print("Angebote")
+            data['Firmen'] = self.db.data['Firmen']
+        print(data, "\n")
+        return self.view.CreateDetail(data)
+
+    #-------------------------------------------------------
+    def GenerateDetailChoice(self, id):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        data['id'] = id
+        data = self.db.data['Angebote'][id]
+        data['Studenten'] = self.db.data['Studenten']
+        data['Lehrender'] = self.db.data['Lehrender']
+        print(data, "\n")
+        return self.view.CreateDetailChoice(data)
+
+    #-------------------------------------------------------
+    def GenerateListEval(self, cat):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        Studenten = self.db.data['Studenten']
+        Lehrender = self.db.data['Lehrender']
+        Firmen = self.db.data['Firmen']
+        Angebote = self.db.data['Angebote']
+
+        data['category'] = cat
+        if(cat == 'Firmen'):
+            for keyFirma, valueFirma in sorted(Firmen.items()):
+                data[valueFirma['Name']] = {}
+                data[valueFirma['Name']]['Name'] = valueFirma['Name']
+                data[valueFirma['Name']]['Angebote'] = {}
+                data[valueFirma['Name']]['Angebote']['Angebot'] = {}
+                data[valueFirma['Name']]['Angebote']['aktuell'] = {}
+                data[valueFirma['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebote, valueAngebote in Angebote.items():
+                    if(valueAngebote['Firma'] == valueFirma['Name']):
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']] = {}
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Name'] = valueAngebote['Name']
+                        if(valueAngebote['Student'] != ''):
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = Studenten[valueAngebote['Student']]['Name']
+                        else:
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = ''
+                        if(valueAngebote['Lehrender'] != ''):
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = Lehrender[valueAngebote['Lehrender']]['Name']
+                        else:
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = ''
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumVon'] = valueAngebote['ZeitraumVon']
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumBis'] = valueAngebote['ZeitraumBis']
+            print(data)
+            return self.view.CreateListEval(data)
+        elif(cat == 'Studenten'):
+            for keyStudent, valueStudent in Studenten.items():
+                data[valueStudent['Name']] = {}
+                data[valueStudent['Name']]['Angebote'] = {}
+                data[valueStudent['Name']]['Angebote']['Angebot'] = {}
+                data[valueStudent['Name']]['Angebote']['aktuell'] = {}
+                data[valueStudent['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebot, valueAngebot in Angebote.items():
+                    if(valueAngebot['Student'] == valueStudent['id']):
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Lehrender'] = Lehrender[valueAngebot['Lehrender']]['Name']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+        elif(cat == 'Lehrender'):
+            for keyLehrende, valueLehrende in Lehrender.items():
+                data[valueLehrende['Name']] = {}
+                data[valueLehrende['Name']]['Angebote'] = {}
+                data[valueLehrende['Name']]['Angebote']['Angebot'] = {}
+                data[valueLehrende['Name']]['Angebote']['aktuell'] = {}
+                data[valueLehrende['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebot, valueAngebot in Angebote.items():
+                    if(valueAngebot['Lehrender'] == valueLehrende['id']):
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Student'] = Studenten[valueAngebot['Student']]['Name']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+
+        return self.view.CreateListEval(data)
+
+
+    #-------------------------------------------------------
+    def GenerateSave(self, dataTmp, category):
+    #-------------------------------------------------------
+        if(category == None):
+            return self.view.CreateIndex()
+        else:
+            self.db.Save(dataTmp, category)
+            return self.GenerateList(category)
+
+    #-------------------------------------------------------
+    def GenerateSaveChoice(self, dataTmp):
+    #-------------------------------------------------------
+        if(dataTmp['Student'] != ''):
+            angebote = self.db.CheckOfferings(dataTmp['Student'])
+            print(angebote)
+            if(angebote == 0):
+                print("Save")
+                self.db.Save(dataTmp, 'Angebote')
+        return self.GenerateListChoice()
+
+    #-------------------------------------------------------
+    def GenerateDelete(self, category, id):
+    #-------------------------------------------------------
+        if(category == None or id == None):
+            return self.view.CreateIndex()
+        else:
+            self.db.Delete(category, id)
+            return self.GenerateList(category)
+
+#EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm1/app/database.py b/Praktikum2/ppm1/app/database.py
new file mode 100644
index 0000000..41e1ca2
--- /dev/null
+++ b/Praktikum2/ppm1/app/database.py
@@ -0,0 +1,189 @@
+# coding: utf-8
+
+import os
+import os.path
+import codecs
+import json
+from datetime import datetime, timedelta
+
+#----------------------------------------------------------
+class Database_cl(object): 
+#----------------------------------------------------------
+    # da es hier nur darum geht, die Daten dauerhaft zu speichern,
+    # wird ein sehr einfacher Ansatz verwendet:
+    # - es können Daten zu genau 15 Teams gespeichert werden
+    # - je Team werden 2 Teilnehmer mit Namen, Vornamen und Matrikelnummer
+    #   berücksichtigt
+    # - die Daten werden als eine JSON-Datei abgelegt
+    
+
+    #-------------------------------------------------------
+    def __init__(self): 
+    #-------------------------------------------------------
+        self.data = {}
+        self.data['Studenten'] = {}
+        self.data['Lehrender'] = {}
+        self.data['Firmen'] = {}
+        self.data['Angebote'] = {}
+        self.ReadAll()
+
+
+    #------------------------------------------------------- 
+    def Read(self, category):
+    #-------------------------------------------------------
+        path = 'data/' + category
+        if not(os.path.exists(path)):
+            os.makedirs(path)
+        categoryDir = os.listdir(path)
+        for fileName in categoryDir:
+            if fileName.endswith('.json') and fileName != 'last.json':
+                file = codecs.open(os.path.join('data', category, fileName), 'rU', 'utf-8')
+                fileContent = file.read()
+                id = fileName[:-5]
+                self.data[category][id] = json.loads(fileContent)
+
+    #------------------------------------------------------- 
+    def ReadAll(self):
+    #-------------------------------------------------------
+        self.Read('Studenten')
+        self.Read('Lehrender')
+        self.Read('Firmen')
+        self.Read('Angebote')    
+
+    #-------------------------------------------------------
+    def ReadEntry(self, category = None, id = None): 
+    #-------------------------------------------------------
+        print("ReadEntry: ", category, id)
+        self.Read(category)
+        data = None
+        if id == None:
+            data = self.data
+        else:
+            if id in self.data[category]: 
+                data = self.data[category][id]
+        
+        print(data, "\n")
+        return data
+
+    #-------------------------------------------------------
+    def Save(self, data, category): 
+    #-------------------------------------------------------
+        status_b = False
+        id = data['id']
+        print("ID: ", id, "\n")
+        if(id != "None"):
+            if id in self.data[category]:
+                file = codecs.open(os.path.join('data', category, id+'.json'), 'w', 'utf-8')
+                file.write(json.dumps(data, indent=3, ensure_ascii=True))
+                file.close()
+                self.Read(category)
+                status_b = True
+        else:
+            data['id'] = self.IdNext(category)
+            file = codecs.open(os.path.join('data', category, data['id']+'.json'), 'w', 'utf-8')
+            file.write(json.dumps(data, indent=3, ensure_ascii=True))
+            file.close()
+            self.Read(category)
+            status_b = True
+        
+        return status_b
+
+    #-------------------------------------------------------
+    def Delete(self, category, id): 
+    #-------------------------------------------------------
+        status_b = False
+        if(category == 'Studenten'):
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Student'] == id):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+        elif(category == 'Lehrender'):
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Lehrender'] == id):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+        elif(category == 'Firmen'):
+            for firmen in self.data['Firmen']:
+                if(firmen == id):
+                    fn = self.data['Firmen'][firmen]['Name']
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Firma'] == fn):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+
+        if id in self.data[category]:
+            os.remove(os.path.join('data', category, id+'.json'))
+            del self.data[category][id]
+        
+        return status_b
+
+    #-------------------------------------------------------
+    def CheckOfferings(self, id): 
+    #-------------------------------------------------------
+        print("Offerings: ", id)
+        for offerings in self.data['Angebote']:
+            if(self.data['Angebote'][offerings]['Student'] != id):
+                return 0
+            else:
+                return 1
+
+    #-------------------------------------------------------
+    def CheckDates(self): 
+    #-------------------------------------------------------
+        now = datetime.now()
+        for offerings in self.data['Angebote']:
+            if(self.data['Angebote'][offerings]['ZeitraumBis'] != ''):
+                zeitraumBis = datetime.strptime(self.data['Angebote'][offerings]['ZeitraumBis'], "%d.%m.%Y")
+                if(zeitraumBis <= now):
+                    self.data['Angebote'][offerings]['Status'] = 'abgeschlossen'
+                    data = {}
+                    data['Status'] = 'abgeschlossen'
+                    data['id'] = offerings
+                    data['Name'] = self.data['Angebote'][offerings]['Name']
+                    data['Firma'] = self.data['Angebote'][offerings]['Firma']
+                    data['Beschreibung'] = self.data['Angebote'][offerings]['Beschreibung']
+                    data['Voraussetzungen'] = self.data['Angebote'][offerings]['Voraussetzungen']
+                    data['Firmenbetreuer'] = self.data['Angebote'][offerings]['Firmenbetreuer']
+                    data['Lehrender'] = self.data['Angebote'][offerings]['Lehrender']
+                    data['ZeitraumVon'] = self.data['Angebote'][offerings]['ZeitraumVon']
+                    data['ZeitraumBis'] = self.data['Angebote'][offerings]['ZeitraumBis']
+                    data['Student'] = self.data['Angebote'][offerings]['Student']
+                    self.Save(data, 'Angebote')
+
+    #-------------------------------------------------------
+    def GetDefault(self, category): 
+    #-------------------------------------------------------
+        if(category == 'Studenten'):
+            return {'Name':'', 'Vorname':'', 'Matrikelnummer':''}
+        elif(category == 'Lehrender'):
+            return {'Titel':'', 'Name':'', 'Vorname':'', 'Lehrgebiet':''}
+        elif(category == 'Firmen'):
+            return {'Name':'', 'Branche':'', 'Schwerpunkt':'', 'Sitz':'', 'Anzahl Mitarbeiter':''}
+        elif(category == 'Angebote'):
+            return {'Name':'', 'Firma':'', 'Beschreibung':'', 'Voraussetzungen':'', 'Firmenbetreuer':'', 'Status':'Angebot', 'Lehrender':'', 'ZeitraumVon':'', 'ZeitraumBis':'', 'Student':''}
+
+    #-------------------------------------------------------
+    def IdNext(self, category):
+    #-------------------------------------------------------
+        path = 'data/' + category + '/last.json'
+        if(os.path.isfile(path)):
+            file = open(os.path.join('data', category, 'last.json'), 'r+')
+            last = file.read()
+            last = str(int(last)+1)
+            file.seek(0)
+            file.write(last)
+            file.close()
+        else:
+            file = open(os.path.join('data', category, 'last.json'), 'w+')
+            last = str(int(0))
+            file.write(last)
+            file.close()
+        return last
+            
+# EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm1/app/view.py b/Praktikum2/ppm1/app/view.py
new file mode 100644
index 0000000..a481e64
--- /dev/null
+++ b/Praktikum2/ppm1/app/view.py
@@ -0,0 +1,52 @@
+import os.path
+from mako.template import Template
+from mako.lookup import TemplateLookup
+
+#----------------------------------------------------------
+class View_cl(object): 
+#----------------------------------------------------------
+  
+  #-------------------------------------------------------
+  def __init__(self): 
+  #-------------------------------------------------------
+    self.path = 'templates'
+    self.lookup = TemplateLookup(directories=['/'])
+  
+  #-------------------------------------------------------
+  def Create(self, template, data): 
+  #-------------------------------------------------------
+    print("CreateView\n")
+    template = Template(filename=os.path.join(self.path, template), output_encoding='utf-8', lookup=self.lookup)
+    return template.render(data = data)
+  
+  #-------------------------------------------------------
+  def CreateIndex(self): 
+  #-------------------------------------------------------
+    print("CreateIndex\n")
+    data = None
+    return self.Create('index.tpl', data)
+
+  #-------------------------------------------------------
+  def CreateList(self, data): 
+  #-------------------------------------------------------
+    return self.Create('list.tpl', data)
+
+  #-------------------------------------------------------
+  def CreateListChoice(self, data): 
+  #-------------------------------------------------------
+    return self.Create('listChoice.tpl', data)
+
+  #-------------------------------------------------------
+  def CreateListEval(self, data): 
+  #-------------------------------------------------------
+    return self.Create('listEval.tpl', data)
+
+  #-------------------------------------------------------
+  def CreateDetail(self, data): 
+  #-------------------------------------------------------
+    return self.Create('detail.tpl', data)
+
+  #-------------------------------------------------------
+  def CreateDetailChoice(self, data): 
+  #-------------------------------------------------------
+    return self.Create('detailChoice.tpl', data)
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/23.json b/Praktikum2/ppm1/data/Angebote/23.json
new file mode 100644
index 0000000..b28de59
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/23.json
@@ -0,0 +1,13 @@
+{
+   "Name": "Angebot IBM 1",
+   "ZeitraumBis": "01.01.2018",
+   "id": "23",
+   "Firmenbetreuer": "Sepp Meine",
+   "Firma": "IBM",
+   "Voraussetzungen": "Keine",
+   "Lehrender": "7",
+   "Status": "aktuell",
+   "Beschreibung": "Praxisphasenplatz bei IBM",
+   "ZeitraumVon": "01.01.2017",
+   "Student": "9"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/26.json b/Praktikum2/ppm1/data/Angebote/26.json
new file mode 100644
index 0000000..f2fd625
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/26.json
@@ -0,0 +1,13 @@
+{
+   "id": "26",
+   "ZeitraumVon": "02.02.2019",
+   "Firma": "Apple",
+   "Student": "10",
+   "Beschreibung": "Beschreibung",
+   "Name": "Name",
+   "Lehrender": "5",
+   "Firmenbetreuer": "Firmenbetreuer3",
+   "Voraussetzungen": "Kein",
+   "Status": "aktuell",
+   "ZeitraumBis": "02.02.2020"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/27.json b/Praktikum2/ppm1/data/Angebote/27.json
new file mode 100644
index 0000000..c1e9b49
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/27.json
@@ -0,0 +1,13 @@
+{
+   "id": "27",
+   "Voraussetzungen": "Keine",
+   "Lehrender": "5",
+   "Status": "abgeschlossen",
+   "Firmenbetreuer": "Horst",
+   "Beschreibung": "Praxisphase Apple",
+   "ZeitraumVon": "02.02.2002",
+   "Student": "11",
+   "Name": "Angebot Apple 2",
+   "Firma": "Apple",
+   "ZeitraumBis": "02.02.2003"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/30.json b/Praktikum2/ppm1/data/Angebote/30.json
new file mode 100644
index 0000000..31c0e32
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/30.json
@@ -0,0 +1,13 @@
+{
+   "ZeitraumBis": "",
+   "Firmenbetreuer": "firmenbetreuer",
+   "id": "30",
+   "ZeitraumVon": "",
+   "Name": "name",
+   "Beschreibung": "beschreibung",
+   "Student": "",
+   "Lehrender": "",
+   "Status": "Angebot",
+   "Voraussetzungen": "voraussetzungen",
+   "Firma": "IBM"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/last.json b/Praktikum2/ppm1/data/Angebote/last.json
new file mode 100644
index 0000000..a5c750f
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/last.json
@@ -0,0 +1 @@
+27
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Firmen/4.json b/Praktikum2/ppm1/data/Firmen/4.json
new file mode 100644
index 0000000..98b84ab
--- /dev/null
+++ b/Praktikum2/ppm1/data/Firmen/4.json
@@ -0,0 +1,8 @@
+{
+   "id": "4",
+   "Branche": "IT",
+   "Sitz": "Cupertino",
+   "Schwerpunkt": "Informatik",
+   "Anzahl Mitarbeiter": "110000",
+   "Name": "Apple"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Firmen/5.json b/Praktikum2/ppm1/data/Firmen/5.json
new file mode 100644
index 0000000..28aecae
--- /dev/null
+++ b/Praktikum2/ppm1/data/Firmen/5.json
@@ -0,0 +1,8 @@
+{
+   "id": "5",
+   "Branche": "IT",
+   "Sitz": "Redmond",
+   "Schwerpunkt": "Informatik",
+   "Anzahl Mitarbeiter": "114000",
+   "Name": "Microsoft"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Firmen/6.json b/Praktikum2/ppm1/data/Firmen/6.json
new file mode 100644
index 0000000..cd2cba7
--- /dev/null
+++ b/Praktikum2/ppm1/data/Firmen/6.json
@@ -0,0 +1,8 @@
+{
+   "id": "6",
+   "Branche": "IT",
+   "Sitz": "Armonk",
+   "Schwerpunkt": "Elektrotechnik",
+   "Anzahl Mitarbeiter": "377000",
+   "Name": "IBM"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Firmen/last.json b/Praktikum2/ppm1/data/Firmen/last.json
new file mode 100644
index 0000000..62f9457
--- /dev/null
+++ b/Praktikum2/ppm1/data/Firmen/last.json
@@ -0,0 +1 @@
+6
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/5.json b/Praktikum2/ppm1/data/Lehrender/5.json
new file mode 100644
index 0000000..cee342e
--- /dev/null
+++ b/Praktikum2/ppm1/data/Lehrender/5.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof",
+   "id": "5",
+   "Lehrgebiet": "Informatik",
+   "Name": "Heiner",
+   "Vorname": "Theodor"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/6.json b/Praktikum2/ppm1/data/Lehrender/6.json
new file mode 100644
index 0000000..bb4eb50
--- /dev/null
+++ b/Praktikum2/ppm1/data/Lehrender/6.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof Dr",
+   "id": "6",
+   "Lehrgebiet": "Elektrotechnik",
+   "Name": "Anton",
+   "Vorname": "Emanuel"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/7.json b/Praktikum2/ppm1/data/Lehrender/7.json
new file mode 100644
index 0000000..2f4b91f
--- /dev/null
+++ b/Praktikum2/ppm1/data/Lehrender/7.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof",
+   "id": "7",
+   "Lehrgebiet": "Informatik",
+   "Name": "Adalbert",
+   "Vorname": "Bastian"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/8.json b/Praktikum2/ppm1/data/Lehrender/8.json
new file mode 100644
index 0000000..62b79b3
--- /dev/null
+++ b/Praktikum2/ppm1/data/Lehrender/8.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Dr",
+   "id": "8",
+   "Lehrgebiet": "Elektrotechnik",
+   "Name": "Leberecht",
+   "Vorname": "Egon"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/last.json b/Praktikum2/ppm1/data/Lehrender/last.json
new file mode 100644
index 0000000..ca7bf83
--- /dev/null
+++ b/Praktikum2/ppm1/data/Lehrender/last.json
@@ -0,0 +1 @@
+13
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/10.json b/Praktikum2/ppm1/data/Studenten/10.json
new file mode 100644
index 0000000..31ac8db
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/10.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Timo",
+   "Name": "Ben",
+   "Matrikelnummer": "3",
+   "id": "10"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/11.json b/Praktikum2/ppm1/data/Studenten/11.json
new file mode 100644
index 0000000..2ccc813
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/11.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Korbinian",
+   "Name": "Moritz",
+   "Matrikelnummer": "6",
+   "id": "11"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/12.json b/Praktikum2/ppm1/data/Studenten/12.json
new file mode 100644
index 0000000..406f91d
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/12.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Alfons",
+   "Name": "Meine",
+   "Matrikelnummer": "4",
+   "id": "12"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/13.json b/Praktikum2/ppm1/data/Studenten/13.json
new file mode 100644
index 0000000..e463503
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/13.json
@@ -0,0 +1,6 @@
+{
+   "id": "13",
+   "Name": "Edmund",
+   "Vorname": "Adalbert",
+   "Matrikelnummer": "1"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/9.json b/Praktikum2/ppm1/data/Studenten/9.json
new file mode 100644
index 0000000..a4bd70d
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/9.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Gregor",
+   "Name": "Klemens",
+   "Matrikelnummer": "2",
+   "id": "9"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Studenten/last.json b/Praktikum2/ppm1/data/Studenten/last.json
new file mode 100644
index 0000000..da2d398
--- /dev/null
+++ b/Praktikum2/ppm1/data/Studenten/last.json
@@ -0,0 +1 @@
+14
\ No newline at end of file
diff --git a/Praktikum2/ppm1/doc/documentation.html b/Praktikum2/ppm1/doc/documentation.html
new file mode 100644
index 0000000..7387d6d
--- /dev/null
+++ b/Praktikum2/ppm1/doc/documentation.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <title></title>
+  <style type="text/css">code{white-space: pre;}</style>
+  <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+<h1 id="web-praktikum-gruppe-a">Web-Praktikum Gruppe A</h1>
+<h2 id="kai-wansart-und-felix-hoster">Kai Wansart und Felix Hoster</h2>
+<h3 id="section">16.11.2016</h3>
+<h2 id="beschreibung-der-lösung">Beschreibung der Lösung</h2>
+<h3 id="aufgabe-der-anwendung">Aufgabe der Anwendung:</h3>
+<ul>
+<li>eine Ünterstützung der Betreuung von Praxisphasen mit einer Web-Anwendung zu erstellen</li>
+<li>Praxisphasen werden von externen Partnern (Firmen) angeboten</li>
+<li>Studenten können diese Angebote nutzen, wenn sie einen Lehrenden als Betreuer finden</li>
+</ul>
+<h4 id="übersicht-der-fachlichen-funktion">Übersicht der fachlichen Funktion:</h4>
+<ul>
+<li>Datenpflege Studenten:
+<ul>
+<li>Eine Liste mit allen erstellten Studenten (Name, Vorname, Matrikelnummer)</li>
+</ul></li>
+<li>Datenpflege Lehrende:
+<ul>
+<li>Eine Übersicht mit allen Lehrenden (Name, Titel, Lehrgebiet)</li>
+</ul></li>
+<li>Datenpflege Firmenverzeichniss:
+<ul>
+<li>Eine Liste mit einer kleinen Übersicht über einzelne Firmen (Schwerpunkt, Sitz, Name, Branche, Mitarbeiteranzahl)</li>
+</ul></li>
+<li>Datenpflege Praxisphase:
+<ul>
+<li>Erhält man eine kurze Übersicht über Angebote für die Studenten (Firmenbetreuer, Beschreibung, Name, Voraussetzung, Firma)</li>
+</ul></li>
+<li>Auswahl Praxisphasen:
+<ul>
+<li>Dort können die Studenten mit einem Professor sich eine Praxisphase aussuchen</li>
+</ul></li>
+<li>Auswertung Firma:
+<ul>
+<li>Hier werden die Firmen bewertet, die ein Angebot für die Praxisphase bewertet</li>
+</ul></li>
+<li>Auswertung Praxisphasen nach Studenten:
+<ul>
+<li>Hier sieht man die Bewertung der Studenten über die einzelnen Angebote</li>
+</ul></li>
+<li>Auswertung Praxisphase nach Betreuern:
+<ul>
+<li>Hier sieht man die Bewertung der Praxisphasen - Betreuer</li>
+</ul></li>
+</ul>
+<h2 id="beschreibung-des-servers">Beschreibung des Servers</h2>
+<h4 id="zweck">Zweck</h4>
+<ul>
+<li>Verwaltung von Praxisphasen, für Studenten, Lehrende, und Firmen</li>
+<li>Anbieten von Praxisphasenangeboten</li>
+<li>Auswertung von aktuellen und vergangenen Praxisphasenangeboten</li>
+</ul>
+<h4 id="aufbau-bestandteile-der-komponente">Aufbau (Bestandteile der Komponente)</h4>
+<ul>
+<li>Application
+<ul>
+<li>Annahme von Anfragen durch den Webbrowser</li>
+<li>Weiterleitung an die jeweiligen Komponenten</li>
+</ul></li>
+<li>Database
+<ul>
+<li>Einlesen, Speicherung, Bearbeitung und Löschung von Datensätzen</li>
+</ul></li>
+<li>View
+<ul>
+<li>Verarbeiten der Templates mit den gegebenen Daten</li>
+</ul></li>
+</ul>
+<h4 id="zusammenwirken-mit-anderen-komponenten">Zusammenwirken mit anderen Komponenten</h4>
+<h4 id="api-programmierschnittstellen-die-die-leistung-der-komponente-anbieten">API (Programmierschnittstellen), die die Leistung der Komponente anbieten</h4>
+<ul>
+<li>index
+<ul>
+<li>Startseite</li>
+</ul></li>
+<li>category
+<ul>
+<li>Darstellung der Kategorien</li>
+</ul></li>
+<li>choice
+<ul>
+<li>Darstellung der Praxisphasenauswahl</li>
+</ul></li>
+<li>eval
+<ul>
+<li>Darstellung der Auswertungen</li>
+</ul></li>
+<li>detail
+<ul>
+<li>Darstellung der Detailansicht für die Kategorien</li>
+</ul></li>
+<li>detailchoice
+<ul>
+<li>Darstellung der Detailansicht für die Praxisphasenauswahl</li>
+</ul></li>
+<li>save
+<ul>
+<li>Speichern der Detailansicht für die Kategorien</li>
+</ul></li>
+<li>savechoice
+<ul>
+<li>Speichern der Detailansicht für die Praxisphasenauswahl</li>
+</ul></li>
+<li>delete
+<ul>
+<li>Löschen eines Eintrags aus der Datenbank</li>
+</ul></li>
+<li>default
+<ul>
+<li>Fehlerdarstellung</li>
+</ul></li>
+</ul>
+</body>
+</html>
diff --git a/Praktikum2/ppm1/doc/documentation.md b/Praktikum2/ppm1/doc/documentation.md
new file mode 100644
index 0000000..27141f1
--- /dev/null
+++ b/Praktikum2/ppm1/doc/documentation.md
@@ -0,0 +1,36 @@
+# Web-Praktikum Gruppe K
+## Kai Wansart und Felix Hoster
+### 16.11.2016
+
+## Beschreibung der Lösung
+### Aufgabe der Anwendung: 
+Die Praktikumsaufgabe war, eine Ünterstützung der Betreuung von Praxisphasen mit einer Web-Anwendung zu erstellen. Praxisphasen werden
+von externen Partnern (Firmen) angeboten, Studenten können diese Angebote nutzen, wenn sie einen Lehrenden als Betreuer
+finden 
+ 
+ #### Übersicht der fachlichen Funktion
+ - Datenpflege Studenten: Eine Liste mit allen erstellten Studenten (Name, Vorname, Matrikelnummer)
+ - Datenpflege Lehrende: Eine Übersicht mit allen Lehrenden (Name, Titel, Lehrgebiet)
+ - Datenpflege Firmenverzeichniss: Eine Liste mit einer kleinen Übersicht über einzelne Firmen (Schwerpunkt, Sitz, Name, Branche, Mitarbeiteranzahl)
+ - Datenpflege Praxisphase: Erhält man eine kurze Übersicht über Angebote für die Studenten (Firmenbetreuer, Beschreibung, Name, Voraussetzung, Firma)
+ - Auswahl Praxisphasen: Dort können die Studenten mit einem Professor sich eine Praxisphase aussuchen
+ - Auswertung Firma: Hier werden die Firmen bewertet, die ein Angebot für die Praxisphase bewertet
+ - Auswertung Praxisphasen nach Studenten: Hier sieht man die Bewertung der Studenten über die einzelnen Angebote
+ - Auswertung Praxisphase nach Betreuern: Hier sieht man die Bewertung der Praxisphasen - Betreuer
+ 
+
+## Beschreibung des Servers
+#### Zweck
+
+#### Aufbau (Bestandteile der Komponente)
+
+#### Zusammenwirken mit anderen Komponenten
+
+#### API (Programmierschnittstellen), die die Leistung der Komponente anbieten
+
+## Datenablage
+Die Daten werden mittels der Kategorie abgespeichert, die als Variable behandelt wird. Mit dieser Variable wird die Datei immer wieder neu gespeichert, wenn etwas gelöscht bzw. geändert wird. Das Format der Datei ist eine JSON-Datei, die im Ordner 'Data' und der darauffolgenden Kategorie abgespeichert wird. 
+
+## Konfiguration
+
+## Durchführung und Ergebnis der geforderten Prüfungen
\ No newline at end of file
diff --git a/Praktikum2/ppm1/server.py b/Praktikum2/ppm1/server.py
new file mode 100644
index 0000000..4e64056
--- /dev/null
+++ b/Praktikum2/ppm1/server.py
@@ -0,0 +1,45 @@
+#coding: utf-8
+
+import os
+import cherrypy
+from app import application
+
+#--------------------------------------
+def main(): 
+#--------------------------------------
+	
+	# Get current directory
+	try:
+		current_dir = os.path.dirname(os.path.abspath(__file__))
+	except:
+		current_dir = os.path.dirname(os.path.abspath(sys.executable))
+	
+	# disable autoreload and timeout_monitor
+	cherrypy.engine.autoreload.unsubscribe() 
+	cherrypy.engine.timeout_monitor.unsubscribe() 
+
+	# Static content config
+	static_config = {
+		'/': {
+			'tools.staticdir.root': current_dir, 
+			'tools.staticdir.on': True, 
+			'tools.staticdir.dir': './static'
+			}
+		}
+	
+	# Mount static content handler
+	root_o = cherrypy.tree.mount(application.Application_cl(), '/', static_config) 
+	
+	# suppress traceback-info
+	cherrypy.config.update({'request.show_tracebacks': False})
+	
+	# Start server
+	cherrypy.engine.start()
+	cherrypy.engine.block()
+
+#--------------------------------------
+if __name__ == '__main__': 
+#--------------------------------------
+	main()
+
+# EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functions.js b/Praktikum2/ppm1/static/functions.js
new file mode 100644
index 0000000..20acdea
--- /dev/null
+++ b/Praktikum2/ppm1/static/functions.js
@@ -0,0 +1,46 @@
+var table = document.getElementById('idList');
+var selected = table.getElementsByClassName('selected');
+var selectedId = 'None';
+table.onclick = highlight;
+
+function select(category, mode) {
+    var id = selectedId;
+    if (id == 'None')
+    {
+        alert("Kein Eintrag ausgewaehlt!");
+    }
+    else
+    {
+      if(mode == 0) {
+        window.location.href = '/detail/?cat=' + category + '&id=' + id;
+      }
+      if(mode == 1) {
+        var result = confirm("Sind Sie sicher, dass der Eintrag gelöscht werden soll?");
+        if(result) {
+          window.location.href = '/delete/?cat=' + category + '&id=' + id;   
+          return true;
+        }
+        else {
+          return false;
+        }
+      }
+      if(mode == 2) {
+        var result = confirm("Sind Sie sicher, dass das Angebot angenommen werden soll?");
+        if(result) {
+          window.location.href = '/detailchoice/?id=' + id;   
+          return true;
+        }
+        else {
+          return false;
+        }
+      }
+    }
+}
+
+
+function highlight(e) {
+   if (selected[0]) selected[0].className = '';
+   e.target.parentNode.className = 'selected';
+   var tr = e.target.parentNode;
+   selectedId = tr.getAttribute('id');
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functionsAngebote.js b/Praktikum2/ppm1/static/functionsAngebote.js
new file mode 100644
index 0000000..967dc07
--- /dev/null
+++ b/Praktikum2/ppm1/static/functionsAngebote.js
@@ -0,0 +1,33 @@
+window.onload = function () {
+  document.getElementById("idList").onclick = function (event_opl) {
+    if (event_opl.target.tagName.toLowerCase() == 'td') {
+      id = event_opl.target.parentNode.id;
+      if (id != "") {
+        document.getElementById(id).className = "";
+      }
+
+      
+      console.log(id);
+      document.getElementById(id).className = "selected";
+    }
+  }
+
+  document.getElementById("New").onclick = function (event_opl) {
+    window.location.href = "/detail/?cat=Angebote" ;
+  }
+
+
+  document.getElementById("Modify").onclick = function (event_opl) {
+    if (id != "")
+      window.location.href = "/detail/?cat=Angebote&id=" + id;
+  }
+
+  document.getElementById("Delete").onclick = function (event_opl) {
+    if (id != "")
+      if (confirm("Soll der Eintrag wirklich geloescht werden?")) {
+        window.location.href = "/delete/?cat=Angebote&id=" + id;  
+      }
+      
+  }
+
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functionsChoice.js b/Praktikum2/ppm1/static/functionsChoice.js
new file mode 100644
index 0000000..ee7b3fa
--- /dev/null
+++ b/Praktikum2/ppm1/static/functionsChoice.js
@@ -0,0 +1,19 @@
+window.onload = function () {
+  document.getElementById("idList").onclick = function (event_opl) {
+    if (event_opl.target.tagName.toLowerCase() == 'td') {
+      id = event_opl.target.parentNode.id;
+      if (id != "") {
+        document.getElementById(id).className = "";
+      }
+
+      
+      console.log(id);
+      document.getElementById(id).className = "selected";
+    }
+  }
+
+  document.getElementById("Annehmen").onclick = function (event_opl) {
+    if (id != "")
+      window.location.href = "/detailchoice/?id=" + id;
+  }
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functionsFirmen.js b/Praktikum2/ppm1/static/functionsFirmen.js
new file mode 100644
index 0000000..c52c68f
--- /dev/null
+++ b/Praktikum2/ppm1/static/functionsFirmen.js
@@ -0,0 +1,33 @@
+window.onload = function () {
+  document.getElementById("idList").onclick = function (event_opl) {
+    if (event_opl.target.tagName.toLowerCase() == 'td') {
+      id = event_opl.target.parentNode.id;
+      if (id != "") {
+        document.getElementById(id).className = "";
+      }
+
+      
+      console.log(id);
+      document.getElementById(id).className = "selected";
+    }
+  }
+
+  document.getElementById("New").onclick = function (event_opl) {
+    window.location.href = "/detail/?cat=Firmen" ;
+  }
+
+
+  document.getElementById("Modify").onclick = function (event_opl) {
+    if (id != "")
+      window.location.href = "/detail/?cat=Firmen&id=" + id;
+  }
+
+  document.getElementById("Delete").onclick = function (event_opl) {
+    if (id != "")
+      if (confirm("Soll der Eintrag wirklich geloescht werden?")) {
+        window.location.href = "/delete/?cat=Firmen&id=" + id;  
+      }
+      
+  }
+
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functionsLehrender.js b/Praktikum2/ppm1/static/functionsLehrender.js
new file mode 100644
index 0000000..de63671
--- /dev/null
+++ b/Praktikum2/ppm1/static/functionsLehrender.js
@@ -0,0 +1,33 @@
+window.onload = function () {
+  document.getElementById("idList").onclick = function (event_opl) {
+    if (event_opl.target.tagName.toLowerCase() == 'td') {
+      id = event_opl.target.parentNode.id;
+      if (id != "") {
+        document.getElementById(id).className = "";
+      }
+
+      
+      console.log(id);
+      document.getElementById(id).className = "selected";
+    }
+  }
+
+  document.getElementById("New").onclick = function (event_opl) {
+    window.location.href = "/detail/?cat=Lehrender" ;
+  }
+
+
+  document.getElementById("Modify").onclick = function (event_opl) {
+    if (id != "")
+      window.location.href = "/detail/?cat=Lehrender&id=" + id;
+  }
+
+  document.getElementById("Delete").onclick = function (event_opl) {
+    if (id != "")
+      if (confirm("Soll der Eintrag wirklich geloescht werden?")) {
+        window.location.href = "/delete/?cat=Lehrender&id=" + id;  
+      }
+      
+  }
+
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/functionsStudenten.js b/Praktikum2/ppm1/static/functionsStudenten.js
new file mode 100644
index 0000000..2136ca2
--- /dev/null
+++ b/Praktikum2/ppm1/static/functionsStudenten.js
@@ -0,0 +1,33 @@
+window.onload = function () {
+  document.getElementById("idList").onclick = function (event_opl) {
+    if (event_opl.target.tagName.toLowerCase() == 'td') {
+      id = event_opl.target.parentNode.id;
+      if (id != "") {
+        document.getElementById(id).className = "";
+      }
+
+      
+      console.log(id);
+      document.getElementById(id).className = "selected";
+    }
+  }
+
+  document.getElementById("New").onclick = function (event_opl) {
+    window.location.href = "/detail/?cat=Studenten" ;
+  }
+
+
+  document.getElementById("Modify").onclick = function (event_opl) {
+    if (id != "")
+      window.location.href = "/detail/?cat=Studenten&id=" + id;
+  }
+
+  document.getElementById("Delete").onclick = function (event_opl) {
+    if (id != "")
+      if (confirm("Soll der Eintrag wirklich geloescht werden?")) {
+        window.location.href = "/delete/?cat=Studenten&id=" + id;  
+      }
+      
+  }
+
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/static/img/logo.png b/Praktikum2/ppm1/static/img/logo.png
new file mode 100644
index 0000000..40801c4
Binary files /dev/null and b/Praktikum2/ppm1/static/img/logo.png differ
diff --git a/Praktikum2/ppm1/static/style.css b/Praktikum2/ppm1/static/style.css
new file mode 100644
index 0000000..9dcd8c3
--- /dev/null
+++ b/Praktikum2/ppm1/static/style.css
@@ -0,0 +1 @@
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:"Open Sans",sans-serif;background-color:#084791;border:none;border-radius:60px;}.clSiteHeader a{text-decoration:none;color:white;}.clSiteHeader:hover{background-color:#0D71E4;cursor:pointer;}.clSiteHeader a:visited,a:active{color:white;text-decoration:none;}.clContent{position:absolute;top:150px;left:0;right:0;bottom:0;margin:0;padding:5px;background-repeat:no-repeat;background-position:bottom left;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:0px;margin:10px 0;margin-left:10px;padding:5px;background-attachment:#819FF7;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#FFFFFF;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:white;background-color:#084791;}.clButtonArea a:hover{color:white;background-color:#0D71E4;cursor:pointer;}.clButtonArea a:visited,a:active{color:white;}.clNavButton{display:inline-block;text-align:center;background-color:#084791;border:1px solid black;color:white;padding:15px 32px;text-decoration:none;font-size:16px;cursor:pointer;float:left;clear:left;width:20%;margin-left:38%;margin-right:30%;}.clNavButton:hover{background-color:#0D71E4;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:white;padding:3px;border:2px solid;}#idList td{padding:3px;border:2px solid;cursor:pointer;}#idForm .clContentArea{width:500px;margin:auto;}.selected{background-color:#0D71E4;color:white;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}.clFormRow select{position:absolute;top:0;left:250px;width:250px;}h3{text-align:center;}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/detail.tpl b/Praktikum2/ppm1/templates/detail.tpl
new file mode 100644
index 0000000..1fa65ec
--- /dev/null
+++ b/Praktikum2/ppm1/templates/detail.tpl
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+         Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+
+      <form id="idForm" class="clContent" action="/save/?cat=${data['category']}" method="POST">
+         <h2 id="idContentHeader" class="clContentHeader">
+            ${data['category']}: Ihre Daten
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+            <input type="hidden" value="${data['id']}" id="id" name="id" />
+
+            % if data['category'] != 'Angebote':
+               % for field in data['content']:
+                  % if field!='id' and field!='Status':
+                  <div class="clFormRow">
+                     <label for="${field}">${field}</label>
+                     <input type="text" value=
+                     % if data['content'][field] != field:
+                     "${data['content'][field]}" id="${field}" name="${field}" />
+                     % else:
+                     "" id="${field}" name="${field}" />
+                     % endif
+                  </div>
+                  % endif
+               % endfor
+            % else:
+               <input type="hidden" value="Angebot" id="Status" name="Status" />
+               <input type="hidden" value="" id="Zeitraum" name="ZeitraumVon" />
+               <input type="hidden" value="" id="Zeitraum" name="ZeitraumBis" />
+               <input type="hidden" value="" id="Student" name="Student" />
+               <input type="hidden" value="" id="Lehrender" name="Lehrender" />
+               % for field in data['content']:
+                  % if field!='id' and field!='Status' and field!='ZeitraumVon' and field!='ZeitraumBis' and field!='Lehrender' and field!='Student':
+                     <div class="clFormRow">
+                        <label for="${field}">${field}</label>
+                     % if field!='Firma':
+                        <input type="text" value=
+                        % if data['content'][field] != field:
+                        "${data['content'][field]}" id="${field}" name="${field}" />
+                        % else:
+                        "" id="${field}" name="${field}" />
+                        % endif
+                     % else:
+                        <select name="Firma" form="idForm">
+                           % for option in data['Firmen']:
+                              <option value="${data['Firmen'][option]['Name']}">${data['Firmen'][option]['Name']}</option>
+                           % endfor
+                        </select>
+                     % endif
+                     </div>
+                  % endif
+               % endfor
+            % endif
+
+            <div id="idButtonArea" class="clButtonArea">
+               <a href="/index" title="Zur&uumlck zur Startseite">Zur&uumlck zur Startseite</a>
+               <a href="/category/?cat=${data['category']}" title="Zurueck zur Startseite">Zur&uumlck zur &uumlbersicht</a>
+               <input type="submit" value="Speichern" />
+            </div>
+         </div>
+      </form>
+   </body>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/detailChoice.tpl b/Praktikum2/ppm1/templates/detailChoice.tpl
new file mode 100644
index 0000000..1451eae
--- /dev/null
+++ b/Praktikum2/ppm1/templates/detailChoice.tpl
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+         Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+
+      <form id="idForm" class="clContent" action="/saveChoice" method="POST">
+         <h2 id="idContentHeader" class="clContentHeader">
+            Praxisphasenangebots Auswahl
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+            <input type="hidden" value="${data['id']}" id="id" name="id" />
+            <input type="hidden" value="${data['Name']}" id="Name" name="Name" />
+            <input type="hidden" value="${data['Firma']}" id="Firma" name="Firma" />
+            <input type="hidden" value="${data['Beschreibung']}" id="Beschreibung" name="Beschreibung" />
+            <input type="hidden" value="${data['Voraussetzungen']}" id="Voraussetzungen" name="Voraussetzungen" />
+            <input type="hidden" value="${data['Firmenbetreuer']}" id="Firmenbetreuer" name="Firmenbetreuer" />
+            <input type="hidden" value="aktuell" id="Status" name="Status" />
+
+            <div class="clFormRow">
+               <label for="Student">Student</label>
+               <select name="Student" form="idForm">
+                  % for option in data['Studenten']:
+                     <option value="${data['Studenten'][option]['id']}">${data['Studenten'][option]['Name']}</option>
+                  % endfor
+               </select>
+            </div>
+
+            <div class="clFormRow">
+               <label for="Lehrender">Lehrender</label>
+               <select name="Lehrender" form="idForm">
+                  % for option in data['Lehrender']:
+                     <option value="${data['Lehrender'][option]['id']}">${data['Lehrender'][option]['Name']}</option>
+                  % endfor
+               </select>
+            </div>
+
+            <div class="clFormRow">
+            <label for="ZeitraumVon">Zeitraum: Von (D.M.Y)</label>
+            <input type="text" value="" id="ZeitraumVon" name="ZeitraumVon" />
+            </div>
+
+            <div class="clFormRow">
+            <label for="ZeitraumBis">Zeitraum: Bis (D.M.Y)</label>
+            <input type="text" value="" id="ZeitraumBis" name="ZeitraumBis" />
+            </div>
+
+            <div id="idButtonArea" class="clButtonArea">
+               <a href="/index" title="Zur&uumlck zur Startseite">Zur&uumlck zur Startseite</a>
+               <a href="/choice" title="Zur&uumlck zur &uumlbersicht">Zur&uumlck zur &uumlbersicht</a>
+               <input type="submit" value="Speichern" />
+            </div>
+         </div>
+      </form>
+   </body>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/index.tpl b/Praktikum2/ppm1/templates/index.tpl
new file mode 100644
index 0000000..e7094e5
--- /dev/null
+++ b/Praktikum2/ppm1/templates/index.tpl
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div class="clContent">
+        <h2 id="idContentHeader" class="clContentHeader">Module</h2>
+        <div class="clContentArea"> 
+          <a href="/category/?cat=Studenten" class="clNavButton">Datenpflege: Studenten</a>
+          <a href="/category/?cat=Lehrender" class="clNavButton">Datenpflege: Lehrender</a>
+          <a href="/category/?cat=Firmen" class="clNavButton">Datenpflege: Firmenverzeichnis</a>
+          <a href="/category/?cat=Angebote" class="clNavButton">Datenpflege: Praxisphasen</a>
+          
+          <a href="/choice" class="clNavButton">Auswahl: Praxisphasen</a>
+
+          <a href="/eval/?cat=Studenten" class="clNavButton">Auswertung: Studenten</a>
+          <a href="/eval/?cat=Lehrender" class="clNavButton">Auswertung: Lehrenden</a>
+          <a href="/eval/?cat=Firmen" class="clNavButton">Auswertung: Firmen</a>
+
+        </div> 
+      </div>
+   </body>
+   <footer>
+      <!--<script type="text/javascript" src="/functions.js"></script>-->
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/list.tpl b/Praktikum2/ppm1/templates/list.tpl
new file mode 100644
index 0000000..7cc3bce
--- /dev/null
+++ b/Praktikum2/ppm1/templates/list.tpl
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+      <script src="/functions${data['category']}.js" type="text/javascript"></script>
+   </head>
+   <body>
+
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht: ${data['category']}
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+
+            <table id="idList">
+               <tr>
+                  % if data['content']!= None:
+                     % for heading in data['headings']:
+                        % if heading!='id' and heading!='Status' and heading!='ZeitraumVon' and heading!='ZeitraumBis' and heading!='Student' and heading!='Lehrender':
+                           <th>${heading}</th>
+                        % endif
+                     % endfor
+                  % else:
+                  <td>Bisher kein Inhalt</td>
+                  % endif
+               </tr>
+               % if data['content']!= None:
+                  
+                  % for entries in data['content']:
+                  <tr id=${entries}>
+                     % if data['category'] == 'Angebote':
+                        % if data['content'][entries]['Status'] == 'Angebot':
+                           % for entry in data['content'][entries]:
+                              % if entry!='id' and entry!='Status' and entry!='ZeitraumVon' and entry!='ZeitraumBis' and entry!='Student' and entry!='Lehrender':
+                                 <td id=${entries}>${data['content'][entries][entry]}</td>
+                              % endif
+                           % endfor
+                        % endif
+                     % else:
+                        % for entry in data['content'][entries]:
+                           % if entry!='id':
+                              <td id=${entries}>${data['content'][entries][entry]}</td>
+                           % endif
+                        % endfor
+                     % endif
+                  </tr id=${entries}>
+                  % endfor
+
+               % endif
+
+            </table>
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a href="/index" class="clButton">Startseite</a>
+
+            <a class="clButton" id="New">Neu</a>
+            <a class="clButton" id="Modify">Bearbeiten</a>
+            <a class="clButton" id="Delete">Loeschen</a>
+
+         </div> 
+      </div>
+   </body>
+   <footer>
+   
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/listChoice.tpl b/Praktikum2/ppm1/templates/listChoice.tpl
new file mode 100644
index 0000000..5241c5c
--- /dev/null
+++ b/Praktikum2/ppm1/templates/listChoice.tpl
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+      <script src="/functionsChoice.js" type="text/javascript"></script>
+   </head>
+   <body>
+
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht Praxisphasen Auswahl
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+
+            <table id="idList">
+               <tr>
+                  <th>Name</th>
+                  <th>Firma</th>
+                  <th>Beschreibung</th>
+                  <th>Voraussetzungen</th>
+                  <th>Firmenbetreuer</th>
+               </tr>
+               % if data['content']!= None:
+                  % for entries in data['content']:
+                  <tr id=${entries}>
+                     <td id=${entries}>${data['content'][entries]['Name']}</td>
+                     <td id=${entries}>${data['content'][entries]['Firma']}</td>
+                     <td id=${entries}>${data['content'][entries]['Beschreibung']}</td>
+                     <td id=${entries}>${data['content'][entries]['Voraussetzungen']}</td>
+                     <td id=${entries}>${data['content'][entries]['Firmenbetreuer']}</td>
+                  </tr id=${entries}>
+                  % endfor
+
+               % endif
+
+            </table>
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a href="/index" class="clButton">Startseite</a>
+            <a class="clButton" id="Annehmen">Annehmen</a>
+         </div> 
+      </div>
+   </body>
+   <footer>
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm1/templates/listEval.tpl b/Praktikum2/ppm1/templates/listEval.tpl
new file mode 100644
index 0000000..0bab960
--- /dev/null
+++ b/Praktikum2/ppm1/templates/listEval.tpl
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht: ${data['category']}
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+         % if data['category'] == 'Firmen':
+            % for firmen in data:
+               % if firmen != 'category':
+                  <h3>${firmen}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Status</th>
+                        <th>Student</th>
+                        <th>Lehrender</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                  % for aktuell in data[firmen]['Angebote']['aktuell']:
+                     <tr>
+                        <td>Aktuell</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['Student']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['Lehrender']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumVon']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumBis']}</td>
+                     </tr>
+                  % endfor
+                  % for abgeschlossen in data[firmen]['Angebote']['abgeschlossen']:
+                     <tr>
+                        <td>Abgeschlossen</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Student']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Lehrender']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumVon']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumBis']}</td>
+                     </tr>
+                  % endfor
+                  </table>
+               % endif
+            % endfor
+         % endif
+
+         % if data['category'] == 'Studenten':
+            % for studenten in data:
+               % if studenten != 'category':
+                  <h3>${studenten}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Lehrender</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     % for angebote in data[studenten]['Angebote']['aktuell']:
+                     <tr>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Lehrender']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Firma']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Status']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
+                     </tr>
+                     % endfor
+                     % for angebote in data[studenten]['Angebote']['abgeschlossen']:
+                     <tr>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Lehrender']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
+                     </tr>
+                     % endfor
+
+                                          
+                  </table>
+               % endif
+            % endfor
+         % endif
+
+         % if data['category'] == 'Lehrender':
+            % for Lehrender in data:
+               % if Lehrender != 'category':
+                  <h3>${Lehrender}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Student</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     % if data[Lehrender] != NULL:
+                        % for angebote in data[Lehrender]['Angebote']['aktuell']:
+                        <tr>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Student']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Firma']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Status']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
+                        </tr>
+                        % endfor
+                        % for angebote in data[Lehrender]['Angebote']['abgeschlossen']:
+                        <tr>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Student']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
+                        </tr>
+                        % endfor
+                     % endif
+                  </table>
+               % endif
+            % endfor
+         % endif
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a href="/index" class="clButton">Startseite</a>
+         </div> 
+      </div>
+   </body>
+   <footer>
+      <!--<script src="/functions.js" type="text/javascript"></script>-->
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/.vs/ppm2/v14/.suo b/Praktikum2/ppm2/.vs/ppm2/v14/.suo
new file mode 100644
index 0000000..9a68bf7
Binary files /dev/null and b/Praktikum2/ppm2/.vs/ppm2/v14/.suo differ
diff --git a/Praktikum2/ppm2/app/__pycache__/application.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/application.cpython-35.pyc
new file mode 100644
index 0000000..c772c2e
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/application.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/category.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/category.cpython-35.pyc
new file mode 100644
index 0000000..478bda0
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/category.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/choice.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/choice.cpython-35.pyc
new file mode 100644
index 0000000..dfc209f
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/choice.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/database.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/database.cpython-35.pyc
new file mode 100644
index 0000000..a86d93c
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/database.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/eval.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/eval.cpython-35.pyc
new file mode 100644
index 0000000..dcb3165
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/eval.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/template.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/template.cpython-35.pyc
new file mode 100644
index 0000000..ffbb276
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/template.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/templates.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/templates.cpython-35.pyc
new file mode 100644
index 0000000..f275311
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/templates.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/__pycache__/view.cpython-35.pyc b/Praktikum2/ppm2/app/__pycache__/view.cpython-35.pyc
new file mode 100644
index 0000000..b94bd66
Binary files /dev/null and b/Praktikum2/ppm2/app/__pycache__/view.cpython-35.pyc differ
diff --git a/Praktikum2/ppm2/app/application.py.old b/Praktikum2/ppm2/app/application.py.old
new file mode 100644
index 0000000..e22162c
--- /dev/null
+++ b/Praktikum2/ppm2/app/application.py.old
@@ -0,0 +1,332 @@
+import json
+import cherrypy
+from app import database
+from app import view
+
+#----------------------------------------------------------
+class Application_cl(object):
+#----------------------------------------------------------
+    exposed = True
+
+    #----------------------------------------------------------
+    def __init__(self):
+    #----------------------------------------------------------
+        self.db_o = database.Database_cl()
+        self.view_o = view.View_cl()
+
+    #----------------------------------------------------------
+    def GET(self, cat=None, id=None):
+    #---------------------------------------------------------- 
+
+        return json.dumps(retVal)
+
+    #----------------------------------------------------------
+    def PUT(self, **data):
+    #----------------------------------------------------------
+
+        return json.dumps(retVal)
+
+    #----------------------------------------------------------
+    def POST(self, cat, id, **data_opl):
+    #----------------------------------------------------------
+
+        return json.dumps(retVal)
+
+    #----------------------------------------------------------
+    def DELETE(self, cat, id):
+    #----------------------------------------------------------
+
+        return json.dumps(retVal)
+
+    #----------------------------------------------------------
+    def default(self, *arguments, **kwargs):
+    #----------------------------------------------------------
+        msg_s = "unbekannte Anforderung: " + \
+            str(arguments) + \
+            ' ' + \
+            str(kwargs)
+    raise cherrypy.HTTPError(404, msg_s) 
+
+# /* import cherrypy
+# from .database import Database_cl
+# from .view import View_cl
+# import collections
+# orderedDict = collections.OrderedDict()
+# from collections import OrderedDict
+
+# #----------------------------------------------------------
+# class Application_cl(object): 
+# #----------------------------------------------------------
+
+# #-------------------------------------------------------
+# # Request Processing
+# #-------------------------------------------------------
+
+#     #-------------------------------------------------------
+#     def __init__(self):
+#     #-------------------------------------------------------
+#         # spezielle Initialisierung können hier eingetragen werden
+#         self.db = Database_cl()
+#         self.view = View_cl()
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def index(self):
+#     #-------------------------------------------------------
+#         print("Index\n")
+#         return self.GenerateIndex()
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def category(self, cat=None):
+#     #-------------------------------------------------------
+#         print("Category: ", cat, "\n")
+#         if(cat==None):
+#             return self.GenerateIndex()
+#         else:
+#             return self.GenerateList(cat)
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def choice(self):
+#     #-------------------------------------------------------
+#         print("Choice \n")
+#         return self.GenerateListChoice()
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def eval(self, cat):
+#     #-------------------------------------------------------
+#         print("Eval \n")
+#         self.db.CheckDates()
+#         return self.GenerateListEval(cat)
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def detail(self, cat=None, id=None):
+#     #-------------------------------------------------------
+#         if(cat!=None):
+#             if(id!=None):
+#                 print("Cat=", cat, " id=", id)
+#                 return self.GenerateDetail(cat, id)
+#             else:
+#                 print("ID=None Cat=", cat)
+#                 return self.GenerateDetail(cat)
+#         else:
+#             return self.GenerateIndex()
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def detailchoice(self, id):
+#     #-------------------------------------------------------
+#         print("id=", id)
+#         return self.GenerateDetailChoice(id)
+
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def save(self, cat=None, **data):
+#     #-------------------------------------------------------
+#         print("Save: ", cat)
+#         dataTmp = data
+#         return self.GenerateSave(dataTmp, cat)
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def saveChoice(self, **data):
+#     #-------------------------------------------------------
+#         print("Save: Choice")
+#         dataTmp = data
+#         return self.GenerateSaveChoice(dataTmp)
+#     @cherrypy.expose
+
+#     #-------------------------------------------------------
+#     def delete(self, cat=None, id=None): 
+#     #-------------------------------------------------------
+#         print("Delete",cat,id)
+#         return self.GenerateDelete(cat, id)
+#     @cherrypy.expose
+    
+#     #-------------------------------------------------------
+#     def default(self, *arguments, **kwargs): 
+#     #-------------------------------------------------------
+#         msg_s = "unbekannte Anforderung: " + \
+#                 str(arguments) + \
+#                 ''+ \
+#                 str(kwargs)
+#         raise cherrypy.HTTPError(404, msg_s)
+#     default.exposed= True
+
+# #-------------------------------------------------------
+# # Functions
+# #-------------------------------------------------------
+
+#     #-------------------------------------------------------
+#     def GenerateIndex(self):
+#     #-------------------------------------------------------
+#         return self.view.CreateIndex()
+
+#     #-------------------------------------------------------
+#     def GenerateList(self, category):
+#     #-------------------------------------------------------
+#         self.db.ReadAll()
+#         data = {}
+#         data['content'] = {}
+#         data['headings'] = {}
+#         data['category'] = category
+#         data['content'] = self.db.data[category]
+#         if(len(data['content']) != 0):
+#             print(len(data['content']))
+#             contentFirst = list(data['content'].keys())[0]
+#             data['headings'] = list(data['content'][contentFirst].keys())
+#         print(data)
+#         return self.view.CreateList(data)
+
+#     #-------------------------------------------------------
+#     def GenerateListChoice(self):
+#     #-------------------------------------------------------
+#         self.db.ReadAll()
+#         data = {}
+#         data['content'] = {}
+#         offerings = self.db.data['Angebote']
+#         for key, value in offerings.items():
+#             for key2, value2 in value.items():
+#                 if(key2 == 'Status'):
+#                     if(value2 == 'Angebot'):
+#                         data['content'][key] = value              
+
+#         print(data)
+#         return self.view.CreateListChoice(data)
+
+#     #-------------------------------------------------------
+#     def GenerateDetail(self, category, id=None):
+#     #-------------------------------------------------------
+#         self.db.ReadAll()
+#         data = {}
+#         data['category'] = category
+#         print("Detail",category,id)
+#         if(id != None):
+#             data['id'] = id
+#             data['content'] = self.db.ReadEntry(category, id)
+#         else:
+#             data['id'] = None
+#             data['content'] = self.db.GetDefault(category)
+#             print(data['content'])
+#         if(category == 'Angebote'):
+#             print("Angebote")
+#             data['Firmen'] = self.db.data['Firmen']
+#         print(data, "\n")
+#         return self.view.CreateDetail(data)
+
+#     #-------------------------------------------------------
+#     def GenerateDetailChoice(self, id):
+#     #-------------------------------------------------------
+#         self.db.ReadAll()
+#         data = {}
+#         data['id'] = id
+#         data = self.db.data['Angebote'][id]
+#         data['Studenten'] = self.db.data['Studenten']
+#         data['Lehrender'] = self.db.data['Lehrender']
+#         print(data, "\n")
+#         return self.view.CreateDetailChoice(data)
+
+#     #-------------------------------------------------------
+#     def GenerateListEval(self, cat):
+#     #-------------------------------------------------------
+#         self.db.ReadAll()
+#         data = {}
+#         Studenten = self.db.data['Studenten']
+#         Lehrender = self.db.data['Lehrender']
+#         Firmen = self.db.data['Firmen']
+#         Angebote = self.db.data['Angebote']
+
+#         data['category'] = cat
+#         if(cat == 'Firmen'):
+#             for keyFirma, valueFirma in sorted(Firmen.items()):
+#                 data[valueFirma['Name']] = {}
+#                 data[valueFirma['Name']]['Name'] = valueFirma['Name']
+#                 data[valueFirma['Name']]['Angebote'] = {}
+#                 data[valueFirma['Name']]['Angebote']['Angebot'] = {}
+#                 data[valueFirma['Name']]['Angebote']['aktuell'] = {}
+#                 data[valueFirma['Name']]['Angebote']['abgeschlossen'] = {}
+#                 for keyAngebote, valueAngebote in Angebote.items():
+#                     if(valueAngebote['Firma'] == valueFirma['Name']):
+#                         data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']] = {}
+#                         data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Name'] = valueAngebote['Name']
+#                         if(valueAngebote['Student'] != ''):
+#                             data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = Studenten[valueAngebote['Student']]['Name']
+#                         else:
+#                             data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = ''
+#                         if(valueAngebote['Lehrender'] != ''):
+#                             data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = Lehrender[valueAngebote['Lehrender']]['Name']
+#                         else:
+#                             data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = ''
+#                         data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumVon'] = valueAngebote['ZeitraumVon']
+#                         data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumBis'] = valueAngebote['ZeitraumBis']
+#             print(data)
+#             return self.view.CreateListEval(data)
+#         elif(cat == 'Studenten'):
+#             for keyStudent, valueStudent in Studenten.items():
+#                 data[valueStudent['Name']] = {}
+#                 data[valueStudent['Name']]['Angebote'] = {}
+#                 data[valueStudent['Name']]['Angebote']['Angebot'] = {}
+#                 data[valueStudent['Name']]['Angebote']['aktuell'] = {}
+#                 data[valueStudent['Name']]['Angebote']['abgeschlossen'] = {}
+#                 for keyAngebot, valueAngebot in Angebote.items():
+#                     if(valueAngebot['Student'] == valueStudent['id']):
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Lehrender'] = Lehrender[valueAngebot['Lehrender']]['Name']
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+#                         data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+#         elif(cat == 'Lehrender'):
+#             for keyLehrende, valueLehrende in Lehrender.items():
+#                 data[valueLehrende['Name']] = {}
+#                 data[valueLehrende['Name']]['Angebote'] = {}
+#                 data[valueLehrende['Name']]['Angebote']['Angebot'] = {}
+#                 data[valueLehrende['Name']]['Angebote']['aktuell'] = {}
+#                 data[valueLehrende['Name']]['Angebote']['abgeschlossen'] = {}
+#                 for keyAngebot, valueAngebot in Angebote.items():
+#                     if(valueAngebot['Lehrender'] == valueLehrende['id']):
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Student'] = Studenten[valueAngebot['Student']]['Name']
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+#                         data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+
+#         return self.view.CreateListEval(data)
+
+
+#     #-------------------------------------------------------
+#     def GenerateSave(self, dataTmp, category):
+#     #-------------------------------------------------------
+#         if(category == None):
+#             return self.view.CreateIndex()
+#         else:
+#             self.db.Save(dataTmp, category)
+#             return self.GenerateList(category)
+
+#     #-------------------------------------------------------
+#     def GenerateSaveChoice(self, dataTmp):
+#     #-------------------------------------------------------
+#         if(dataTmp['Student'] != ''):
+#             angebote = self.db.CheckOfferings(dataTmp['Student'])
+#             print(angebote)
+#             if(angebote == 0):
+#                 print("Save")
+#                 self.db.Save(dataTmp, 'Angebote')
+#         return self.GenerateListChoice()
+
+#     #-------------------------------------------------------
+#     def GenerateDelete(self, category, id):
+#     #-------------------------------------------------------
+#         if(category == None or id == None):
+#             return self.view.CreateIndex()
+#         else:
+#             self.db.Delete(category, id)
+#             return self.GenerateList(category)
+# #EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm2/app/category.py b/Praktikum2/ppm2/app/category.py
new file mode 100644
index 0000000..649364c
--- /dev/null
+++ b/Praktikum2/ppm2/app/category.py
@@ -0,0 +1,33 @@
+# coding: utf-8
+
+import json
+import cherrypy
+from app import database
+
+#-------------------------------------------------------
+class Category(object):
+#-------------------------------------------------------
+
+    exposed = True # gilt für alle Methoden
+
+    #-------------------------------------------------------
+    def __init__(self):
+    #-------------------------------------------------------
+        self.db = database.Database()
+
+    #-------------------------------------------------------
+    def GET(self, cat=None):
+    #-------------------------------------------------------
+        data = {}
+        if(cat != None):
+            self.db.ReadAll()
+            data['content'] = {}
+            data['headings'] = {}
+            data['category'] = cat
+            data['content'] = self.db.data[cat]
+            if(len(data['content']) != 0):
+                print(len(data['content']))
+                contentFirst = list(data['content'].keys())[0]
+                data['headings'] = list(data['content'][contentFirst].keys())
+        print(data)
+        return json.dumps(data)
diff --git a/Praktikum2/ppm2/app/choice.py b/Praktikum2/ppm2/app/choice.py
new file mode 100644
index 0000000..cbe5e65
--- /dev/null
+++ b/Praktikum2/ppm2/app/choice.py
@@ -0,0 +1,31 @@
+# coding: utf-8
+
+import json
+import cherrypy
+from app import database
+
+#-------------------------------------------------------
+class Choice(object):
+#-------------------------------------------------------
+
+    exposed = True # gilt für alle Methoden
+
+    #-------------------------------------------------------
+    def __init__(self):
+    #-------------------------------------------------------
+        self.db = database.Database()
+
+    #-------------------------------------------------------
+    def GET(self):
+    #-------------------------------------------------------
+        self.db.ReadAll()
+        data = {}
+        data['content'] = {}
+        offerings = self.db.data['Angebote']
+        for key, value in offerings.items():
+            for key2, value2 in value.items():
+                if(key2 == 'Status'):
+                    if(value2 == 'Angebot'):
+                        data['content'][key] = value
+        print(data)
+        return json.dumps(data)
diff --git a/Praktikum2/ppm2/app/database.py b/Praktikum2/ppm2/app/database.py
new file mode 100644
index 0000000..36c072a
--- /dev/null
+++ b/Praktikum2/ppm2/app/database.py
@@ -0,0 +1,189 @@
+# coding: utf-8
+
+import os
+import os.path
+import codecs
+import json
+from datetime import datetime, timedelta
+
+#----------------------------------------------------------
+class Database(object): 
+#----------------------------------------------------------
+    # da es hier nur darum geht, die Daten dauerhaft zu speichern,
+    # wird ein sehr einfacher Ansatz verwendet:
+    # - es können Daten zu genau 15 Teams gespeichert werden
+    # - je Team werden 2 Teilnehmer mit Namen, Vornamen und Matrikelnummer
+    #   berücksichtigt
+    # - die Daten werden als eine JSON-Datei abgelegt
+    
+
+    #-------------------------------------------------------
+    def __init__(self): 
+    #-------------------------------------------------------
+        self.data = {}
+        self.data['Studenten'] = {}
+        self.data['Lehrender'] = {}
+        self.data['Firmen'] = {}
+        self.data['Angebote'] = {}
+        self.ReadAll()
+
+
+    #------------------------------------------------------- 
+    def Read(self, category):
+    #-------------------------------------------------------
+        path = 'data/' + category
+        if not(os.path.exists(path)):
+            os.makedirs(path)
+        categoryDir = os.listdir(path)
+        for fileName in categoryDir:
+            if fileName.endswith('.json') and fileName != 'last.json':
+                file = codecs.open(os.path.join('data', category, fileName), 'rU', 'utf-8')
+                fileContent = file.read()
+                id = fileName[:-5]
+                self.data[category][id] = json.loads(fileContent)
+
+    #------------------------------------------------------- 
+    def ReadAll(self):
+    #-------------------------------------------------------
+        self.Read('Studenten')
+        self.Read('Lehrender')
+        self.Read('Firmen')
+        self.Read('Angebote')    
+
+    #-------------------------------------------------------
+    def ReadEntry(self, category = None, id = None): 
+    #-------------------------------------------------------
+        print("ReadEntry: ", category, id)
+        self.Read(category)
+        data = None
+        if id == None:
+            data = self.data
+        else:
+            if id in self.data[category]: 
+                data = self.data[category][id]
+        
+        print(data, "\n")
+        return data
+
+    #-------------------------------------------------------
+    def Save(self, data, category): 
+    #-------------------------------------------------------
+        status_b = False
+        id = data['id']
+        print("ID: ", id, "\n")
+        if(id != "None"):
+            if id in self.data[category]:
+                file = codecs.open(os.path.join('data', category, id+'.json'), 'w', 'utf-8')
+                file.write(json.dumps(data, indent=3, ensure_ascii=True))
+                file.close()
+                self.Read(category)
+                status_b = True
+        else:
+            data['id'] = self.IdNext(category)
+            file = codecs.open(os.path.join('data', category, data['id']+'.json'), 'w', 'utf-8')
+            file.write(json.dumps(data, indent=3, ensure_ascii=True))
+            file.close()
+            self.Read(category)
+            status_b = True
+        
+        return status_b
+
+    #-------------------------------------------------------
+    def Delete(self, category, id): 
+    #-------------------------------------------------------
+        status_b = False
+        if(category == 'Studenten'):
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Student'] == id):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+        elif(category == 'Lehrender'):
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Lehrender'] == id):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+        elif(category == 'Firmen'):
+            for firmen in self.data['Firmen']:
+                if(firmen == id):
+                    fn = self.data['Firmen'][firmen]['Name']
+            for angebote in self.data['Angebote']:
+                if(self.data['Angebote'][angebote]['Firma'] == fn):
+                    try:
+                        os.remove(os.path.join('data', 'Angebote', angebote+'.json'))
+                    except OSError:
+                        pass
+
+        if id in self.data[category]:
+            os.remove(os.path.join('data', category, id+'.json'))
+            del self.data[category][id]
+        
+        return status_b
+
+    #-------------------------------------------------------
+    def CheckOfferings(self, id): 
+    #-------------------------------------------------------
+        print("Offerings: ", id)
+        for offerings in self.data['Angebote']:
+            if(self.data['Angebote'][offerings]['Student'] != id):
+                return 0
+            else:
+                return 1
+
+    #-------------------------------------------------------
+    def CheckDates(self): 
+    #-------------------------------------------------------
+        now = datetime.now()
+        for offerings in self.data['Angebote']:
+            if(self.data['Angebote'][offerings]['ZeitraumBis'] != ''):
+                zeitraumBis = datetime.strptime(self.data['Angebote'][offerings]['ZeitraumBis'], "%d.%m.%Y")
+                if(zeitraumBis <= now):
+                    self.data['Angebote'][offerings]['Status'] = 'abgeschlossen'
+                    data = {}
+                    data['Status'] = 'abgeschlossen'
+                    data['id'] = offerings
+                    data['Name'] = self.data['Angebote'][offerings]['Name']
+                    data['Firma'] = self.data['Angebote'][offerings]['Firma']
+                    data['Beschreibung'] = self.data['Angebote'][offerings]['Beschreibung']
+                    data['Voraussetzungen'] = self.data['Angebote'][offerings]['Voraussetzungen']
+                    data['Firmenbetreuer'] = self.data['Angebote'][offerings]['Firmenbetreuer']
+                    data['Lehrender'] = self.data['Angebote'][offerings]['Lehrender']
+                    data['ZeitraumVon'] = self.data['Angebote'][offerings]['ZeitraumVon']
+                    data['ZeitraumBis'] = self.data['Angebote'][offerings]['ZeitraumBis']
+                    data['Student'] = self.data['Angebote'][offerings]['Student']
+                    self.Save(data, 'Angebote')
+
+    #-------------------------------------------------------
+    def GetDefault(self, category): 
+    #-------------------------------------------------------
+        if(category == 'Studenten'):
+            return {'Name':'', 'Vorname':'', 'Matrikelnummer':''}
+        elif(category == 'Lehrender'):
+            return {'Titel':'', 'Name':'', 'Vorname':'', 'Lehrgebiet':''}
+        elif(category == 'Firmen'):
+            return {'Name':'', 'Branche':'', 'Schwerpunkt':'', 'Sitz':'', 'Anzahl Mitarbeiter':''}
+        elif(category == 'Angebote'):
+            return {'Name':'', 'Firma':'', 'Beschreibung':'', 'Voraussetzungen':'', 'Firmenbetreuer':'', 'Status':'Angebot', 'Lehrender':'', 'ZeitraumVon':'', 'ZeitraumBis':'', 'Student':''}
+
+    #-------------------------------------------------------
+    def IdNext(self, category):
+    #-------------------------------------------------------
+        path = 'data/' + category + '/last.json'
+        if(os.path.isfile(path)):
+            file = open(os.path.join('data', category, 'last.json'), 'r+')
+            last = file.read()
+            last = str(int(last)+1)
+            file.seek(0)
+            file.write(last)
+            file.close()
+        else:
+            file = open(os.path.join('data', category, 'last.json'), 'w+')
+            last = str(int(0))
+            file.write(last)
+            file.close()
+        return last
+            
+# EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm2/app/eval.py b/Praktikum2/ppm2/app/eval.py
new file mode 100644
index 0000000..b27f6d3
--- /dev/null
+++ b/Praktikum2/ppm2/app/eval.py
@@ -0,0 +1,87 @@
+# coding: utf-8
+
+import json
+import cherrypy
+from app import database
+
+#-------------------------------------------------------
+class Eval(object):
+#-------------------------------------------------------
+
+    exposed = True # gilt für alle Methoden
+
+    #-------------------------------------------------------
+    def __init__(self):
+    #-------------------------------------------------------
+        self.db = database.Database()
+
+    #-------------------------------------------------------
+    def GET(self, cat=None):
+    #-------------------------------------------------------
+        self.db.CheckDates()
+        self.db.ReadAll()
+        data = {}
+        Studenten = self.db.data['Studenten']
+        Lehrender = self.db.data['Lehrender']
+        Firmen = self.db.data['Firmen']
+        Angebote = self.db.data['Angebote']
+
+        data['category'] = cat
+        if(cat == 'Firmen'):
+            for keyFirma, valueFirma in sorted(Firmen.items()):
+                data[valueFirma['Name']] = {}
+                data[valueFirma['Name']]['Name'] = valueFirma['Name']
+                data[valueFirma['Name']]['Angebote'] = {}
+                data[valueFirma['Name']]['Angebote']['Angebot'] = {}
+                data[valueFirma['Name']]['Angebote']['aktuell'] = {}
+                data[valueFirma['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebote, valueAngebote in Angebote.items():
+                    if(valueAngebote['Firma'] == valueFirma['Name']):
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']] = {}
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Name'] = valueAngebote['Name']
+                        if(valueAngebote['Student'] != ''):
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = Studenten[valueAngebote['Student']]['Name']
+                        else:
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Student'] = ''
+                        if(valueAngebote['Lehrender'] != ''):
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = Lehrender[valueAngebote['Lehrender']]['Name']
+                        else:
+                            data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = ''
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumVon'] = valueAngebote['ZeitraumVon']
+                        data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumBis'] = valueAngebote['ZeitraumBis']
+            print(data)
+            return self.view.CreateListEval(data)
+        elif(cat == 'Studenten'):
+            for keyStudent, valueStudent in Studenten.items():
+                data[valueStudent['Name']] = {}
+                data[valueStudent['Name']]['Angebote'] = {}
+                data[valueStudent['Name']]['Angebote']['Angebot'] = {}
+                data[valueStudent['Name']]['Angebote']['aktuell'] = {}
+                data[valueStudent['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebot, valueAngebot in Angebote.items():
+                    if(valueAngebot['Student'] == valueStudent['id']):
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Lehrender'] = Lehrender[valueAngebot['Lehrender']]['Name']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+                        data[valueStudent['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+        elif(cat == 'Lehrender'):
+            for keyLehrende, valueLehrende in Lehrender.items():
+                data[valueLehrende['Name']] = {}
+                data[valueLehrende['Name']]['Angebote'] = {}
+                data[valueLehrende['Name']]['Angebote']['Angebot'] = {}
+                data[valueLehrende['Name']]['Angebote']['aktuell'] = {}
+                data[valueLehrende['Name']]['Angebote']['abgeschlossen'] = {}
+                for keyAngebot, valueAngebot in Angebote.items():
+                    if(valueAngebot['Lehrender'] == valueLehrende['id']):
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot] = {}
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Student'] = Studenten[valueAngebot['Student']]['Name']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Status'] = valueAngebot['Status']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Praxisphase'] = valueAngebot['Name']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['Firma'] = valueAngebot['Firma']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
+                        data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
+        print(data)
+        return json.dumps(data)
diff --git a/Praktikum2/ppm2/app/templates.py b/Praktikum2/ppm2/app/templates.py
new file mode 100644
index 0000000..adb2340
--- /dev/null
+++ b/Praktikum2/ppm2/app/templates.py
@@ -0,0 +1,37 @@
+# coding: utf-8
+
+import json
+import os
+import codecs
+import cherrypy
+
+#----------------------------------------------------------
+class Templates(object):
+#----------------------------------------------------------
+
+   exposed = True # gilt für alle Methoden
+
+   #-------------------------------------------------------
+   def __init__(self):
+   #-------------------------------------------------------
+      pass
+
+   #-------------------------------------------------------
+   def GET(self):
+   #-------------------------------------------------------
+      retVal = {
+         'templates': {}
+      }
+
+      files = os.listdir('templates')
+      for fileName in files:
+         if fileName != '.DS_Store':
+            file = codecs.open(os.path.join('templates', fileName), 'rU', 'utf-8', errors='ignore')
+            content = file.read()
+            file.close()
+            retVal["templates"][fileName] = content
+      print(retVal)
+
+      return json.dumps(retVal)
+      
+# EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm2/app/view.py.old b/Praktikum2/ppm2/app/view.py.old
new file mode 100644
index 0000000..636a61f
--- /dev/null
+++ b/Praktikum2/ppm2/app/view.py.old
@@ -0,0 +1,52 @@
+# import os.path
+# from mako.template import Template
+# from mako.lookup import TemplateLookup
+
+# #----------------------------------------------------------
+# class View_cl(object): 
+# #----------------------------------------------------------
+  
+#   #-------------------------------------------------------
+#   def __init__(self): 
+#   #-------------------------------------------------------
+#     self.path = 'templates'
+#     self.lookup = TemplateLookup(directories=['/'])
+  
+#   #-------------------------------------------------------
+#   def Create(self, template, data): 
+#   #-------------------------------------------------------
+#     print("CreateView\n")
+#     template = Template(filename=os.path.join(self.path, template), output_encoding='utf-8', lookup=self.lookup)
+#     return template.render(data = data)
+  
+#   #-------------------------------------------------------
+#   def CreateIndex(self): 
+#   #-------------------------------------------------------
+#     print("CreateIndex\n")
+#     data = None
+#     return self.Create('index.tpl', data)
+
+#   #-------------------------------------------------------
+#   def CreateList(self, data): 
+#   #-------------------------------------------------------
+#     return self.Create('list.tpl', data)
+
+#   #-------------------------------------------------------
+#   def CreateListChoice(self, data): 
+#   #-------------------------------------------------------
+#     return self.Create('listChoice.tpl', data)
+
+#   #-------------------------------------------------------
+#   def CreateListEval(self, data): 
+#   #-------------------------------------------------------
+#     return self.Create('listEval.tpl', data)
+
+#   #-------------------------------------------------------
+#   def CreateDetail(self, data): 
+#   #-------------------------------------------------------
+#     return self.Create('detail.tpl', data)
+
+#   #-------------------------------------------------------
+#   def CreateDetailChoice(self, data): 
+#   #-------------------------------------------------------
+#     return self.Create('detailChoice.tpl', data)
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Angebote/23.json b/Praktikum2/ppm2/data/Angebote/23.json
new file mode 100644
index 0000000..b28de59
--- /dev/null
+++ b/Praktikum2/ppm2/data/Angebote/23.json
@@ -0,0 +1,13 @@
+{
+   "Name": "Angebot IBM 1",
+   "ZeitraumBis": "01.01.2018",
+   "id": "23",
+   "Firmenbetreuer": "Sepp Meine",
+   "Firma": "IBM",
+   "Voraussetzungen": "Keine",
+   "Lehrender": "7",
+   "Status": "aktuell",
+   "Beschreibung": "Praxisphasenplatz bei IBM",
+   "ZeitraumVon": "01.01.2017",
+   "Student": "9"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Angebote/26.json b/Praktikum2/ppm2/data/Angebote/26.json
new file mode 100644
index 0000000..f2fd625
--- /dev/null
+++ b/Praktikum2/ppm2/data/Angebote/26.json
@@ -0,0 +1,13 @@
+{
+   "id": "26",
+   "ZeitraumVon": "02.02.2019",
+   "Firma": "Apple",
+   "Student": "10",
+   "Beschreibung": "Beschreibung",
+   "Name": "Name",
+   "Lehrender": "5",
+   "Firmenbetreuer": "Firmenbetreuer3",
+   "Voraussetzungen": "Kein",
+   "Status": "aktuell",
+   "ZeitraumBis": "02.02.2020"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Angebote/27.json b/Praktikum2/ppm2/data/Angebote/27.json
new file mode 100644
index 0000000..966a816
--- /dev/null
+++ b/Praktikum2/ppm2/data/Angebote/27.json
@@ -0,0 +1,13 @@
+{
+   "Lehrender": "5",
+   "Status": "abgeschlossen",
+   "Firmenbetreuer": "Horst",
+   "Firma": "Apple",
+   "Name": "Angebot Apple 2",
+   "Beschreibung": "Praxisphase Apple",
+   "Student": "11",
+   "Voraussetzungen": "Keine",
+   "ZeitraumBis": "02.02.2003",
+   "id": "27",
+   "ZeitraumVon": "02.02.2002"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Angebote/30.json b/Praktikum2/ppm2/data/Angebote/30.json
new file mode 100644
index 0000000..31c0e32
--- /dev/null
+++ b/Praktikum2/ppm2/data/Angebote/30.json
@@ -0,0 +1,13 @@
+{
+   "ZeitraumBis": "",
+   "Firmenbetreuer": "firmenbetreuer",
+   "id": "30",
+   "ZeitraumVon": "",
+   "Name": "name",
+   "Beschreibung": "beschreibung",
+   "Student": "",
+   "Lehrender": "",
+   "Status": "Angebot",
+   "Voraussetzungen": "voraussetzungen",
+   "Firma": "IBM"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Angebote/last.json b/Praktikum2/ppm2/data/Angebote/last.json
new file mode 100644
index 0000000..a5c750f
--- /dev/null
+++ b/Praktikum2/ppm2/data/Angebote/last.json
@@ -0,0 +1 @@
+27
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Firmen/4.json b/Praktikum2/ppm2/data/Firmen/4.json
new file mode 100644
index 0000000..98b84ab
--- /dev/null
+++ b/Praktikum2/ppm2/data/Firmen/4.json
@@ -0,0 +1,8 @@
+{
+   "id": "4",
+   "Branche": "IT",
+   "Sitz": "Cupertino",
+   "Schwerpunkt": "Informatik",
+   "Anzahl Mitarbeiter": "110000",
+   "Name": "Apple"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Firmen/5.json b/Praktikum2/ppm2/data/Firmen/5.json
new file mode 100644
index 0000000..28aecae
--- /dev/null
+++ b/Praktikum2/ppm2/data/Firmen/5.json
@@ -0,0 +1,8 @@
+{
+   "id": "5",
+   "Branche": "IT",
+   "Sitz": "Redmond",
+   "Schwerpunkt": "Informatik",
+   "Anzahl Mitarbeiter": "114000",
+   "Name": "Microsoft"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Firmen/6.json b/Praktikum2/ppm2/data/Firmen/6.json
new file mode 100644
index 0000000..cd2cba7
--- /dev/null
+++ b/Praktikum2/ppm2/data/Firmen/6.json
@@ -0,0 +1,8 @@
+{
+   "id": "6",
+   "Branche": "IT",
+   "Sitz": "Armonk",
+   "Schwerpunkt": "Elektrotechnik",
+   "Anzahl Mitarbeiter": "377000",
+   "Name": "IBM"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Firmen/last.json b/Praktikum2/ppm2/data/Firmen/last.json
new file mode 100644
index 0000000..62f9457
--- /dev/null
+++ b/Praktikum2/ppm2/data/Firmen/last.json
@@ -0,0 +1 @@
+6
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Lehrender/5.json b/Praktikum2/ppm2/data/Lehrender/5.json
new file mode 100644
index 0000000..cee342e
--- /dev/null
+++ b/Praktikum2/ppm2/data/Lehrender/5.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof",
+   "id": "5",
+   "Lehrgebiet": "Informatik",
+   "Name": "Heiner",
+   "Vorname": "Theodor"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Lehrender/6.json b/Praktikum2/ppm2/data/Lehrender/6.json
new file mode 100644
index 0000000..bb4eb50
--- /dev/null
+++ b/Praktikum2/ppm2/data/Lehrender/6.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof Dr",
+   "id": "6",
+   "Lehrgebiet": "Elektrotechnik",
+   "Name": "Anton",
+   "Vorname": "Emanuel"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Lehrender/7.json b/Praktikum2/ppm2/data/Lehrender/7.json
new file mode 100644
index 0000000..2f4b91f
--- /dev/null
+++ b/Praktikum2/ppm2/data/Lehrender/7.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Prof",
+   "id": "7",
+   "Lehrgebiet": "Informatik",
+   "Name": "Adalbert",
+   "Vorname": "Bastian"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Lehrender/8.json b/Praktikum2/ppm2/data/Lehrender/8.json
new file mode 100644
index 0000000..62b79b3
--- /dev/null
+++ b/Praktikum2/ppm2/data/Lehrender/8.json
@@ -0,0 +1,7 @@
+{
+   "Titel": "Dr",
+   "id": "8",
+   "Lehrgebiet": "Elektrotechnik",
+   "Name": "Leberecht",
+   "Vorname": "Egon"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Lehrender/last.json b/Praktikum2/ppm2/data/Lehrender/last.json
new file mode 100644
index 0000000..ca7bf83
--- /dev/null
+++ b/Praktikum2/ppm2/data/Lehrender/last.json
@@ -0,0 +1 @@
+13
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/10.json b/Praktikum2/ppm2/data/Studenten/10.json
new file mode 100644
index 0000000..31ac8db
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/10.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Timo",
+   "Name": "Ben",
+   "Matrikelnummer": "3",
+   "id": "10"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/11.json b/Praktikum2/ppm2/data/Studenten/11.json
new file mode 100644
index 0000000..2ccc813
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/11.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Korbinian",
+   "Name": "Moritz",
+   "Matrikelnummer": "6",
+   "id": "11"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/12.json b/Praktikum2/ppm2/data/Studenten/12.json
new file mode 100644
index 0000000..406f91d
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/12.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Alfons",
+   "Name": "Meine",
+   "Matrikelnummer": "4",
+   "id": "12"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/13.json b/Praktikum2/ppm2/data/Studenten/13.json
new file mode 100644
index 0000000..e463503
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/13.json
@@ -0,0 +1,6 @@
+{
+   "id": "13",
+   "Name": "Edmund",
+   "Vorname": "Adalbert",
+   "Matrikelnummer": "1"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/9.json b/Praktikum2/ppm2/data/Studenten/9.json
new file mode 100644
index 0000000..a4bd70d
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/9.json
@@ -0,0 +1,6 @@
+{
+   "Vorname": "Gregor",
+   "Name": "Klemens",
+   "Matrikelnummer": "2",
+   "id": "9"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/data/Studenten/last.json b/Praktikum2/ppm2/data/Studenten/last.json
new file mode 100644
index 0000000..da2d398
--- /dev/null
+++ b/Praktikum2/ppm2/data/Studenten/last.json
@@ -0,0 +1 @@
+14
\ No newline at end of file
diff --git a/Praktikum2/ppm2/ppm2.pyproj b/Praktikum2/ppm2/ppm2.pyproj
new file mode 100644
index 0000000..fdb09eb
--- /dev/null
+++ b/Praktikum2/ppm2/ppm2.pyproj
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1747f32f-45d5-4d27-868d-c3fe710f4d86}</ProjectGuid>
+    <ProjectHome />
+    <StartupFile>server.py</StartupFile>
+    <SearchPath />
+    <WorkingDirectory>.</WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
+    <LaunchProvider>Standard Python launcher</LaunchProvider>
+    <InterpreterId />
+    <InterpreterVersion />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
+  <PropertyGroup>
+    <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
+    <PtvsTargetsFile>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="app\category.py" />
+    <Compile Include="app\database.py" />
+    <Compile Include="app\template.py" />
+    <Compile Include="server.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="static\css\style.css" />
+    <Content Include="static\html\detail.html" />
+    <Content Include="static\html\detailChoice.html" />
+    <Content Include="static\html\index.html" />
+    <Content Include="static\html\listChoice.html" />
+    <Content Include="static\html\listEval.html" />
+    <Content Include="static\js\jquery-3.1.1.min.js" />
+    <Content Include="static\js\ppm.js" />
+    <Content Include="static\js\te.js" />
+    <Content Include="static\js\tm.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="app" />
+    <Folder Include="static\" />
+    <Folder Include="static\css" />
+    <Folder Include="static\html" />
+    <Folder Include="static\js" />
+  </ItemGroup>
+  <Import Project="$(PtvsTargetsFile)" Condition="Exists($(PtvsTargetsFile))" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="!Exists($(PtvsTargetsFile))" />
+</Project>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/ppm2.sln b/Praktikum2/ppm2/ppm2.sln
new file mode 100644
index 0000000..9e6727a
--- /dev/null
+++ b/Praktikum2/ppm2/ppm2.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ppm2", "ppm2.pyproj", "{1747F32F-45D5-4D27-868D-C3FE710F4D86}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1747F32F-45D5-4D27-868D-C3FE710F4D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1747F32F-45D5-4D27-868D-C3FE710F4D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Praktikum2/ppm2/server.conf b/Praktikum2/ppm2/server.conf
new file mode 100644
index 0000000..3b608c4
--- /dev/null
+++ b/Praktikum2/ppm2/server.conf
@@ -0,0 +1,19 @@
+[global]
+tools.log_headers.on: True
+tools.sessions.on:    False  
+tools.encode.on:      True
+tools.encode.encoding:"utf-8"
+
+server.socket_port:   8080   
+server.socket_timeout:60     
+
+server.thread_pool:  10      
+server.environment:  "production"
+log.screen:          True    
+
+[/]
+tools.staticdir.root: cherrypy.Application.currentDir_s
+tools.staticdir.on = True
+tools.staticdir.dir = '.'
+tools.staticdir.index = 'static/html/index.html'
+
diff --git a/Praktikum2/ppm2/server.py b/Praktikum2/ppm2/server.py
new file mode 100644
index 0000000..bda808b
--- /dev/null
+++ b/Praktikum2/ppm2/server.py
@@ -0,0 +1,54 @@
+# coding:utf-8
+
+import os.path
+import cherrypy
+
+from app import templates, category, choice, eval
+
+#----------------------------------------------------------
+def main():
+#----------------------------------------------------------
+   
+   # aktuelles Verzeichnis ermitteln, damit es in der Konfigurationsdatei als
+   # Bezugspunkt verwendet werden kann   
+   try:                                    # aktuelles Verzeichnis als absoluter Pfad
+      currentDir_s = os.path.dirname(os.path.abspath(__file__))
+   except:
+      currentDir_s = os.path.dirname(os.path.abspath(sys.executable))
+   cherrypy.Application.currentDir_s = currentDir_s
+
+   configFileName_s = 'server.conf' # im aktuellen Verzeichnis   
+   if os.path.exists(configFileName_s) == False:
+      # Datei gibt es nicht
+      configFileName_s = None
+   
+   # autoreload und timeout_Monitor hier abschalten
+   # für cherrypy-Versionen >= "3.1.0" !
+   cherrypy.engine.autoreload.unsubscribe()
+   cherrypy.engine.timeout_monitor.unsubscribe()
+
+   # Standardverhalten, Berücksichtigung der Konfigurationsangaben im configFile
+   cherrypy.tree.mount(
+      None, '/', configFileName_s
+   )
+
+   cherrypy.tree.mount(
+      category.Category(), '/category', {'/': {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}}
+   )
+   cherrypy.tree.mount(
+      choice.Choice(), '/choice', {'/': {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}}
+   )
+   cherrypy.tree.mount(
+      eval.Eval(), '/eval', {'/': {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}}
+   )
+   cherrypy.tree.mount(
+      templates.Templates(), '/templates', {'/': {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}}
+   )
+
+   cherrypy.engine.start()
+   cherrypy.engine.block() 
+
+#----------------------------------------------------------
+if __name__ == '__main__':
+#----------------------------------------------------------
+   main()
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/css/style.css b/Praktikum2/ppm2/static/css/style.css
new file mode 100644
index 0000000..cbbf0f7
--- /dev/null
+++ b/Praktikum2/ppm2/static/css/style.css
@@ -0,0 +1 @@
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:"Open Sans",sans-serif;background-color:#084791;border:none;border-radius:60px;}.clSiteHeader a{text-decoration:none;color:white;}.clSiteHeader:hover{background-color:#0D71E4;cursor:pointer;}.clSiteHeader a:visited,a:active{color:white;text-decoration:none;}.clContent{position:absolute;top:150px;left:0;right:0;bottom:0;margin:0;padding:5px;background-repeat:no-repeat;background-position:bottom left;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:0px;margin:10px 0;margin-left:10px;padding:5px;background-attachment:#819FF7;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#FFFFFF;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:white;background-color:#084791;}.clButtonArea a:hover{color:white;background-color:#0D71E4;cursor:pointer;}.clButtonArea a:visited,a:active{color:white;}.clNavButton{display:inline-block;text-align:center;background-color:#084791;border:1px solid black;color:white;padding:15px 32px;text-decoration:none;font-size:16px;cursor:pointer;float:left;clear:left;width:20%;margin-left:38%;margin-right:30%;}.clNavButton:hover{background-color:#0D71E4;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:white;padding:3px;border:2px solid;}#idList td{padding:3px;border:2px solid;cursor:pointer;}#idForm .clContentArea{width:500px;margin:auto;}.selected{background-color:#0D71E4;color:white;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}.clFormRow select{position:absolute;top:0;left:250px;width:250px;}.clMenu{list-style-type:none;padding-left:0;margin-left:0;}h3{text-align:center;}
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/html/detail.html b/Praktikum2/ppm2/static/html/detail.html
new file mode 100644
index 0000000..1fa65ec
--- /dev/null
+++ b/Praktikum2/ppm2/static/html/detail.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+         Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+
+      <form id="idForm" class="clContent" action="/save/?cat=${data['category']}" method="POST">
+         <h2 id="idContentHeader" class="clContentHeader">
+            ${data['category']}: Ihre Daten
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+            <input type="hidden" value="${data['id']}" id="id" name="id" />
+
+            % if data['category'] != 'Angebote':
+               % for field in data['content']:
+                  % if field!='id' and field!='Status':
+                  <div class="clFormRow">
+                     <label for="${field}">${field}</label>
+                     <input type="text" value=
+                     % if data['content'][field] != field:
+                     "${data['content'][field]}" id="${field}" name="${field}" />
+                     % else:
+                     "" id="${field}" name="${field}" />
+                     % endif
+                  </div>
+                  % endif
+               % endfor
+            % else:
+               <input type="hidden" value="Angebot" id="Status" name="Status" />
+               <input type="hidden" value="" id="Zeitraum" name="ZeitraumVon" />
+               <input type="hidden" value="" id="Zeitraum" name="ZeitraumBis" />
+               <input type="hidden" value="" id="Student" name="Student" />
+               <input type="hidden" value="" id="Lehrender" name="Lehrender" />
+               % for field in data['content']:
+                  % if field!='id' and field!='Status' and field!='ZeitraumVon' and field!='ZeitraumBis' and field!='Lehrender' and field!='Student':
+                     <div class="clFormRow">
+                        <label for="${field}">${field}</label>
+                     % if field!='Firma':
+                        <input type="text" value=
+                        % if data['content'][field] != field:
+                        "${data['content'][field]}" id="${field}" name="${field}" />
+                        % else:
+                        "" id="${field}" name="${field}" />
+                        % endif
+                     % else:
+                        <select name="Firma" form="idForm">
+                           % for option in data['Firmen']:
+                              <option value="${data['Firmen'][option]['Name']}">${data['Firmen'][option]['Name']}</option>
+                           % endfor
+                        </select>
+                     % endif
+                     </div>
+                  % endif
+               % endfor
+            % endif
+
+            <div id="idButtonArea" class="clButtonArea">
+               <a href="/index" title="Zur&uumlck zur Startseite">Zur&uumlck zur Startseite</a>
+               <a href="/category/?cat=${data['category']}" title="Zurueck zur Startseite">Zur&uumlck zur &uumlbersicht</a>
+               <input type="submit" value="Speichern" />
+            </div>
+         </div>
+      </form>
+   </body>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/html/detailChoice.html b/Praktikum2/ppm2/static/html/detailChoice.html
new file mode 100644
index 0000000..1451eae
--- /dev/null
+++ b/Praktikum2/ppm2/static/html/detailChoice.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+         Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+
+      <form id="idForm" class="clContent" action="/saveChoice" method="POST">
+         <h2 id="idContentHeader" class="clContentHeader">
+            Praxisphasenangebots Auswahl
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+            <input type="hidden" value="${data['id']}" id="id" name="id" />
+            <input type="hidden" value="${data['Name']}" id="Name" name="Name" />
+            <input type="hidden" value="${data['Firma']}" id="Firma" name="Firma" />
+            <input type="hidden" value="${data['Beschreibung']}" id="Beschreibung" name="Beschreibung" />
+            <input type="hidden" value="${data['Voraussetzungen']}" id="Voraussetzungen" name="Voraussetzungen" />
+            <input type="hidden" value="${data['Firmenbetreuer']}" id="Firmenbetreuer" name="Firmenbetreuer" />
+            <input type="hidden" value="aktuell" id="Status" name="Status" />
+
+            <div class="clFormRow">
+               <label for="Student">Student</label>
+               <select name="Student" form="idForm">
+                  % for option in data['Studenten']:
+                     <option value="${data['Studenten'][option]['id']}">${data['Studenten'][option]['Name']}</option>
+                  % endfor
+               </select>
+            </div>
+
+            <div class="clFormRow">
+               <label for="Lehrender">Lehrender</label>
+               <select name="Lehrender" form="idForm">
+                  % for option in data['Lehrender']:
+                     <option value="${data['Lehrender'][option]['id']}">${data['Lehrender'][option]['Name']}</option>
+                  % endfor
+               </select>
+            </div>
+
+            <div class="clFormRow">
+            <label for="ZeitraumVon">Zeitraum: Von (D.M.Y)</label>
+            <input type="text" value="" id="ZeitraumVon" name="ZeitraumVon" />
+            </div>
+
+            <div class="clFormRow">
+            <label for="ZeitraumBis">Zeitraum: Bis (D.M.Y)</label>
+            <input type="text" value="" id="ZeitraumBis" name="ZeitraumBis" />
+            </div>
+
+            <div id="idButtonArea" class="clButtonArea">
+               <a href="/index" title="Zur&uumlck zur Startseite">Zur&uumlck zur Startseite</a>
+               <a href="/choice" title="Zur&uumlck zur &uumlbersicht">Zur&uumlck zur &uumlbersicht</a>
+               <input type="submit" value="Speichern" />
+            </div>
+         </div>
+      </form>
+   </body>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/html/index.html b/Praktikum2/ppm2/static/html/index.html
new file mode 100644
index 0000000..6e2abee
--- /dev/null
+++ b/Praktikum2/ppm2/static/html/index.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("static/css/style.css");
+      </style>
+   <script type="text/javascript" src="/static/js/jquery-3.1.1.min.js"></script>
+   <script type="text/javascript" src="/static/js/te.js"></script>
+   <script type="text/javascript" src="/static/js/tm.js"></script>
+   <script type="text/javascript" src="/static/js/ppm.js"></script>
+   </head>
+   <body>
+      <h1 id="idSiteHeader" class="clSiteHeader" data-action="index">
+         <a title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+        <h2 id="idContentHeader" class="clContentHeader">Module</h2>
+        <div class="clContentArea">
+          <ul class="clMenu" id="clMenu">
+            <li><a class="clNavButton" data-action="categoryStudenten">Datenpflege: Studenten</a></li>
+            <li><a class="clNavButton" data-action="categoryLehrender">Datenpflege: Lehrender</a></li>
+            <li><a class="clNavButton" data-action="categoryFirmen">Datenpflege: Firmenverzeichnis</a></li>
+            <li><a class="clNavButton" data-action="choice">Auswahl: Praxisphasen</a></li>
+            <li><a class="clNavButton" data-action="evalStudenten">Auswertung: Studenten</a></li>
+            <li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
+            <li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
+          </ul>
+        </div> 
+      </div>
+   </body>
+   <footer>
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/html/listChoice.html b/Praktikum2/ppm2/static/html/listChoice.html
new file mode 100644
index 0000000..5241c5c
--- /dev/null
+++ b/Praktikum2/ppm2/static/html/listChoice.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+      <script src="/functionsChoice.js" type="text/javascript"></script>
+   </head>
+   <body>
+
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht Praxisphasen Auswahl
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+
+            <table id="idList">
+               <tr>
+                  <th>Name</th>
+                  <th>Firma</th>
+                  <th>Beschreibung</th>
+                  <th>Voraussetzungen</th>
+                  <th>Firmenbetreuer</th>
+               </tr>
+               % if data['content']!= None:
+                  % for entries in data['content']:
+                  <tr id=${entries}>
+                     <td id=${entries}>${data['content'][entries]['Name']}</td>
+                     <td id=${entries}>${data['content'][entries]['Firma']}</td>
+                     <td id=${entries}>${data['content'][entries]['Beschreibung']}</td>
+                     <td id=${entries}>${data['content'][entries]['Voraussetzungen']}</td>
+                     <td id=${entries}>${data['content'][entries]['Firmenbetreuer']}</td>
+                  </tr id=${entries}>
+                  % endfor
+
+               % endif
+
+            </table>
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a href="/index" class="clButton">Startseite</a>
+            <a class="clButton" id="Annehmen">Annehmen</a>
+         </div> 
+      </div>
+   </body>
+   <footer>
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/html/listEval.html b/Praktikum2/ppm2/static/html/listEval.html
new file mode 100644
index 0000000..0bab960
--- /dev/null
+++ b/Praktikum2/ppm2/static/html/listEval.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>
+          Praxisphasenmanager (PPM)
+      </title>
+      <meta charset="UTF-8" />     
+      <style type="text/css">
+         @import url("/style.css");
+      </style>
+   </head>
+   <body>
+
+      <h1 id="idSiteHeader" class="clSiteHeader">
+         <a href="/index" title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
+      </h1>
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht: ${data['category']}
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+         % if data['category'] == 'Firmen':
+            % for firmen in data:
+               % if firmen != 'category':
+                  <h3>${firmen}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Status</th>
+                        <th>Student</th>
+                        <th>Lehrender</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                  % for aktuell in data[firmen]['Angebote']['aktuell']:
+                     <tr>
+                        <td>Aktuell</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['Student']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['Lehrender']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumVon']}</td>
+                        <td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumBis']}</td>
+                     </tr>
+                  % endfor
+                  % for abgeschlossen in data[firmen]['Angebote']['abgeschlossen']:
+                     <tr>
+                        <td>Abgeschlossen</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Student']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Lehrender']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumVon']}</td>
+                        <td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumBis']}</td>
+                     </tr>
+                  % endfor
+                  </table>
+               % endif
+            % endfor
+         % endif
+
+         % if data['category'] == 'Studenten':
+            % for studenten in data:
+               % if studenten != 'category':
+                  <h3>${studenten}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Lehrender</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     % for angebote in data[studenten]['Angebote']['aktuell']:
+                     <tr>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Lehrender']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Firma']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['Status']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
+                        <td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
+                     </tr>
+                     % endfor
+                     % for angebote in data[studenten]['Angebote']['abgeschlossen']:
+                     <tr>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Lehrender']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
+                        <td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
+                     </tr>
+                     % endfor
+
+                                          
+                  </table>
+               % endif
+            % endfor
+         % endif
+
+         % if data['category'] == 'Lehrender':
+            % for Lehrender in data:
+               % if Lehrender != 'category':
+                  <h3>${Lehrender}</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Student</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     % if data[Lehrender] != NULL:
+                        % for angebote in data[Lehrender]['Angebote']['aktuell']:
+                        <tr>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Student']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Firma']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Status']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
+                           <td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
+                        </tr>
+                        % endfor
+                        % for angebote in data[Lehrender]['Angebote']['abgeschlossen']:
+                        <tr>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Student']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
+                           <td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
+                        </tr>
+                        % endfor
+                     % endif
+                  </table>
+               % endif
+            % endfor
+         % endif
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a href="/index" class="clButton">Startseite</a>
+         </div> 
+      </div>
+   </body>
+   <footer>
+      <!--<script src="/functions.js" type="text/javascript"></script>-->
+   </footer>
+</html>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/js/jquery-3.1.1.min.js b/Praktikum2/ppm2/static/js/jquery-3.1.1.min.js
new file mode 100644
index 0000000..4c5be4c
--- /dev/null
+++ b/Praktikum2/ppm2/static/js/jquery-3.1.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v3.1.1 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):C.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/[^\x20\t\r\n\f]+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),
+a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:X.test(a)?JSON.parse(a):a)}function $(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=Z(c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),$(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=$(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var _=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,aa=new RegExp("^(?:([+-])=|)("+_+")([a-z%]*)$","i"),ba=["Top","Right","Bottom","Left"],ca=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function ea(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&aa.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var fa={};function ga(a){var b,c=a.ownerDocument,d=a.nodeName,e=fa[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),fa[d]=e,e)}function ha(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ca(d)&&(e[f]=ga(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ha(this,!0)},hide:function(){return ha(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ca(this)?r(this).show():r(this).hide()})}});var ia=/^(?:checkbox|radio)$/i,ja=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ka=/^$|\/(?:java|ecma)script/i,la={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};la.optgroup=la.option,la.tbody=la.tfoot=la.colgroup=la.caption=la.thead,la.th=la.td;function ma(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function na(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var oa=/<|&#?\w+;/;function pa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(oa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ja.exec(f)||["",""])[1].toLowerCase(),i=la[h]||la._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=ma(l.appendChild(f),"script"),j&&na(g),c){k=0;while(f=g[k++])ka.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var qa=d.documentElement,ra=/^key/,sa=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ta=/^([^.]*)(?:\.(.+)|)/;function ua(){return!0}function va(){return!1}function wa(){try{return d.activeElement}catch(a){}}function xa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)xa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=va;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(qa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==wa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===wa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ua:va,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:va,isPropagationStopped:va,isImmediatePropagationStopped:va,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ua,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ua,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ua,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&ra.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&sa.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return xa(this,a,b,c,d)},one:function(a,b,c,d){return xa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=va),this.each(function(){r.event.remove(this,a,c,b)})}});var ya=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,za=/<script|<style|<link/i,Aa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ba=/^true\/(.*)/,Ca=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Da(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Ea(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Fa(a){var b=Ba.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ga(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ha(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ia.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ia(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Aa.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ia(f,b,c,d)});if(m&&(e=pa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(ma(e,"script"),Ea),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,ma(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Fa),l=0;l<i;l++)j=h[l],ka.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ca,""),k))}return a}function Ja(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(ma(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&na(ma(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(ya,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=ma(h),f=ma(a),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);if(b)if(c)for(f=f||ma(a),g=g||ma(h),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);else Ga(a,h);return g=ma(h,"script"),g.length>0&&na(g,!i&&ma(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ja(this,a,!0)},remove:function(a){return Ja(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.appendChild(a)}})},prepend:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(ma(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!za.test(a)&&!la[(ja.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(ma(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ia(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(ma(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ka=/^margin/,La=new RegExp("^("+_+")(?!px)[a-z%]+$","i"),Ma=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",qa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,qa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Na(a,b,c){var d,e,f,g,h=a.style;return c=c||Ma(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&La.test(g)&&Ka.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Oa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Pa=/^(none|table(?!-c[ea]).+)/,Qa={position:"absolute",visibility:"hidden",display:"block"},Ra={letterSpacing:"0",fontWeight:"400"},Sa=["Webkit","Moz","ms"],Ta=d.createElement("div").style;function Ua(a){if(a in Ta)return a;var b=a[0].toUpperCase()+a.slice(1),c=Sa.length;while(c--)if(a=Sa[c]+b,a in Ta)return a}function Va(a,b,c){var d=aa.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Wa(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ba[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ba[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ba[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ba[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ba[f]+"Width",!0,e)));return g}function Xa(a,b,c){var d,e=!0,f=Ma(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Na(a,b,f),(d<0||null==d)&&(d=a.style[b]),La.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Wa(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Na(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=aa.exec(c))&&e[1]&&(c=ea(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Na(a,b,d)),"normal"===e&&b in Ra&&(e=Ra[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Pa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Xa(a,b,d):da(a,Qa,function(){return Xa(a,b,d)})},set:function(a,c,d){var e,f=d&&Ma(a),g=d&&Wa(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=aa.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Va(a,c,g)}}}),r.cssHooks.marginLeft=Oa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Na(a,"marginLeft"))||a.getBoundingClientRect().left-da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ba[d]+b]=f[d]||f[d-2]||f[0];return e}},Ka.test(a)||(r.cssHooks[a+b].set=Va)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=Ma(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Ya(a,b,c,d,e){return new Ya.prototype.init(a,b,c,d,e)}r.Tween=Ya,Ya.prototype={constructor:Ya,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Ya.propHooks[this.prop];return a&&a.get?a.get(this):Ya.propHooks._default.get(this)},run:function(a){var b,c=Ya.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ya.propHooks._default.set(this),this}},Ya.prototype.init.prototype=Ya.prototype,Ya.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Ya.propHooks.scrollTop=Ya.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Ya.prototype.init,r.fx.step={};var Za,$a,_a=/^(?:toggle|show|hide)$/,ab=/queueHooks$/;function bb(){$a&&(a.requestAnimationFrame(bb),r.fx.tick())}function cb(){return a.setTimeout(function(){Za=void 0}),Za=r.now()}function db(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ba[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function eb(a,b,c){for(var d,e=(hb.tweeners[b]||[]).concat(hb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function fb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ca(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],_a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ha([a],!0),j=a.style.display||j,k=r.css(a,"display"),ha([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ha([a],!0),m.done(function(){p||ha([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=eb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function gb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function hb(a,b,c){var d,e,f=0,g=hb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Za||cb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Za||cb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(gb(k,j.opts.specialEasing);f<g;f++)if(d=hb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,eb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}r.Animation=r.extend(hb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return ea(c.elem,a,aa.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],hb.tweeners[c]=hb.tweeners[c]||[],hb.tweeners[c].unshift(b)},prefilters:[fb],prefilter:function(a,b){b?hb.prefilters.unshift(a):hb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:"number"!=typeof e.duration&&(e.duration in r.fx.speeds?e.duration=r.fx.speeds[e.duration]:e.duration=r.fx.speeds._default),null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ca).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=hb(this,r.extend({},a),f);(e||V.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&ab.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(db(b,!0),a,d,e)}}),r.each({slideDown:db("show"),slideUp:db("hide"),slideToggle:db("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Za=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Za=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){$a||($a=a.requestAnimationFrame?a.requestAnimationFrame(bb):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame($a):a.clearInterval($a),$a=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var ib,jb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?ib:void 0)),
+void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),ib={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=jb[b]||r.find.attr;jb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=jb[g],jb[g]=e,e=null!=c(a,b,d)?g:null,jb[g]=f),e}});var kb=/^(?:input|select|textarea|button)$/i,lb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):kb.test(a.nodeName)||lb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function mb(a){var b=a.match(K)||[];return b.join(" ")}function nb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,nb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,nb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,nb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=nb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(nb(c))+" ").indexOf(b)>-1)return!0;return!1}});var ob=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ob,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:mb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ia.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,"$1"),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=pa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=mb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||qa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Oa(o.pixelPosition,function(a,c){if(c)return c=Na(a,b),La.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
diff --git a/Praktikum2/ppm2/static/js/ppm.js b/Praktikum2/ppm2/static/js/ppm.js
new file mode 100644
index 0000000..5ad9b89
--- /dev/null
+++ b/Praktikum2/ppm2/static/js/ppm.js
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// PPM - Hauptfunktion
+//------------------------------------------------------------------------------
+
+class PPM
+{
+    constructor ()
+    {
+        this.TemplateManager_o = new TemplateManager_cl();
+        this.TemplateManager_o;
+    }
+
+    Menu (message)
+    {
+        switch (message)
+        {
+            case 'index':
+
+                this.LoadContent('/category/', 'index.tpl');
+                break;
+            
+            case 'categoryStudenten':
+
+                this.LoadContent('/category/?cat=Studenten', 'list.tpl');
+                break
+            
+            case 'categoryLehrender':
+
+                this.LoadContent('/category/?cat=Lehrender', 'list.tpl');
+                break
+            
+            case 'categoryFirmen':
+
+                this.LoadContent('/category/?cat=Firmen', 'list.tpl');
+                break
+            
+            case 'choice':
+
+                this.LoadContent('/choice', 'listChoice.tpl');
+                break
+            
+            case 'evalStudenten':
+
+                this.LoadContent('/eval/?cat=Studenten', 'listEval.tpl');
+                break
+            
+            case 'evalLehrender':
+
+                this.LoadContent('/eval/?cat=Lehrender', 'listEval.tpl');
+                break
+            
+            case 'evalFirmen':
+
+                this.LoadContent('/eval/?cat=Firmen', 'listEval.tpl');
+                break
+            
+            default:
+
+                alert ('[PPM] Unbekannte Anfrage: ' + message);
+        }
+    }
+
+    LoadContent ( path, template )
+    {
+        $.ajax({
+            dataType: "json",
+            url: path,
+            type: 'GET',
+            context: this
+        })
+        .done(function (json) {
+            console.log("JSON: ", json);
+
+            var result = this.TemplateManager_o.execute_px( template, json );
+            console.log("RESULT: ", result);
+
+            $( ".clContent" ).replaceWith(result);
+            console.log("DONE LOADING!");              
+        })
+        .fail(function(jqXHR_opl, textStatus_spl) {
+            alert( "[PPM] Fehler bei Anforderung: " + textStatus_spl );
+        });
+    }
+}
+
+$(function() {
+    $('body').on('click', '[data-action]', function() {
+        var action = $(this).data('action');
+        this.PPM_o = new PPM();
+        this.PPM_o.Menu(action);
+        return false;
+    });
+});
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/js/te.js b/Praktikum2/ppm2/static/js/te.js
new file mode 100644
index 0000000..d746fb9
--- /dev/null
+++ b/Praktikum2/ppm2/static/js/te.js
@@ -0,0 +1,266 @@
+//------------------------------------------------------------------------------
+// Template-Engine
+//------------------------------------------------------------------------------
+
+'use strict'
+
+class Generator_cl {
+   constructor () {
+      this.reset_px();
+   }
+   reset_px () {
+      this.code_a = ['var result_a = [];\n'];
+   }
+   write_px (text_spl) {
+      // Escape-Zeichen bei Strings ergänzen
+      var text_s = text_spl.replace(/"/g, '\\"');
+      text_s = text_s.replace(/'/g, "\\'");
+      this.code_a.push('result_a.push("' + text_s + '");\n');
+   }
+   code_px (code_spl) {
+      if (code_spl.startsWith('if')) {
+         this.code_a.push('if (' + code_spl.substr(2) + ') {\n');
+      } else if (code_spl.startsWith('else')) {
+         this.code_a.push('} else {\n');
+      } else if (code_spl.startsWith('endif')) {
+         this.code_a.push('}\n');
+      } else if (code_spl.startsWith('for')) {
+         this.code_a.push('for (' + code_spl.substr(3) + ') {\n');
+      } else if (code_spl.startsWith('endfor')) {
+         this.code_a.push('}\n');
+      } else {
+         this.code_a.push(code_spl + '\n');
+      }
+   }
+   substitute_px (subst_spl) {
+      let value_s = subst_spl == null ? '' : String(subst_spl);
+      this.code_a.push('result_a.push(' + value_s + ');\n');
+   }
+   generate_px () {
+      var result_s = this.code_a.join('') + ' return result_a.join("");';
+      var f_o = new Function ('context', result_s);
+      return f_o;
+   }
+}
+
+class TemplateCompiler_cl {
+   constructor () {
+      this.gen_o = new Generator_cl();
+      this.reset_px();
+   }
+   reset_px () {
+      this.gen_o.reset_px();
+      this.preservePreWS_b = false;
+      this.preservePostWS_b = false;
+   }
+   setPreWS_px (on_bpl) {
+      if ((on_bpl == undefined) || (on_bpl == false)) {
+         this.preservePreWS_b = false;
+      } else {
+         this.preservePreWS_b = true;
+      }
+   }
+   setPostWS_px (on_bpl) {
+      if ((on_bpl == undefined) || (on_bpl == false)) {
+         this.preservePostWS_b = false;
+      } else {
+         this.preservePostWS_b = true;
+      }
+   }
+   compile_px (source_spl) {
+      var state_i = 0;
+      var pos_i = 0;
+      var len_i = source_spl.length;
+      var text_s = '';
+      var code_s = '';
+      var subst_s = '';
+      this.gen_o.reset_px();
+
+      var doubletest_f = function (char_spl) {
+         var status_b = false;
+         if ((pos_i + 1) < len_i) {
+            if ((source_spl[pos_i] == char_spl) && (source_spl[pos_i+1] == char_spl)) {
+               status_b = true;
+            }
+         }
+         return status_b;
+      }
+
+      while (pos_i < len_i) {
+         switch (state_i) {
+         case 0:
+            // outside
+            if (source_spl[pos_i] == '@') { // ECMA 5!
+               if (doubletest_f('@') == false) {
+                  state_i = 2;
+                  code_s = '';
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  state_i = 1;
+                  text_s = '@';
+                  pos_i++;
+               }
+            } else if (source_spl[pos_i] == '#') {
+               if (doubletest_f('#') == false) {
+                  state_i = 3;
+                  subst_s = '';
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  state_i = 1;
+                  text_s = '#';
+                  pos_i++;
+               }
+            } else if ((source_spl[pos_i] == ' ') || (source_spl[pos_i] == '\t')) {
+               state_i = 4;
+               text_s = '';
+               pos_i--; // Zeichen erneut verarbeiten
+            } else {
+               state_i = 1;
+               text_s = '';
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         case 1:
+            // inText
+            if (source_spl[pos_i] == '@') {
+               if (doubletest_f('@') == false) {
+                  // Textende, neuer Code
+                  state_i = 0;
+                  this.gen_o.write_px(text_s);
+                  pos_i--; // Zeichen erneut verarbeiten
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  text_s += '@';
+                  pos_i++;
+               }
+            } else if (source_spl[pos_i] == '#') {
+               if (doubletest_f('#') == false) {
+                  // Textende, neue Substitution
+                  state_i = 0;
+                  this.gen_o.write_px(text_s);
+                  pos_i--; // Zeichen erneut verarbeiten
+                  // Textende, neuer Code
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  text_s += '#';
+                  pos_i++;
+               }
+            } else if ((source_spl[pos_i] == ' ') || (source_spl[pos_i] == '\t')) {
+               // Textende
+               state_i = 0;
+               this.gen_o.write_px(text_s);
+               pos_i--; // Zeichen erneut verarbeiten
+            } else {
+               // sammeln
+               if ((source_spl[pos_i] != '\n') && (source_spl[pos_i] != '\r')) {
+                  text_s += source_spl[pos_i];
+               } else if (source_spl[pos_i] == '\n') {
+                  text_s += '\\n';
+               } else {
+                  text_s += '\\r';
+               }
+            }
+            break;
+         case 2:
+            // inCode
+            if (source_spl[pos_i] == '@') {
+               if (doubletest_f('@') == false) {
+                  // zu Ende, erzeugen
+                  this.gen_o.code_px(code_s);
+                  state_i = 5;  //0
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  code_s += '@';
+                  pos_i++;
+               }
+            } else {
+               // sammeln
+               code_s += source_spl[pos_i];
+            }
+            break;
+         case 3:
+            // inSubst
+            // Verdopplung # hier nicht zulässig!
+            if (source_spl[pos_i] == '#') {
+               // zu Ende, erzeugen
+               this.gen_o.substitute_px(subst_s);
+               state_i = 0;
+            } else {
+               // sammeln
+               subst_s += source_spl[pos_i];
+            }
+            break;
+         case 4:
+            // pre-code-whitespace
+            switch (source_spl[pos_i]) {
+            case ' ':
+            case '\t':
+               // sammeln
+               text_s += source_spl[pos_i];
+               break;
+            default:
+               state_i = 0;
+               if (source_spl[pos_i] != '@') {
+                  this.gen_o.write_px(text_s);
+               } else {
+                  if (doubletest_f('@') == false) {
+                     // Whitespace vor Code-Beginn erkannt
+                     if (this.preservePreWS_b == true) {
+                        // trotzdem ausgeben
+                        this.gen_o.write_px(text_s);
+                     }
+                  } // ansonsten wie normales Zeichen behandeln
+               }
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         case 5:
+            // post-code-whitespace
+            switch (source_spl[pos_i]) {
+            case '\n':
+               text_s += '\\n';
+               state_i = 0;
+               break;
+            case '\r':
+               text_s += '\\r';
+               state_i = 0;
+               break;
+            case ' ':
+            case '\t':
+               // ggf. sammeln
+               text_s += source_spl[pos_i];
+               break;
+            default:
+               // Whitespace nach Code erkannt
+               if (this.preservePostWS_b == true) {
+                  // trotzdem ausgeben
+                  this.gen_o.write_px(text_s);
+               }
+               state_i = 0;
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         }
+         pos_i++;
+      }
+      // welcher Zustand liegt abschließend vor?
+      if (state_i == 1) {
+         this.gen_o.write_px(text_s);
+      } else if (state_i == 2) {
+         this.gen_o.code_px(code_s);
+      } else if (state_i == 3) {
+         this.gen_o.substitute_px(subst_s);
+      } else if (state_i == 4) {
+         if (this.preservePreWS_b == true) {
+            this.gen_o.write_px(text_s);
+         }
+      } else if (state_i == 5) {
+         if (this.preservePostWS_b == true) {
+            this.gen_o.write_px(text_s);
+         }
+      }
+
+      return this.gen_o.generate_px();
+   }
+}
+// EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm2/static/js/tm.js b/Praktikum2/ppm2/static/js/tm.js
new file mode 100644
index 0000000..0eee56c
--- /dev/null
+++ b/Praktikum2/ppm2/static/js/tm.js
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// Template-Manager
+// - Laden und Bereitstellen von Template-Quellen
+//------------------------------------------------------------------------------
+// depends-on:
+//    jquery
+//    te
+//------------------------------------------------------------------------------
+
+'use strict'
+
+class TemplateManager_cl {
+   constructor () {
+      this.templates_o = {};
+      this.compiled_o  = {};
+      this.teCompiler_o = new TemplateCompiler_cl();
+      // Templates als Ressource anfordern und speichern
+      var path_s = "/templates/";
+      $.ajax({
+         dataType: "json",
+         url: path_s,
+         type: 'GET',
+         context: this
+      })
+      .done(function (data_opl) {
+         this.templates_o = data_opl['templates'];
+      })
+      .fail(function(jqXHR_opl, textStatus_spl) {
+         alert( "[tm] Fehler bei Anforderung: " + textStatus_spl );
+      });
+   }
+   get_px (name_spl) {
+      alert (name_spl);
+      alert (this.templates_o);
+      if (name_spl in this.templates_o) {
+         return this.templates_o[name_spl];
+      } else {
+         return null;
+      }
+   }
+   execute_px (name_spl, data_opl) {
+      var compiled_o = null;
+      if (name_spl in this.compiled_o) {
+         compiled_o = this.compiled_o[name_spl];
+      } else {
+         // Übersetzen und ausführen
+         if (name_spl in this.templates_o) {
+            this.teCompiler_o.reset_px();
+            compiled_o = this.teCompiler_o.compile_px(this.templates_o[name_spl]);
+            this.compiled_o[name_spl] = compiled_o;
+         }
+      }
+      if (compiled_o != null) {
+         return compiled_o(data_opl);
+      } else {
+         return null;
+      }
+   }
+}
+
+// EOF
\ No newline at end of file
diff --git a/Praktikum2/ppm2/templates/index.tpl b/Praktikum2/ppm2/templates/index.tpl
new file mode 100644
index 0000000..ca54028
--- /dev/null
+++ b/Praktikum2/ppm2/templates/index.tpl
@@ -0,0 +1,14 @@
+<div id="idContent" class="clContent">
+  <h2 id="idContentHeader" class="clContentHeader">Module</h2>
+  <div class="clContentArea">
+    <ul class="clMenu" id="clMenu">
+      <li><a class="clNavButton" data-action="categoryStudenten">Datenpflege: Studenten</a></li>
+      <li><a class="clNavButton" data-action="categoryLehrender">Datenpflege: Lehrender</a></li>
+      <li><a class="clNavButton" data-action="categoryFirmen">Datenpflege: Firmenverzeichnis</a></li>
+      <li><a class="clNavButton" data-action="choice">Auswahl: Praxisphasen</a></li>
+      <li><a class="clNavButton" data-action="evalStudenten">Auswertung: Studenten</a></li>
+      <li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
+      <li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
+    </ul>
+  </div> 
+</div>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/templates/list.tpl b/Praktikum2/ppm2/templates/list.tpl
new file mode 100644
index 0000000..b91f2f4
--- /dev/null
+++ b/Praktikum2/ppm2/templates/list.tpl
@@ -0,0 +1,51 @@
+      <div id="idContent" class="clContent">
+        <h2 id="idContentHeader" class="clContentHeader">
+          &Uumlbersicht: #context['category']#
+        </h2>
+        
+        <div id="idContentArea" class="clContentArea">
+          
+          <table id="idList">
+            <tr>
+              @if context['content'] != 'None'@
+                @for heading in context['headings']@
+                  @if context['headings'][heading] != 'id' && context['headings'][heading] != 'Status' && context['headings'][heading] != 'ZeitraumVon' &&context['headings'][heading] != 'ZeitraumBis' && context['headings'][heading] != 'Student' && context['headings'][heading] != 'Lehrender'@
+                    <th>#context['headings'][heading]#</th>
+                  @endif@
+                @endfor@
+              @else@
+                <td>Bisher kein Inhalt</td>
+              @endif@
+            </tr>
+            @if context['content'] != 'None'@
+              @for entries in context['content']@
+                <tr id=#entries#>
+                  @if context['category'] == 'Angebote'@
+                    @if context['content'][entries]['Status'] == 'Angebot'@
+                      @for entry in context['content'][entries]@
+                        @if entry!='id' && entry!='Status' && entry!='ZeitraumVon' && entry!='ZeitraumBis' && entry!='Student' && entry!='Lehrender'@
+                          <td id=#entries#>#context['content'][entries][entry]#</td>
+                        @endif@
+                      @endfor@
+                    @endif@
+                  @else@
+                    @for entry in context['content'][entries]@
+                      @if entry != 'id'@
+                        <td id=#entries#>#context['content'][entries][entry]#</td>
+                      @endif@
+                    @endfor@
+                  @endif@
+                  </tr id=#entries#>
+              @endfor@
+            @endif
+          </table>
+        </div>
+
+        <div id="idButtonArea" class="clButtonArea"> 
+          <a href="/index" class="clButton">Startseite</a>
+          <a class="clButton" id="New">Neu</a>
+          <a class="clButton" id="Modify">Bearbeiten</a>
+          <a class="clButton" id="Delete">Loeschen</a>
+        </div>
+        
+      </div>
diff --git a/Praktikum2/ppm2/templates/listChoice.tpl b/Praktikum2/ppm2/templates/listChoice.tpl
new file mode 100644
index 0000000..9b6a277
--- /dev/null
+++ b/Praktikum2/ppm2/templates/listChoice.tpl
@@ -0,0 +1,35 @@
+<div id="idContent" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      &Uumlbersicht Praxisphasen Auswahl
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+
+      <table id="idList">
+         <tr>
+            <th>Name</th>
+            <th>Firma</th>
+            <th>Beschreibung</th>
+            <th>Voraussetzungen</th>
+            <th>Firmenbetreuer</th>
+         </tr>
+         @if context['content']!= 'None'@
+            @for entries in context['content']@
+            <tr id=${entries}>
+               <td id=#entries#>#context['content'][entries]['Name']#</td>
+               <td id=#entries#>#context['content'][entries]['Firma']#</td>
+               <td id=#entries#>#context['content'][entries]['Beschreibung']#</td>
+               <td id=#entries#>#context['content'][entries]['Voraussetzungen']#</td>
+               <td id=#entries#>#context['content'][entries]['Firmenbetreuer']#</td>
+            </tr id=#entries#>
+            @endfor@
+
+         @endif@
+
+      </table>
+   </div>
+
+   <div id="idButtonArea" class="clButtonArea"> 
+      <a data-action="index" class="clButton">Startseite</a>
+      <a class="clButton" id="Annehmen">Annehmen</a>
+   </div> 
+</div>
\ No newline at end of file
diff --git a/Praktikum2/ppm2/templates/listEval.tpl b/Praktikum2/ppm2/templates/listEval.tpl
new file mode 100644
index 0000000..d2b9ace
--- /dev/null
+++ b/Praktikum2/ppm2/templates/listEval.tpl
@@ -0,0 +1,123 @@
+      <div id="idContent" class="clContent">
+         <h2 id="idContentHeader" class="clContentHeader">
+            &Uumlbersicht: #context['category']#
+         </h2>
+         <div id="idContentArea" class="clContentArea">
+         @if context['category'] == 'Firmen'@
+            @for firmen in category@
+               @if firmen != 'category'@
+                  <h3>#firmen#</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Status</th>
+                        <th>Student</th>
+                        <th>Lehrender</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                  @for aktuell in context[firmen]['Angebote']['aktuell']@
+                     <tr>
+                        <td>Aktuell</td>
+                        <td>#context[firmen]['Angebote']['aktuell'][aktuell]['Student']#</td>
+                        <td>#context[firmen]['Angebote']['aktuell'][aktuell]['Lehrender']#</td>
+                        <td>#context[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumVon']#</td>
+                        <td>#context[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumBis']#</td>
+                     </tr>
+                  @endfor@
+                  @for abgeschlossen in context[firmen]['Angebote']['abgeschlossen']@
+                     <tr>
+                        <td>Abgeschlossen</td>
+                        <td>#context[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Student']#</td>
+                        <td>#context[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Lehrender']#</td>
+                        <td>#context[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumVon']#</td>
+                        <td>#context[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumBis']#</td>
+                     </tr>
+                  @endfor@
+                  </table>
+               @endif@
+            @endfor@
+         @endif@
+
+         @if context['category'] == 'Studenten'@
+            @for studenten in context@
+               @if studenten != 'category'@
+                  <h3>#studenten#</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Lehrender</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     @for angebote in context[studenten]['Angebote']['aktuell']@
+                     <tr>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['Lehrender']#</td>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['Firma']#</td>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['Praxisphase']#</td>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['Status']#</td>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['ZeitraumVon']#</td>
+                        <td>#context[studenten]['Angebote']['aktuell'][angebote]['ZeitraumBis']#</td>
+                     </tr>
+                     @endfor@
+                     @for angebote in context[studenten]['Angebote']['abgeschlossen']@
+                     <tr>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['Lehrender']#</td>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['Firma']#</td>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['Praxisphase']#</td>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['Status']#</td>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']#</td>
+                        <td>#context[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']#</td>
+                     </tr>
+                     @endfor@                      
+                  </table>
+               @endif@
+            @endfor@
+         @endif@
+
+         @if context['category'] == 'Lehrender'@
+            @for Lehrender in context@
+               @if Lehrender != 'category'@
+                  <h3>#Lehrender#</h3>
+                  <table id="idList">
+                     <tr>
+                        <th>Student</th>
+                        <th>Firma</th>
+                        <th>Praxisphase</th>
+                        <th>Status</th>
+                        <th>Zeitraum: Von</th>
+                        <th>Zeitraum: Bis</th>
+                     </tr>
+                     @if context[Lehrender] != 'NULL'@
+                        @for angebote in context[Lehrender]['Angebote']['aktuell']@
+                        <tr>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['Student']#</td>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['Firma']#</td>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['Praxisphase']#</td>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['Status']#</td>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumVon']#</td>
+                           <td>#context[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumBis']#</td>
+                        </tr>
+                        @endfor@
+                        @for angebote in context[Lehrender]['Angebote']['abgeschlossen']@
+                        <tr>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['Student']#</td>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['Firma']#</td>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['Praxisphase']#</td>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['Status']#</td>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']#</td>
+                           <td>#context[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']#</td>
+                        </tr>
+                        @endfor@
+                     @endif@
+                  </table>
+               @endif@
+            @endfor@
+         @endif@
+         </div>
+
+         <div id="idButtonArea" class="clButtonArea"> 
+            <a data-action="index" class="clButton">Startseite</a>
+         </div> 
+      </div>
\ No newline at end of file
diff --git a/Sammlung/P2/template/template.css b/Sammlung/P2/template/template.css
index 87f45c9..59decaa 100644
--- a/Sammlung/P2/template/template.css
+++ b/Sammlung/P2/template/template.css
@@ -1,148 +1 @@
-/* template.css */
-
-/* allgemeine Vorgaben */
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-
-   padding: 0;
-   margin: 0;
-}
-
-/* Basislayout */
-
-.clSiteHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 100px;
-   line-height: 100px;
-   margin: 0;
-   padding: 5px;
-   font-size: 40pt;
-   text-align: center;
-   text-shadow:black 3px 2px;
-   font-family: cursive, fantasy;
-   color: #920B19;
-   background-color: #B6B6B7;
-}
-
-.clContent {
-   position: absolute;
-   top: 110px;  /* height, padding, border, margin von idSiteHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 5px;
-}
-
-/* Elemente im Content-Bereich */
-
-.clContentHeader {
-   position: absolute;
-   top: 20px;
-   left: 0;
-   right: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   font-size: 18pt;
-   text-align: center;
-}
-
-.clContentArea {
-   position: absolute;
-   top: 80px; /* height, padding, border, margin von idContentHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 40px;  /* height, padding, border, margin von idButtonArea beachten */
-   margin: 10px 0;
-   margin-left: 10px;
-   padding: 5px;
-}
-
-.clButtonArea {
-   position: absolute;
-   left: 0;
-   right: 0;
-   /*float: left; width: 10px:*/
-   bottom: 0;
-   height: 80px;
-   line-height: 80px;
-   margin: 0;
-   padding: 5px;
-   text-align: center;
-   background-color: #B6B6B7;
-}
-
-/* Links und Submit-Schalter im Buttonbereich gestalten */
-
-.clButtonArea a, input[type="submit"] {
-   margin: 0 5px;
-   padding: 3px 6px;
-   font-size: 14pt;
-   text-decoration: none;
-   border: 2px solid;
-   color: black;
-   background-color: buttonface;
-}
-
-/* unterschiedliche Kennzeichnungen je nach Bedienung vermeiden */
-
-.clButtonArea a:hover, a:visited, a:active {
-   color: black;
-}
-
-/* Gestaltung von Tabellen */
-
-#idList {
-   table-layout: fixed;
-   width: auto;
-   border: 2px solid;
-   border-collapse: collapse;
-   margin:auto;
-}
-
-#idList th {
-   text-align: center;
-   padding-left: 5px;
-   background-color: #FFFFFF;
-}
-
-#idList th, #idList td {
-   padding: 3px;
-   border: 2px solid;
-}
-
-/* Gestaltung von Formularen */
-
-/* das Formular nochmals zusätzlich gestalten */
-#idForm .clContentArea {
-   width: 500px;
-   margin: auto;
-}
-
-.clFormRow {
-   position: relative; /* damit das Element in jedem Fall "positioniert" ist und damit als Bezugspunkt geeignet ist */
-   height: 30px;
-   margin-bottom: 10px;
-}
-
-.clFormRow label {
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 240px;
-   text-align: center;
-}
-
-.clFormRow input {
-   position: absolute;
-   top: 0;
-   left: 250px;
-   width: 250px;
-}
-/* EOF */
\ No newline at end of file
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:cursive,fantasy;color:#920B19;background-color:#B6B6B7;}.clContent{position:absolute;top:110px;left:0;right:0;bottom:0;margin:0;padding:5px;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:40px;margin:10px 0;margin-left:10px;padding:5px;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#B6B6B7;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:black;background-color:buttonface;}.clButtonArea a:hover,a:visited,a:active{color:black;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:#FFFFFF;}#idList th,#idList td{padding:3px;border:2px solid;}#idForm .clContentArea{width:500px;margin:auto;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}
\ No newline at end of file
diff --git a/Sammlung/P3/template/template.css b/Sammlung/P3/template/template.css
index 87f45c9..59decaa 100644
--- a/Sammlung/P3/template/template.css
+++ b/Sammlung/P3/template/template.css
@@ -1,148 +1 @@
-/* template.css */
-
-/* allgemeine Vorgaben */
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-
-   padding: 0;
-   margin: 0;
-}
-
-/* Basislayout */
-
-.clSiteHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 100px;
-   line-height: 100px;
-   margin: 0;
-   padding: 5px;
-   font-size: 40pt;
-   text-align: center;
-   text-shadow:black 3px 2px;
-   font-family: cursive, fantasy;
-   color: #920B19;
-   background-color: #B6B6B7;
-}
-
-.clContent {
-   position: absolute;
-   top: 110px;  /* height, padding, border, margin von idSiteHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 5px;
-}
-
-/* Elemente im Content-Bereich */
-
-.clContentHeader {
-   position: absolute;
-   top: 20px;
-   left: 0;
-   right: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   font-size: 18pt;
-   text-align: center;
-}
-
-.clContentArea {
-   position: absolute;
-   top: 80px; /* height, padding, border, margin von idContentHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 40px;  /* height, padding, border, margin von idButtonArea beachten */
-   margin: 10px 0;
-   margin-left: 10px;
-   padding: 5px;
-}
-
-.clButtonArea {
-   position: absolute;
-   left: 0;
-   right: 0;
-   /*float: left; width: 10px:*/
-   bottom: 0;
-   height: 80px;
-   line-height: 80px;
-   margin: 0;
-   padding: 5px;
-   text-align: center;
-   background-color: #B6B6B7;
-}
-
-/* Links und Submit-Schalter im Buttonbereich gestalten */
-
-.clButtonArea a, input[type="submit"] {
-   margin: 0 5px;
-   padding: 3px 6px;
-   font-size: 14pt;
-   text-decoration: none;
-   border: 2px solid;
-   color: black;
-   background-color: buttonface;
-}
-
-/* unterschiedliche Kennzeichnungen je nach Bedienung vermeiden */
-
-.clButtonArea a:hover, a:visited, a:active {
-   color: black;
-}
-
-/* Gestaltung von Tabellen */
-
-#idList {
-   table-layout: fixed;
-   width: auto;
-   border: 2px solid;
-   border-collapse: collapse;
-   margin:auto;
-}
-
-#idList th {
-   text-align: center;
-   padding-left: 5px;
-   background-color: #FFFFFF;
-}
-
-#idList th, #idList td {
-   padding: 3px;
-   border: 2px solid;
-}
-
-/* Gestaltung von Formularen */
-
-/* das Formular nochmals zusätzlich gestalten */
-#idForm .clContentArea {
-   width: 500px;
-   margin: auto;
-}
-
-.clFormRow {
-   position: relative; /* damit das Element in jedem Fall "positioniert" ist und damit als Bezugspunkt geeignet ist */
-   height: 30px;
-   margin-bottom: 10px;
-}
-
-.clFormRow label {
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 240px;
-   text-align: center;
-}
-
-.clFormRow input {
-   position: absolute;
-   top: 0;
-   left: 250px;
-   width: 250px;
-}
-/* EOF */
\ No newline at end of file
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:cursive,fantasy;color:#920B19;background-color:#B6B6B7;}.clContent{position:absolute;top:110px;left:0;right:0;bottom:0;margin:0;padding:5px;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:40px;margin:10px 0;margin-left:10px;padding:5px;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#B6B6B7;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:black;background-color:buttonface;}.clButtonArea a:hover,a:visited,a:active{color:black;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:#FFFFFF;}#idList th,#idList td{padding:3px;border:2px solid;}#idForm .clContentArea{width:500px;margin:auto;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/1/ias_p1/iasp1.css b/Sammlung/Praktikum/1/ias_p1/iasp1.css
index 36eb599..e22016e 100644
--- a/Sammlung/Praktikum/1/ias_p1/iasp1.css
+++ b/Sammlung/Praktikum/1/ias_p1/iasp1.css
@@ -1,9 +1 @@
-figure, figure img {
-   margin-left: auto;
-   margin-right: auto;
-   text-align: center; /* zur Zentrierung des img-Elements */
-   width: 15cm;
-}
-figcaption {
-   text-align: center;
-}
+figure,figure img{margin-left:auto;margin-right:auto;text-align:center;width:15cm;}figcaption{text-align:center;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/1/iasp1.css b/Sammlung/Praktikum/1/iasp1.css
index 36eb599..e22016e 100644
--- a/Sammlung/Praktikum/1/iasp1.css
+++ b/Sammlung/Praktikum/1/iasp1.css
@@ -1,9 +1 @@
-figure, figure img {
-   margin-left: auto;
-   margin-right: auto;
-   text-align: center; /* zur Zentrierung des img-Elements */
-   width: 15cm;
-}
-figcaption {
-   text-align: center;
-}
+figure,figure img{margin-left:auto;margin-right:auto;text-align:center;width:15cm;}figcaption{text-align:center;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/ias_p2_a0.21/css/auktionsansicht.css b/Sammlung/Praktikum/3/ias_p2_a0.21/css/auktionsansicht.css
index 669007c..8a10a23 100644
--- a/Sammlung/Praktikum/3/ias_p2_a0.21/css/auktionsansicht.css
+++ b/Sammlung/Praktikum/3/ias_p2_a0.21/css/auktionsansicht.css
@@ -1,66 +1 @@
-#canvas{
-	position: absolute;
-	top: 0;
-	left: 500px;
-	width: 300px;
-	margin: 0;
-	height: 300px;
-}
-
-#aktuelleAuktion{
-	position: absolute;
-	top: 410px;
-	left: 500px;
-	width: 300px;
-	margin: 0px;
-	height: 150px;
-	background-color: #f9802f;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-#naechsteAuktion{
-	position: absolute;
-	top: 410px;
-	left: 150px;
-	width: 300px;
-	margin: 0;
-	height: 150px;
-	background-color: #2fdbf9;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-#letzteAuktion{
-	position: absolute;
-	top: 410px;
-	left: 850px;
-	width: 300px;
-	margin: 0;
-	height: 150px;
-	background-color: #dbdad9;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-#kaufen{
-	position: absolute;
-	top: 310px;
-	height :80px;
-	width: 200px;
-	left: 550px;
-	background-color: green;
-	border-radius: 10px;
-}
-#simManager{
-	position: absolute;
-	top: 20px;
-	right: 0;
-	width: 100px;
-}
-button{
-	width: 100px;
-	background-color: #dbdad9;
-}
\ No newline at end of file
+#canvas{position:absolute;top:0;left:500px;width:300px;margin:0;height:300px;}#aktuelleAuktion{position:absolute;top:410px;left:500px;width:300px;margin:0px;height:150px;background-color:#f9802f;border-radius:10px;border-style:solid;border-width:1px;}#naechsteAuktion{position:absolute;top:410px;left:150px;width:300px;margin:0;height:150px;background-color:#2fdbf9;border-radius:10px;border-style:solid;border-width:1px;}#letzteAuktion{position:absolute;top:410px;left:850px;width:300px;margin:0;height:150px;background-color:#dbdad9;border-radius:10px;border-style:solid;border-width:1px;}#kaufen{position:absolute;top:310px;height: 80px;width:200px;left:550px;background-color:green;border-radius:10px;}#simManager{position:absolute;top:20px;right:0;width:100px;}button{width:100px;background-color:#dbdad9;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/ias_p2_a0.21/css/botButton.css b/Sammlung/Praktikum/3/ias_p2_a0.21/css/botButton.css
index dc5ce28..ca09a10 100644
--- a/Sammlung/Praktikum/3/ias_p2_a0.21/css/botButton.css
+++ b/Sammlung/Praktikum/3/ias_p2_a0.21/css/botButton.css
@@ -1,11 +1 @@
-.botButtonActiveStyle{
-	background-color: green;
-}
-
-.botButtonInactiveStyle{
-	background-color: #dbdad9;
-}
-
-.botButtonBuyActionStyle{
-	background-color: yellow;
-}
\ No newline at end of file
+.botButtonActiveStyle{background-color:green;}.botButtonInactiveStyle{background-color:#dbdad9;}.botButtonBuyActionStyle{background-color:yellow;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/ias_p2_b0.1/css/auktionsansicht.css b/Sammlung/Praktikum/3/ias_p2_b0.1/css/auktionsansicht.css
index 68ba4fa..cff8020 100644
--- a/Sammlung/Praktikum/3/ias_p2_b0.1/css/auktionsansicht.css
+++ b/Sammlung/Praktikum/3/ias_p2_b0.1/css/auktionsansicht.css
@@ -1,71 +1 @@
-#canvas{
-	position: absolute;
-	top: 0;
-	left: 500px;
-	width: 300px;
-	margin: 0;
-	height: 300px;
-}
-
-#aktuelleAuktion{
-	position: absolute;
-	top: 410px;
-	left: 500px;
-	width: 300px;
-	margin: 0px;
-	height: 150px;
-	background-color: #f9802f;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-#naechsteAuktion{
-	position: absolute;
-	top: 410px;
-	left: 150px;
-	width: 300px;
-	margin: 0;
-	height: 150px;
-	background-color: #2fdbf9;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-#letzteAuktion{
-	position: absolute;
-	top: 410px;
-	left: 850px;
-	width: 300px;
-	margin: 0;
-	height: 150px;
-	background-color: #dbdad9;
-	border-radius: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-#kaufen{
-	position: absolute;
-	top: 310px;
-	height :80px;
-	width: 200px;
-	left: 550px;
-	background-color: green;
-	border-radius: 10px;
-}
-#simManager{
-	position: absolute;
-	top: 20px;
-	right: 0;
-	width: 100px;
-}
-button{
-	width: 100px;
-	background-color: #dbdad9;
-}
-.bigbutton{
-	height: 50px;
-	width: 100px;
-	background-color: #dbdad9;
-}
\ No newline at end of file
+#canvas{position:absolute;top:0;left:500px;width:300px;margin:0;height:300px;}#aktuelleAuktion{position:absolute;top:410px;left:500px;width:300px;margin:0px;height:150px;background-color:#f9802f;border-radius:10px;border-style:solid;border-width:1px;}#naechsteAuktion{position:absolute;top:410px;left:150px;width:300px;margin:0;height:150px;background-color:#2fdbf9;border-radius:10px;border-style:solid;border-width:1px;}#letzteAuktion{position:absolute;top:410px;left:850px;width:300px;margin:0;height:150px;background-color:#dbdad9;border-radius:10px;border-style:solid;border-width:1px;}#kaufen{position:absolute;top:310px;height: 80px;width:200px;left:550px;background-color:green;border-radius:10px;}#simManager{position:absolute;top:20px;right:0;width:100px;}button{width:100px;background-color:#dbdad9;}.bigbutton{height:50px;width:100px;background-color:#dbdad9;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/ias_p2_b0.1/css/botButton.css b/Sammlung/Praktikum/3/ias_p2_b0.1/css/botButton.css
index 1a3326f..8f5143e 100644
--- a/Sammlung/Praktikum/3/ias_p2_b0.1/css/botButton.css
+++ b/Sammlung/Praktikum/3/ias_p2_b0.1/css/botButton.css
@@ -1,14 +1 @@
-.botButtonActiveStyle{
-	height: 50px;
-	background-color: green;
-}
-
-.botButtonInactiveStyle{
-	height: 50px;
-	background-color: #dbdad9;
-}
-
-.botButtonBuyActionStyle{
-	height: 50px;
-	background-color: yellow;
-}
\ No newline at end of file
+.botButtonActiveStyle{height:50px;background-color:green;}.botButtonInactiveStyle{height:50px;background-color:#dbdad9;}.botButtonBuyActionStyle{height:50px;background-color:yellow;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/ias_p2_b0.1/css/wizardButton.css b/Sammlung/Praktikum/3/ias_p2_b0.1/css/wizardButton.css
index aa35ce0..45b39b6 100644
--- a/Sammlung/Praktikum/3/ias_p2_b0.1/css/wizardButton.css
+++ b/Sammlung/Praktikum/3/ias_p2_b0.1/css/wizardButton.css
@@ -1,8 +1 @@
-.wizardButtonNeu{
-	height: 50px;
-	background-color: yellow;
-}
-.wizardButtonFertig{
-	height: 50px;
-	background-color: green;
-}
\ No newline at end of file
+.wizardButtonNeu{height:50px;background-color:yellow;}.wizardButtonFertig{height:50px;background-color:green;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/3/iasp1.css b/Sammlung/Praktikum/3/iasp1.css
index 36eb599..e22016e 100644
--- a/Sammlung/Praktikum/3/iasp1.css
+++ b/Sammlung/Praktikum/3/iasp1.css
@@ -1,9 +1 @@
-figure, figure img {
-   margin-left: auto;
-   margin-right: auto;
-   text-align: center; /* zur Zentrierung des img-Elements */
-   width: 15cm;
-}
-figcaption {
-   text-align: center;
-}
+figure,figure img{margin-left:auto;margin-right:auto;text-align:center;width:15cm;}figcaption{text-align:center;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/4/app/__pycache__/__init__.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/__init__.cpython-35.pyc
index d00f3d4..9ea01c8 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/__init__.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/database.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/database.cpython-35.pyc
index a16d8c8..540ddad 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/database.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/database.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/discussion.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/discussion.cpython-35.pyc
index a11861d..5a9ca65 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/discussion.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/discussion.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/login.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/login.cpython-35.pyc
index f7f7487..2e19621 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/login.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/login.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/post.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/post.cpython-35.pyc
index d135b89..93190c6 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/post.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/post.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/template.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/template.cpython-35.pyc
index 381f12f..10564aa 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/template.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/template.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/app/__pycache__/topic.cpython-35.pyc b/Sammlung/Praktikum/4/app/__pycache__/topic.cpython-35.pyc
index b4f9490..a4f0659 100644
Binary files a/Sammlung/Praktikum/4/app/__pycache__/topic.cpython-35.pyc and b/Sammlung/Praktikum/4/app/__pycache__/topic.cpython-35.pyc differ
diff --git a/Sammlung/Praktikum/4/css/main.css b/Sammlung/Praktikum/4/css/main.css
index 0ce2054..9e3e3cf 100644
--- a/Sammlung/Praktikum/4/css/main.css
+++ b/Sammlung/Praktikum/4/css/main.css
@@ -1,287 +1 @@
-/* main.css */
-
-/* allgemeine Vorgaben */
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-
-   padding: 0;
-   margin: 0;
-}
-
-/* Basislayout */
-
-.clSiteHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 80px;
-   line-height: 80px;
-   margin: 0;
-   padding: 5px;
-   font-size: 12pt;
-   color: #efc9a0;
-   background-color: #40200d;
-   text-align: center;
-}
-
-.clLoggedInText {
-   position: absolute;
-   right: 50px;
-   height: 80px;
-   line-height: 48px;
-   margin: 0;
-   padding: 5px;
-   font-size: 12pt;
-   color: #efc9a0;
-   background-color: #40200d;
-   text-align: right;
-   font-weight: bold;
-}
-
-.clNav {
-   position: absolute;
-   left: 0;
-   width: 150px;
-   margin: 0;
-   padding: 10px;
-
-}
-
-.clNav a, a:hover, a:visited, a:active{
-   display: block;
-   text-decoration: none;
-   margin-bottom: 10px;
-}
-
-.clNav a:hover {
-   font-weight: bold;
-}
-
-.clContentOuter {
-   position: absolute;
-   top: 80px; 
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 0;
-}
-
-.clContent {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 5px;
-   background-color: #efc9a0;
-}
-
-/* Elemente im Content-Bereich */
-
-.clContentHeader {
-   position: absolute;
-   top: 20px;
-   left: 0;
-   right: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   font-size: 14pt;
-   text-align: center;
-}
-
-.clContentArea {
-   position: absolute;
-   top: 60px; 
-   left: 0;
-   right: 0;
-   bottom: 40px;  
-   margin: 0;
-   padding: 0px;
-   overflow-y: auto;
-}
-
-.clSelected{
-   color: white;
-   font-weight: bold;
-}
-
-
-.clButtonArea {
-   position: fixed;
-   left: 0;
-   right: 0;
-   bottom: 0;
-   height: 50px;
-   line-height: 50px;
-   margin: 0;
-   padding: 5px;
-   text-align: center;
-   background-color: #40200d;
-	
-}
-
-/* Links und Submit-Schalter im Buttonbereich gestalten */
-
-.clButtonArea button, a, input[type="submit"] {
-   margin: 0 5px;
-   padding: 3px 6px;
-   font-size: 10pt;
-   text-decoration: none;
-   border: 1px solid;
-   color: black;
-   background-color: #efc9a0;
-}
-
-.clButtonArea button:disabled {
-   color: graytext;
-}
-
-
-.clButtonArea button:enabled {
-   font-weight: bold;
-}
-
-/* Gestaltung von Tabellen */
-
-#idTopicList, #idDiscussionList {
-   table-layout: fixed;
-   width: 66%;
-   border: 1px solid;
-   border-collapse: collapse;
-   margin:auto;
-   
-}
-
-#idTopicList th, #idDiscussionList th {
-   text-align: left;
-   padding-left: 6px;
-}
-
-#idTopicList th, #idTopicList td, #idDiscussionList  th, #idDiscussionList  td{
-   padding: 3px;
-   border: 1px solid #000;
-}
-
-#idPostList {
-   width: 80%;
-   border: 1px solid;
-   border-collapse: collapse;
-   margin:auto;
-   padding: 0px;
-}
-
-
-
-.listheader th{
-  color:#efc9a0;
-  background-color:#40200d;
-}
-
-#idTopicList tr, #idDiscussionList tr{
-  background-color:#F4C484
-}
-
-#idTopicList tr:nth-of-type(even), #idDiscussionList tr:nth-of-type(even){
-background-color:#E4A454;
-}
-
-
-/* Gestaltung von Formularen */
-
-/* das Formular nochmals zusätzlich gestalten */
-#idForm .clContentArea {
-   width: 500px;
-   margin-left: auto;
-   margin-right: auto;
-}
-
-.clFormRow {
-   position: relative; /* damit das Element in jedem Fall "positioniert" ist und damit als Bezugspunkt geeignet ist */
-   height: 25px;
-   margin-bottom: 10px;
-   
-   
-}
-
-.clFormRow label {
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 150px;
-   text-align: right;
-}
-
-.clFormRow input, .clFormRow textarea {
-   position: absolute;
-   top: 0;
-   left: 160px;
-   width: 250px;
-   margin: auto;
-}
-
-
-/********************************************************************STYLES für einzelne Posts der Postliste*/
-#idPostList li {
-    border: 1px solid;
-    border-collapse: collapse;
-    padding: 0px;
-    margin: 0px;
-    list-style-type: none;
-    
-}
-
-.clMetaDataContainer {
-    width: 15%;
-    height: 100%;
-    margin: 0px;
-    left: 0;
-    right: 80%;
-    color: #efc9a0;
-    background-color: #40200D;
-}
-
-.clPostContainer{
-    position: relative;
-}
-
-
-.clPostDataContainer{
-    position: absolute;
-    width: 85%;
-    left: 15%;
-    height: 100%;
-    top: 0;
-}
-
-#idPostList .clOwner {
-    margin: 0px;
-
-}
-#idPostList .clTime {
-    margin: 0px;
-}
-
-#idPostList .clTitle {   
-    margin: 0;
-    position: relative;
-    width: 100%;
-    text-align: center;
-    color: #efc9a0;
-    background-color: #40200d;
-}
-
-#idPostList .clText {
-    margin: 0;
-    margin-left: 3px;
-    bottom: 0;
-    position: relative;
-    width: 100%;
-}
-
-/* EOF */
\ No newline at end of file
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:80px;line-height:80px;margin:0;padding:5px;font-size:12pt;color:#efc9a0;background-color:#40200d;text-align:center;}.clLoggedInText{position:absolute;right:50px;height:80px;line-height:48px;margin:0;padding:5px;font-size:12pt;color:#efc9a0;background-color:#40200d;text-align:right;font-weight:bold;}.clNav{position:absolute;left:0;width:150px;margin:0;padding:10px;}.clNav a,a:hover,a:visited,a:active{display:block;text-decoration:none;margin-bottom:10px;}.clNav a:hover{font-weight:bold;}.clContentOuter{position:absolute;top:80px;left:0;right:0;bottom:0;margin:0;padding:0;}.clContent{position:absolute;top:0;left:0;right:0;bottom:0;margin:0;padding:5px;background-color:#efc9a0;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:14pt;text-align:center;}.clContentArea{position:absolute;top:60px;left:0;right:0;bottom:40px;margin:0;padding:0px;overflow-y:auto;}.clSelected{color:white;font-weight:bold;}.clButtonArea{position:fixed;left:0;right:0;bottom:0;height:50px;line-height:50px;margin:0;padding:5px;text-align:center;background-color:#40200d;}.clButtonArea button,a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:10pt;text-decoration:none;border:1px solid;color:black;background-color:#efc9a0;}.clButtonArea button:disabled{color:graytext;}.clButtonArea button:enabled{font-weight:bold;}#idTopicList,#idDiscussionList{table-layout:fixed;width:66%;border:1px solid;border-collapse:collapse;margin:auto;}#idTopicList th,#idDiscussionList th{text-align:left;padding-left:6px;}#idTopicList th,#idTopicList td,#idDiscussionList th,#idDiscussionList td{padding:3px;border:1px solid #000;}#idPostList{width:80%;border:1px solid;border-collapse:collapse;margin:auto;padding:0px;}.listheader th{color:#efc9a0;background-color:#40200d;}#idTopicList tr,#idDiscussionList tr{background-color:#F4C484}#idTopicList tr:nth-of-type(even),#idDiscussionList tr:nth-of-type(even){background-color:#E4A454;}#idForm .clContentArea{width:500px;margin-left:auto;margin-right:auto;}.clFormRow{position:relative;height:25px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:150px;text-align:right;}.clFormRow input,.clFormRow textarea{position:absolute;top:0;left:160px;width:250px;margin:auto;}#idPostList li{border:1px solid;border-collapse:collapse;padding:0px;margin:0px;list-style-type:none;}.clMetaDataContainer{width:15%;height:100%;margin:0px;left:0;right:80%;color:#efc9a0;background-color:#40200D;}.clPostContainer{position:relative;}.clPostDataContainer{position:absolute;width:85%;left:15%;height:100%;top:0;}#idPostList .clOwner{margin:0px;}#idPostList .clTime{margin:0px;}#idPostList .clTitle{margin:0;position:relative;width:100%;text-align:center;color:#efc9a0;background-color:#40200d;}#idPostList .clText{margin:0;margin-left:3px;bottom:0;position:relative;width:100%;}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/4/data/topics.dat b/Sammlung/Praktikum/4/data/topics.dat
index e235242..d3fb024 100644
--- a/Sammlung/Praktikum/4/data/topics.dat
+++ b/Sammlung/Praktikum/4/data/topics.dat
@@ -1 +1 @@
-{"1": {"name": "Ich bin das erste Test-Thema", "discs": [], "deleted": true, "owner": "Test"}, "5": {"name": "test", "deleted": false, "discs": [], "owner": "test"}, "4": {"name": "TestThema", "discs": ["9"], "deleted": false, "owner": "Florian"}, "2": {"name": "Und ich das zweite!", "discs": ["8", "10"], "deleted": false, "owner": "Test"}, "nextID": "6", "3": {"name": "Web-Engineering", "discs": [], "deleted": true, "owner": "Florian"}}
\ No newline at end of file
+{"4": {"owner": "Florian", "deleted": false, "name": "TestThema", "discs": ["9"]}, "2": {"owner": "Test", "deleted": false, "name": "Und ich das zweite!", "discs": ["8", "10"]}, "3": {"owner": "Florian", "deleted": true, "name": "Web-Engineering", "discs": []}, "5": {"owner": "test", "discs": [], "name": "test", "deleted": false}, "1": {"owner": "Test", "deleted": true, "name": "Ich bin das erste Test-Thema", "discs": []}, "nextID": "7", "6": {"discs": [], "owner": "Kai", "name": "test", "deleted": false}}
\ No newline at end of file
diff --git a/Sammlung/Praktikum/4/js/forum.js b/Sammlung/Praktikum/4/js/forum.js
index b6c7abb..c177be1 100644
--- a/Sammlung/Praktikum/4/js/forum.js
+++ b/Sammlung/Praktikum/4/js/forum.js
@@ -149,6 +149,8 @@ FORUM.Application_cl = Class.create({
     setContent_p: function (newContent_opl, data_opl) {
         if (this.content_o != null) {
             if (this.content_o.canClose_px()) {
+                console.log(newContent_opl);
+                console.log(data_opl);
                     this.content_o.close_px();
                     this.content_o = newContent_opl;
                     this.content_o.render_px(data_opl);
diff --git a/Sammlung/Praktikum/4/js/tm.js b/Sammlung/Praktikum/4/js/tm.js
index 827f4b3..88cdede 100644
--- a/Sammlung/Praktikum/4/js/tm.js
+++ b/Sammlung/Praktikum/4/js/tm.js
@@ -41,6 +41,8 @@ TELIB.TemplateManager_cl = Class.create({
    },
    execute_px: function (name_spl, data_opl) {
       var compiled_o = null;
+      console.log(this.compiled_o);
+      console.log(this.templates_o);
       if (name_spl in this.compiled_o) {
          compiled_o = this.compiled_o[name_spl];
       } else {
diff --git a/Sammlung/lit-8/app/__pycache__/__init__.cpython-35.pyc b/Sammlung/lit-8/app/__pycache__/__init__.cpython-35.pyc
index ec6e993..049d419 100644
Binary files a/Sammlung/lit-8/app/__pycache__/__init__.cpython-35.pyc and b/Sammlung/lit-8/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Sammlung/lit-8/app/__pycache__/application.cpython-35.pyc b/Sammlung/lit-8/app/__pycache__/application.cpython-35.pyc
index 519f8cb..65d2b09 100644
Binary files a/Sammlung/lit-8/app/__pycache__/application.cpython-35.pyc and b/Sammlung/lit-8/app/__pycache__/application.cpython-35.pyc differ
diff --git a/Sammlung/lit-8/app/__pycache__/database.cpython-35.pyc b/Sammlung/lit-8/app/__pycache__/database.cpython-35.pyc
index 9077eae..183559f 100644
Binary files a/Sammlung/lit-8/app/__pycache__/database.cpython-35.pyc and b/Sammlung/lit-8/app/__pycache__/database.cpython-35.pyc differ
diff --git a/Sammlung/lit-8/app/__pycache__/template.cpython-35.pyc b/Sammlung/lit-8/app/__pycache__/template.cpython-35.pyc
index 16d8001..2a8f1de 100644
Binary files a/Sammlung/lit-8/app/__pycache__/template.cpython-35.pyc and b/Sammlung/lit-8/app/__pycache__/template.cpython-35.pyc differ
diff --git a/Sammlung/lit-8/app/__pycache__/view.cpython-35.pyc b/Sammlung/lit-8/app/__pycache__/view.cpython-35.pyc
index 8a5fb29..759ebd6 100644
Binary files a/Sammlung/lit-8/app/__pycache__/view.cpython-35.pyc and b/Sammlung/lit-8/app/__pycache__/view.cpython-35.pyc differ
diff --git a/Sammlung/lit-8/css/main.css b/Sammlung/lit-8/css/main.css
index 9cc1266..f39c8f3 100644
--- a/Sammlung/lit-8/css/main.css
+++ b/Sammlung/lit-8/css/main.css
@@ -1,194 +1 @@
-/* main.css */
-
-/* allgemeine Vorgaben */
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-
-   padding: 0;
-   margin: 0;
-}
-
-/* Basislayout */
-
-.clSiteHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 50px;
-   line-height: 50px;
-   margin: 0;
-   padding: 5px;
-   font-size: 12pt;
-   color: white;
-   background-color: #0000AA;
-}
-
-.clNav {
-   position: absolute;
-   top: 60px;  /* height, padding, border, margin von idSiteHeader beachten */
-   left: 0;
-   bottom: 0;
-   width: 140px;
-   border-right: 1px solid;
-   margin: 0;
-   padding: 5px;
-}
-
-.clNav a, a:hover, a:visited, a:active{
-   display: block;
-   text-decoration: none;
-   margin-bottom: 10px;
-}
-
-.clNav a:hover {
-   font-weight: bold;
-}
-
-.clContentOuter {
-   position: absolute;
-   top: 60px;  /* height, padding, border, margin von idSiteHeader beachten */
-   left: 151px;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 0;
-}
-
-.clContent {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 5px;
-}
-
-/* Elemente im Content-Bereich */
-
-.clContentHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   font-size: 14pt;
-   text-align: center;
-}
-
-.clContentArea {
-   position: absolute;
-   top: 40px; /* height, padding, border, margin von idContentHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 40px;  /* height, padding, border, margin von idButtonArea beachten */
-   margin: 0;
-   padding: 0px;
-
-   overflow-y: auto;
-}
-
-.clButtonArea {
-   position: absolute;
-   left: 0;
-   right: 0;
-   bottom: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   text-align: center;
-   background-color: #EEEEEE;
-}
-
-/* Links und Submit-Schalter im Buttonbereich gestalten */
-
-.clButtonArea button, a, input[type="submit"] {
-   margin: 0 5px;
-   padding: 3px 6px;
-   font-size: 10pt;
-   text-decoration: none;
-   border: 1px solid;
-   color: black;
-   background-color: buttonface;
-}
-
-.clButtonArea button:disabled {
-   color: graytext;
-}
-/* unterschiedliche Kennzeichnungen je nach Bedienung vermeiden */
-
-.clButtonArea a:hover, a:visited, a:active {
-   color: black;
-}
-
-/* Gestaltung von Tabellen */
-
-#idList {
-   table-layout: fixed;
-   width: 80%;
-   border: 1px solid;
-   border-collapse: collapse;
-   margin:auto;
-}
-
-#idList th {
-   text-align: left;
-   padding-left: 6px;
-}
-#idList th, #idList td {
-   padding: 3px;
-   border: 1px solid;
-}
-
-/* damit wird jede ungerade Zeile in Tabellen mit einer anderen Hintergrundfarbe ausgegeben */
-/* den Effekt nennt man auch "Zebra"-Tables */
-
-tr:nth-of-type(odd) {
-  background-color:#ccc;
-} 
-
-#idList tr.clSelected {
-   background-color: blue;
-   color: white;
-}
-
-/* Gestaltung von Formularen */
-
-/* das Formular nochmals zusätzlich gestalten */
-#idForm .clContentArea {
-   width: 500px;
-   margin: auto;
-}
-
-.clFormRow {
-   position: relative; /* damit das Element in jedem Fall "positioniert" ist und damit als Bezugspunkt geeignet ist */
-   height: 25px;
-   margin-bottom: 10px;
-}
-
-.clFormRow label {
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 150px;
-   text-align: right;
-}
-
-.clFormRow input {
-   position: absolute;
-   top: 0;
-   left: 160px;
-   width: 250px;
-}
-
-label span.clRequired {
-   color: red;
-   content: '*';
-}
-/* EOF */
\ No newline at end of file
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:50px;line-height:50px;margin:0;padding:5px;font-size:12pt;color:white;background-color:#0000AA;}.clNav{position:absolute;top:60px;left:0;bottom:0;width:140px;border-right:1px solid;margin:0;padding:5px;}.clNav a,a:hover,a:visited,a:active{display:block;text-decoration:none;margin-bottom:10px;}.clNav a:hover{font-weight:bold;}.clContentOuter{position:absolute;top:60px;left:151px;right:0;bottom:0;margin:0;padding:0;}.clContent{position:absolute;top:0;left:0;right:0;bottom:0;margin:0;padding:5px;}.clContentHeader{position:absolute;top:0;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:14pt;text-align:center;}.clContentArea{position:absolute;top:40px;left:0;right:0;bottom:40px;margin:0;padding:0px;overflow-y:auto;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:30px;line-height:30px;margin:0;padding:5px;text-align:center;background-color:#EEEEEE;}.clButtonArea button,a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:10pt;text-decoration:none;border:1px solid;color:black;background-color:buttonface;}.clButtonArea button:disabled{color:graytext;}.clButtonArea a:hover,a:visited,a:active{color:black;}#idList{table-layout:fixed;width:80%;border:1px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:left;padding-left:6px;}#idList th,#idList td{padding:3px;border:1px solid;}tr:nth-of-type(odd){background-color:#ccc;}#idList tr.clSelected{background-color:blue;color:white;}#idForm .clContentArea{width:500px;margin:auto;}.clFormRow{position:relative;height:25px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:150px;text-align:right;}.clFormRow input{position:absolute;top:0;left:160px;width:250px;}label span.clRequired{color:red;content:'*';}
\ No newline at end of file
diff --git a/Sammlung/p2 051115/content/css/style.css b/Sammlung/p2 051115/content/css/style.css
index 87f45c9..59decaa 100644
--- a/Sammlung/p2 051115/content/css/style.css	
+++ b/Sammlung/p2 051115/content/css/style.css	
@@ -1,148 +1 @@
-/* template.css */
-
-/* allgemeine Vorgaben */
-body {
-   font-family: "Open Sans", sans-serif;
-   font-size: 12pt;
-
-   padding: 0;
-   margin: 0;
-}
-
-/* Basislayout */
-
-.clSiteHeader {
-   position: absolute;
-   top: 0;
-   left: 0;
-   right: 0;
-   height: 100px;
-   line-height: 100px;
-   margin: 0;
-   padding: 5px;
-   font-size: 40pt;
-   text-align: center;
-   text-shadow:black 3px 2px;
-   font-family: cursive, fantasy;
-   color: #920B19;
-   background-color: #B6B6B7;
-}
-
-.clContent {
-   position: absolute;
-   top: 110px;  /* height, padding, border, margin von idSiteHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 0;
-   margin: 0;
-   padding: 5px;
-}
-
-/* Elemente im Content-Bereich */
-
-.clContentHeader {
-   position: absolute;
-   top: 20px;
-   left: 0;
-   right: 0;
-   height: 30px;
-   line-height: 30px;
-   margin: 0;
-   padding: 5px;
-   font-size: 18pt;
-   text-align: center;
-}
-
-.clContentArea {
-   position: absolute;
-   top: 80px; /* height, padding, border, margin von idContentHeader beachten */
-   left: 0;
-   right: 0;
-   bottom: 40px;  /* height, padding, border, margin von idButtonArea beachten */
-   margin: 10px 0;
-   margin-left: 10px;
-   padding: 5px;
-}
-
-.clButtonArea {
-   position: absolute;
-   left: 0;
-   right: 0;
-   /*float: left; width: 10px:*/
-   bottom: 0;
-   height: 80px;
-   line-height: 80px;
-   margin: 0;
-   padding: 5px;
-   text-align: center;
-   background-color: #B6B6B7;
-}
-
-/* Links und Submit-Schalter im Buttonbereich gestalten */
-
-.clButtonArea a, input[type="submit"] {
-   margin: 0 5px;
-   padding: 3px 6px;
-   font-size: 14pt;
-   text-decoration: none;
-   border: 2px solid;
-   color: black;
-   background-color: buttonface;
-}
-
-/* unterschiedliche Kennzeichnungen je nach Bedienung vermeiden */
-
-.clButtonArea a:hover, a:visited, a:active {
-   color: black;
-}
-
-/* Gestaltung von Tabellen */
-
-#idList {
-   table-layout: fixed;
-   width: auto;
-   border: 2px solid;
-   border-collapse: collapse;
-   margin:auto;
-}
-
-#idList th {
-   text-align: center;
-   padding-left: 5px;
-   background-color: #FFFFFF;
-}
-
-#idList th, #idList td {
-   padding: 3px;
-   border: 2px solid;
-}
-
-/* Gestaltung von Formularen */
-
-/* das Formular nochmals zusätzlich gestalten */
-#idForm .clContentArea {
-   width: 500px;
-   margin: auto;
-}
-
-.clFormRow {
-   position: relative; /* damit das Element in jedem Fall "positioniert" ist und damit als Bezugspunkt geeignet ist */
-   height: 30px;
-   margin-bottom: 10px;
-}
-
-.clFormRow label {
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 240px;
-   text-align: center;
-}
-
-.clFormRow input {
-   position: absolute;
-   top: 0;
-   left: 250px;
-   width: 250px;
-}
-/* EOF */
\ No newline at end of file
+body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:cursive,fantasy;color:#920B19;background-color:#B6B6B7;}.clContent{position:absolute;top:110px;left:0;right:0;bottom:0;margin:0;padding:5px;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:40px;margin:10px 0;margin-left:10px;padding:5px;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#B6B6B7;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:black;background-color:buttonface;}.clButtonArea a:hover,a:visited,a:active{color:black;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:#FFFFFF;}#idList th,#idList td{padding:3px;border:2px solid;}#idForm .clContentArea{width:500px;margin:auto;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}
\ No newline at end of file
diff --git a/Sammlung/te_tm/hinweise_te_tm.000.pdf b/Sammlung/te_tm/hinweise_te_tm.000.pdf
new file mode 100644
index 0000000..1adb8a0
Binary files /dev/null and b/Sammlung/te_tm/hinweise_te_tm.000.pdf differ
diff --git a/Sammlung/te_tm/te.js b/Sammlung/te_tm/te.js
new file mode 100644
index 0000000..d746fb9
--- /dev/null
+++ b/Sammlung/te_tm/te.js
@@ -0,0 +1,266 @@
+//------------------------------------------------------------------------------
+// Template-Engine
+//------------------------------------------------------------------------------
+
+'use strict'
+
+class Generator_cl {
+   constructor () {
+      this.reset_px();
+   }
+   reset_px () {
+      this.code_a = ['var result_a = [];\n'];
+   }
+   write_px (text_spl) {
+      // Escape-Zeichen bei Strings ergänzen
+      var text_s = text_spl.replace(/"/g, '\\"');
+      text_s = text_s.replace(/'/g, "\\'");
+      this.code_a.push('result_a.push("' + text_s + '");\n');
+   }
+   code_px (code_spl) {
+      if (code_spl.startsWith('if')) {
+         this.code_a.push('if (' + code_spl.substr(2) + ') {\n');
+      } else if (code_spl.startsWith('else')) {
+         this.code_a.push('} else {\n');
+      } else if (code_spl.startsWith('endif')) {
+         this.code_a.push('}\n');
+      } else if (code_spl.startsWith('for')) {
+         this.code_a.push('for (' + code_spl.substr(3) + ') {\n');
+      } else if (code_spl.startsWith('endfor')) {
+         this.code_a.push('}\n');
+      } else {
+         this.code_a.push(code_spl + '\n');
+      }
+   }
+   substitute_px (subst_spl) {
+      let value_s = subst_spl == null ? '' : String(subst_spl);
+      this.code_a.push('result_a.push(' + value_s + ');\n');
+   }
+   generate_px () {
+      var result_s = this.code_a.join('') + ' return result_a.join("");';
+      var f_o = new Function ('context', result_s);
+      return f_o;
+   }
+}
+
+class TemplateCompiler_cl {
+   constructor () {
+      this.gen_o = new Generator_cl();
+      this.reset_px();
+   }
+   reset_px () {
+      this.gen_o.reset_px();
+      this.preservePreWS_b = false;
+      this.preservePostWS_b = false;
+   }
+   setPreWS_px (on_bpl) {
+      if ((on_bpl == undefined) || (on_bpl == false)) {
+         this.preservePreWS_b = false;
+      } else {
+         this.preservePreWS_b = true;
+      }
+   }
+   setPostWS_px (on_bpl) {
+      if ((on_bpl == undefined) || (on_bpl == false)) {
+         this.preservePostWS_b = false;
+      } else {
+         this.preservePostWS_b = true;
+      }
+   }
+   compile_px (source_spl) {
+      var state_i = 0;
+      var pos_i = 0;
+      var len_i = source_spl.length;
+      var text_s = '';
+      var code_s = '';
+      var subst_s = '';
+      this.gen_o.reset_px();
+
+      var doubletest_f = function (char_spl) {
+         var status_b = false;
+         if ((pos_i + 1) < len_i) {
+            if ((source_spl[pos_i] == char_spl) && (source_spl[pos_i+1] == char_spl)) {
+               status_b = true;
+            }
+         }
+         return status_b;
+      }
+
+      while (pos_i < len_i) {
+         switch (state_i) {
+         case 0:
+            // outside
+            if (source_spl[pos_i] == '@') { // ECMA 5!
+               if (doubletest_f('@') == false) {
+                  state_i = 2;
+                  code_s = '';
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  state_i = 1;
+                  text_s = '@';
+                  pos_i++;
+               }
+            } else if (source_spl[pos_i] == '#') {
+               if (doubletest_f('#') == false) {
+                  state_i = 3;
+                  subst_s = '';
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  state_i = 1;
+                  text_s = '#';
+                  pos_i++;
+               }
+            } else if ((source_spl[pos_i] == ' ') || (source_spl[pos_i] == '\t')) {
+               state_i = 4;
+               text_s = '';
+               pos_i--; // Zeichen erneut verarbeiten
+            } else {
+               state_i = 1;
+               text_s = '';
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         case 1:
+            // inText
+            if (source_spl[pos_i] == '@') {
+               if (doubletest_f('@') == false) {
+                  // Textende, neuer Code
+                  state_i = 0;
+                  this.gen_o.write_px(text_s);
+                  pos_i--; // Zeichen erneut verarbeiten
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  text_s += '@';
+                  pos_i++;
+               }
+            } else if (source_spl[pos_i] == '#') {
+               if (doubletest_f('#') == false) {
+                  // Textende, neue Substitution
+                  state_i = 0;
+                  this.gen_o.write_px(text_s);
+                  pos_i--; // Zeichen erneut verarbeiten
+                  // Textende, neuer Code
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  text_s += '#';
+                  pos_i++;
+               }
+            } else if ((source_spl[pos_i] == ' ') || (source_spl[pos_i] == '\t')) {
+               // Textende
+               state_i = 0;
+               this.gen_o.write_px(text_s);
+               pos_i--; // Zeichen erneut verarbeiten
+            } else {
+               // sammeln
+               if ((source_spl[pos_i] != '\n') && (source_spl[pos_i] != '\r')) {
+                  text_s += source_spl[pos_i];
+               } else if (source_spl[pos_i] == '\n') {
+                  text_s += '\\n';
+               } else {
+                  text_s += '\\r';
+               }
+            }
+            break;
+         case 2:
+            // inCode
+            if (source_spl[pos_i] == '@') {
+               if (doubletest_f('@') == false) {
+                  // zu Ende, erzeugen
+                  this.gen_o.code_px(code_s);
+                  state_i = 5;  //0
+               } else {
+                  // als normales Zeichen verarbeiten, ein Zeichen überlesen
+                  code_s += '@';
+                  pos_i++;
+               }
+            } else {
+               // sammeln
+               code_s += source_spl[pos_i];
+            }
+            break;
+         case 3:
+            // inSubst
+            // Verdopplung # hier nicht zulässig!
+            if (source_spl[pos_i] == '#') {
+               // zu Ende, erzeugen
+               this.gen_o.substitute_px(subst_s);
+               state_i = 0;
+            } else {
+               // sammeln
+               subst_s += source_spl[pos_i];
+            }
+            break;
+         case 4:
+            // pre-code-whitespace
+            switch (source_spl[pos_i]) {
+            case ' ':
+            case '\t':
+               // sammeln
+               text_s += source_spl[pos_i];
+               break;
+            default:
+               state_i = 0;
+               if (source_spl[pos_i] != '@') {
+                  this.gen_o.write_px(text_s);
+               } else {
+                  if (doubletest_f('@') == false) {
+                     // Whitespace vor Code-Beginn erkannt
+                     if (this.preservePreWS_b == true) {
+                        // trotzdem ausgeben
+                        this.gen_o.write_px(text_s);
+                     }
+                  } // ansonsten wie normales Zeichen behandeln
+               }
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         case 5:
+            // post-code-whitespace
+            switch (source_spl[pos_i]) {
+            case '\n':
+               text_s += '\\n';
+               state_i = 0;
+               break;
+            case '\r':
+               text_s += '\\r';
+               state_i = 0;
+               break;
+            case ' ':
+            case '\t':
+               // ggf. sammeln
+               text_s += source_spl[pos_i];
+               break;
+            default:
+               // Whitespace nach Code erkannt
+               if (this.preservePostWS_b == true) {
+                  // trotzdem ausgeben
+                  this.gen_o.write_px(text_s);
+               }
+               state_i = 0;
+               pos_i--; // Zeichen erneut verarbeiten
+            }
+            break;
+         }
+         pos_i++;
+      }
+      // welcher Zustand liegt abschließend vor?
+      if (state_i == 1) {
+         this.gen_o.write_px(text_s);
+      } else if (state_i == 2) {
+         this.gen_o.code_px(code_s);
+      } else if (state_i == 3) {
+         this.gen_o.substitute_px(subst_s);
+      } else if (state_i == 4) {
+         if (this.preservePreWS_b == true) {
+            this.gen_o.write_px(text_s);
+         }
+      } else if (state_i == 5) {
+         if (this.preservePostWS_b == true) {
+            this.gen_o.write_px(text_s);
+         }
+      }
+
+      return this.gen_o.generate_px();
+   }
+}
+// EOF
\ No newline at end of file
diff --git a/Sammlung/te_tm/tm.js b/Sammlung/te_tm/tm.js
new file mode 100644
index 0000000..86cff37
--- /dev/null
+++ b/Sammlung/te_tm/tm.js
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+// Template-Manager
+// - Laden und Bereitstellen von Template-Quellen
+//------------------------------------------------------------------------------
+// depends-on:
+//    jquery
+//    te
+//------------------------------------------------------------------------------
+
+'use strict'
+
+class TemplateManager_cl {
+   constructor () {
+      this.templates_o = {};
+      this.compiled_o  = {};
+      this.teCompiler_o = new TemplateCompiler_cl();
+      // Templates als Ressource anfordern und speichern
+      var path_s = "/templates/";
+      $.ajax({
+         dataType: "json",
+         url: path_s,
+         type: 'GET',
+         context: this
+      })
+      .done(function (data_opl) {
+         this.templates_o = data_opl['templates'];
+      })
+      .fail(function(jqXHR_opl, textStatus_spl) {
+         alert( "[tm] Fehler bei Anforderung: " + textStatus_spl );
+      });
+   }
+   get_px (name_spl) {
+      if (name_spl in this.templates_o) {
+         return this.templates_o[name_spl];
+      } else {
+         return null;
+      }
+   }
+   execute_px (name_spl, data_opl) {
+      var compiled_o = null;
+      if (name_spl in this.compiled_o) {
+         compiled_o = this.compiled_o[name_spl];
+      } else {
+         // Übersetzen und ausführen
+         if (name_spl in this.templates_o) {
+            this.teCompiler_o.reset_px();
+            compiled_o = this.teCompiler_o.compile_px(this.templates_o[name_spl]);
+            this.compiled_o[name_spl] = compiled_o;
+         }
+      }
+      if (compiled_o != null) {
+         return compiled_o(data_opl);
+      } else {
+         return null;
+      }
+   }
+}
+
+// EOF
\ No newline at end of file
diff --git a/Sammlung/web_p4/app/__pycache__/Absolventenfeier.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/Absolventenfeier.cpython-35.pyc
index 4504779..7df97f9 100644
Binary files a/Sammlung/web_p4/app/__pycache__/Absolventenfeier.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/Absolventenfeier.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/__init__.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/__init__.cpython-35.pyc
index 4801f66..31549bb 100644
Binary files a/Sammlung/web_p4/app/__pycache__/__init__.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/account.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/account.cpython-35.pyc
index 9e71e58..6010796 100644
Binary files a/Sammlung/web_p4/app/__pycache__/account.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/account.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/converter.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/converter.cpython-35.pyc
index 24d7788..c8b0cf0 100644
Binary files a/Sammlung/web_p4/app/__pycache__/converter.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/converter.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/counter.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/counter.cpython-35.pyc
index 739da03..1537d01 100644
Binary files a/Sammlung/web_p4/app/__pycache__/counter.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/counter.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/database.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/database.cpython-35.pyc
index 6bf6c57..264900b 100644
Binary files a/Sammlung/web_p4/app/__pycache__/database.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/database.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/validator.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/validator.cpython-35.pyc
index a236b6d..24d9c78 100644
Binary files a/Sammlung/web_p4/app/__pycache__/validator.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/validator.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/app/__pycache__/view.cpython-35.pyc b/Sammlung/web_p4/app/__pycache__/view.cpython-35.pyc
index ca5e772..2266b73 100644
Binary files a/Sammlung/web_p4/app/__pycache__/view.cpython-35.pyc and b/Sammlung/web_p4/app/__pycache__/view.cpython-35.pyc differ
diff --git a/Sammlung/web_p4/content/style.css b/Sammlung/web_p4/content/style.css
index a6a59be..e9656e4 100644
--- a/Sammlung/web_p4/content/style.css
+++ b/Sammlung/web_p4/content/style.css
@@ -1,118 +1 @@
-/* background-grey: #EFEFEF */
-
-
-header {
-	display: block;
-	background-color: #FFFFFF; 
-} 
-
-section {
-	background-color: #EFEFEF; /*#F8F8F8;*/
-	border-top-right-radius: 40px; 
-}
-
-footer {
-	background-color: #EFEFEF;
-	border-bottom-left-radius: 30px;
-	border-bottom-right-radius: 30px;
-	padding-top: 1%;
-	padding-left: 1%;
-}
-
-body { 
-	background-color:#FFFFFF; 
-	margin-left: auto;
-	margin-right: auto;
-	width: 65%;
-}
-
-h1 { 
-	color: black;
-}
-
-h2 {
-	color: grey;
-}
-
-a:link {
-    color: black;
-    text-decoration: none;
-    /*background-color: black;*/
-}
-
-a:hover {
-    color: #ADFF2F;
-}
-
-.form {
-	width: 40%;
-}
-
-.alert {
-	color: #FF6E6E;
-}
-
-#mainNav li {
-	display: inline; 
-	padding-right: 10px;
-	padding-left: 10px;
-	cursor: pointer;
-}
-
-li+li {
-	border-left: 2px solid grey;
-}
-
-#mainNav {
-	background-color: #424242;
-	color: white;
-	width: 60%;
-	border-top-left-radius: 10px;
-}
-
-#navButton1 {
-	color: #FCFCFC;
-	text-decoration: none;
-	font-weight: bold;
-	font-size: 110%;
-	padding-left: 2%;
-	padding-right: 2%;
-}
-
-#divideSection {
-	width: 30%;
-	border-bottom: 1px solid #000000;
-}
-
-#subSection2 {
-	padding-left: 1%;
-}
-
-#subSection1 {
-	padding-left: 1%;
-	padding-top: 5px;
-}
-
-#table1 {
-	width: 25%;
-}
-
-#verticalLineLeft {
-	border-left: 1px solid #000000;
-}
-
-/*
-#footerBottomLine {
-	margin-left: auto;
-	width: 40%;
-	border-bottom: 1px solid #000000;
-}
-*/
-
-
-tr.attendendee:hover, .selected {
-	background-color: #ADFF2F;
-	cursor: pointer;
-}
-
-
+header{display:block;background-color:#FFFFFF;}section{background-color:#EFEFEF;border-top-right-radius:40px;}footer{background-color:#EFEFEF;border-bottom-left-radius:30px;border-bottom-right-radius:30px;padding-top:1%;padding-left:1%;}body{background-color:#FFFFFF;margin-left:auto;margin-right:auto;width:65%;}h1{color:black;}h2{color:grey;}a:link{color:black;text-decoration:none;}a:hover{color:#ADFF2F;}.form{width:40%;}.alert{color:#FF6E6E;}#mainNav li{display:inline;padding-right:10px;padding-left:10px;cursor:pointer;}li+li{border-left:2px solid grey;}#mainNav{background-color:#424242;color:white;width:60%;border-top-left-radius:10px;}#navButton1{color:#FCFCFC;text-decoration:none;font-weight:bold;font-size:110%;padding-left:2%;padding-right:2%;}#divideSection{width:30%;border-bottom:1px solid #000000;}#subSection2{padding-left:1%;}#subSection1{padding-left:1%;padding-top:5px;}#table1{width:25%;}#verticalLineLeft{border-left:1px solid #000000;}tr.attendendee:hover,.selected{background-color:#ADFF2F;cursor:pointer;}
\ No newline at end of file