Changeset 14149 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

2 Sep 2016, 05:42:16 (8 years ago)

Author:

Henrik Bettermann

Message:

In AAUE only editable tickets are shown.

Location:

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

Files:

• browser.py (modified) (5 diffs)
• browser_templates/editscorespage.pt (modified) (3 diffs)

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

@@ -654 +654 @@
             self.current_academic_session).title
         self.tickets = self._searchCatalog(self.current_academic_session)
-        editable_tickets = [
+        self.editable_tickets = [
             ticket for ticket in self.tickets if ticket.editable_by_lecturer]
         if not self.tickets:
@@ -663 +663 @@
             return
 
-        if not editable_tickets:
+        if not self.editable_tickets:
             return
         if 'UPDATE_FILE' in form:
@@ -681 +681 @@
             formvals = dict(zip(form['sids'], zip(form['scores'], form['cas'])))
         error = ''
-        for ticket in editable_tickets:
+        # In AAUE only editable tickets are shown, see also customized
+        # pagetemplate
+        for ticket in self.editable_tickets:
             ticket_error = False
             score = ticket.score
@@ -736 +738 @@
             code=(self.context.code, self.context.code)
             )
+        # In AAUE only editable tickets can be printed
+        editable_tickets = [
+            ticket for ticket in coursetickets if ticket.editable_by_lecturer]
         header = [[_(''),
                    _('Matric No.'),
@@ -750 +755 @@
         tickets = []
         no = 1
-        for ticket in list(coursetickets):
+        # In AAUE only editable tickets can be printed
+        for ticket in editable_tickets:
             if None in (ticket.score, ticket.ca):
                 total = 'n/a'

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

@@ -84 +84 @@
     </thead>
     <tbody>
-    <tr tal:repeat="ticket view/tickets">
+    <tr tal:repeat="ticket view/editable_tickets">
       <td tal:content="ticket/student/matric_number">MATRIC_NUMBER</td>
       <td tal:content="ticket/student/reg_number">REG_NUMBER</td>
@@ -91 +91 @@
       <td tal:content="ticket/student/certcode">CERTCODE</td>
       <td tal:content="ticket/level">LEVEL</td>
-      <td tal:condition="ticket/editable_by_lecturer" style="width: 65px;">
+      <td style="width: 65px;">
           <input type="text" name="scores:list" class="form-control"
                  tal:attributes="value ticket/score" />
@@ -97 +97 @@
                  tal:attributes="value ticket/student/student_id" />
       </td>
-      <td tal:condition="ticket/editable_by_lecturer" style="width: 65px;">
+      <td style="width: 65px;">
           <input type="text" name="cas:list" class="form-control"
                  tal:attributes="value ticket/ca" />
       </td>
-      <td tal:condition="not: ticket/editable_by_lecturer"
-          tal:content="ticket/score">SCORE</td>
-      <td tal:condition="not: ticket/editable_by_lecturer"
-          tal:content="ticket/ca">CA</td>
     </tr>
     </tbody>