Changeset 9698 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

20 Nov 2012, 09:08:13 (12 years ago)

Author:

Henrik Bettermann

Message:

We need to customize if students are allowed to remove mandatory course tickets. Therefore I added a property attribute removable_by_student.

Allow manager to edit the mandatory attribute.

Location:

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

Files:

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

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

@@ -106 +106 @@
         value._p_activate()
         value_dict = dict([i for i in value.__dict__.items()])
-        value_dict['mandatory_bool'] = value.mandatory
+        value_dict['removable_by_student'] = value.removable_by_student
         value_dict['mandatory'] = translate(str(value.mandatory), 'zope',
             target_language=lang)
@@ -1306 +1306 @@
     form_fields['passmark'].for_display = True
     form_fields['credits'].for_display = True
-    form_fields['mandatory'].for_display = True
+    form_fields['mandatory'].for_display = False
     form_fields['automatic'].for_display = True
     form_fields['carry_over'].for_display = True
@@ -2227 +2227 @@
         for id in child_id:
             # Students are not allowed to remove core tickets
-            if not self.context[id].mandatory:
+            if self.context[id].removable_by_student:
                 del self.context[id]
                 deleted.append(id)

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

@@ -27 +27 @@
         <input type="checkbox" name="val_id"
                   tal:attributes="value value/__name__"
-        tal:condition="not: value/mandatory_bool" />
+        tal:condition="value/removable_by_student" />
       </td>
       <td tal:content="value/semester">SEMESTER</td>

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

@@ -535 +535 @@
     grade = Attribute('grade calculated from score')
     weight = Attribute('weight calculated from score')
+    removable_by_student = Attribute('Is student allowed to remove the ticket?')
 
     title = schema.TextLine(

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

@@ -190 +190 @@
             return None
 
+    @property
+    def removable_by_student(self):
+        return not self.mandatory
+
     def writeLogMessage(self, view, message):
         return self.__parent__.__parent__.__parent__.writeLogMessage(view, message)