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

Timestamp:

25 Jun 2015, 12:41:57 (9 years ago)

Author:

Henrik Bettermann

Message:

More docs.

Location:

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

Files:

• applicants/browser.py (modified) (2 diffs)
• students/tests/sample_student_data.csv (modified) (1 diff)

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

@@ -995 +995 @@
     def display_actions(self):
         state = IWorkflowState(self.context).getState()
-        actions = [[],[]]
+        # If the form is unlocked, applicants are allowed to save the form
+        # and remove unused tickets.
+        actions = [[_('Save')], [_('Remove selected tickets')]]
+        # Only in state started they can also add tickets.
         if state == STARTED:
             actions = [[_('Save')],
                 [_('Add online payment ticket'),_('Remove selected tickets')]]
+        # In state paid, they can submit the data and further add tickets
+        # if the application is special.
         elif self.context.special and state == PAID:
             actions = [[_('Save'), _('Finally Submit')],
@@ -1008 +1013 @@
 
     def unremovable(self, ticket):
-        state = IWorkflowState(self.context).getState()
-        return ticket.r_code or state in (INITIALIZED, SUBMITTED)
+        return ticket.r_code
 
     def emit_lock_message(self):

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data.csv

@@ -1 +1 @@
 student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,sex,state
-X666666,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,M,courses validated
+X666666,Aaren,Pieri,1,1990-01-02,100000,,1234,M,courses validated
 Y777777,Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234,m,courses validated
 ,Susann,Berson,3,1990-01-04,100002,aa@aa.ng,1234,F,courses validated