Changeset 13244

Timestamp:

4 Sep 2015, 17:17:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Uups, that was the wrong utility class.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• students/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -47 +47 @@
         new_session = student['studycourse'].current_session + 1
         return new_session, new_level
+
+    def getAccommodationDetails(self, student):
+        """Determine the accommodation data of a student.
+        """
+        d = {}
+        d['error'] = u''
+        hostels = grok.getSite()['hostels']
+        d['booking_session'] = hostels.accommodation_session
+        d['allowed_states'] = hostels.accommodation_states
+        d['startdate'] = hostels.startdate
+        d['enddate'] = hostels.enddate
+        d['expired'] = hostels.expired
+        # Determine bed type
+        studycourse = student['studycourse']
+        certificate = getattr(studycourse,'certificate',None)
+        entry_session = studycourse.entry_session
+        current_level = studycourse.current_level
+        if None in (entry_session, current_level, certificate):
+            return d
+        end_level = certificate.end_level
+        if current_level == 10:
+            bt = 'pr'
+        elif entry_session == grok.getSite()['hostels'].accommodation_session:
+            bt = 'fr'
+        elif current_level >= end_level:
+            bt = 'fi'
+        else:
+            bt = 're'
+        if student.sex == 'f':
+            sex = 'female'
+        else:
+            sex = 'male'
+        special_handling = 'regular'
+        d['bt'] = u'%s_%s_%s' % (special_handling,sex,bt)
+        return d
 
     def _paymentMade(self, student, session):

main/waeup.uniben/trunk/src/waeup/uniben/utils/utils.py

@@ -107 +107 @@
 
     EXAM_GRADES = NigeriaKofaUtils.EXAM_GRADES + (('B1', 'B1'), ('P', 'P'),)
-
-    def getAccommodationDetails(self, student):
-        """Determine the accommodation data of a student.
-        """
-        d = {}
-        d['error'] = u''
-        hostels = grok.getSite()['hostels']
-        d['booking_session'] = hostels.accommodation_session
-        d['allowed_states'] = hostels.accommodation_states
-        d['startdate'] = hostels.startdate
-        d['enddate'] = hostels.enddate
-        d['expired'] = hostels.expired
-        # Determine bed type
-        studycourse = student['studycourse']
-        certificate = getattr(studycourse,'certificate',None)
-        entry_session = studycourse.entry_session
-        current_level = studycourse.current_level
-        if None in (entry_session, current_level, certificate):
-            return d
-        end_level = certificate.end_level
-        if current_level == 10:
-            bt = 'pr'
-        elif entry_session == grok.getSite()['hostels'].accommodation_session:
-            bt = 'fr'
-        elif current_level >= end_level:
-            bt = 'fi'
-        else:
-            bt = 're'
-        if student.sex == 'f':
-            sex = 'female'
-        else:
-            sex = 'male'
-        special_handling = 'regular'
-        d['bt'] = u'%s_%s_%s' % (special_handling,sex,bt)
-        return d
-
-