Changeset 13834 for main

Timestamp:

19 Apr 2016, 06:42:26 (9 years ago)

Author:

Henrik Bettermann

Message:

Further customizations for taking the ca into consideration and displaying the ca on all forms and slips.

Location:

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

Files:

• browser.py (modified) (5 diffs)
• browser_templates/studyleveleditpage.pt (added)
• browser_templates/studylevelmanagepage.pt (added)
• browser_templates/studylevelpage.pt (added)
• interfaces.py (modified) (2 diffs)
• studylevel.py (modified) (3 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -31 +31 @@
     CourseTicketAddFormPage,
     StudyLevelDisplayFormPage,
+    StudyLevelManageFormPage,
+    StudyLevelEditFormPage,
     ExportPDFTranscriptSlip,
     ExportPDFAdmissionSlip,
@@ -204 +206 @@
         'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
 
+class CustomStudyLevelManageFormPage(StudyLevelManageFormPage):
+    """ Page to edit the student study level data
+    """
+    grok.context(ICustomStudentStudyLevel)
+
+class CustomStudyLevelEditFormPage(StudyLevelEditFormPage):
+    """ Page to edit the student study level data by students
+    """
+    grok.context(ICustomStudentStudyLevel)
+
 class CustomExportPDFCourseRegistrationSlip(
     NigeriaExportPDFCourseRegistrationSlip):
@@ -289 +301 @@
         Cred = translate('Cred.', 'waeup.kofa', target_language=portal_language)
         Score = translate('Score', 'waeup.kofa', target_language=portal_language)
+        CA = translate('CA', 'waeup.kofa', target_language=portal_language)
         Grade = translate('Grade', 'waeup.kofa', target_language=portal_language)
         Signature = translate(_('Lecturer\'s Signature'), 'waeup.aaue',
@@ -307 +320 @@
                                (Cred, 'credits', 1.5),
                                (Score, 'score', 1.4),
+                               (CA, 'ca', 1.4),
                                (Grade, 'grade', 1.4),
                                (Signature, 'dummy', 3),
@@ -337 +351 @@
             'Akhimien Felicia O. (MANUPA) <br /> Principal Assistant Registrar  <br /> '
             'Exams, Records and Data Processing Division <br /> For: Registrar')],)
+
+    def render(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
+        Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
+        Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)
+        Cred = translate(_('Credits'), 'waeup.kofa', target_language=portal_language)
+        Score = translate(_('Score'), 'waeup.kofa', target_language=portal_language)
+        CA = translate(_('CA'), 'waeup.kofa', target_language=portal_language)
+        Grade = translate(_('Grade'), 'waeup.kofa', target_language=portal_language)
+        studentview = StudentBasePDFFormPage(self.context.student,
+            self.request, self.omit_fields)
+        students_utils = getUtility(IStudentsUtils)
+
+        tableheader = [(Code,'code', 2.5),
+                         (Title,'title', 7),
+                         (Term, 'semester', 1.5),
+                         (Cred, 'credits', 1.5),
+                         (Score, 'score', 1.5),
+                         (CA, 'ca', 1.5),
+                         (Grade, 'grade', 1.5),
+                         ]
+
+        return students_utils.renderPDFTranscript(
+            self, 'transcript.pdf',
+            self.context.student, studentview,
+            omit_fields=self.omit_fields,
+            tableheader=tableheader,
+            signatures=self._signatures(),
+            sigs_in_footer=self._sigsInFooter(),
+            )
 
 class CustomExportPDFAdmissionSlip(ExportPDFAdmissionSlip):

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

@@ -304 +304 @@
 
     ca = schema.Int(
-        title = _(u'Continuous Assessment'),
+        title = _(u'CA'),
         default = None,
         required = False,
@@ -310 +310 @@
         )
 
-ICustomCourseTicket['ca'].order = ICustomCourseTicket['mandatory'].order
+ICustomCourseTicket['ca'].order = ICustomCourseTicket['score'].order
 
 class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):

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

@@ -36 +36 @@
 
 
+def getGradeWeightFromScore(score, ca):
+    if None in (score, ca):
+        return (None, None)
+    total = score + ca
+    if total >= 70:
+        return ('A',5)
+    if total >= 60:
+        return ('B',4)
+    if total >= 50:
+        return ('C',3)
+    if total >= 45:
+        return ('D',2)
+    if total >= 40:
+        return ('E',1)
+    return ('F',0)
+
+
 class CustomStudentStudyLevel(StudentStudyLevel):
     """This is a container for course tickets.
@@ -57 +74 @@
                 total += ticket.credits
         return total
+
+    @property
+    def gpa_params(self):
+        """Calculate gpa parameters for this level.
+        """
+        credits_weighted = 0.0
+        credits_counted = 0
+        level_gpa = 0.0
+        for ticket in self.values():
+            if None not in (ticket.score, ticket.ca):
+                credits_counted += ticket.credits
+                credits_weighted += ticket.credits * ticket.weight
+        if credits_counted:
+            level_gpa = round(credits_weighted/credits_counted, 3)
+        return level_gpa, credits_counted, credits_weighted
 
     @property
@@ -111 +143 @@
     grok.provides(ICustomCourseTicket)
 
+    @property
+    def grade(self):
+        """Returns the grade calculated from score.
+        """
+        return getGradeWeightFromScore(self.score, self.ca)[0]
+
+    @property
+    def weight(self):
+        """Returns the weight calculated from score.
+        """
+        return getGradeWeightFromScore(self.score, self.ca)[1]
+
 CustomCourseTicket = attrs_to_fields(CustomCourseTicket)
 

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

@@ -86 +86 @@
         # First course has been added automatically.
         # Set score. 
-        studylevel['COURSE1'].score = 55
+        studylevel['COURSE1'].score = 35
+        studylevel['COURSE1'].ca = 20
         # GPA is 3.0.
         self.assertEqual(studylevel.gpa_params[0], 3.0)
@@ -93 +94 @@
         courseticket.title = u'Any TITLE'
         courseticket.credits = 13
-        courseticket.score = 66
+        courseticket.score = 44
+        courseticket.ca = 22
         courseticket.semester = 1
         courseticket.dcode = u'ANYDCODE'