Changeset 2485

Timestamp:

30 Oct 2007, 23:56:17 (17 years ago)

Author:

Henrik Bettermann

Message:

getSessionResults.py: fetch verdict from results
aos.xml: ticket #371
logged_in.py: fixed

Location:

WAeUP_SRP

Files:

• base/skins/cps_custom/logged_in.py (modified) (1 diff)
• base/skins/waeup_student/getSessionResults.py (modified) (3 diffs)
• base/skins/waeup_utilities/fix06Verdict.py (modified) (1 diff)
• fceokene/profiles/default/vocabularies/aos.xml (modified) (1 diff)

WAeUP_SRP/base/skins/cps_custom/logged_in.py

@@ -212 +212 @@
         #########################################################
 
-        has_results = context.results_import(matric_no = matric_no)
+        if matric_no:
+            has_results = context.results_import(matric_no = matric_no)
+        else:
+            has_results = ''
 
         #########################################################

WAeUP_SRP/base/skins/waeup_student/getSessionResults.py

@@ -68 +68 @@
 session = None
 level = None
+verdict = None
 
 for r in results:
@@ -73 +74 @@
         session = r.Session
     if level is None:
-        level = r.Level        
+        level = r.Level
+    if verdict is None:
+        verdict = r.Verdict        
     result = {}
     for field in fields:
@@ -106 +109 @@
 
 #set_trace()
-verdict_voc = context.portal_vocabularies.verdicts
-verdict_code = student_from_cat.verdict
-if verdict_code:
-    info['verdict'] = verdict = verdict_voc.get(verdict_code,'N/A').upper()
-else:
-    info['verdict'] = verdict = 'N/A'
+#verdict_voc = context.portal_vocabularies.verdicts
+#verdict_code = student_from_cat.verdict
+#if verdict_code:
+#    info['verdict'] = verdict = verdict_voc.get(verdict_code,'N/A').upper()
+#else:
+#    info['verdict'] = verdict = 'N/A'
 
+if verdict:
+    info['verdict'] = verdict
 if session:
     info['session'] = session

WAeUP_SRP/base/skins/waeup_utilities/fix06Verdict.py

@@ -47 +47 @@
     try:
         study_course_doc = getattr(getattr(students,brain.id),'study_course').getContent()
-        verdict = study_course_doc.current_verdict
+        
+        # final fix
+        if brain.matric_no:
+            verdict = study_course_doc.current_verdict
+        else:
+            verdict = ''
         study_course_doc.edit(mapping = { "current_verdict": '',
                                           "previous_verdict": verdict})
-        #rwrite('found %s , %s ,%s, %s' % (brain.id,
-        #                                  study_course_doc.current_session,
-        #                                  brain.matric_no,
-        #                                  brain.name))
+
+        # Info: The logging message is wrong if not matric_no
         logger.info("Current verdict of %s (%s, %s, %s, %s) moved to previous verdict" % (brain.id,
                                           brain.matric_no,

WAeUP_SRP/fceokene/profiles/default/vocabularies/aos.xml

@@ -81 +81 @@
     <item key="as72" msgid="">MARKETING</item>
     <item key="as73" msgid="">EDUCATION ECONOMICS/SOCIAL STUDIES</item>
+    <item key="as74" msgid="">PHYSIOLOGY</item>
+    <item key="as75" msgid="">AGRICULTURE</item>