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

Timestamp:

6 Aug 2020, 10:49:02 (4 years ago)

Author:

Henrik Bettermann

Message:

year (Year of Entrance) is no longer required when creating an applicants container.

Location:

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

Files:

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

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

@@ -230 +230 @@
     def addApplicantsContainer(self, **data):
         year = data['year']
+        if not data['container_number'] and not data['year']:
+            self.flash(
+              _('You must select either Year of Entrance or Container Number.'),
+                type='warning')
+            return
         if not data['container_number']:
             code = u'%s%s' % (data['prefix'], year)
@@ -235 +240 @@
             code = u'%s%s' % (data['prefix'], data['container_number'])
         apptypes_dict = getUtility(IApplicantsUtils).APP_TYPES_DICT
-        title = apptypes_dict[data['prefix']][0]
-        title = u'%s %s/%s' % (title, year, year + 1)
+        title = u'%s' % apptypes_dict[data['prefix']][0]
+        if year:
+            title = u'%s %s/%s' % (title, year, year + 1)
         if code in self.context.keys():
             self.flash(
               _('An applicants container for the same application '
-                'type and entrance year exists already in the database.'),
+                'type and entrance year or container number '
+                'already exists in the database.'),
                 type='warning')
             return

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

@@ -221 +221 @@
     year = schema.Choice(
         title = _(u'Year of Entrance'),
-        required = True,
+        required = False,
         values = year_range(),
-        readonly = True,
+        readonly = False,
         )
 
@@ -323 +323 @@
     year = schema.Choice(
         title = _(u'Year of Entrance'),
-        required = True,
+        required = False,
         values = year_range(),
         readonly = False,

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

@@ -364 +364 @@
             name="form.application_category").value = ['basic']
         self.browser.getControl("Add applicants container").click()
-        self.assertTrue('exists already in the database'
+        self.assertTrue('already exists in the database'
                         in self.browser.contents)
         # Managers can add containers with prefix+number code instead of