Changeset 7532

Timestamp:

28 Jan 2012, 14:19:49 (13 years ago)

Author:

Henrik Bettermann

Message:

Use fixed start_level and end_level if no certificate has yet been assigned. This way, we can import certificate end current_level at the same time.

Extend conversion checking so that current_level does not exceed level limits given by the certificate.

Location:

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

Files:

• batching.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• vocabularies.py (modified) (2 diffs)

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

@@ -36 +36 @@
     IObjectHistory)
 from waeup.sirp.students.interfaces import (
-    IStudent, IStudentStudyCourseImport,
+    IStudent, IStudentStudyCourse,
     IStudentUpdateByRegNo, IStudentUpdateByMatricNo)
 from waeup.sirp.students.workflow import  IMPORTABLE_STATES
@@ -214 +214 @@
 
     name = u'StudentStudyCourse Importer (update only)'
-    iface = IStudentStudyCourseImport
+    iface = IStudentStudyCourse
     factory_name = 'waeup.StudentStudyCourse'
 
@@ -293 +293 @@
         return
 
+    def checkConversion(self, row, mode='ignore'):
+        """Validates all values in row.
+        """
+        converter = IObjectConverter(self.iface)
+        errs, inv_errs, conv_dict =  converter.fromStringDict(
+            row, self.factory_name)
+        # We have to check if current_level is in range of certificate.
+        # This is not done by the converter.
+        certificate = conv_dict['certificate']
+        start_level = certificate.start_level
+        end_level = certificate.end_level
+        if conv_dict['current_level'] < start_level or \
+            conv_dict['current_level'] > end_level:
+            errs.append(('current_level','not in range'))
+        return errs, inv_errs, conv_dict
+

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

@@ -305 +305 @@
         )
 
-class IStudentStudyCourseImport(IStudentStudyCourse):
-    """A container for student study levels.
-
-    """
-    current_level = schema.Int(
-        title = u'Current Level',
-        default = None,
-        )
-
 class IStudentStudyLevel(ISIRPObject):
     """A container for course tickets.

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

@@ -37 +37 @@
 
 def study_levels(studycourse):
-    try:
+    if studycourse.certificate is not None:
         start_level = int(studycourse.certificate.start_level)
         end_level = int(studycourse.certificate.end_level)
-        levels = [level for level in range(start_level,end_level+200,10)
-                   if level % 100 < 30 and level < end_level + 120]
-        return levels
-    except AttributeError:
-        return []
+    else:
+        start_level = 0
+        end_level = 600
+    levels = [level for level in range(start_level,end_level+200,10)
+               if level % 100 < 30 and level < end_level + 120]
+    return levels
+
 
 class StudyLevelSource(BasicContextualSourceFactory):
@@ -60 +62 @@
 
     def getTitle(self, context, value):
-        end_level = int(context.certificate.end_level)
+        if context.certificate is not None:
+            end_level = int(context.certificate.end_level)
+        else:
+            end_level = 600
         level,repeat = divmod(value, 100)
         level = level * 100