Changeset 15417 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

21 May 2019, 09:16:47 (6 years ago)

Author:

Henrik Bettermann

Message:

Add graduated students filter.

Inform students_catalog after setting workflow state.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• hostels/hostel.py (modified) (1 diff)
• students/batching.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/containermanagepage.pt (modified) (1 diff)
• students/browser_templates/containerpage.pt (modified) (1 diff)
• students/catalog.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/hostel.py

@@ -260 +260 @@
                           'accommodation'][str(accommodation_session)]
         except KeyError:
+            self.owner = NOT_OCCUPIED
+            sh, sex, bt = self.bed_type.split('_')
+            bt = u'%s_%s_reserved' % (sh, sex)
+            self.bed_type = bt
+            notify(grok.ObjectModifiedEvent(self))
             return
         if bedticket.maint_payment_made:

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -234 +234 @@
                 value = row['state']
                 IWorkflowState(obj).setState(value)
+                notify(grok.ObjectModifiedEvent(obj))
                 msg = _("State '${a}' set", mapping = {'a':value})
                 history = IObjectHistory(obj)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -263 +263 @@
         form = self.request.form
         self.hitlist = []
-        if form.get('searchtype', None) in ('suspended', TRANSREQ, TRANSVAL):
+        if form.get('searchtype', None) in (
+            'suspended', TRANSREQ, TRANSVAL, GRADUATED):
             self.searchtype = form['searchtype']
             self.searchterm = None
@@ -305 +306 @@
         form = self.request.form
         self.hitlist = []
-        if form.get('searchtype', None) in ('suspended', TRANSREQ, TRANSVAL):
+        if form.get('searchtype', None) in (
+            'suspended', TRANSREQ, TRANSVAL, GRADUATED):
             self.searchtype = form['searchtype']
             self.searchterm = None
@@ -374 +376 @@
         self.context.addStudent(student)
         IWorkflowState(student).setState(GRADUATED)
+        notify(grok.ObjectModifiedEvent(student))
         self.flash(_('Student record created.'))
         self.redirect(self.url(self.context[student.student_id], 'index'))

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/containermanagepage.pt

@@ -22 +22 @@
       <option i18n:translate="" value="transcript validated">
         in state 'transcript validated' (search term omitted)
+      </option>
+      <option i18n:translate="" value="graduated">
+        in state 'graduated' (search term omitted)
       </option>
     </select>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/containerpage.pt

@@ -22 +22 @@
       <option i18n:translate="" value="transcript validated">
         in state 'transcript validated' (search term omitted)
+      </option>
+      <option i18n:translate="" value="graduated">
+        in state 'graduated' (search term omitted)
       </option>
     </select>

main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

@@ -29 +29 @@
 from waeup.kofa.students.interfaces import IStudent, ICourseTicket
 from waeup.kofa.university.vocabularies import course_levels
-from waeup.kofa.students.workflow import (TRANSREQ, TRANSVAL)
+from waeup.kofa.students.workflow import TRANSREQ, TRANSVAL, GRADUATED
 
 class StudentsCatalog(grok.Indexes):
@@ -89 +89 @@
                 hitlist.append(StudentQueryResultItem(student, view=view))
         return hitlist
-    elif searchtype in (TRANSREQ, TRANSVAL):
+    elif searchtype in (TRANSREQ, TRANSVAL, GRADUATED):
         cat = queryUtility(ICatalog, name='students_catalog')
         results = cat.searchResults(state=(searchtype, searchtype))