Changeset 659 for WAeUP_SRP/trunk/skins

Timestamp:

11 Oct 2006, 23:22:16 (18 years ago)

Author:

Henrik Bettermann

Message:

some fixes and minor modifications for the launching of the accommodation module

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/acco_folder_view.pt (modified) (1 diff)
• waeup_accommodation/acco_hall_view.pt (modified) (2 diffs)
• waeup_custom/logged_in.py (modified) (2 diffs)
• waeup_student/getStudentInfo.py (modified) (3 diffs)
• waeup_student/reserve_accommodation.py (modified) (5 diffs)
• waeup_student/student_edit.py (modified) (1 diff)
• waeup_student/student_index.py (modified) (1 diff)
• waeup_student/student_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

@@ -27 +27 @@
         <tr>
           <th width="200px">Bed Type</th>
-          <th>Total No of Beds</th>
-          <th>Reserved Beds</th>
+          <th width="80px">Total</th>
+          <th width="80px">Booked</th>
         </tr>
         <tr tal:repeat="bt bed_types">

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

@@ -16 +16 @@
       <span tal:omit-tag=""  
             tal:content="structure python: info['doc'].render(layout_mode='view')" />
-      
+      <br />
       <table tal:condition="info/bed_types"
              tal:define="bed_types info/bed_types">
         <tr>
-          <th width="190px">Bed Type</th>
-          <th>Total No of Beds</th>
-          <th>Reserved Beds</th>
+          <th width="200px">Bed Type</th>
+          <th width="80px">Total</th>
+          <th width="80px">Booked</th>
         </tr>
         <tr tal:repeat="bt bed_types">
@@ -31 +31 @@
         <tr><td>&nbsp;</td></tr>
       </table>
+      <br />
       <table tal:condition="info/reserved"
              tal:define="reserved info/reserved">

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -53 +53 @@
             if info['review_state'] == "created":
                 student.content_status_modify(workflow_action="enter_application_pin")
+                wftool.doActionFor(info['app'],'open',dest_container=info['app'])
                 da = {}
                 pin = request.get('pin')
@@ -79 +80 @@
     member.setProperties(last_login_time=current,login_time=current)
     if info['review_state'] == "application_pin_entered":
-        wftool.doActionFor(info['app'],'open',dest_container=info['app'])
+
         return response.redirect("%s/passport_entry_view" % student.absolute_url())
     return response.redirect("%s" % student.absolute_url())

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -22 +22 @@
 info = {}
 info['is_manager'] = context.isManager
+info['is_student'] = context.isStudent()
 member_id = str(member)
 if student is None:
@@ -58 +59 @@
 else:
     info['acco'] = None
-    
-items = []    
-sos = context.portal_catalog(container_path=student_path,
-                             review_state = ['opened', 'closed'])
+
+items = []
+sos = context.portal_catalog(container_path=student_path)
 for so in sos:
     row = {}
@@ -69 +69 @@
     row['title'] = sod.Title()
     row['url'] = soo.absolute_url()
+    row['type'] = so.portal_type
     row['is_editable'] = mtool.checkPermission('Modify portal content', soo)
+    row['review_state'] = so.review_state
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -8 +8 @@
 current = DateTime.DateTime()
 pr = context.portal_registration
+wftool = context.portal_workflow
 
 info = context.getStudentInfo()
@@ -15 +16 @@
 pr = context.portal_registration
 session = current.year()
-acco_id = 'Acco_%s' % session
+acco_id = 'accommodation_%s' % session
 info = context.getStudentInfo()
 student = info['student']
@@ -27 +28 @@
                       layout_mode='create',
                       formaction = "reserve_accommodation",
-                      button = "book Bed",
+                      button = "Book",
                       )
 if psm == 'invalid':
@@ -47 +48 @@
     s_id = ds.get('s_id')
     pin = str(ds.get('acco_res_ac_pin'))
-    
+
     pa = context.portal_accommodation
     code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
@@ -59 +60 @@
 student.invokeFactory('StudentAccommodation',acco_id)
 acco = getattr(student,acco_id)
+wftool.doActionFor(acco,'open',dest_container=acco)
 ds.set('acco_res_date', current)
 ds.set('bed', bed)

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -48 +48 @@
                                     use_session=True)
         action = "/passport_entry_view"
-        if is_valid and app_doc.passport is not None:
+        if app_doc.passport is not None:
             psm = 'You successfully uploaded your passport image.'
             args = {'apply_button': 'Apply',}

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -21 +21 @@
 
 if context.isManager():
-    return redirect("%s/academics_contents" % context.absolute_url())
+    return redirect("%s/student_view" % context.absolute_url())
 if context.isStudent():
     info = context.getStudentInfo()
     student = info['student']
-#    doc = info['app_doc']
-#    state = context.getStudentInfo()['review_state']
-#    if state == 'admission_applied':
-#       elif state == 'application_pin_entered':
-#        return redirect("%s/passport_entry_view" % student.absolute_url())
-
-    return redirect("%s/student_view" % student.absolute_url())
+    doc = info['app_doc']
+    state = context.getStudentInfo()['review_state']
+    if state == 'admission_applied':
+        return redirect("%s/application_view" % student.absolute_url())
+    elif state == 'application_pin_entered':
+        return redirect("%s/passport_entry_view" % student.absolute_url())
 
 

WAeUP_SRP/trunk/skins/waeup_student/student_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getStudentInfo;
-                is_manager info/is_manager|nothing;">
+                is_manager info/is_manager|nothing;
+                is_student info/is_student|nothing">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
@@ -9 +10 @@
             tal:define="review_state info/review_state;
                         rows python: info['items']">
+
+      <a href="" tal:condition="is_manager"
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
             
-        <h3>My Study Data</h3>
+        <h3 tal:content="info/student/Title" />
         <br />
 
-        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+        <table tal:condition="is_manager" class="contentListing" width="100%" summary="content layout" id="folder_content">      
           <tr tal:repeat="row rows"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="is_manager">
-              
-            </td>
             <td><a href="view" tal:attributes="href string:${row/url}">
               <strong tal:content="row/title" /></a> </td>
-            
             <td> 
             <a tal:condition="row/is_editable"
@@ -31 +33 @@
             </a> 
             </td>
-            
           </tr>
         </table>
+
+        <table tal:condition="is_student" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+          <span tal:repeat="row rows">
+          <tr tal:condition="python:row['type'] == 'StudentApplication' and row['review_state'] in ['opened', 'closed']"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td><a href="view" tal:attributes="href string:${row/url}/application_view">
+              <strong tal:content="row/title" /></a> </td>
+            <td> 
+            <a tal:condition="row/is_editable"
+                href="edit" tal:attributes="href string:${here/absolute_url}/passport_entry_view">
+                [edit]
+            </a> 
+            </td>
+          </tr>
+          
+          <tr tal:condition="python:row['type'] == 'StudentAccommodation' and row['review_state'] in ['opened', 'closed']"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td><a href="view" tal:attributes="href string:${row/url}/accommodation_view">
+              <strong tal:content="row/title" /></a> </td>
+            <td> 
+            </td>
+          </tr>
+          
+          </span>
+        </table>
+
         
       </span>