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

Timestamp:

31 Aug 2012, 15:23:50 (12 years ago)

Author:

Henrik Bettermann

Message:

Copy entry_session when transferring students. The entry session always remains the same.

Location:

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

Files:

• student.py (modified) (2 diffs)
• tests/test_student.py (modified) (2 diffs)

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

@@ -144 +144 @@
 
     def transfer(self, certificate, current_session=None,
-        current_level=None, current_verdict=None, previous_verdict=None,
-        entry_session=None):
+        current_level=None, current_verdict=None, previous_verdict=None):
         """ Creates a new studycourse and backups the old one.
 
@@ -156 +155 @@
         studycourse.current_verdict = current_verdict
         studycourse.previous_verdict = previous_verdict
-        studycourse.entry_session = entry_session
         old = self['studycourse']
+        studycourse.entry_session = old.entry_session
         # Students can be transferred only two times.
         if 'studycourse_1' in self.keys():

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

@@ -268 +268 @@
             RequiredMissing, self.student.transfer, self.certificate2)
         success = self.student.transfer(self.certificate2,
-            current_session=2013, entry_session=2010)
+            current_session=2013)
         self.assertEqual(self.student['studycourse_1'].certificate.code, 'CERT1')
         self.assertEqual(self.student['studycourse'].certificate.code, 'CERT2')
         self.assertEqual(self.student['studycourse_1'].current_session, 2012)
         self.assertEqual(self.student['studycourse'].current_session, 2013)
+        self.assertEqual(self.student['studycourse'].entry_session,
+            self.student['studycourse_1'].entry_session)
         self.assertEqual(self.student['studycourse_1'].__name__, 'studycourse_1')
         logfile = os.path.join(
@@ -296 +298 @@
         # Students can be transferred (only) two times.
         success = self.student.transfer(self.certificate,
-            current_session=2013, entry_session=2010)
+            current_session=2013)
         self.assertTrue(success)
         success = self.student.transfer(self.certificate2,
-            current_session=2013, entry_session=2010)
+            current_session=2013)
         self.assertFalse(success)
         self.assertEqual([i for i in self.student.keys()],