PPM2: select

2016-12-12 22:21:01 +01:00
parent 1b35f02647 b2f022ec66
commit 552b7cc942
10 changed files with 340 additions and 5 deletions
--- a/Praktikum2/ppm2/app/eval.py
+++ b/Praktikum2/ppm2/app/eval.py
@ -49,6 +49,11 @@ 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']
+<<<<<<< HEAD
+=======
+            print(data)
+            return self.view.CreateListEval(data)
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
        elif(cat == 'Studenten'):
            for keyStudent, valueStudent in Studenten.items():
                data[valueStudent['Name']] = {}