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

Timestamp:

10 Mar 2016, 07:57:24 (9 years ago)

Author:

Henrik Bettermann

Message:

Improve AddStudyLevelFormPage.

Location:

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

Files:

• browser.py (modified) (1 diff)
• browser_templates/studyleveladdpage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

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

@@ -2612 +2612 @@
         except KeyError:
             self.flash(_('This level exists.'), type="warning")
+            self.redirect(self.url(self.context))
+            return
         except RequiredMissing:
-            self.flash(_('Your data are incomplete'), type="danger")
-        self.redirect(self.url(self.context))
+            self.flash(_('Your data are incomplete.'), type="danger")
+            self.redirect(self.url(self.context))
+            return
+        self.flash(_('You successfully created a new course list.'))
+        self.redirect(self.url(self.context, str(studylevel.level)))
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studyleveladdpage.pt

@@ -2 +2 @@
       i18n:domain="waeup.kofa" enctype="multipart/form-data">
 
-  <p i18n:translate="">Text to explain course registration procedure.</p>
+  <p i18n:translate="">In Kofa a study level is a container for courses,
+  which means it can list the courses taken by the student at a certain level.
+  The container also
+  stores and provides the information when and by whom the course list was
+  validated, in which session the level was taken and which verdict the
+  student finally obtained.
+  </p>
 
   <div class="actionButtons" tal:condition="view/availableActions">

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

@@ -2659 +2659 @@
                            self.browser.contents)
         self.browser.getControl("Create course list now").click()
+        self.assertTrue("You successfully created a new course list"
+            in self.browser.contents)
         # A level with one course ticket was created
         self.assertEqual(self.student['studycourse']['999'].number_of_tickets, 0)
-        self.browser.getLink("999").click()
         self.browser.getLink("Edit course list").click()
         self.browser.getLink("here").click()