Changeset 9690

Timestamp:

20 Nov 2012, 06:17:36 (12 years ago)

Author:

Henrik Bettermann

Message:

Use new attrs_to_fields function to display gpa and total_credits on level pages.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (1 diff)
• browser.py (modified) (1 diff)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -476 +476 @@
     additional_headers = ['level']
 
+    @property
+    def available_fields(self):
+        fields = super(StudentStudyLevelProcessor, self).available_fields
+        fields.remove('total_credits')
+        fields.remove('gpa')
+        return  fields
+
     def getParent(self, row, site):
         student = self._getStudent(row, site)

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

@@ -1107 +1107 @@
     grok.template('studylevelmanagepage')
     form_fields = grok.AutoFields(IStudentStudyLevel).omit(
-        'validation_date', 'validated_by')
+        'validation_date', 'validated_by', 'total_credits', 'gpa')
     pnav = 4
     taboneactions = [_('Save'),_('Cancel')]

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt

@@ -15 +15 @@
       </tr>
     </tal:block>
-    <tr>
-      <td i18n:translate="">
-        Total Credits:
-      </td>
-      <td>
-        <span tal:replace="view/context/total_credits">26</span>
-      </td>
-    </tr>
-    <tr>
-      <td i18n:translate="">
-        Momentary GPA:
-      </td>
-      <td>
-        <span tal:replace="python: '%4.2f' % view.context.gpa">2.33</span>
-      </td>
-    </tr>
   </tbody>
 </table>

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -480 +480 @@
     certcode = Attribute('The certificate code of the study course')
     is_current_level = Attribute('Is this level the current level of the student?')
-    total_credits = Attribute('Total of all ticket credits in this study level.')
-    gpa = Attribute('Grade point average in this study level.')
 
     level_session = schema.Choice(
@@ -508 +506 @@
         )
 
+    total_credits = schema.Int(
+        title = _(u'Total Credits'),
+        required = False,
+        readonly = True,
+        )
+
+    gpa = schema.Int(
+        title = _(u'GPA'),
+        required = False,
+        readonly = True,
+        )
+
     def addCourseTicket(ticket, course):
         """Add a course ticket object.

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

@@ -89 +89 @@
                 gpa += ticket.credits * ticket.weight
         if credits_counted:
-            gpa = float(gpa)/credits_counted
-        return gpa
+            gpa = 100*gpa/credits_counted
+        return float(gpa)/100
 
     @property
@@ -138 +138 @@
         return
 
-StudentStudyLevel = attrs_to_fields(StudentStudyLevel)
+StudentStudyLevel = attrs_to_fields(
+    StudentStudyLevel, omit=['total_credits', 'gpa'])
 
 class StudentStudyLevelFactory(grok.GlobalUtility):

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -767 +767 @@
         # GPA has been properly calculated and is shown on the page
         self.browser.open(self.student_path + '/studycourse/100')
-        self.assertTrue('3.00' in self.browser.contents)
+        self.assertTrue('3.0' in self.browser.contents)
         self.assertEqual(self.student['studycourse']['100'].gpa, 3.0)
         # Carry-over courses will be collected when next level is created

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -219 +219 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            ',,0,,,,0,\r\n'
+            '0.0,,,0,0,,,,0,\r\n'
             )
         return
@@ -236 +237 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -251 +253 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -265 +268 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return