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

Timestamp:

10 Dec 2012, 06:46:32 (12 years ago)

Author:

Henrik Bettermann

Message:

Add suspended students search.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/browser_templates/containermanagepage.pt (modified) (1 diff)
• students/browser_templates/containerpage.pt (modified) (1 diff)
• students/catalog.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)

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

@@ -674 +674 @@
             # Add log message to payments.log
             self.context.logger.info(
-                '%s,%s,%s,%s,%s,,,,,,,,,,,,' % (
+                '%s,%s,%s,%s,%s,,,,,,' % (
                 applicant.applicant_id,
                 self.context.p_id, self.context.p_category,

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -815 +815 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            '"zope.mgr",%s,%s,application,200.0,AP,,,,,,,,,,,,\n'
+            '"zope.mgr",%s,%s,application,200.0,AP,,,,,,\n'
             % (self.applicant.applicant_id, payment.p_id)
             in logcontent)

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

@@ -204 +204 @@
         form = self.request.form
         self.hitlist = []
-        if 'searchterm' in form and form['searchterm']:
+        if form.get('searchtype', None) == 'suspended':
+            self.searchtype = form['searchtype']
+            self.searchterm = None
+        elif 'searchterm' in form and form['searchterm']:
             self.searchterm = form['searchterm']
             self.searchtype = form['searchtype']
@@ -244 +247 @@
         form = self.request.form
         self.hitlist = []
-        if 'searchterm' in form and form['searchterm']:
+        if form.get('searchtype', None) == 'suspended':
+            self.searchtype = form['searchtype']
+            self.searchterm = None
+        elif 'searchterm' in form and form['searchterm']:
             self.searchterm = form['searchterm']
             self.searchtype = form['searchtype']

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

@@ -13 +13 @@
     <option i18n:translate="" value="depcode">in department</option>
     <option i18n:translate="" value="current_mode">in study mode</option>
+    <option i18n:translate="" value="suspended">
+      with deactivated account (search term omitted)
+    </option>
   </select>
 

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

@@ -13 +13 @@
     <option i18n:translate="" value="depcode">in department</option>
     <option i18n:translate="" value="current_mode">in study mode</option>
+    <option i18n:translate="" value="suspended">
+      with deactivated account (search term omitted)
+    </option>
   </select>
 

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

@@ -80 +80 @@
         results = Query().searchResults(
             Text(('students_catalog', searchtype), query))
+    elif searchtype == 'suspended':
+        # 'suspended' is not indexed
+        cat = queryUtility(ICatalog, name='students_catalog')
+        all = cat.searchResults(student_id=(None, None))
+        for student in all:
+            if student.suspended:
+                hitlist.append(StudentQueryResultItem(student, view=view))
+        return hitlist
     else:
         # Temporary solution to display all students added

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -368 +368 @@
         self.assertTrue('Anna Tester' in self.browser.contents)
         # The old searchterm will be used again
+        self.browser.getControl("Search").click()
+        self.assertTrue('Anna Tester' in self.browser.contents)
+
+        # We can find suspended students
+        self.student.suspended = True
+        notify(grok.ObjectModifiedEvent(self.student))
+        self.browser.open(self.manage_container_path)
+        self.browser.getControl(name="searchtype").value = ['suspended']
+        self.browser.getControl("Search").click()
+        self.assertTrue('Anna Tester' in self.browser.contents)
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['suspended']
         self.browser.getControl("Search").click()
         self.assertTrue('Anna Tester' in self.browser.contents)
@@ -845 +857 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            '"zope.mgr",K1000000,%s,schoolfee,40000.0,AP,,,,,,,,,,,,\n' % value
+            '"zope.mgr",K1000000,%s,schoolfee,40000.0,AP,,,,,,\n' % value
             in logcontent)