Changeset 10631 for main/waeup.kofa/trunk

Timestamp:

21 Sep 2013, 05:12:49 (11 years ago)

Author:

Henrik Bettermann

Message:

Define conditions for score editing. Tests will follow.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/editscorespage.pt (modified) (1 diff)
• students/studylevel.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -644 +644 @@
     current_academic_session = schema.Choice(
         title = _(u'Current Academic Session'),
+        description = _(u'Session for which score editing is allowed'),
         source = academic_sessions_vocab,
         default = None,

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

@@ -3055 +3055 @@
         session = academic_sessions_vocab.getTerm(
             self.current_academic_session).title
-        return 'Students registered for %s in academic session %s' % (
-            self.context.longtitle(), session)
+        return '%s tickets in academic session %s' % (
+            self.context.code, session)
 
     def _searchCatalog(self, session):
@@ -3073 +3073 @@
         datatable.need()
         self.tickets = self._searchCatalog(self.current_academic_session)
+        editable_tickets = [
+            ticket for ticket in self.tickets if ticket.editable_by_lecturer]
         if not self.tickets:
             self.flash(_('No student found.'))
@@ -3079 +3081 @@
             tno = 0
             error = ''
-            for ticket in self.tickets:
+            if not editable_tickets:
+                return
+            scores = form['scores']
+            if isinstance(scores, basestring):
+                scores = [scores]
+            for ticket in editable_tickets:
                 score = ticket.score
                 try:
-                    score = int(form['scores'][tno])
+                    score = int(scores[tno])
                 except ValueError:
                     error += '%s, ' % ticket.student.display_fullname

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/editscorespage.pt

@@ -25 +25 @@
       <td tal:content="ticket/student/current_level">LEVEL</td>
       <td tal:content="ticket/level">LEVEL</td>
-          <td><input type="text" name="scores" class="span1"
-                     tal:attributes="value ticket/score" /></td>
+          <td tal:condition="ticket/editable_by_lecturer">
+          <input type="text" name="scores" class="span1"
+                     tal:attributes="value ticket/score" />
+      </td>
+      <td tal:condition="not: ticket/editable_by_lecturer"
+          tal:content="ticket/score">SCORE</td>
         </tr>
     </tbody>

main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py

@@ -25 +25 @@
 from zope.component import createObject, queryUtility
 from zope.interface import implementedBy
-from waeup.kofa.interfaces import academic_sessions_vocab
+from waeup.kofa.interfaces import academic_sessions_vocab, VALIDATED
 from waeup.kofa.students.interfaces import (
     IStudentStudyLevel, IStudentNavigation, ICourseTicket)
@@ -291 +291 @@
         return not self.mandatory
 
+    @property
+    def editable_by_lecturer(self):
+        cas = grok.getSite()['configuration'].current_academic_session
+        if self.student.state == VALIDATED and self.student.current_session == cas:
+            return True
+        return False
+
     def writeLogMessage(self, view, message):
         return self.__parent__.__parent__.__parent__.writeLogMessage(view, message)