Changeset 1417

Timestamp:

15 Feb 2007, 10:56:43 (18 years ago)

Author:

joachim

Message:

Edit student_study course added
verdicts vocabulary added
new levels are only created, when no level there,
allow loggin for returning students, which have been created with add_student

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/layout.xsl (modified) (1 diff)
• profiles/default/layouts/student_create.xml (modified) (1 diff)
• profiles/default/layouts/student_study_course.xml (modified) (3 diffs)
• profiles/default/types/StudentStudyCourse.xml (modified) (2 diffs)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/entry_modes.xml (modified) (1 diff)
• profiles/default/vocabularies/verdicts.xml (added)
• profiles/default/vocabularies/vocabulary.xsl (added)
• skins/waeup_custom/logged_in.py (modified) (2 diffs)
• skins/waeup_default/waeup_edit.py (modified) (1 diff)
• skins/waeup_student/add_student.py (modified) (1 diff)
• skins/waeup_student/getSessionResults.py (modified) (2 diffs)
• skins/waeup_student/getStudyCourseInfo.py (modified) (1 diff)
• skins/waeup_student/study_level_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl

@@ -89 +89 @@
                 </th>
                 <td>
-                  <xsl:value-of select="text()"/>
+                  <xsl:choose>
+                    <xsl:when test="@name='vocabulary'">
+                      <a href="../vocabularies/{text()}.xml"><xsl:value-of select="text()"/></a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="text()"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
                 </td>
                 <td>

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

@@ -1 +1 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="student_create" meta_type="CPS Layout">
  <property name="layout_create_method"></property>

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

@@ -20 +20 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="current_level" meta_type="String Widget">
+ <widget name="current_level" meta_type="Select Widget">
   <property name="title">Current Studylevel</property>
   <property name="fields">
@@ -31 +31 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">courselevel</property>
  </widget>
- <widget name="current_verdict" meta_type="String Widget">
+ <widget name="current_verdict" meta_type="Select Widget">
   <property name="title">Current Verdict</property>
   <property name="fields">
@@ -43 +44 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">verdicts</property>
  </widget>
  <table>
+  <row>
+   <cell name="study_course"/>
+  </row>
   <row>
    <cell name="current_verdict"/>

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

@@ -37 +37 @@
   <permission value="View"/>
  </action>
+ <action title="action_edit" action_id="edit" category="object" condition_expr=""
+    url_expr="string:${object_url}/waeup_edit_form" visible="True">
+  <permission value="Modify portal content"/>
+ </action>
  <action title="Delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
@@ -45 +49 @@
     condition_expr=""
     url_expr="string:${object/absolute_url}/content_create?type_name=StudentStudyLevel"
-    visible="True">
+    visible="False">
   <permission value="Add portal content"/>
  </action>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -31 +31 @@
  <object name="academics_search_mode" meta_type="CPS Vocabulary"/>
  <object name="searchable_academics_states" meta_type="CPS Vocabulary"/>
+ <object name="verdicts" meta_type="CPS Vocabulary"/>
  </object>

WAeUP_SRP/trunk/profiles/default/vocabularies/entry_modes.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="vocabulary.xsl"?>
 <object name="entry_modes" meta_type="CPS Vocabulary">
  <property name="title"></property>

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -113 +113 @@
                              p_review_state == 'created' :
             wftool.doActionFor(student_per,'open')
-        
+        res = context.students_catalog(id = str(member))
+        matric_no = res[0].matric_no
+        is_imported = context.returning_import(matric_no = matric_no)
         if s_review_state == "application_pin_entered":
             redirect_url = "%s/application_edit_form" % student.absolute_url()
@@ -122 +124 @@
         elif s_review_state == "cleared_and_validated":
             redirect_url = "%s/personal_edit_form" % student.absolute_url()
-        elif s_review_state == "returning":
+        elif s_review_state == "returning" and is_imported:
             redirect_url = "%s/session_results_view" % student.absolute_url()
         else:

WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py

@@ -53 +53 @@
             context.students_catalog.modifyRecord(id = student_id,
                                                   course = course,
+                                                  level = ds.get('current_level'),
+                                                  verdict = ds.get('current_verdict'),
                                                   faculty = c_path[-4],
                                                   department = c_path[-3],

WAeUP_SRP/trunk/skins/waeup_student/add_student.py

@@ -49 +49 @@
 matric_no = ds.get('matric_no')
 res = context.students_catalog(matric_no = matric_no)
-psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
 if res:
+    psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
     return context.add_student_form(rendered = rendered,
                                  psm = psm,

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -8 +8 @@
 pr = context.portal_registration
 
+request = context.REQUEST
 returning = context.returning_import
 results = context.results_import
@@ -45 +46 @@
 
 res = returning(matric_no = matric_no)
-student_from_returning = res[0]
+if res:
+    student_from_returning = res[0]
+else:
+    return None
+
 res = results(matric_no = matric_no)
 results = res

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -45 +45 @@
 current_level = sbrain.level
 levels = context.objectIds()
-if current_level not in levels:
+#levels.sort()
+#if int(current_level) > int(levels[-1]):
+if not levels:
     context.invokeFactory('StudentStudyLevel',"%s" % current_level)
     level = getattr(context,"%s" % current_level)

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -11 +11 @@
       </a>
       <h3> 
-        <span tal:condition="python:is_so and s_info">
+        <span tal:condition="is_so">
           <span tal:content="info/student/name" />:
         </span>