Changeset 3169 for WAeUP_SRP/base

Timestamp:

15 Feb 2008, 08:06:37 (17 years ago)

Author:

Henrik Bettermann

Message:

srp_view.pt: Notice for course advisers added

action_after_* in external_study_level_view.pt and study_level_view.pt fixed

change_bed.py: psm modified and fixed for calls without parameter

Location:

WAeUP_SRP/base/skins

Files:

• waeup_accommodation/change_bed.py (modified) (4 diffs)
• waeup_student/external_study_level_view.pt (modified) (1 diff)
• waeup_student/study_level_view.pt (modified) (5 diffs)

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -46 +46 @@
         allocated_bed = res[0]
         if allocated_bed.bed_type == status:
-            logger.info('Status %s of %s has not changed' % (status,student_id))
+            logger.info('Status %s of %s has not changed.' % (status,student_id))
             psm='Student status has not changed!'
             break
             #return redirect("%s/%s/%s/waeup_document_view?portal_status_message=%s" % (students.absolute_url(),student_id,info['acco_id'],psm))
-        logger.info('Bed status %s of %s has changed to %s' % (allocated_bed.bed_type,student_id,status))
+        logger.info('Bed status %s of %s has changed to %s.' % (allocated_bed.bed_type,student_id,status))
         query = Eq('bed_type',status) & Eq('student',context.portal_accommodation.not_occupied)
         records = context.portal_accommodation.evalAdvancedQuery(query)
         if len(records) < 1:
-            psm='New bed allocation for %s failed, No bed free in category %s' % (student_id,status)
+            psm='Bed change for %s failed, no free bed in category %s.' % (student_id,status)
             logger.info(psm)
-            psm='Bed change failed!'
             break
         beds.modifyRecord(bed=allocated_bed.bed,student=beds.not_occupied)
@@ -76 +75 @@
         #acco_doc = info['acco_doc']
         #acco_doc.edit(mapping={'bed':"-- cancelled by officer due to failed bed change request --"})
-        logger.info('New bed allocation for %s failed, code = %s' % (student_id,code))
+        logger.info('Bed change for %s failed, code = %s' % (student_id,code))
         #logger.info('%s cancelled booking of bed %s by %s' % (member,bed,student_id))
         psm='Bed change failed!'
@@ -82 +81 @@
 
 info = {}
-records = [r for r in beds() if  r.student]
+records = [r for r in beds() if  r.student and  r.student != beds.not_occupied]
 list = []
 to_modify = []
@@ -91 +90 @@
         continue
     elif r.bed_type == sbt:
-        list.append("Student %s bed_type %s ok" % (r.student,r.bed_type))
+        #list.append("Student %s bed_type %s ok" % (r.student,r.bed_type))
         continue
     list.append("Student %s bed_type %s != %s" % (r.student,
                                                   r.bed_type,
                                                   info['student_status']))
-    to_modify.append((r.bed,r.student,info['student_status'],info['acco_doc']))
+    #to_modify.append((r.bed,r.student,info['student_status'],info['acco_doc']))
+    
+return "\r".join(list)
+    
 for former_bed, student, status,acco_doc in to_modify:
     beds.modifyRecord(bed=former_bed,student='')

WAeUP_SRP/base/skins/waeup_student/external_study_level_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
-          tal:define="info context/getStudyLevelInfo;">
+          tal:define="info context/getStudyLevelInfo;
+                      contact_student_form string:external_contact_student_form;
+                      study_level_view string:external_study_level_view;
+                      ">
              
   <metal:block use-macro="here/study_level_view/macros/edit_form" />

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
   <metal:main fill-slot="main"
-          tal:define="info context/getStudyLevelInfo;">
+          tal:define="info context/getStudyLevelInfo;
+                      contact_student_form string:contact_student_form;
+                      study_level_view string:study_level_view;">
   <metal:block define-macro="edit_form">   
               
@@ -246 +248 @@
                      
               <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
-                     tal:attributes="value string:study_level_view"/>  
+                     tal:attributes="value study_level_view"/>  
                      
               <br /><br />
@@ -290 +292 @@
                      
               <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
-                     tal:attributes="value string:study_level_view"/>                         
+                     tal:attributes="value study_level_view"/>                         
               <input type="hidden" name="action_after_reject" type="text" id="action_after_reject"
-                     tal:attributes="value string:contact_student_form"/>                         
+                     tal:attributes="value contact_student_form"/>                         
 
           </td>
@@ -327 +329 @@
                      
               <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
-                     tal:attributes="value string:external_study_level_view"/>                         
+                     tal:attributes="value study_level_view"/>                         
               <input type="hidden" name="action_after_reject" type="text" id="action_after_reject"
-                     tal:attributes="value string:external_contact_student_form"/>    
+                     tal:attributes="value contact_student_form"/>    
                                            
 
@@ -350 +352 @@
                    />
             <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
-                     tal:attributes="value string:study_level_view"/>                       
+                     tal:attributes="value study_level_view"/>                       
           </td>                
       </table>