darthsandmann/WEB
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Done

Browse Source
This commit is contained in:
darthsandmann
2016-12-15 13:52:05 +01:00
parent aa300044f6
commit 41af35a624
13 changed files with 30 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Praktikum2/ppm2/app/__pycache__/category.cpython-35.pyc
View File

Binary file not shown.

BIN
Praktikum2/ppm2/app/__pycache__/eval.cpython-35.pyc
View File

Binary file not shown.

2
Praktikum2/ppm2/app/category.py
View File

@ -18,9 +18,9 @@ class Category(object):
#-------------------------------------------------------
def GET(self, cat, view, id=None):
#-------------------------------------------------------
self.db.ReadAll()
data = {}
if(cat != "Index"):
self.db.ReadAll()
if(view == "List"):
data['content'] = {}
data['headings'] = {}

4
Praktikum2/ppm2/app/eval.py
View File

@ -35,6 +35,7 @@ class Eval(object):
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']] = {}
@ -49,6 +50,7 @@ class Eval(object):
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']
elif(cat == 'Studenten'):
for keyStudent, valueStudent in Studenten.items():
data[valueStudent['Name']] = {}
@ -82,4 +84,4 @@ class Eval(object):
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)
return json.dumps(data)