Changeset 7205 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

26 Nov 2011, 06:49:16 (13 years ago)

Author:

Henrik Bettermann

Message:

academics: Show students in departments.

students: Search for students in department.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (3 diffs)
• browser_templates/containermanagepage.pt (modified) (1 diff)
• browser_templates/containerpage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

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

@@ -70 +70 @@
     if changed_fields:
         changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
+    # Inform catalog if certificate has changed
+    # (applyData does this only for the context)
+    if 'certificate' in changed_fields:
+        notify(grok.ObjectModifiedEvent(view.context.getStudent()))
     fields_string = ' + '.join(changed_fields)
-    #view.context._p_changed = True
     view.flash('Form has been saved.')
     if fields_string:
@@ -599 +602 @@
     @property
     def department(self):
-        if self.context.certificate:
+        if self.context.certificate is not None:
             return self.context.certificate.__parent__.__parent__
         return
@@ -605 +608 @@
     @property
     def faculty(self):
-        if self.context.certificate:
+        if self.context.certificate is not None:
             return self.context.certificate.__parent__.__parent__.__parent__
         return

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

@@ -10 +10 @@
     <option value="student_id">with id</option>
     <option value="fullname">with name</option>
+    <option value="reg_number">with registration number</option>
+    <option value="matric_number">with matriculation number</option>
     <option value="current_session">in session</option>
+    <option value="depcode">in department</option>
   </select>
 

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

@@ -13 +13 @@
     <option value="matric_number">with matriculation number</option>
     <option value="current_session">in session</option>
+    <option value="depcode">in department</option>
   </select>
 

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

@@ -149 +149 @@
         self.certificate.end_level = 500
         self.app['faculties']['fac1'] = Faculty()
-        self.app['faculties']['fac1']['dep1'] = Department()
+        self.app['faculties']['fac1']['dep1'] = Department(code='dep1')
         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
             self.certificate)
@@ -196 +196 @@
         self.student['studycourse'].current_verdict = 'A'
         self.student['studycourse'].current_level = 100
+        # Update the catalog
+        notify(grok.ObjectModifiedEvent(self.student))
 
         # Put the prepopulated site into test ZODB and prepare test
@@ -263 +265 @@
         self.browser.getControl(name="searchtype").value = ['student_id']
         self.browser.getControl(name="searchterm").value = self.student_id
+        self.browser.getControl("Search").click()
+        self.assertTrue('Anna Tester' in self.browser.contents)
+
+        # We can find a student in a certain department
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['depcode']
+        self.browser.getControl(name="searchterm").value = 'dep1'
         self.browser.getControl("Search").click()
         self.assertTrue('Anna Tester' in self.browser.contents)