Changeset 1160

Timestamp:

30 Dec 2006, 21:39:19 (18 years ago)

Author:

Henrik Bettermann

Message:

session result checking made work on demo server

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (9 diffs)
• profiles/default/actions.xml (modified) (1 diff)
• skins/waeup_student/createReturningStudent.py (added)
• skins/waeup_student/createStudentFT.py (deleted)
• skins/waeup_student/layout_search_session_edit.pt (modified) (1 diff)
• skins/waeup_student/session_results_anon_view.pt (modified) (1 diff)
• skins/waeup_student/set_access_data_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -75 +75 @@
         return None
     ###)
-    
+
     security.declarePublic('findStudentByMatricelNo') ###(
     def findStudentByMatricelNo(self,matric_no):
@@ -103 +103 @@
         self.manage_setLocalRoles(sid, ['Owner',])
     ###)
-        
+
     security.declarePublic('makeStudentData') ###(
     def makeStudentData(self,student_id,email=None,phone_nr=None):
@@ -115 +115 @@
         res = self.returning_import(matric_no = st.matric_no)
         if res:
-            student = res[0] 
+            student = res[0]
         logger.info('"%s", "creating Datastructure"' % student_id)
         certcode_org = student.Coursemajorcode
@@ -134 +134 @@
         student_obj.invokeFactory('StudentApplication','application')
         application = student_obj.application
-        self.portal_workflow.doActionFor(application,'open',dest_container=application)
+        self.portal_workflow.doActionFor(application,'close',dest_container=application)
         da = {'Title': 'Application Data'}
         student_obj.invokeFactory('StudentPersonal','personal')
@@ -144 +144 @@
         student_obj.invokeFactory('StudentClearance','clearance')
         clearance = student_obj.clearance
-        self.portal_workflow.doActionFor(clearance,'open',dest_container=clearance)
+        self.portal_workflow.doActionFor(clearance,'close',dest_container=clearance)
         dc = {'Title': 'Clearance/Eligibility Record'}
         dc['matric_no'] = matric_no
@@ -196 +196 @@
 ##            self.portal_workflow.doActionFor(l,'open',dest_container=l)
 ##            l.getContent().edit(mapping={'Title': "Level %s" % level})
-        
+
     security.declarePublic('getAccommodationInfo') ###(
     def getAccommodationInfo(self,bed):
@@ -228 +228 @@
         pm = self.portal_membership
         member = pm.getAuthenticatedMember()
-        
+
         if str(member) not in ("henrik","joachim"):
             return "not possible"
@@ -235 +235 @@
         if len(res) < 1:
             return "No Departments found"
-        
+
         deleted = []
         for dep in res:
@@ -243 +243 @@
                 deleted.append("deleted Courses in %s" % dep.getId)
         return "\r".join(deleted)
-    ###)    
-    
+    ###)
+
 
 InitializeClass(WAeUPTool)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -170 +170 @@
    <permission>View</permission>
   </action>
-  <action title="View Session Results" action_id="display_session_results"
+  <action title="View Sess. Results" action_id="display_session_results"
      category="student" condition_expr="not:member"
      url_expr="string:${portal_url}/display_session_results" visible="True">
    <permission>View</permission>
-  </action>  
+  </action>
   <action title="My Accommodation" action_id="reserve_accommodation"
      category="student_navigation" condition_expr="member"

WAeUP_SRP/trunk/skins/waeup_student/layout_search_session_edit.pt

@@ -71 +71 @@
   <br />
   <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
+         value="Save and Login (not yet working)" 
          id="cpsdocument_edit_button"
          tal:condition="not:creation" />

WAeUP_SRP/trunk/skins/waeup_student/session_results_anon_view.pt

@@ -52 +52 @@
         </span>
       </table>
-      <a href="" tal:attributes="href string:${context/absolute_url}/set_access_data?matric_no=${student/matric_no}">Continue to Email-entry</a>
+      <br />
+      <a href="" tal:attributes="href string:${context/absolute_url}/set_access_data?matric_no=${student/matric_no}">
+        Continue to Login! 
+      </a>
     </metal:main>
   </metal:body>

WAeUP_SRP/trunk/skins/waeup_student/set_access_data_form.pt

@@ -13 +13 @@
       </metal:block>
       <metal:block fill-slot="main">
-        <h3>Enter Your Email Address and Choose a Password</h3>
+        <h3>Enter Your Email Address and Choose a Password!</h3>
         <br />
         <div tal:replace="structure rendered_main" />