Changeset 1986

Timestamp:

5 Jul 2007, 09:10:38 (17 years ago)

Author:

Henrik Bettermann

Message:

show sessions, courselevel and entrymodes vocabularies in correct order, please check
(btw courselevel should be renamed to levels)

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (2 diffs)
• Widgets.py (modified) (6 diffs)
• profiles/default/layouts/import_student.xml (modified) (4 diffs)
• profiles/default/vocabularies/courselevel.xml (modified) (1 diff)
• profiles/default/vocabularies/entry_modes.xml (modified) (1 diff)
• profiles/default/vocabularies/verdicts.xml (modified) (2 diffs)
• skins/waeup_default/sessions_voc.py (modified) (2 diffs)
• skins/waeup_student/create_level.py (modified) (2 diffs)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -61 +61 @@
     def manage_catalogClear(self, REQUEST=None, RESPONSE=None, URL1=None):
         """ clears the whole enchilada """
-        
+
         #if REQUEST and RESPONSE:
         #    RESPONSE.redirect(
@@ -357 +357 @@
             digit = int(doc.jamb_reg_no[0])
         except:
-            return "xx"
+            return "-1"
         if digit < 8:
             return "0%c" % doc.jamb_reg_no[0]
         return "9%c" % doc.jamb_reg_no[0]
-
-    def get_from_doc_session(self,doc):
-        "return the students session"
-        if doc is None:
-            return None
-        return getattr(doc,'current_session',None)
 
     def get_from_doc_course(self,doc):

WAeUP_SRP/trunk/Widgets.py

@@ -177 +177 @@
 
 class WAeUPStudyModeWidget(CPSSelectWidget): ###(
-    """WAeUP StudyMode widget."""
+    """WAeUP StudyMode Widget."""
     meta_type = 'WAeUP StudyMode Widget'
     vocabulary = 'entry_modes'
@@ -246 +246 @@
 
 class WAeUPSessionWidget(CPSSelectWidget): ###(
-    """WAeUP Session widget."""
+    """WAeUP Session Widget."""
     meta_type = 'WAeUP Session Widget'
 
     def _getSessions(self):
         current_year = DateTime().year()
-        d = {'xx': 'unknown'}
+        d = {'-1': 'N/A'}
         for y in range(current_year - 9,current_year + 1):
             d['%s' % str(y)[-2:]] = '%4d/%4d' % (y,y+1)
@@ -295 +295 @@
             vocabulary_items = sessions.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -321 +321 @@
 
     def _getLevels(self):
-        d = {'999':'unknown'}
+        d = {'000':'N/A'}
         for y in range(100,800,100):
             d['%s' % str(y)] = 'Year %1d (%3d Level)' % (y/100,y)
@@ -363 +363 @@
             vocabulary_items = levels.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -385 +385 @@
 
 class WAeUPVerdictWidget(CPSSelectWidget): ###(
-    """WAeUP Verdict widget."""
+    """WAeUP Verdict Widget."""
     meta_type = 'WAeUP Verdict Widget'
 

WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml

@@ -164 +164 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -179 +179 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">courselevel</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -195 +195 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="vocabulary">verdicts</property>
+  <property name="sorted">True</property>
  </widget>
  <widget name="entry_session" meta_type="WAeUP Session Widget">
@@ -206 +207 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>

WAeUP_SRP/trunk/profiles/default/vocabularies/courselevel.xml

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

WAeUP_SRP/trunk/profiles/default/vocabularies/entry_modes.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="unknown" msgid="">unknown</item>
+ <item key="unknown" msgid="">N/A</item>
  <item key="ume_ft" msgid="">UME Full Time</item>
  <item key="de_ft" msgid="">Direct Entry Full Time</item>

WAeUP_SRP/trunk/profiles/default/vocabularies/verdicts.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
+ <item key="N/A" msgid="">N/A</item>
  <item key="A" msgid="">successful student</item>
  <item key="B" msgid="">student with carryover courses</item>
@@ -18 +19 @@
  <item key="K" msgid="">unregistered student</item>
  <item key="L" msgid="">referred student</item>
- <item key="N/A" msgid="">N/A</item>
 </object>

WAeUP_SRP/trunk/skins/waeup_default/sessions_voc.py

@@ -6 +6 @@
 """
 if key is None:
-    l = [('xx','unknown')]
+    # not used for WAeUPSessionWidget, only for SelectWidget
+    l = [('-1','N/A')]
     for y in range(1998,2008):
         l.append( ('%s' % str(y)[-2:],'%4d/%4d' % (y,y+1)))
@@ -14 +15 @@
     y = int(key)
 except:
-    return 'unknown'
+    return 'N/A'
+if y == -1:
+    return 'N/A' 
 if y < 90:
     cent = 2000

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -34 +34 @@
 current_level = student.level
 in_progress =  request.get('in_progress','not started')
-level_created =  request.get('level_created','xxx')
+#level_created =  request.get('level_created','xxx')
 create_level =  request.get('create_level',None)
 
@@ -71 +71 @@
     l = []
     carry_overs = results
-    
+
     # carry_overs for probation students: yes or not, that is the question
     #if student.verdict == "C": # on probation