Changeset 1393 for WAeUP_SRP/trunk

Timestamp:

5 Feb 2007, 21:42:08 (18 years ago)

Author:

joachim

Message:

new method book_reserved_bed to book a reserved bed for a student

Location:

WAeUP_SRP/trunk

Files:

• Accommodation.py (modified) (1 diff)
• Students.py (modified) (2 diffs)
• Widgets.py (modified) (2 diffs)
• profiles/default/layouts.xml (modified) (1 diff)
• profiles/default/layouts/acco_bed_booking.xml (added)
• profiles/default/schemas.xml (modified) (1 diff)
• profiles/default/schemas/acco_bed_booking.xml (added)
• profiles/default/vocabularies.xml (modified) (1 diff)
• skins/waeup_accommodation/book_reserved_bed.py (added)
• skins/waeup_accommodation/book_reserved_bed_form.pt (added)
• skins/waeup_accommodation/getAccoHallBeds.py (added)
• skins/waeup_accommodation/reservedRoomsVoc.py (added)
• skins/waeup_default/layout_wo_object_create.pt (added)
• skins/waeup_default/layout_wo_object_edit.pt (added)
• skins/waeup_utilities/fixLevel.py (modified) (1 diff)
• skins/waeup_utilities/increaseReturningLevels.py (modified) (1 diff)

WAeUP_SRP/trunk/Accommodation.py

@@ -114 +114 @@
             return self.title
         return heading
-
-###)
+    ###)
 
 InitializeClass(AccoHall)
 
+    
 def addAccoHall(container, id, REQUEST=None, **kw):
     """Add a AccoHall."""

WAeUP_SRP/trunk/Students.py

@@ -1178 +1178 @@
                 table.addRecord(**result)
             except ValueError:
-                import pdb;pdb.set_trace()
+                #import pdb;pdb.set_trace()
                 result['Error'] = "Duplicate"
                 no_import.append( format_error % result)
@@ -1210 +1210 @@
             open("%s/import/%sno_courses%s.csv" % (i_home,name,current),"a").write(
                                     '\n'.join(no_course_list))
+        em = '%d transactions commited total %s\n courses not found %s' % (tr_count,total,course_count)
+        logger.info(em)
         return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
     ###)

WAeUP_SRP/trunk/Widgets.py

@@ -203 +203 @@
 
 widgetRegistry.register(WAeUPReservedRoomsWidget)
-
-
 ###)
 
@@ -463 +461 @@
 
 widgetRegistry.register(MatricNoWidget)
+###)
+
+class StudentIdWidget(CPSStringWidget): ###(
+    """ StudentId Widget"""
+    meta_type = "StudentId Widget"
+    def validate(self, datastructure, **kw):
+        """Validate datastructure and update datamodel."""
+        valid = CPSStringWidget.validate(self, datastructure, **kw)
+        logger = logging.getLogger('StudentId.Validate')
+        #import pdb;pdb.set_trace()
+        s_cat = self.students_catalog
+        err = 0
+        widget_id = self.getWidgetId()
+        value = datastructure[widget_id]
+        if not valid or not value:
+            err = 'Invalid StudentId String %s.' % value
+            logger.info('"%s","invalid StudentId String"' % value)
+            datastructure['student'] = res
+        else:
+            value = value.upper()
+            res = s_cat(id = value)
+            if not res:
+                logger.info('"%s","StudentId not found."' % value)
+                err = 'No Student with StudentId %s.' % (value)
+                datastructure['student'] = None
+            else:
+                datastructure['student'] = res[0]
+        if err:
+            datastructure.setError(widget_id, err)
+        else:
+            datamodel = datastructure.getDataModel()
+            datamodel[self.fields[0]] = value
+        return not err
+
+InitializeClass(StudentIdWidget)
+
+widgetRegistry.register(StudentIdWidget)
 ###)
 

WAeUP_SRP/trunk/profiles/default/layouts.xml

@@ -3 +3 @@
  <property name="title"></property>
  <object name="acco_hall" meta_type="CPS Layout"/>
+ <object name="acco_bed_booking" meta_type="CPS Layout"/>
  <object name="academics_search" meta_type="CPS Layout"/>
  <object name="certificate" meta_type="CPS Layout"/>

WAeUP_SRP/trunk/profiles/default/schemas.xml

@@ -5 +5 @@
  <object name="academics_search" meta_type="CPS Schema"/>
  <object name="acco_hall" meta_type="CPS Schema"/>
+ <object name="acco_bed_booking" meta_type="CPS Schema"/>
  <object name="certificate" meta_type="CPS Schema"/>
  <object name="certificate_course" meta_type="CPS Schema"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -2 +2 @@
 <object name="portal_vocabularies" meta_type="CPS Vocabularies Tool">
  <property name="title"></property>
+ <object name="acco_hall_beds" meta_type="CPS Method Vocabulary"/>
+ <object name="acco_hall_reserved_rooms" meta_type="CPS Method Vocabulary"/>
  <object name="courselevel" meta_type="CPS Vocabulary"/>
  <object name="exam_subjects" meta_type="CPS Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_utilities/fixLevel.py

@@ -30 +30 @@
 values = scat.uniqueValuesFor('level')
 #query = ~ In("level",('100', '200', '300', '400', '500', '600'))
-query = In("level",('',))
-res = aq_students(query)
+#query = In("level",('',))
+#res = aq_students(query)
 #from Products.zdb import set_trace;set_trace()
 modified = []

WAeUP_SRP/trunk/skins/waeup_utilities/increaseReturningLevels.py

@@ -10 +10 @@
 # $Id$
 """
-list Students for ClearanceOfficers
+increase the Level for returning Students
 """