Changeset 523

Timestamp:

15 Sep 2006, 13:06:52 (18 years ago)

Author:

joachim

Message:

using home_student as defaultview

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (2 diffs)
• profiles/default/types/StudentsFolder.xml (modified) (2 diffs)
• profiles/default/types/University.xml (modified) (3 diffs)
• skins/waeup_student/get_student_info.py (modified) (1 diff)
• skins/waeup_student/home_student.pt (modified) (2 diffs)
• skins/waeup_student/student_edit.py (modified) (3 diffs)
• skins/waeup_student/widget_scratch_card_pin_render.pt (modified) (1 diff)

WAeUP_SRP/trunk/Widgets.py

@@ -360 +360 @@
         if v and type(v) is StringType:
             p,b,n = v.split('-')
-            v = ScratchCardPin(v,b,n)
+            v = ScratchCardPin(p,b,n)
         if v:
             b = '%s' % v.b
@@ -371 +371 @@
             datastructure[widget_id+'_b'] = b
             datastructure[widget_id+'_n'] = n
-            
-###)
-
-
         return meth(mode=mode, 
                     datastructure=datastructure, 
                     prefix=self.prefix,
-                    value=v,
                     )
+    ###)
 
 

WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentsFolder</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">home_student</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -30 +30 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="home_student"/>
+ <alias from="view" to="home_student"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/home_student" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/University.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addUniversity</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">home_student</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -14 +14 @@
   <element value="AcademicsFolder"/>
   <element value="AccoFolder"/>
-  <element value="FAQ"/>
-  <element value="Section"/>
   <element value="StudentsFolder"/>
  </property>
@@ -37 +35 @@
  <property name="cps_is_portlet">False</property>
  <alias from="(Default)" to="home_student"/>
+ <alias from="view" to="home_student"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/home_student" visible="True">
   <permission value="Modify portal content"/>
  </action>

WAeUP_SRP/trunk/skins/waeup_student/get_student_info.py

@@ -17 +17 @@
 
 info = {}
-student = getattr(context.students,str(member))
+student = getattr(context.students,str(member),None)
+if student is None:
+    return
 info['review_state'] = wf.getInfoFor(student,'review_state','keiner')
 #info['wf_state'] = 'keiner'

WAeUP_SRP/trunk/skins/waeup_student/home_student.pt

@@ -1 @@
-<metal:html>
+<metal:html tal:define="info context/get_student_info">
 
 <metal:body use-macro="here/main_template/macros/master">
 
 <metal:main fill-slot="main">
-
+<span tal:condition="isAnon">
   <h2>Welcome to the     
    
@@ -23 +23 @@
   
   <p>This site is best seen in Firefox browser.</p>
+</span>
+<span tal:condition="not:isAnon">
+    <h3 tal:content="info/review_state"></h3>
+   <span tal:omit-tag="" tal:condition="python:info['review_state'] == 'admission_applied'"
+          tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
+                                                               layout_mode='view', 
+                                                               layout_id='student_application_fe')" />
+      
+
+</span>
   
 </metal:main>

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -7 +7 @@
 ##parameters=REQUEST, cluster=None, cpsdocument_edit_and_view_button=None, action=None
 ##title=
-##
 # $Id$
 """
@@ -38 +37 @@
 if context.portal_type == "StudentApplication":
     student = context.aq_parent
-    if context.portal_workflow.getInfoFor(student,'review_state',None) == "application_pin_entered":
+    state = context.portal_workflow.getInfoFor(student,'review_state',None) 
+    if state == "application_pin_entered":
         student.content_status_modify(workflow_action="apply_for_admission")
+    if doc.passport is None:
         is_valid, ds = doc.validate(request=REQUEST,
                                     proxy=context,
@@ -45 +46 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-
+    
         action = '/application_form'
-
         if is_valid:
             comments = REQUEST.get('comments')

WAeUP_SRP/trunk/skins/waeup_student/widget_scratch_card_pin_render.pt

@@ -4 +4 @@
                    id_n string:${id}_n;
                    prefix options/prefix;
-                   value options/datastructure/?id;
                    batch options/datastructure/?id_b;
                    nr options/datastructure/?id_n;
 ">
 <tal:block condition="python: mode == 'view'">
-<span tal:replace="value" />
+<span tal:replace="prefix" />-<span tal:replace="batch" />-<span tal:replace="nr" />
 </tal:block>
 <tal:block define="name here/getHtmlWidgetId;"