Changeset 10480 for main/waeup.aaue/trunk/src/waeup

Timestamp:

12 Aug 2013, 09:08:35 (11 years ago)

Author:

Henrik Bettermann

Message:

Reinvent unrectified sessional gpa (adjustments to base package).

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/studylevel.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -33 +33 @@
 msgstr "Total Units"
 
+#: manually included
+msgid "Sessional GPA (rectified)"
+msgstr "Sessional GPA"
+
 #: waeup/kofa/students/interfaces.py:531
 #: waeup/kofa/university/interfaces.py:152

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -68 +68 @@
     """
     grok.context(ICustomStudentStudyLevel)
-    form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit('total_credits')
+    form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
+        'total_credits', 'gpa')
     form_fields[
         'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -79 +80 @@
     form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
         'level_session', 'level_verdict',
-        'validated_by', 'validation_date')
+        'validated_by', 'validation_date', 'gpa')
 
     omit_fields = ('password', 'suspended', 'suspended_comment',

main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

@@ -56 +56 @@
 
     @property
-    def gpa_params(self):
-        weighted_credits = 0.0
-        credits_counted = 0
-        level_gpa = 0.0
-        for ticket in self.values():
-            if ticket.score:
-                credits_counted += ticket.credits
-                weighted_credits += ticket.credits * ticket.weight
-        if credits_counted:
-            level_gpa = round(weighted_credits/credits_counted, 2)
-        return level_gpa, credits_counted, weighted_credits
+    def gpa_params_rectified(self):
+        return self.gpa_params
 
 CustomStudentStudyLevel = attrs_to_fields(
     CustomStudentStudyLevel, omit=[
-    'total_credits', 'total_credits_s1', 'total_credits_s2'])
+    'total_credits', 'total_credits_s1', 'total_credits_s2', 'gpa'])
 
 class CustomStudentStudyLevelFactory(StudentStudyLevelFactory):