Changeset 2456

Timestamp:

28 Oct 2007, 07:09:46 (17 years ago)

Author:

Henrik Bettermann

Message:

mark deprecated vocabulary
use '000' for pre-studies (no longer missing value)
improve fixReturningSession.py (do not replace level by '000')
fix getNextInfo.py
fix logged_in.py

Location:

WAeUP_SRP

Files:

• base/Widgets.py (modified) (1 diff)
• base/skins/cps_custom/logged_in.py (modified) (3 diffs)
• base/skins/waeup_epayment/simulate_callback.py (deleted)
• base/skins/waeup_student/getNextInfo.py (modified) (1 diff)
• base/skins/waeup_student/getStudyCourseInfo.py (modified) (1 diff)
• base/skins/waeup_student/get_levels_voc.py (deleted)
• base/skins/waeup_utilities/fixReturningSession.py (modified) (3 diffs)
• fceokene/profiles/default/students_catalog.xml (modified) (2 diffs)
• fceokene/profiles/default/vocabularies.xml (modified) (1 diff)
• fceokene/profiles/default/vocabularies/levels.xml (modified) (1 diff)
• fceokene/profiles/default/vocabularies/levels_voc.xml (deleted)

WAeUP_SRP/base/Widgets.py

@@ -329 +329 @@
 
     def _getLevels(self):
-        d = {'000':'N/A'}
+        d = {'':'N/A','000':'Pre-Studies'}
         for y in range(100,800,100):
             d['%s' % str(y)] = 'Year %1d (%3d Level)' % (y/100,y)

WAeUP_SRP/base/skins/cps_custom/logged_in.py

@@ -203 +203 @@
         verdict = res[0].verdict
         level = res[0].level
-        has_level = level and not level == '000' 
-        has_verdict = verdict and not verdict == 'N/A' 
+        has_level = level and not level == '000'
+        has_verdict = verdict and not verdict == 'N/A'
         #set_trace()
 
@@ -212 +212 @@
 
         #########################################################
-        
+
         # fetch current verdict via getVerdict and level via getLevelFromResultsCosCode
 
-        if s_review_state in ('returning','school_fee_paid') and not (has_verdict or has_level):
+        if s_review_state in ('returning','school_fee_paid') and not (has_verdict and has_level):
             if has_results:
                 study_course = getattr(student,'study_course')
@@ -224 +224 @@
                 if not has_level and s_review_state == 'returning':
                     lnr = context.getLevelFromResultsCosCode(has_results)
-                    dsc['current_level'] = "%d00" % lnr                    
+                    dsc['current_level'] = "%d00" % lnr
                 if sc_review_state != 'opened':
                     wftool.doActionFor(study_course,'open')

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -26 +26 @@
     info['next_transition'] = "pay_school_fee"
 elif review_state == 'returning':
-    info['next_level_id'] = "%s" % (int(level_id) + 100)
-    info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
-    if int(session_id) > int(context.getSessionId()[0]) -2:
-        info['next_transition'] = "pay_school_fee"
-        if verdict not in ('A','B',):
-            info['next_level_id'] = level_id
+    if level_id:
+        info['next_level_id'] = "%s" % (int(level_id) + 100)
+    if session_id:
+        info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
+        if int(session_id) > int(context.getSessionId()[0]) -2:
+            info['next_transition'] = "pay_school_fee"
+            if verdict not in ('A','B',):
+                info['next_level_id'] = level_id
 
 info['next_session_str'] = context.sessions_voc(next_session_id)

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -77 +77 @@
     row = {}
     row['id'] = l
-    #row['title'] = "Level %s" % l
-    row['title'] = context.portal_vocabularies.levels_voc[l]
+    row['title'] = "Level %s" % l
+    #row['title'] = context.portal_vocabularies.levels_voc[l]
     row['url'] = "%s/%s" % (context.absolute_url(),l)
     items.append(row)

WAeUP_SRP/base/skins/waeup_utilities/fixReturningSession.py

@@ -27 +27 @@
 students = context.portal_url.getPortalObject().campus.students
 #from string import Template
-def rwrite(s):
-    response.setHeader('Content-type','text/html; charset=ISO-8859-15')
-    response.write("%s<br>\n\r" % s)
+#def rwrite(s):
+#    response.setHeader('Content-type','text/html; charset=ISO-8859-15')
+#    response.write("%s<br>\n\r" % s)
 
 #logger.info('')
@@ -36 +36 @@
 brains = aq_students(query)
 total = len(brains)
-logger.info('editet %d students with session 06 and state returning' % total)
+logger.info('started editing %d students with session 06 in state returning' % total)
 count = 0
 commit_after = 100
@@ -48 +48 @@
         study_course_doc = getattr(getattr(students,brain.id),'study_course').getContent()
         study_course_doc.edit(mapping = { "current_session": '05',
-                                          "current_level": '000'})
-        rwrite('found %s , %s ,%s, %s' % (brain.id,
+                                          "current_level": ''})
+        #rwrite('found %s , %s ,%s, %s' % (brain.id,
+        #                                  study_course_doc.current_session,
+        #                                  brain.matric_no,
+        #                                  brain.name))
+        logger.info("Session and level of %s (%s, %s, %s) changed from ('%s', '%s') to ('%s', '%s')" % (brain.id,
+                                          brain.matric_no,
+                                          brain.name,
+                                          brain.review_state,
+                                          brain.session,
+                                          brain.level,
                                           study_course_doc.current_session,
-                                          brain.matric_no,
-                                          brain.name))
+                                          study_course_doc.current_level,
+                                          ))
     except:
-        rwrite('>>>> not found %s study_course' % (brain.id))
+        #rwrite('>>>> not found %s study_course' % (brain.id))
+        pass
+logger.info('finished editing %d students with session 06 in state returning' % total)
 
+return

WAeUP_SRP/fceokene/profiles/default/students_catalog.xml

@@ -58 +58 @@
   <indexed_attr value="course"/>
  </index>
- <index name="registered_courses" meta_type="KeywordIndex">
-  <indexed_attr value="registered_courses"/>
- </index>
+
  <column value="id"/>
  <column value="review_state"/>
@@ -70 +68 @@
  <column value="department"/>
  <column value="course"/>
- <column value="registered_courses"/>
  <column value="lga"/>
  <column value="perm_address"/>

WAeUP_SRP/fceokene/profiles/default/vocabularies.xml

@@ -16 +16 @@
  <object name="get_departments_voc" meta_type="CPS Method Vocabulary"/>
  <object name="get_faculties_voc" meta_type="CPS Method Vocabulary"/>
- <object name="levels_voc" meta_type="CPS Method Vocabulary"/>
  <object name="groups_voc" meta_type="CPS Method Vocabulary"/>
  <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>

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

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="000" msgid="">N/A</item>
+ <item key="" msgid="">N/A</item>
+ <item key="000" msgid="">Pre-Studies</item>
  <item key="100" msgid="">Year 1 (100 Level)</item>
  <item key="200" msgid="">Year 2 (200 Level)</item>