Changeset 837 for WAeUP_SRP/trunk


Ignore:
Timestamp:
11 Nov 2006, 11:12:39 (18 years ago)
Author:
Henrik Bettermann
Message:

clearance_view and admission_form re-built

Location:
WAeUP_SRP/trunk
Files:
3 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r826 r837  
    4949  <property name="label_edit">Acknowledgement</property>
    5050  <property
    51      name="help">I hereby acknowledge by ticking this check box that if it is discovered at any time that i do not possess any of the qualifications which i claim to have obtained, i will be expelled from the University and shall not be re-admitted for the same or any other programme, even if i have upgraded my previous qualifications or possess additional qualifications.</property>
    52   <property name="readonly_layout_modes"/>
    53   <property name="hidden_layout_modes">
    54    <element value="create"/>
    55   </property>
    56   <property name="hidden_readonly_layout_modes"/>
     51     name="description">I hereby acknowledge by ticking this check box that if it is discovered at any time that i do not possess any of the qualifications which i claim to have obtained, i will be expelled from the University and shall not be re-admitted for the same or any other programme, even if i have upgraded my previous qualifications or possess additional qualifications.</property>
     52  <property name="readonly_layout_modes"/>
     53  <property name="hidden_layout_modes">
     54   <element value="create"/>
     55  </property>
     56  <property name="hidden_readonly_layout_modes"/>
     57  <property name="render_format">checkbox</property>
    5758 </widget>
    5859 <widget name="age_dec" meta_type="Image Widget">
    … …  
    9394  <property name="label">Fullname</property>
    9495  <property name="label_edit">Fullname</property>
     96  <property name="description">Advanced Level Data</property>
    9597  <property
    9698     name="help">Fullname as it appears on certificate/result</property>
    … …  
    114116  <property name="hidden_readonly_layout_modes"/>
    115117 </widget>
     118 <widget name="alr_results" meta_type="WAeUp Results Widget">
     119  <property name="title">Results</property>
     120  <property name="fields">
     121   <element value="alr_results"/>
     122  </property>
     123  <property name="label">Results</property>
     124  <property name="label_edit">Results</property>
     125  <property name="hidden_layout_modes">
     126   <element value="create"/>
     127  </property>
     128  <property name="hidden_readonly_layout_modes"/>
     129 </widget>
    116130 <widget name="alr_scan" meta_type="Image Widget">
    117131  <property name="title">Scan of Advanced Level Result</property>
    … …  
    138152  <property name="label">Birth Certificate</property>
    139153  <property name="label_edit">Birth Certificate</property>
     154  <property name="description">Other Documents</property>
    140155  <property name="readonly_layout_modes"/>
    141156  <property name="hidden_layout_modes">
    … …  
    223238  </property>
    224239  <property name="hidden_readonly_layout_modes"/>
     240  <property name="render_format">radio</property>
    225241 </widget>
    226242 <widget name="entry_date" meta_type="Date Widget">
    … …  
    231247  <property name="label">Entry Date</property>
    232248  <property name="label_edit">Entry Date</property>
    233   <property name="readonly_layout_modes"/>
     249  <property name="readonly_layout_modes">
     250   <element value="edit"/>
     251  </property>
    234252  <property name="hidden_layout_modes">
    235253   <element value="create"/>
    … …  
    244262  <property name="label">Entry Session</property>
    245263  <property name="label_edit">Entry Session</property>
    246   <property name="readonly_layout_modes"/>
     264  <property name="readonly_layout_modes">
     265   <element value="edit"/>
     266  </property>
    247267  <property name="hidden_layout_modes">
    248268   <element value="create"/>
    … …  
    300320  <property name="label">Fullname</property>
    301321  <property name="label_edit">Fullname</property>
     322  <property name="description">First Sitting Data</property>
    302323  <property
    303324     name="help">Fullname as it appears on certificate/result</property>
    … …  
    321342  <property name="hidden_readonly_layout_modes"/>
    322343 </widget>
     344 <widget name="fst_sit_results" meta_type="WAeUp Results Widget">
     345  <property name="title">Results</property>
     346  <property name="fields">
     347   <element value="fst_sit_results"/>
     348  </property>
     349  <property name="label">Results</property>
     350  <property name="label_edit">Results</property>
     351  <property name="readonly_layout_modes"/>
     352  <property name="hidden_layout_modes">
     353   <element value="create"/>
     354  </property>
     355  <property name="hidden_readonly_layout_modes"/>
     356 </widget>
    323357 <widget name="fst_sit_scan" meta_type="Image Widget">
    324358  <property name="title">Scan of First Sitting Result</property>
    … …  
    442476  <property name="label">Higher Qualification</property>
    443477  <property name="label_edit">Higher Qualification</property>
     478  <property name="description">Higher Qualification Data</property>
    444479  <property name="readonly_layout_modes"/>
    445480  <property name="hidden_layout_modes">
    … …  
    521556  <property name="label">Matriculation Number</property>
    522557  <property name="label_edit">Matriculation Number</property>
    523   <property name="readonly_layout_modes"/>
     558  <property name="readonly_layout_modes">
     559   <element value="edit"/>
     560  </property>
    524561  <property name="hidden_layout_modes">
    525562   <element value="create"/>
    … …  
    597634  <property name="label">Fullname</property>
    598635  <property name="label_edit">Fullname</property>
     636  <property name="description">Second Sitting Data</property>
    599637  <property
    600638     name="help">Fullname as it appears on certificate/result</property>
    … …  
    618656  <property name="hidden_readonly_layout_modes"/>
    619657 </widget>
     658 <widget name="scd_sit_results" meta_type="WAeUp Results Widget">
     659  <property name="title">Results</property>
     660  <property name="fields">
     661   <element value="scd_sit_results"/>
     662  </property>
     663  <property name="label">Results</property>
     664  <property name="label_edit">Results</property>
     665  <property name="readonly_layout_modes"/>
     666  <property name="hidden_layout_modes">
     667   <element value="create"/>
     668  </property>
     669  <property name="hidden_readonly_layout_modes"/>
     670 </widget>
    620671 <widget name="scd_sit_scan" meta_type="Image Widget">
    621672  <property name="title">Scan of Second Sitting Result</property>
    … …  
    678729  </property>
    679730  <property name="hidden_readonly_layout_modes"/>
     731  <property name="render_format">radio</property>
    680732 </widget>
    681733 <table>
    … …  
    714766  </row>
    715767  <row>
     768   <cell name="fst_sit_results"/>
     769  </row>
     770  <row>
    716771   <cell name="fst_sit_scan"/>
    717772  </row>
    … …  
    729784  </row>
    730785  <row>
     786   <cell name="scd_sit_results"/>
     787  </row>
     788  <row>
    731789   <cell name="scd_sit_scan"/>
    732790  </row>
    … …  
    739797  <row>
    740798   <cell name="alr_date"/>
     799  </row>
     800  <row>
     801   <cell name="alr_results"/>
    741802  </row>
    742803  <row>

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

    r805 r837  
    1111  <element key="accommodation_slip" value="WAeUP_Student+Slippage"/>
    1212  <element key="pume_slip" value="WAeUP_Student+Slippage"/>
    13   <element key="pume_anon_slip" value="WAeUP_Student+Slippage"/> 
     13  <element key="pume_anon_slip" value="WAeUP_Student+Slippage"/>
     14  <element key="admission_slip" value="WAeUP_Student+Slippage"/>
     15  <element key="clearance_anon_slip" value="WAeUP_Student+Slippage"/>
    1416 </property>
    1517 <object name="default" meta_type="Portal Theme"/>

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

    r828 r837  
    9595        return response.redirect("%s/application_edit" % student.absolute_url())
    9696    elif info['review_state'] == "admitted":
    97         return response.redirect("%s/admission_accept_form" % student.absolute_url())
     97        return response.redirect("%s/admission_form" % student.absolute_url())
    9898    elif info['review_state'] == "clearance_pin_entered":
    99         return response.redirect("%s/clearance_edit" % student.absolute_url())       
     99        return response.redirect("%s/clearance_edit" % student.absolute_url())
    100100    return response.redirect("%s/student_index" % info['url'])
    101101

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

    r826 r837  
    99           
    1010        <div style="text-align: right"
    11              tal:condition="python:review_state=='admission_applied'">
    12         <a href="" target="slip" tal:attributes="href string:application_slip"
     11             tal:condition="python:review_state in ('clearance_requested', 'cleared','clearance_pin_entered',)">
     12        <a href="" target="slip" tal:attributes="href string:clearance_slip"
    1313            onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
    1414            <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
    15             Application Slip
     15            Clearance/Eligibility Slip
    1616        </a>
    1717       

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

    r805 r837  
    33<metal:block define-macro="default_view"
    44  tal:define="layout options/layout;
    5               dm options/datastructure/getDataModel;
    65              widgets python:context.getRenderedWidgets(layout);
    7               fields python:('')"
     6              fields_not_displayed python:('',)"
    87                                 >
    9   <table cellpadding="2" cellspacing="2" summary="layout">
    10     <tr>
    11       <td><span class="dlabel">Student ID</span>:
    12       </td>
    13       <td>
    14          <span tal:replace="python:here.aq_parent.aq_parent.id" />
    15       </td>     
    16     </tr>
    17     <tr tal:repeat="field fields">
    18       <tal:block tal:define="cell python: widgets[field]">
    19         <tal:block define="widget cell/widget">
    20           <div tal:attributes="class cell/widget_css_class|string:label;
    21             id python:widget.getHtmlWidgetId()+'_widget';">
    22             <td >
    23              <span class="dlabel"
    24                     tal:condition="widget/label"
    25                     tal:content="widget/label">label</span>:
     8  <table>
     9    <span tal:repeat="row layout/rows">
     10        <span tal:repeat="cell row">
     11          <span tal:define="widget cell/widget"
     12                tal:condition="python:cell['widget_id'] not in fields_not_displayed
     13                                       and widget.meta_type!='Image Widget' ">
     14            <div tal:omit-tag=""
     15                 tal:attributes="class cell/widget_css_class|nothing;">
     16                 
     17            <tr tal:condition="widget/description|nothing" class="even ajaxtd">
     18              <th colspan="5" align="left"><h3 tal:replace="widget/description" /></th>
     19            </tr>
     20            <tr>                         
     21            <tal:block condition="widget/label">
     22            <td valign="top" nowrap>
     23              <span i18n:translate="" tal:condition="widget/is_i18n">
     24                  <span tal:content="widget/label" />:</span>
     25              <span tal:condition="not:widget/is_i18n">
     26                  <span tal:content="widget/label" />:</span>
    2627            </td>
    27             <td>
    28                <span tal:replace="structure cell/widget_rendered" />
     28            </tal:block>
     29            <tal:block condition="not: widget/label">
     30            <td>
     31              <div valign="top"> no label </div>
    2932            </td>
    30           </div>
    31         </tal:block>
    32       </tal:block>
    33     </tr>
     33            </tal:block>             
     34            <td>
     35             <div class="ddescription" tal:condition="cell" tal:content="structure cell/widget_rendered"></div>
     36             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
     37            </td>
     38            </tr>
     39            </div>
     40          </span>
     41          <span tal:define="widget cell/widget;
     42                            title_name string:${cell/widget_id}_filename;"
     43                tal:condition="python:cell['widget_id'] not in fields_not_displayed
     44                                       and widget.meta_type=='Image Widget'
     45                                       and cell['widget_rendered']">
     46            <div tal:omit-tag=""
     47                 tal:attributes="class cell/widget_css_class|nothing;">
     48            <tr>
     49            <td valign="top"><span tal:content="widget/title" />:</td>
     50            <td>
     51            <a href="" target="slip" tal:attributes="href widget/getWidgetId">
     52            <span tal:content="string: Hier sollte der Dateiname stehen." />
     53            </a>
     54           
     55           
     56            </td>
     57            </tr>
     58            </div>
     59          </span>
     60        </span>
     61    </span>
    3462  </table>
    3563</metal:block>

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

    r806 r837  
    5353  <tr>
    5454    <td class="active">
    55     <a href="" tal:attributes="href string:${info/url}/admission_accept_form">
     55    <a href="" tal:attributes="href string:${info/url}/admission_form">
    5656    Admitted
    5757    </a>

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

    r805 r837  
    3535        return redirect("%s/application_edit" % info['app'].absolute_url())
    3636    elif state in ('admitted',):
    37         return redirect("%s/admission_accept_form" % student.absolute_url())
     37        return redirect("%s/admission_form" % student.absolute_url())
    3838    elif state == 'clearance_pin_entered':
    3939        return redirect("%s/student_view" % info['clear'].absolute_url())
Note: See TracChangeset for help on using the changeset viewer.