Changeset 3043 for WAeUP_SRP/base/skins

Timestamp:

24 Jan 2008, 18:02:36 (17 years ago)

Author:

joachim

Message:

update bedlist now modyfies beds, if they have been modyfied. Change beds
now sets the previous bed student to not_occupied.

Location:

WAeUP_SRP/base/skins/waeup_accommodation

Files:

• acco_folder_view.pt (modified) (1 diff)
• change_bed.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_accommodation/acco_folder_view.pt

@@ -22 +22 @@
         <tr>
           <th width="200px">Hall Name</th>
-          <th>New Beds Generated</th>
+          <th>Beds Generated</th>
+          <th>Beds Modyfied</th>
         </tr>
         <tr tal:repeat="hall beds_generated">
           <td tal:content="hall/name"></td>
           <td tal:content="hall/count"></td>
+          <td tal:content="hall/modyfied_count"></td>
         </tr>
       </table>

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -44 +44 @@
         return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
     logger.info('Bed status %s of %s has changed to %s' % (allocated_bed.bed_type,student_id,status))
-    beds.modifyRecord(bed=allocated_bed.bed,student='')
+    beds.modifyRecord(bed=allocated_bed.bed,student=beds.not_occupied)
     logger.info('Bed %s released' % (allocated_bed.bed))
     code,bed = beds.searchAndReserveBed(student_id,status)