Changeset 658


Ignore:
Timestamp:
11 Oct 2006, 18:08:17 (18 years ago)
Author:
joachim
Message:

accommodation_view and slip

Location:
WAeUP_SRP/trunk
Files:
5 added
10 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Students.py

    r648 r658  
    351351            app_doc = app.getContent()
    352352            app_doc.edit(mapping=da)
    353             wftool.doActionFor(app,'open',dest_container=app)
     353            #wftool.doActionFor(app,'open',dest_container=app)
    354354            app.manage_setLocalRoles(sid, ['Owner',])
    355355            student.getContent().createSubObjects()

  • WAeUP_SRP/trunk/WAeUPTables.py

    r637 r658  
    8585            return -1,"Student with Id %s already booked bed %s" % (student_id,records[0].bed)
    8686           
    87         records = self.searchResults({'bed_type' : bed_type, "student": ''})
     87        records = [r for r in self.searchResults({'bed_type' : bed_type, "student": ''})]
    8888        if len(records) == 0:
    8989            return -1,"no bed of this type available"

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

    r629 r658  
    1717  <property name="hidden_layout_modes"/>
    1818  <property name="hidden_readonly_layout_modes"/>
     19  <property name="view_format">iso8601_medium_easy</property>
     20<property name="hidden_empty">True</property>
    1921 </widget>
    2022 <widget name="acco_maint_sc_pin" meta_type="String Widget">
    … …  
    2830  <property name="hidden_layout_modes"/>
    2931  <property name="hidden_readonly_layout_modes"/>
     32<property name="hidden_empty">True</property>
    3033 </widget>
    3134 <widget name="acco_maint_sc_serial" meta_type="String Widget">
    … …  
    4043  <property name="hidden_readonly_layout_modes"/>
    4144  <property name="display_width">10</property>
     45<property name="hidden_empty">True</property>
    4246 </widget>
    4347 <widget name="acco_res_date" meta_type="DateTime Widget">
    4448  <property name="title">Accommodation Reservation Date</property>
    4549  <property name="fields">
    46    <element value="acco_res-date"/>
     50   <element value="acco_res_date"/>
    4751  </property>
    4852  <property name="label">Accommodation Reservation Date</property>
    … …  
    5155  <property name="hidden_layout_modes"/>
    5256  <property name="hidden_readonly_layout_modes"/>
     57  <property name="view_format">iso8601_medium_easy</property>
    5358 </widget>
    5459 <widget name="acco_res_sc_pin" meta_type="String Widget">
    55   <property name="title">Accommodation Reservation SC-pin</property>
     60  <property name="title">Accommodation Reservation SC-Pin</property>
    5661  <property name="fields">
    5762   <element value="acco_res_sc_pin"/>
    5863  </property>
    59   <property name="label">Accommodation Reservation SC-pin</property>
    60   <property name="label_edit">Accommodation Reservation SC-pin</property>
     64  <property name="label">Accommodation Reservation SC-Pin</property>
     65  <property name="label_edit">Accommodation Reservation SC-Pin</property>
    6166  <property name="readonly_layout_modes"/>
    6267  <property name="hidden_layout_modes"/>
    … …  
    7378  <property name="hidden_layout_modes"/>
    7479  <property name="hidden_readonly_layout_modes"/>
     80<property name="hidden_empty">True</property>
    7581 </widget>
    7682 <widget name="bed" meta_type="String Widget">

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

    r617 r658  
    1717  <property name="hidden_layout_modes"/>
    1818  <property name="hidden_readonly_layout_modes"/>
     19  <property name="view_format">iso8601_medium_easy</property>
    1920 </widget>
    2021<widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    … …  
    219220  <property name="size_max">204800</property>
    220221  <property name="display_external_editor">False</property>
    221   <property name="display_width">300</property>
    222   <property name="display_height">600</property>
     222  <property name="display_width">150</property>
     223  <property name="display_height">200</property>
    223224  <property name="allow_resize">True</property>
    224225 </widget>

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

    r538 r658  
    2121  </property>
    2222  <property name="hidden_readonly_layout_modes"/>
     23  <property name="view_format">iso8601_medium_easy</property>
    2324 </widget>
    2425 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    … …  
    2829  </property>
    2930  <property name="is_required">True</property>
    30   <property name="label">Application PIN</property>
     31  <property name="label">Access Code</property>
    3132  <property name="label_edit">Application PIN</property>
    3233  <property name="readonly_layout_modes">
    … …  
    8990   <element value="jamb_lastname"/>
    9091  </property>
    91   <property name="label">Name</property>
     92  <property name="label">Student's Name</property>
    9293  <property name="label_edit">Name</property>   
    9394  <property name="readonly_layout_modes">
    … …  
    160161  <property name="hidden_readonly_layout_modes"/>
    161162 </widget>
    162  <widget name="passport" meta_type="WAeUP Image Widget">
     163 <widget name="jamb_state" meta_type="String Widget">
     164  <property name="title">JAMB State</property>
     165  <property name="fields">
     166   <element value="jamb_state"/>
     167  </property>
     168  <property name="label">State of Origin</property>
     169  <property name="label_edit">JAMB State</property>
     170  <property name="readonly_layout_modes">
     171  </property>
     172  <property name="hidden_layout_modes"/>
     173  <property name="hidden_readonly_layout_modes"/>
     174 </widget>
     175 <widget name="passport" meta_type="Photo Widget">
    163176  <property name="title">Passport Picture</property>
    164177  <property name="fields">
    … …  
    177190  <property name="size_max">204800</property>
    178191  <property name="display_external_editor">False</property>
    179   <property name="display_width">300</property>
    180   <property name="display_height">600</property>
     192  <property name="display_width">150</property>
     193  <property name="display_height">200</property>
    181194  <property name="allow_resize">True</property>
    182195 </widget>
    … …  
    196209  <row>
    197210   <cell name="jamb_sex" ncols="3"/>
     211  </row>
     212  <row>
     213   <cell name="entry_mode" ncols="3"/>
     214  </row>
     215  <row>
     216   <cell name="jamb_state" ncols="3"/>
    198217  </row>
    199218  <row>

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

    r585 r658  
    99  <element key="index_html" value="WAeUP_Student+Default"/>
    1010  <element key="application_slip" value="WAeUP_Student+Slippage"/>
     11  <element key="accommodation_slip" value="WAeUP_Student+Slippage"/>
    1112 </property>
    1213 <object name="default" meta_type="Portal Theme"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml

    r652 r658  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addStudentAccommodation</property>
    10  <property name="immediate_view">accommodation_slip</property>
     10 <property name="immediate_view">accommodation_view</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    2626 <property name="storage_methods"/>
    2727 <property name="cps_is_portlet">False</property>
    28  <alias from="(Default)" to="accommodation_slip"/>
    29  <alias from="view" to="accommodation_slip"/>
     28 <alias from="(Default)" to="accommodation_view"/>
     29 <alias from="view" to="accommodation_view"/>
    3030 <action title="Standard View" action_id="view" category="object"
    31     condition_expr="" url_expr="string:${object_url}/accommodation_slip"
     31    condition_expr="" url_expr="string:${object_url}/accommodation_view"
    3232    visible="True">
    3333  <permission value="View"/>

  • WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

    r654 r658  
    7979    member.setProperties(last_login_time=current,login_time=current)
    8080    if info['review_state'] == "application_pin_entered":
    81         #wftool.doActionFor(info['app'],'open',dest_container=info['app'])
     81        wftool.doActionFor(info['app'],'open',dest_container=info['app'])
    8282        return response.redirect("%s/passport_entry_view" % student.absolute_url())
    8383    return response.redirect("%s" % student.absolute_url())

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

    r656 r658  
    1 <html metal:use-macro="here/content_lib_master/macros/master">
    2   <metal:block fill-slot="head_slot">
    3   </metal:block>
    4 
    5   <metal:block fill-slot="css_slot">
    6     <link rel="Stylesheet" type="text/css" href=""
    7       tal:attributes="href string:${base_url}document.css" />
    8   </metal:block>
    9  
    10   <metal:block fill-slot="header">
    11   </metal:block>
    12 
    13   <metal:block fill-slot="main"
    14       tal:define="info context/getStudentInfo">
    15     <h3>Hostel Application Slip</h3>
    16     <br />
    17    
    18     <table width="" cellpadding="2" cellspacing="0" summary="Form layout"
    19            tal:define="acco_doc nocall: info/acco_doc"
    20            >
    21       <tr><td>Reservation Date: </td><td><span tal:content="python:acco_doc.acco_res_date.aCommonZ()" /></td></tr>
    22       <tr><td>Pin used: </td><td><span tal:content="acco_doc/acco_res_sc_pin" /></td></tr>
    23       <tr><td>Bed </td><td><span tal:content="python:context.formatBed(acco_doc.bed)" /></td></tr>
    24     </table>
    25   </metal:block>
    26  
    27   <metal:block fill-slot="sub">
    28   </metal:block>
    29 </html>
     1<metal:html tal:define="info context/getStudentInfo">
     2  <metal:body use-macro="here/main_template/macros/master">
     3    <metal:main fill-slot="main">
     4      <span tal:condition="not: info">
     5        <metal:block use-macro="here/error_not_found/macros/not_found" />
     6      </span>
     7      <h3>Hostel Application Slip</h3>
     8      <br />
     9      <span tal:omit-tag=""
     10            tal:content="structure python: info['acco_doc'].render(proxy=info['acco_doc'],
     11            layout_mode='view_slip',
     12            layout_id='student_accommodation')"
     13            />
     14    </metal:main>
     15  </metal:body>
     16</metal:html>

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

    r645 r658  
    1 <html metal:use-macro="here/content_lib_master/macros/master">
    2   <metal:block fill-slot="head_slot">
    3   </metal:block>
    4 
    5   <metal:block fill-slot="css_slot">
    6     <link rel="Stylesheet" type="text/css" href=""
    7       tal:attributes="href string:${base_url}document.css" />
    8   </metal:block>
    9  
    10   <metal:block fill-slot="header">
    11   </metal:block>
    12 
    13   <metal:block fill-slot="main">
    14 
    15     <tal:block tal:condition="python:context.portal_type == 'Student'" tal:omit-tag="">
    16     <h3>Post UME Acknowledegement Slip</h3>
     1<metal:html tal:define="info context/getStudentInfo">
     2  <metal:body use-macro="here/main_template/macros/master">
     3    <metal:main fill-slot="main">
     4      <span tal:condition="not: info">
     5        <metal:block use-macro="here/error_not_found/macros/not_found" />
     6      </span>
     7      <span tal:condition="info"
     8            tal:define="review_state info/review_state">
     9           
     10        <h3>Post UME Acknowledegement Slip</h3>
    1711        <br />
    18        
    19       <tal:block tal:define="application_data python:context.application.getContent();">
    20      
    21      
    22       <table cellpadding="10em" cellspacing="">
    23       <tr>
    24       <td valign="top">
    25         <img tal:condition="application_data/passport|nothing" width="150" height="200"
    26              tal:attributes="src string:${context/absolute_url}/application/passport"/>
    27               <span tal:condition="nothing" tal:replace="structure application_data/passport" />
    28       </td>
    29 
    30       <td>
    31      
    32       <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
    33       <tr><td>Student ID: </td><td><span tal:content="context/id" /></td>
    34       <tr><td>Access Code: </td><td><span tal:content="application_data/app_ac_pin" /></td></tr>
    35       <tr><td>Application Date: </td><td><span tal:content="python:application_data.app_ac_date.aCommonZ()" /></td></tr>
    36       <tr><td>JAMB Registration Number: </td><td><span tal:content="application_data/jamb_reg_no" /></td></tr>
    37       <tr><td>Student's Name: </td><td><span tal:content="application_data/jamb_firstname" /> <span tal:content="application_data/jamb_middlename" /> <span tal:content="application_data/jamb_lastname" /></td></tr>
    38       <tr><td>Sex: </td><td><span tal:content="application_data/jamb_sex" /></td></tr>
    39       <tr><td>Mode of Entry: </td><td><span tal:content="application_data/entry_mode" /></td></tr>
    40       <tr><td>Course of Study: </td><td><span tal:content="application_data/jamb_first_cos" />, <span tal:content="application_data/jamb_second_cos" /></td></tr>
    41       <tr><td>State of Origin: </td><td><span tal:content="application_data/jamb_state" /> / <span tal:content="application_data/jamb_lga" /></td></tr>
    42       <tr><td>Post UME Examination Date: </td><td></td></tr>
    43       </table>
    44 
    45       </td>
    46       </tr>
    47       </table>
    48      
    49       </tal:block>
    50     </tal:block>
    51     <tal:block condition="python:context.portal_type != 'Student'">
    52       Please do not manipulate the URL! This is not a student object.
    53     </tal:block> 
    54  
    55   </metal:block>
    56 
    57   <metal:block fill-slot="sub">
    58   </metal:block>
    59 </html>
     12        <span tal:omit-tag=""
     13              tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
     14              layout_mode='view_slip',
     15              layout_id='student_application_fe')"
     16              />
     17      </span>
     18    </metal:main>
     19  </metal:body>
     20</metal:html>
Note: See TracChangeset for help on using the changeset viewer.