Changeset 14500


Ignore:
Timestamp:
3 Feb 2017, 17:30:44 (8 years ago)
Author:
Henrik Bettermann
Message:

Revert r14490.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r14490 r14500  
    128128        if not fac_dep_paid:
    129129            return _("Please pay faculty and departmental dues first.")
    130         #restitution_paid = True
    131         #if self.student.entry_session < 2016 \
    132         #    and self.student.current_mode == 'ug_ft':
    133         #    restitution_paid = False
    134         #    for ticket in self.student['payments'].values():
    135         #        if ticket.p_category == 'restitution' and \
    136         #            ticket.p_session == self.level_session and \
    137         #            ticket.p_state == 'paid':
    138         #                restitution_paid = True
    139         #                continue
    140         #if not restitution_paid:
    141         #    return _("Please pay restitution fee first.")
     130        restitution_paid = True
     131        if self.student.entry_session < 2016 \
     132            and self.student.current_mode == 'ug_ft':
     133            restitution_paid = False
     134            for ticket in self.student['payments'].values():
     135                if ticket.p_category == 'restitution' and \
     136                    ticket.p_session == self.level_session and \
     137                    ticket.p_state == 'paid':
     138                        restitution_paid = True
     139                        continue
     140        if not restitution_paid:
     141            return _("Please pay restitution fee first.")
    142142        if self.student.is_fresh:
    143143            return
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

    r14490 r14500  
    976976        self.browser.getLink("Edit course list").click()
    977977        self.browser.getControl("Register course list").click()
    978         #self.assertTrue('Please pay restitution fee first'
    979         #    in self.browser.contents)
    980         #self.app['configuration']['2004'].restitution_fee = 9999.0
    981         #self.browser.open(self.payments_path + '/addop')
    982         #self.browser.getControl(name="form.p_category").value = ['restitution']
    983         #self.browser.getControl("Create ticket").click()
    984         #self.student['payments'].values()[0].approveStudentPayment()
    985         #self.browser.open(self.studycourse_path + '/100/edit')
    986         #self.browser.getControl("Register course list").click()
     978        self.assertTrue('Please pay restitution fee first'
     979            in self.browser.contents)
     980        self.app['configuration']['2004'].restitution_fee = 9999.0
     981        self.browser.open(self.payments_path + '/addop')
     982        self.browser.getControl(name="form.p_category").value = ['restitution']
     983        self.browser.getControl("Create ticket").click()
     984        self.student['payments'].values()[0].approveStudentPayment()
     985        self.browser.open(self.studycourse_path + '/100/edit')
     986        self.browser.getControl("Register course list").click()
    987987        self.assertTrue('Course list has been registered'
    988988            in self.browser.contents)
Note: See TracChangeset for help on using the changeset viewer.