Changeset 14113

Timestamp:

23 Aug 2016, 07:00:13 (8 years ago)

Author:

Henrik Bettermann

Message:

Define max values for score and ca.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (4 diffs)
• interfaces.py (modified) (4 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -22 +22 @@
 from zope.i18n import translate
 from zope.component import getUtility, queryUtility
+from zope.schema.interfaces import TooBig, TooSmall
 from zope.security import checkPermission
 from zope.catalog.interfaces import ICatalog
@@ -699 +700 @@
                 ticket_error = True
             if not ticket_error and ticket.score != score:
-                ticket.score = score
+                try:
+                    ticket.score = score
+                except TooBig:
+                    error += '%s, ' % ticket.student.display_fullname
+                    ticket_error = True
+                    pass
                 ticket.student.__parent__.logger.info(
                     '%s - %s %s/%s score updated (%s)' %
@@ -705 +711 @@
                      ticket.level, ticket.code, score))
             if not ticket_error and ticket.ca != ca:
-                ticket.ca = ca
+                try:
+                    ticket.ca = ca
+                except TooBig:
+                    error += '%s, ' % ticket.student.display_fullname
+                    pass
                 ticket.student.__parent__.logger.info(
                     '%s - %s %s/%s ca updated (%s)' %
@@ -712 +722 @@
         if error:
             self.flash(_('Error: Score(s) and CA(s) of %s have not be updated. '
-              'Only integers are allowed.' % error.strip(', ')),
-              type="danger")
+              % error.strip(', ')), type="danger")
             return
         self.flash(_('You successfully updated course results.'))

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

@@ -333 +333 @@
     """
 
+    score = schema.Int(
+        title = _(u'Score'),
+        required = False,
+        readonly = False,
+        max = 70,
+        )
+
     ca = schema.Int(
         title = _(u'CA'),
@@ -338 +345 @@
         required = False,
         missing_value = None,
+        max = 30,
         )
 
@@ -347 +355 @@
         required = False,
         readonly = False,
+        max = 70,
         )
 
@@ -353 +362 @@
         required = False,
         readonly = False,
+        max = 30,
         )