Changeset 13977 for main/waeup.aaue/trunk/src/waeup
- Timestamp:
- 23 Jun 2016, 07:25:56 (8 years ago)
- Location:
- main/waeup.aaue/trunk/src/waeup/aaue
- Files:
-
- 7 edited
-
applicants/browser.py (modified) (3 diffs)
-
applicants/browser_templates/applicanteditpage.pt (modified) (1 diff)
-
applicants/interfaces.py (modified) (6 diffs)
-
applicants/tests/test_applicantcopier.py (modified) (1 diff)
-
applicants/tests/test_browser.py (modified) (1 diff)
-
etranzact/tests.py (modified) (2 diffs)
-
interswitch/tests.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py
r13967 r13977 66 66 ) 67 67 UG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + ( 68 'jamb_subjects_list', ) + UG_OMIT_FIELDS68 'jamb_subjects_list', 'master_sheet_number') + UG_OMIT_FIELDS 69 69 UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + UG_OMIT_FIELDS + ( 70 70 'reg_number','alr_fname', 'alr_no', 'alr_date', … … 80 80 'jamb_reg_number', 81 81 'aggregate', 82 83 'firstname', 84 'middlename', 85 'lastname', 86 'sex', 87 'lga', 88 'course1', 89 'master_sheet_number', 82 90 ) 83 91 … … 101 109 'scd_sit_type', 102 110 'scd_sit_results', 103 'programme_type',111 #'programme_type', 104 112 'jamb_age', 105 113 'jamb_subjects', -
main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt
r13547 r13977 100 100 </div> 101 101 102 <br /><br /> 103 <h3 i18n:translate=""> 104 Payment Tickets 105 </h3> 102 <tal:payments condition="view/display_payments"> 103 <br /><br /> 104 <h3 i18n:translate=""> 105 Payment Tickets 106 </h3> 106 107 107 <table i18n:domain="waeup.kofa" class="table table-condensed"> 108 <thead> 109 <tr> 110 <th> </th> 111 <th i18n:translate="">Payment Id</th> 112 <th i18n:translate="">Creation Date</th> 113 <th i18n:translate="">Payment Date</th> 114 <th i18n:translate="">Category</th> 115 <th i18n:translate="">Item</th> 116 <th i18n:translate="">State</th> 117 </tr> 118 </thead> 119 <tbody> 120 <tr tal:repeat="cl context/values"> 121 <td> 122 <input type="checkbox" 123 name="val_id" 124 tal:attributes="value cl/__name__" 125 tal:condition="python: not view.unremovable(cl)" /> 126 </td> 127 <td> <a tal:attributes="href python:view.url(cl)"> 128 <span tal:content="cl/p_id">PID</span></a></td> 129 <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td> 130 <td tal:content="python: layout.formatDatetime(cl.payment_date)">PAYMENT DATE</td> 131 <td tal:content ="cl/category">CATEGORY</td> 132 <td tal:content ="cl/display_item">ITEM</td> 133 <td tal:content ="cl/p_state_title">STATE</td> 108 <table i18n:domain="waeup.kofa" class="table table-condensed"> 109 <thead> 110 <tr> 111 <th> </th> 112 <th i18n:translate="">Payment Id</th> 113 <th i18n:translate="">Creation Date</th> 114 <th i18n:translate="">Payment Date</th> 115 <th i18n:translate="">Category</th> 116 <th i18n:translate="">Item</th> 117 <th i18n:translate="">State</th> 134 118 </tr> 135 </tbody> 136 </table> 119 </thead> 120 <tbody> 121 <tr tal:repeat="cl context/values"> 122 <td> 123 <input type="checkbox" 124 name="val_id" 125 tal:attributes="value cl/__name__" 126 tal:condition="python: not view.unremovable(cl)" /> 127 </td> 128 <td> <a tal:attributes="href python:view.url(cl)"> 129 <span tal:content="cl/p_id">PID</span></a></td> 130 <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td> 131 <td tal:content="python: layout.formatDatetime(cl.payment_date)">PAYMENT DATE</td> 132 <td tal:content ="cl/category">CATEGORY</td> 133 <td tal:content ="cl/display_item">ITEM</td> 134 <td tal:content ="cl/p_state_title">STATE</td> 135 </tr> 136 </tbody> 137 </table> 137 138 138 <div tal:condition="view/availableActions"> 139 <span tal:repeat="action view/actions" 140 tal:omit-tag=""> 141 <input tal:condition="python:action.label in view.display_actions[1]" 142 tal:replace="structure action/render"/> 143 </span> 144 </div> 145 <br /> 146 <p i18n:translate="" tal:condition="context/special"> 147 <strong>Notice:</strong> If you need to pay for another service, 148 select the corresponding special application category above, 149 click 'Save' and then 'Add online payment ticket' again. 150 </p> 139 <div tal:condition="view/availableActions"> 140 <span tal:repeat="action view/actions" 141 tal:omit-tag=""> 142 <input tal:condition="python:action.label in view.display_actions[1]" 143 tal:replace="structure action/render"/> 144 </span> 145 </div> 146 <br /> 147 <p i18n:translate="" tal:condition="context/special"> 148 <strong>Notice:</strong> If you need to pay for another service, 149 select the corresponding special application category above, 150 click 'Save' and then 'Add online payment ticket' again. 151 </p> 152 </tal:payments> 151 153 </form> -
main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py
r13679 r13977 60 60 """ 61 61 62 programme_type = schema.Choice(63 title = _(u'Programme Type'),64 vocabulary = programme_types_vocab,65 required = False,66 )62 #programme_type = schema.Choice( 63 # title = _(u'Programme Type'), 64 # vocabulary = programme_types_vocab, 65 # required = False, 66 # ) 67 67 68 68 nationality = schema.Choice( … … 84 84 required = False, 85 85 ) 86 jamb_reg_number = schema.TextLine(87 title = _(u'JAMB Registration Number'),88 required = False,89 )86 #jamb_reg_number = schema.TextLine( 87 # title = _(u'JAMB Registration Number'), 88 # required = False, 89 # ) 90 90 jamb_score = schema.Int( 91 91 title = _(u'Total JAMB Score'), 92 required = False, 93 ) 94 jamb_subjects = schema.Text( 95 title = _(u'JAMB Subjects and Scores'), 92 96 required = False, 93 97 ) … … 406 410 required = False, 407 411 ) 412 413 414 master_sheet_number = schema.TextLine( 415 title = _(u'Master Sheet Number'), 416 required = False, 417 readonly = False, 418 ) 419 408 420 #screening_venue = schema.TextLine( 409 421 # title = _(u'Screening Venue'), … … 447 459 raise Invalid(_("2nd choice course must differ from 1st choice course.")) 448 460 449 ICustomUGApplicant['programme_type'].order = IApplicantBaseData[450 'reg_number'].order461 #ICustomUGApplicant['programme_type'].order = IApplicantBaseData[ 462 # 'reg_number'].order 451 463 452 464 class ICustomPGApplicant(INigeriaPGApplicant): … … 628 640 """ 629 641 630 programme_type = schema.Choice(631 title = _(u'Programme Type'),632 vocabulary = programme_types_vocab,633 required = True,634 )642 #programme_type = schema.Choice( 643 # title = _(u'Programme Type'), 644 # vocabulary = programme_types_vocab, 645 # required = True, 646 # ) 635 647 636 648 date_of_birth = FormattedDate( … … 640 652 ) 641 653 642 ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[643 'programme_type'].order654 #ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[ 655 # 'programme_type'].order 644 656 ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant[ 645 657 'date_of_birth'].order -
main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_applicantcopier.py
r13545 r13977 49 49 self.browser.getControl(name="form.lga").value = ['abia_aba_north'] 50 50 self.browser.getControl(name="form.course_admitted").value = ['CERT1'] 51 self.browser.getControl(name="form.programme_type").value = ['regular']51 #self.browser.getControl(name="form.programme_type").value = ['regular'] 52 52 # Date of birth is not required 53 53 self.browser.getControl(name="form.date_of_birth").value = '' -
main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py
r13888 r13977 56 56 self.login() 57 57 self.browser.open(self.edit_path) 58 self.fill_correct_values() 59 self.browser.getControl(name="form.programme_type").value = ['regular'] 58 self.browser.getControl(name="form.date_of_birth").value = '09/09/1988' 59 self.browser.getControl(name="form.email").value = 'xx@yy.zz' 60 #self.browser.getControl(name="form.programme_type").value = ['regular'] 60 61 self.browser.getControl(name="form.nationality").value = ['NG'] 61 62 self.browser.getControl("Save").click() -
main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py
r13963 r13977 255 255 def setUp(self): 256 256 super(EtranzactTestsApplicants, self).setUp() 257 self.applicantscontainer.application_fee = 200.0 257 258 self.browser.addHeader('Authorization', 'Basic mgr:mgrpw') 258 259 self.browser.open(self.manage_path) … … 261 262 self.browser.getControl(name="transition").value = ['start'] 262 263 self.browser.getControl(name="form.nationality").value = ['NG'] 263 self.browser.getControl(name="form.programme_type").value = ['direct']264 #self.browser.getControl(name="form.programme_type").value = ['direct'] 264 265 self.browser.getControl("Save").click() 265 266 self.browser.getControl("Add online").click() -
main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py
r13678 r13977 58 58 #IWorkflowState(self.student).setState('started') 59 59 super(InterswitchTestsApplicants, self).fill_correct_values() 60 self.browser.getControl(name="form.programme_type").value = ['regular']60 #self.browser.getControl(name="form.programme_type").value = ['regular'] 61 61 self.applicantscontainer.application_fee = 10000.0 62 62 self.browser.getControl(name="form.nationality").value = ['NG']
Note: See TracChangeset for help on using the changeset viewer.
