diff --git a/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc index e74ac05..ae068d7 100644 Binary files a/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc and b/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc differ diff --git a/Praktikum2/ppm1/app/application.py b/Praktikum2/ppm1/app/application.py index 4accc55..528176a 100644 --- a/Praktikum2/ppm1/app/application.py +++ b/Praktikum2/ppm1/app/application.py @@ -32,7 +32,6 @@ class Application_cl(object): def category(self, cat=None): #------------------------------------------------------- print("Category: ", cat, "\n") - self.db.ReadAll() if(cat==None): return self.GenerateIndex() else: @@ -43,7 +42,6 @@ class Application_cl(object): def choice(self): #------------------------------------------------------- print("Choice \n") - self.db.ReadAll() return self.GenerateListChoice() @cherrypy.expose @@ -51,7 +49,6 @@ class Application_cl(object): def eval(self, cat): #------------------------------------------------------- print("Eval \n") - self.db.ReadAll() self.db.CheckDates() return self.GenerateListEval(cat) @cherrypy.expose @@ -123,6 +120,7 @@ class Application_cl(object): #------------------------------------------------------- def GenerateList(self, category): #------------------------------------------------------- + self.db.ReadAll() data = {} data['content'] = {} data['headings'] = {} @@ -138,6 +136,7 @@ class Application_cl(object): #------------------------------------------------------- def GenerateListChoice(self): #------------------------------------------------------- + self.db.ReadAll() data = {} data['content'] = {} offerings = self.db.data['Angebote'] @@ -153,6 +152,7 @@ class Application_cl(object): #------------------------------------------------------- def GenerateDetail(self, category, id=None): #------------------------------------------------------- + self.db.ReadAll() data = {} data['category'] = category print("Detail",category,id) @@ -172,6 +172,7 @@ class Application_cl(object): #------------------------------------------------------- def GenerateDetailChoice(self, id): #------------------------------------------------------- + self.db.ReadAll() data = {} data['id'] = id data = self.db.data['Angebote'][id] @@ -183,6 +184,7 @@ class Application_cl(object): #------------------------------------------------------- def GenerateListEval(self, cat): #------------------------------------------------------- + self.db.ReadAll() data = {} Studenten = self.db.data['Studenten'] Lehrender = self.db.data['Lehrender'] 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/last.json b/Praktikum2/ppm1/data/Angebote/last.json index 410b14d..978b4e8 100644 --- a/Praktikum2/ppm1/data/Angebote/last.json +++ b/Praktikum2/ppm1/data/Angebote/last.json @@ -1 +1 @@ -25 \ No newline at end of file +26 \ No newline at end of file diff --git a/Praktikum2/ppm1/data/Lehrender/last.json b/Praktikum2/ppm1/data/Lehrender/last.json index 301160a..ca7bf83 100644 --- a/Praktikum2/ppm1/data/Lehrender/last.json +++ b/Praktikum2/ppm1/data/Lehrender/last.json @@ -1 +1 @@ -8 \ No newline at end of file +13 \ No newline at end of file