Changeset 15548

Timestamp:

19 Aug 2019, 10:27:05 (5 years ago)

Author:

Henrik Bettermann

Message:

Allow to add applicants containers with a number instead of entrance year
in container code.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/interfaces.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Allow to add applicants containers with a number instead of entrance year
+  in container code.
 
 * Add semester filter to Fix `CourseTicketExporter`. 

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

@@ -225 +225 @@
     def addApplicantsContainer(self, **data):
         year = data['year']
-        code = u'%s%s' % (data['prefix'], year)
+        if not data['container_number']:
+            code = u'%s%s' % (data['prefix'], year)
+        else:
+            code = u'%s%s' % (data['prefix'], data['container_number'])
         apptypes_dict = getUtility(IApplicantsUtils).APP_TYPES_DICT
         title = apptypes_dict[data['prefix']][0]

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

@@ -325 +325 @@
         )
 
+    container_number = schema.Choice(
+        title = _(u'Container Number'),
+        values = (1,2,3,4,5,6,7,8,9),
+        description = _(u'If set, this number will be added to the container '
+                         'prefix (e.g. app3). If not set, the year of entrance will be '
+                         'used (e.g. app2019).'),
+        required = False,
+        readonly = False,
+        )
+
 IApplicantsContainerAdd[
     'prefix'].order =  IApplicantsContainer['prefix'].order
 IApplicantsContainerAdd[
     'year'].order =  IApplicantsContainer['year'].order
+IApplicantsContainerAdd[
+    'container_number'].order =  IApplicantsContainer['year'].order
 
 class IApplicantBaseData(IKofaObject):

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

@@ -365 +365 @@
         self.assertTrue('exists already in the database'
                         in self.browser.contents)
+        # Managers can add containers with prefix+number code instead of
+        # prefix+year code.
+        self.browser.open(self.add_container_path)
+        self.browser.getControl(name="form.prefix").value = ['app']
+        self.browser.getControl(name="form.year").value = [str(session_2)]
+        self.browser.getControl(name="form.container_number").value = ['8']
+        self.browser.getControl(name="form.mode").value = ['create']
+        self.browser.getControl(
+            name="form.application_category").value = ['basic']
+        self.browser.getControl("Add applicants container").click()
+        self.assertTrue('Added: "app8"' in self.browser.contents)
+        self.browser.getLink(container_name_1).click()
+        self.assertTrue('Manage applicants container'
+            in self.browser.contents)
         self.browser.open(self.manage_root_path)
         ctrl = self.browser.getControl(name='val_id')