Changeset 2108 for WAeUP_SRP/trunk

Timestamp:

16 Aug 2007, 18:43:20 (17 years ago)

Author:

Henrik Bettermann

Message:

form shows now the correct data and correct mode

select widget for course3 added

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/application.xml (modified) (3 diffs)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/cos.xml (added)
• skins/waeup_student/apply_pume.py (modified) (2 diffs)
• skins/waeup_student/apply_pume_form.pt (modified) (2 diffs)
• skins/waeup_student/apply_pume_slip.pt (modified) (2 diffs)

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

@@ -548 +548 @@
     <property name="css_class_expr">string:row</property>
   </widget>
-  <widget name="course3" meta_type="String Widget">
+  <widget name="course3" meta_type="Select Widget">
     <property name="title">3rd Choice Course of Study</property>
     <property name="fields">
@@ -565 +565 @@
     </property>
     <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">cos</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -613 +614 @@
   <row>
    <cell name="status" ncols="2"/>
-  </row> 
+  </row>
   <row>
    <cell name="application_date" ncols="2"/>
-  </row> 
+  </row>
   <row>
    <cell name="screening_date" ncols="2"/>
-  </row>  
+  </row>
  </table>
 </object>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -39 +39 @@
  <object name="verdicts" meta_type="CPS Vocabulary"/>
  <object name="global_roles" meta_type="CPS Vocabulary"/>
+ <object name="cos" meta_type="CPS Vocabulary"/>
  </object>

WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

@@ -105 +105 @@
         data['application_date'] = current
         data['status'] = "submitted"
-        context.applicants_catalog.modifyRecord(**data)           
+        context.applicants_catalog.modifyRecord(**data) 
+        res,psm_dummy,ds = lt.renderLayout(layout_id= 'application',
+                                schema_id= 'application',
+                                layout_mode = mode,
+                                context=context,
+                                mapping=validate and REQUEST,
+                                ob=object,
+                                commit = False,
+                                )                      
 elif create:
     if submitted:
@@ -126 +134 @@
     psm = "Content changed"
 
-res,psm_dummy,ds = lt.renderLayout(layout_id= 'application',
-                             schema_id= 'application',
-                             layout_mode = mode,
-                             context=context,
-                             mapping=validate and REQUEST,
-                             ob=object,
-                             commit = False,
-                            )
+
    
 return context.apply_pume_form(rendered = res,

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_form.pt

@@ -9 +9 @@
     <metal:block use-macro="here/main_template/macros/master">
       <metal:block fill-slot="main">
-        <h3>Apply for the Post University Matriculation Examination! </h3>
+        <h3 tal:condition="python:not mode=='view'">Apply for the Post University Matriculation Examination! </h3>
+        <h3 tal:condition="python:mode=='view'">Your PUME Application Record</h3>
         <br />
         <form action="" id="editForm" method="post" 
@@ -21 +22 @@
                  tal:attributes="value ds/pin|nothing"
                  tal:condition="ds/pin|nothing"/>
+
           <div tal:replace="structure rendered_main" />
           

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_slip.pt

@@ -4 +4 @@
            jamb options/jamb/getContent|nothing;
            mode options/mode;
+           name python:ds['lastname'];
            "
            >
@@ -9 +10 @@
     <metal:block use-macro="here/slip_template/macros/master">
       <metal:block fill-slot="main">
-        <h3>Apply for the Post University Matriculation Examination! </h3>
+        <h3>PUME Application Record of <span tal:replace="name" /></h3>
         <br />
         <div tal:replace="structure rendered_main" />