Changeset 7641 for main/waeup.sirp/trunk/src/waeup

Timestamp:

14 Feb 2012, 07:07:46 (13 years ago)

Author:

Henrik Bettermann

Message:

Add current_mode index to students_catalog.

Location:

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

Files:

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

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

@@ -590 +590 @@
     @property
     def current_mode(self):
-        if self.context.certificate:
+        if self.context.certificate is not None:
             current_mode = study_modes.getTermByToken(
                 self.context.certificate.study_mode).title

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

@@ -11 +11 @@
     <option value="current_session">in session</option>
     <option value="depcode">in department</option>
+    <option value="current_mode">in study mode</option>
   </select>
 

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

@@ -11 +11 @@
     <option value="current_session">in session</option>
     <option value="depcode">in department</option>
+    <option value="current_mode">in study mode</option>
   </select>
 

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

@@ -47 +47 @@
     faccode = index.Field(attribute='faccode')
     current_session = index.Field(attribute='current_session')
+    current_mode = index.Field(attribute='current_mode')
 
 class StudentQueryResultItem(object):

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

@@ -134 +134 @@
     faccode = Attribute('The faculty code of any chosen study course')
     current_session = Attribute('The current session of the student')
+    current_mode = Attribute('The current mode of the student')
     fullname = Attribute('All name parts separated by hyphens')
     display_fullname = Attribute('The fullname of an applicant')

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

@@ -111 +111 @@
     @property
     def current_session(self):
-        cert = getattr(self.get('studycourse', None), 'current_session', None)
-        return cert
+        session = getattr(self.get('studycourse', None), 'current_session', None)
+        return session
+
+    @property
+    def current_mode(self):
+        certificate = getattr(self.get('studycourse', None), 'certificate', None)
+        if certificate is not None:
+            return certificate.study_mode
+        return
 
 # Set all attributes of Student required in IStudent as field

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

@@ -271 +271 @@
         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 session
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['current_session']
+        self.browser.getControl(name="searchterm").value = '2004'
+        self.browser.getControl("Search").click()
+        self.assertTrue('Anna Tester' in self.browser.contents)
+
+        # We can find a student in a certain study_mode
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['current_mode']
+        self.browser.getControl(name="searchterm").value = 'ug_ft'
         self.browser.getControl("Search").click()
         self.assertTrue('Anna Tester' in self.browser.contents)
@@ -598 +612 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.studycourse_student_path)
+        self.assertTrue('Undergraduate Full Time' in self.browser.contents)
         self.browser.getLink("Manage").click()
         self.assertTrue('Manage study course' in self.browser.contents)

main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py

@@ -56 +56 @@
 class CertificateCoursesIndexes(grok.Indexes):
     """This catalog is needed for automatic removal of certificate courses
-    and later for selection course tickets in the students section.
+    and later for selection of course tickets in the students section.
     """
     grok.site(IUniversity)
@@ -67 +67 @@
 @grok.subscribe(ICourse, grok.IObjectAddedEvent)
 def handle_course_added(obj, event):
-    """Index an added course with the local catalog.
+    """Index an add course with the local catalog.
 
     Courses are not indexed automatically, as they are not a