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

Timestamp:

15 Sep 2011, 12:05:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Check if reg_number or matric_number exist when editing student base data.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -349 +349 @@
             IUserAccount(self.context).setPassword(form['password'])
             self.context.loggerInfo(ob_class, 'password changed')
+        self.reg_number = form.get('form.reg_number', None)
+        if self.reg_number:
+            hitlist = search(query=self.reg_number,searchtype='reg_number', view=self)
+            
+            if hitlist and hitlist[0].student_id != self.context.student_id:
+                self.flash('Registration number exists.')
+                return
+        self.matric_number = form.get('form.matric_number', None)
+        if self.matric_number:
+            hitlist = search(query=self.matric_number,
+                searchtype='matric_number', view=self)
+            if hitlist and hitlist[0].student_id != self.context.student_id:
+                self.flash('Matriculation number exists.')
+                return
         # Turn list of lists into single list
         changed_fields = self.applyData(self.context, **data)
         if changed_fields:
             changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-            changed_fields = [x for x in changed_fields
-                              if not x.startswith('password')]
         fields_string = ' + '.join(changed_fields)
         self.context._p_changed = True

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

@@ -173 +173 @@
         self.assertTrue('Student record created' in self.browser.contents)
 
-        # Registration numbers must be unique
-        #self.browser.getLink("Manage").click()
-        #self.browser.getControl(name="form.reg_number").value = '123'
-        #self.browser.getControl("Save").click()
-        #self.assertMatches('...value already exists in catalog...',
-        #                   self.browser.contents)
+        # Registration and matric numbers must be unique
+        self.browser.getLink("Manage").click()
+        self.browser.getControl(name="form.reg_number").value = '123'
+        self.browser.getControl("Save").click()
+        self.assertMatches('...Registration number exists...',
+                           self.browser.contents)
+        self.browser.getControl(name="form.reg_number").value = '789'
+        self.browser.getControl(name="form.matric_number").value = '234'
+        self.browser.getControl("Save").click()
+        self.assertMatches('...Matriculation number exists...',
+                           self.browser.contents)
 
         self.browser.open(self.container_path)
@@ -233 +238 @@
         self.browser.getControl(name="transition").value = ['admit']
         self.browser.getControl(name="form.name").value = 'John Tester'
-        self.browser.getControl(name="form.reg_number").value = '123'
+        self.browser.getControl(name="form.reg_number").value = '345'
         self.browser.getControl(name="password").value = 'secret'
         self.browser.getControl(name="control_password").value = 'secret'