Changeset 7601 for main/waeup.sirp/trunk/src

Timestamp:

8 Feb 2012, 07:05:16 (13 years ago)

Author:

Henrik Bettermann

Message:

Values must not be Zero in sources and vocabularies.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/browser.txt (modified) (1 diff)
• students/vocabularies.py (modified) (1 diff)
• university/interfaces.py (modified) (1 diff)
• university/vocabularies.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

@@ -553 +553 @@
   >>> ctrl = browser.getControl(name='form.semester')
   >>> ctrl.options
-  ['0', '1', '2', '3']
+  ['9', '1', '2', '3']
 
   >>> ctrl.displayOptions

main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

@@ -41 +41 @@
         end_level = int(studycourse.certificate.end_level)
     else:
-        start_level = 0
+        start_level = 10
         end_level = 600
     levels = [level for level in range(start_level,end_level+200,10)

main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py

@@ -163 +163 @@
     semester = schema.Choice(
         title = u'Semester/Term',
-        default = 0,
+        default = 9,
         vocabulary = semester,
         required = True,

main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py

@@ -35 +35 @@
 
 course_levels = SimpleSIRPVocabulary(
-    ('Pre-Studies',0),
+    ('Pre-Studies', 10),
     ('100 (Year 1)',100),
     ('200 (Year 2)',200),
@@ -47 +47 @@
 
 semester = SimpleSIRPVocabulary(
-    ('N/A', 0),
+    ('N/A', 9),
     ('First Semester', 1),
     ('Second Semester', 2),
@@ -58 +58 @@
     ('Sandwich','sandwich'),
     ('Postgraduate','pg'),
+    ('no application','no'),
     )