Changeset 2606 for WAeUP_SRP/base/WAeUPTables.py

Timestamp:

9 Nov 2007, 12:04:49 (17 years ago)

Author:

Henrik Bettermann

Message:

resolve #122

File:

• WAeUP_SRP/base/WAeUPTables.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTables.py

@@ -1355 +1355 @@
         course_results = self.course_results.evalAdvancedQuery(query)
         carry_overs = []
-        normal = []
+        normal1 = []
+        normal2 = []
+        normal3 = []
         credits = 0
         for brain in course_results:
@@ -1373 +1375 @@
                 carry_overs.append(d)
             else:
-                normal.append(d)
-        normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
-                                        "%(semester)s%(code)s" % y))
+                if brain.semester == '1':
+                    normal1.append(d)
+                elif brain.semester == '2':
+                    normal2.append(d)
+                else:
+                    normal3.append(d)
+        #normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
+        #                                "%(semester)s%(code)s" % y))
         carry_overs.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
                                              "%(semester)s%(code)s" % y))
-        return credits,carry_overs,normal
+        return credits,carry_overs,normal1,normal2,normal3
     ###)