Changeset 2105


Ignore:
Timestamp:
16 Aug 2007, 13:24:11 (17 years ago)
Author:
Henrik Bettermann
Message:

intermediate checkin

Location:
WAeUP_SRP/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/applicants_catalog.xml

    r2099 r2105  
    33<object name="portal_pumeresults" meta_type="WAeUP Table">
    44 <column value="reg_no"/>
    5  <column value="registration_date"/>
     5 <column value="application_date"/>
    66 <column value="date_of_birth"/>
    77 <column value="sex"/>

  • WAeUP_SRP/trunk/profiles/default/layouts/application.xml

    r2101 r2105  
    88  <property name="flexible_widgets"/>
    99  <property name="validate_values_expr"></property>
    10   <widget name="course1" meta_type="String Widget">
    11     <property name="title">Course</property>
    12     <property name="fields">
    13       <element value="course1"/>
    14     </property>
    15     <property name="label">Course 1</property>
    16     <property name="label_edit">Course 1</property>
    17     <property name="description"></property>
    18     <property name="help"></property>
    19     <property name="is_i18n">False</property>
    20     <property name="widget_mode_expr"></property>
    21     <property name="readonly_layout_modes"/>
    22     <property name="hidden_layout_modes"/>
    23     <property name="hidden_readonly_layout_modes"/>
    24     <property name="css_class_expr">string:row</property>
    25   </widget>
    26   <widget name="course3" meta_type="String Widget">
    27     <property name="title">Course 3</property>
    28     <property name="fields">
    29       <element value="course3"/>
    30     </property>
    31     <property name="label">Course 3</property>
    32     <property name="label_edit">Course 3</property>
    33     <property name="description"></property>
    34     <property name="help"></property>
    35     <property name="is_i18n">False</property>
    36     <property name="widget_mode_expr"></property>
    37     <property name="readonly_layout_modes"/>
    38     <property name="hidden_layout_modes"/>
    39     <property name="hidden_readonly_layout_modes"/>
    40     <property name="css_class_expr">string:row</property>
    41   </widget>
    42   <widget name="course2" meta_type="String Widget">
    43     <property name="title">Course 2</property>
    44     <property name="fields">
    45       <element value="course2"/>
    46     </property>
    47     <property name="label">Course 2</property>
    48     <property name="label_edit">Course 2</property>
    49     <property name="description"></property>
    50     <property name="help"></property>
    51     <property name="is_i18n">False</property>
    52     <property name="widget_mode_expr"></property>
    53     <property name="readonly_layout_modes"/>
    54     <property name="hidden_layout_modes"/>
    55     <property name="hidden_readonly_layout_modes"/>
    56     <property name="css_class_expr">string:row</property>
    57   </widget>
     10
    5811  <widget name="date_of_birth" meta_type="DateTime Widget">
    5912    <property name="title">Date of Birth</property>
    … …  
    157110  </widget>
    158111  <widget name="aggregate" meta_type="Int Widget">
    159     <property name="title">JAMB Aggregate Score</property>
     112    <property name="title">Total Score</property>
    160113    <property name="fields">
    161114      <element value="aggregate"/>
    162115    </property>
    163     <property name="label">JAMB Aggregate Score</property>
    164     <property name="label_edit">JAMB Aggregate Score</property>
     116    <property name="label">Total Score</property>
     117    <property name="label_edit">Total Score</property>
    165118    <property name="description"></property>
    166119    <property name="help"></property>
    … …  
    181134      <element value="eng_score"/>
    182135    </property>
    183     <property name="label">English</property>
    184     <property name="label_edit">English</property>
     136    <property name="label">'English' Score</property>
     137    <property name="label_edit">'English' Score</property>
    185138    <property name="description"></property>
    186139    <property name="help"></property>
    … …  
    426379    <property name="reference">reg_no</property>
    427380  </widget>
    428   <widget name="registration_date" meta_type="DateTime Widget">
    429     <property name="title">Registration Date</property>
    430     <property name="fields">
    431       <element value="registration_date"/>
    432     </property>
    433     <property name="label">Registration Date</property>
    434     <property name="label_edit">Registration Date</property>
    435     <property name="description"></property>
    436     <property name="help"></property>
    437     <property name="is_i18n">False</property>
    438     <property name="widget_mode_expr"></property>
    439     <property name="readonly_layout_modes">
    440       <element value="edit"/>
    441     </property>
    442     <property name="hidden_layout_modes"/>
     381  <widget name="application_date" meta_type="DateTime Widget">
     382    <property name="title">Application Date</property>
     383    <property name="fields">
     384      <element value="application_date"/>
     385    </property>
     386    <property name="label">Application Date</property>
     387    <property name="label_edit">Application Date</property>
     388    <property name="description"></property>
     389    <property name="help"></property>
     390    <property name="is_i18n">False</property>
     391    <property name="widget_mode_expr"></property>
     392    <property name="readonly_layout_modes">
     393      <element value="edit"/>
     394    </property>
     395    <property name="hidden_layout_modes">
     396      <element value="create"/>
     397    </property>
    443398    <property name="hidden_readonly_layout_modes"/>
    444399    <property name="css_class_expr">string:row</property>
    … …  
    455410    <property name="is_i18n">False</property>
    456411    <property name="widget_mode_expr"></property>
    457     <property name="readonly_layout_modes"/>
    458     <property name="hidden_layout_modes"/>
     412    <property name="readonly_layout_modes">
     413      <element value="edit"/>
     414    </property>
     415    <property name="hidden_layout_modes">
     416      <element value="create"/>
     417    </property>
    459418    <property name="hidden_readonly_layout_modes"/>
    460419    <property name="css_class_expr">string:row</property>
    … …  
    502461      <element value="sex"/>
    503462    </property>
    504     <property name="label">Score</property>
    505     <property name="label_edit">Score</property>
     463    <property name="label">Sex</property>
     464    <property name="label_edit">Sex</property>
    506465    <property name="description"></property>
    507466    <property name="help"></property>
    … …  
    530489  </widget>
    531490  <widget name="status" meta_type="String Widget">
    532     <property name="title">Status</property>
     491    <property name="title">Application Status</property>
    533492    <property name="fields">
    534493      <element value="status"/>
    535494    </property>
    536     <property name="label">Status</property>
    537     <property name="label_edit">Status</property>
    538     <property name="description"></property>
    539     <property name="help"></property>
    540     <property name="is_i18n">False</property>
    541     <property name="widget_mode_expr"></property>
    542     <property name="readonly_layout_modes"/>
    543     <property name="hidden_layout_modes"/>
     495    <property name="label">Application Status</property>
     496    <property name="label_edit">Application Status</property>
     497    <property name="description"></property>
     498    <property name="help"></property>
     499    <property name="is_i18n">False</property>
     500    <property name="widget_mode_expr"></property>
     501    <property name="readonly_layout_modes">
     502      <element value="edit"/>
     503    </property>
     504    <property name="hidden_layout_modes">
     505      <element value="create"/>
     506    </property>
    544507    <property name="hidden_readonly_layout_modes"/>
    545508    <property name="css_class_expr">string:row</property>
    … …  
    564527    <property name="hidden_readonly_layout_modes"/>
    565528    <property name="css_class_expr">string:row</property>
    566   </widget> 
     529  </widget>
    567530  <widget name="course2" meta_type="String Widget">
    568531    <property name="title">2nd Choice Course of Study</property>
    … …  
    584547    <property name="hidden_readonly_layout_modes"/>
    585548    <property name="css_class_expr">string:row</property>
    586   </widget> 
     549  </widget>
    587550  <widget name="course3" meta_type="String Widget">
    588551    <property name="title">3rd Choice Course of Study</property>
    … …  
    603566    <property name="hidden_readonly_layout_modes"/>
    604567    <property name="css_class_expr">string:row</property>
    605   </widget>   
     568  </widget>
    606569
    607570 <table>
    … …  
    644607  <row>
    645608   <cell name="course2" ncols="2"/>
    646   </row>   
     609  </row>
    647610  <row>
    648611   <cell name="course3" ncols="2"/>
     612  </row>
     613  <row>
     614   <cell name="status" ncols="2"/>
     615  </row>
     616  <row>
     617   <cell name="registration_date" ncols="2"/>
     618  </row>
     619  <row>
     620   <cell name="screening_date" ncols="2"/>
    649621  </row> 
    650622 </table>

  • WAeUP_SRP/trunk/profiles/default/schemas/application.xml

    r2101 r2105  
    2424 <field name="reg_no" meta_type="CPS String Field"/>
    2525 <field name="date_of_birth" meta_type="CPS DateTime Field"/>
    26  <field name="registration_date" meta_type="CPS DateTime Field"/>
     26 <field name="application_date" meta_type="CPS DateTime Field"/>
    2727 <field name="score" meta_type="CPS Int Field"/>
    2828 <field name="sex" meta_type="CPS Boolean Field"/>

  • WAeUP_SRP/trunk/profiles/default/vocabularies/jamb_subjects.xml

    r2100 r2105  
    77
    88  <item key="" msgid="">None</item>
    9   <item key="AGR" msgid="">Agriculture</item>
    10   <item key="ART" msgid="">Fine Arts</item>
    11   <item key="BIO" msgid="">Biology</item>
    12   <item key="CHE" msgid="">Chemistry</item>
    13   <item key="COM" msgid="">Commerce</item>
    14   <item key="CRK" msgid="">Christian Rel. Knowledge</item>
    15   <item key="ECO" msgid="">Economics</item>
    16   <item key="FRE" msgid="">French</item>
    17   <item key="GEO" msgid="">Geography</item>
    18   <item key="GOV" msgid="">Government</item>
    19   <item key="HIS" msgid="">History</item>
    20   <item key="IRK" msgid="">Islamic Rel. Knowledge</item>
    21   <item key="MAT" msgid="">Mathematics</item>
    22   <item key="IGB" msgid="">Igbo Language</item>
    23   <item key="H/E" msgid="">Home Economics</item>
    24   <item key="LIT" msgid="">Literature In English</item>
    25   <item key="MUS" msgid="">Music</item>
    26   <item key="PHY" msgid="">Physics</item>
    27   <item key="YOR" msgid="">Yoruba Language</item>
    28   <item key="P/A" msgid="">Principles of Accounting</item>
     9  <item key="AGR" msgid="">'Agriculture' Score</item>
     10  <item key="ART" msgid="">'Fine Arts' Score</item>
     11  <item key="BIO" msgid="">'Biology' Score</item>
     12  <item key="CHE" msgid="">'Chemistry' Score</item>
     13  <item key="COM" msgid="">'Commerce' Score</item>
     14  <item key="CRK" msgid="">'Christian Rel. Knowledge' Score</item>
     15  <item key="ECO" msgid="">'Economics' Score</item>
     16  <item key="FRE" msgid="">'French' Score</item>
     17  <item key="GEO" msgid="">'Geography' Score</item>
     18  <item key="GOV" msgid="">'Government' Score</item>
     19  <item key="HIS" msgid="">'History' Score</item>
     20  <item key="IRK" msgid="">'Islamic Rel. Knowledge' Score</item>
     21  <item key="MAT" msgid="">'Mathematics' Score</item>
     22  <item key="IGB" msgid="">'Igbo Language' Score</item>
     23  <item key="H/E" msgid="">'Home Economics' Score</item>
     24  <item key="LIT" msgid="">'Literature In English' Score</item>
     25  <item key="MUS" msgid="">'Music' Score</item>
     26  <item key="PHY" msgid="">'Physics' Score</item>
     27  <item key="YOR" msgid="">'Yoruba Language' Score</item>
     28  <item key="P/A" msgid="">'Principles of Accounting' Score</item>
    2929</object>

  • WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

    r2103 r2105  
    7373                                   ds = ds,
    7474                                  )
    75    
     75
    7676if psm == 'invalid':
    7777    return context.apply_pume_form(rendered = res,
    … …  
    9595data['reg_no'] = reg_no
    9696if apply_pume:
    97     data['registration_date'] = current
     97    data['application_date'] = current
    9898    data['status'] = "submitted"
    9999context.applicants_catalog.modifyRecord(**data)

  • WAeUP_SRP/trunk/skins/waeup_student/apply_pume_form.pt

    r2103 r2105  
    4444                 class="standalone"
    4545                 name="create"
    46                  value="Login for PUME Application"
     46                 value="Show PUME Application Record"
    4747                 tal:condition="python: mode == 'create'"
    4848                 />

  • WAeUP_SRP/trunk/skins/waeup_student/layout_apply_pume_view.pt

    r2103 r2105  
    1111         tal:condition="ds/pin|nothing"/>
    1212  <input type="submit" class="standalone" name="slip"
    13          value="Print application slip"
     13         value="Print Application Slip"
    1414         />
    1515</form>
Note: See TracChangeset for help on using the changeset viewer.