Changeset 9022


Ignore:
Timestamp:
19 Jul 2012, 07:11:32 (12 years ago)
Author:
Henrik Bettermann
Message:

Change title and msg of some workflow transitions.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

    r9021 r9022  
    479479        self.assertEqual(self.browser.headers['Status'], '200 Ok')
    480480        self.assertEqual(self.browser.url, self.history_path)
    481         self.assertMatches('...Student admitted by Manager...',
     481        self.assertMatches('...Admitted by Manager...',
    482482                           self.browser.contents)
    483483        # Only the Application Slip does not exist
  • main/waeup.kofa/trunk/src/waeup/kofa/students/workflow.py

    r9005 r9022  
    2323        source = None,
    2424        condition = NullCondition,
    25         msg = _('Student record created'),
     25        msg = _('Record created'),
    2626        destination = CREATED),
    2727
     
    2929        transition_id = 'admit',
    3030        title = _('Admit student'),
    31         msg = _('Student admitted'),
     31        msg = _('Admitted'),
    3232        source = CREATED,
    3333        destination = ADMITTED),
     
    6363    Transition(
    6464        transition_id = 'reset3',
    65         title = _('Reset to clearance'),
    66         msg = _("Reset to 'clearance'"),
     65        title = _('Reset to clearance started'),
     66        msg = _("Reset to 'clearance started'"),
    6767        source = REQUESTED,
    6868        destination = CLEARANCE),
     
    7777    Transition(
    7878        transition_id = 'reset4',
    79         title = _('Reset to clearance'),
    80         msg = _("Reset to 'clearance'"),
     79        title = _('Reset to clearance started'),
     80        msg = _("Reset to 'clearance started'"),
    8181        source = CLEARED,
    8282        destination = CLEARANCE),
     
    8585        transition_id = 'pay_first_school_fee',
    8686        title = _('Pay school fee'),
    87         msg = _('School fee paid'),
     87        msg = _('First school fee payment made'),
    8888        source = CLEARED,
    8989        destination = PAID),
     
    9292        transition_id = 'approve_first_school_fee',
    9393        title = _('Approve payment'),
    94         msg = _('School fee payment approved'),
     94        msg = _('First school fee payment approved'),
    9595        source = CLEARED,
    9696        destination = PAID),
     
    106106        transition_id = 'pay_school_fee',
    107107        title = _('Pay school fee'),
    108         msg = _('Payment made'),
     108        msg = _('School fee payment made'),
    109109        source = RETURNING,
    110110        destination = PAID),
     
    112112    Transition(
    113113        transition_id = 'pay_pg_fee',
    114         title = _('Pay postgraduate school fee'),
    115         msg = _('Payment made'),
     114        title = _('Pay PG school fee'),
     115        msg = _('PG school fee payment made'),
    116116        source = PAID,
    117117        destination = PAID),
     
    119119    Transition(
    120120        transition_id = 'approve_school_fee',
    121         title = _('Approve payment'),
     121        title = _('Approve school fee payment'),
    122122        msg = _('School fee payment approved'),
    123123        source = RETURNING,
     
    126126    Transition(
    127127        transition_id = 'approve_pg_fee',
    128         title = _('Approve postgraduate payment'),
    129         msg = _('School fee payment approved'),
     128        title = _('Approve PG school fee payment'),
     129        msg = _('PG school fee payment approved'),
    130130        source = PAID,
    131131        destination = PAID),
     
    147147    Transition(
    148148        transition_id = 'reset7',
    149         title = _('Reset to paid'),
    150         msg = _("Reset to 'paid'"),
     149        title = _('Reset to school fee paid'),
     150        msg = _("Reset to 'school fee paid'"),
    151151        source = REGISTERED,
    152152        destination = PAID),
     
    161161    Transition(
    162162        transition_id = 'reset8',
    163         title = _('Reset to paid'),
    164         msg = _("Reset to 'paid'"),
     163        title = _('Reset to school fee paid'),
     164        msg = _("Reset to 'school fee paid'"),
    165165        source = VALIDATED,
    166166        destination = PAID),
     
    175175    Transition(
    176176        transition_id = 'reset9',
    177         title = _('Reset to validated'),
    178         msg = _("Reset to 'validated'"),
     177        title = _('Reset to courses validated'),
     178        msg = _("Reset to 'courses validated'"),
    179179        source = RETURNING,
    180180        destination = VALIDATED),
  • main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_browser.py

    r9012 r9022  
    4141
    4242    def test_replace_student_messages(self):
    43         self.assertTrue('Student record created by system' in
     43        self.assertTrue('Record created by system' in
    4444            self.student.history.messages[0])
    4545        replaceStudentMessages('system', 'me')
    46         self.assertTrue('Student record created by me' in
     46        self.assertTrue('Record created by me' in
    4747            self.student.history.messages[0])
    4848
    4949    def test_modify_all_student_history(self):
    50         self.assertTrue('Student record created by system' in
     50        self.assertTrue('Record created by system' in
    5151            self.student.history.messages[0])
    5252        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     
    5858            'http://localhost/app/modify_student_history?old=by system&new=by me')
    5959        self.assertTrue('Finished' in self.browser.contents)
    60         self.assertTrue('Student record created by me' in
     60        self.assertTrue('Record created by me' in
    6161            self.student.history.messages[0])
    6262
Note: See TracChangeset for help on using the changeset viewer.