Ignore:
Timestamp:
23 Jun 2016, 07:25:56 (9 years ago)
Author:
Henrik Bettermann
Message:

Changes requested in ticket #232 (fire brigade approach).

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r13967 r13977  
    6666      )
    6767UG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + (
    68     'jamb_subjects_list',) + UG_OMIT_FIELDS
     68    'jamb_subjects_list', 'master_sheet_number') + UG_OMIT_FIELDS
    6969UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + UG_OMIT_FIELDS + (
    7070      'reg_number','alr_fname', 'alr_no', 'alr_date',
     
    8080    'jamb_reg_number',
    8181    'aggregate',
     82
     83    'firstname',
     84    'middlename',
     85    'lastname',
     86    'sex',
     87    'lga',
     88    'course1',
     89    'master_sheet_number',
    8290    )
    8391
     
    101109    'scd_sit_type',
    102110    'scd_sit_results',
    103     'programme_type',
     111    #'programme_type',
    104112    'jamb_age',
    105113    'jamb_subjects',
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt

    r13547 r13977  
    100100  </div>
    101101
    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>
    106107
    107   <table i18n:domain="waeup.kofa" class="table table-condensed">
    108     <thead>
    109     <tr>
    110       <th>&nbsp;</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>&nbsp;</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>
    134118      </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>
    137138
    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>
    151153</form>
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

    r13679 r13977  
    6060    """
    6161
    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    #    )
    6767
    6868    nationality = schema.Choice(
     
    8484        required = False,
    8585        )
    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    #    )
    9090    jamb_score = schema.Int(
    9191        title = _(u'Total JAMB Score'),
     92        required = False,
     93        )
     94    jamb_subjects = schema.Text(
     95        title = _(u'JAMB Subjects and Scores'),
    9296        required = False,
    9397        )
     
    406410        required = False,
    407411        )
     412
     413
     414    master_sheet_number = schema.TextLine(
     415        title = _(u'Master Sheet Number'),
     416        required = False,
     417        readonly = False,
     418        )
     419
    408420    #screening_venue = schema.TextLine(
    409421    #    title = _(u'Screening Venue'),
     
    447459            raise Invalid(_("2nd choice course must differ from 1st choice course."))
    448460
    449 ICustomUGApplicant['programme_type'].order = IApplicantBaseData[
    450     'reg_number'].order
     461#ICustomUGApplicant['programme_type'].order = IApplicantBaseData[
     462#    'reg_number'].order
    451463
    452464class ICustomPGApplicant(INigeriaPGApplicant):
     
    628640    """
    629641
    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    #    )
    635647
    636648    date_of_birth = FormattedDate(
     
    640652        )
    641653
    642 ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[
    643     'programme_type'].order
     654#ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[
     655#    'programme_type'].order
    644656ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant[
    645657    'date_of_birth'].order
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_applicantcopier.py

    r13545 r13977  
    4949        self.browser.getControl(name="form.lga").value = ['abia_aba_north']
    5050        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']
    5252        # Date of birth is not required
    5353        self.browser.getControl(name="form.date_of_birth").value = ''
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

    r13888 r13977  
    5656        self.login()
    5757        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']
    6061        self.browser.getControl(name="form.nationality").value = ['NG']
    6162        self.browser.getControl("Save").click()
  • main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

    r13963 r13977  
    255255    def setUp(self):
    256256        super(EtranzactTestsApplicants, self).setUp()
     257        self.applicantscontainer.application_fee = 200.0
    257258        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    258259        self.browser.open(self.manage_path)
     
    261262        self.browser.getControl(name="transition").value = ['start']
    262263        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']
    264265        self.browser.getControl("Save").click()
    265266        self.browser.getControl("Add online").click()
  • main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

    r13678 r13977  
    5858        #IWorkflowState(self.student).setState('started')
    5959        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']
    6161        self.applicantscontainer.application_fee = 10000.0
    6262        self.browser.getControl(name="form.nationality").value = ['NG']
Note: See TracChangeset for help on using the changeset viewer.