Revert "PPM2: select"

This reverts commit 552b7cc942
2016-12-12 23:04:04 +01:00
parent 552b7cc942
commit 8060d7af68
10 changed files with 5 additions and 340 deletions
--- a/Praktikum2/ppm2/app/eval.py
+++ b/Praktikum2/ppm2/app/eval.py
@ -49,11 +49,6 @@ 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']] = {}