Changeset 6695

Timestamp:

9 Sep 2011, 06:03:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Add clearance_locked attribute and set True when a student is added.

Add clearance edit page for students.

Shorten page template names.

Rename Edit buttons for officers. Officers are managing and students are editing objects.

Location:

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

Files:

• browser.py (modified) (16 diffs)
• browser_templates/baseeditpage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentbaseeditpage.pt)
• browser_templates/basemanagepage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentbasemanagepage.pt)
• browser_templates/containermanagepage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentscontainermanagepage.pt)
• browser_templates/containerpage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentscontainerpage.pt)
• container.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• student.py (modified) (2 diffs)
• tests/test_browser.py (modified) (6 diffs)

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

@@ -66 +66 @@
     IStudentPersonal, IStudentBase, IStudentStudyCourse,
     IStudentPayments, IStudentAccommodation, IStudentNavigation,
-    IStudentBaseEdit, 
+    IStudentBaseEdit, IStudentClearanceEdit,
     )
 from waeup.sirp.students.student import Student
@@ -117 +117 @@
     grok.name('index')
     grok.require('waeup.viewStudent')
-    grok.template('studentscontainerpage')
+    grok.template('containerpage')
     label = 'Student Section'
     title = 'Students'
@@ -156 +156 @@
     grok.name('manage')
     grok.require('waeup.manageStudents')
-    grok.template('studentscontainermanagepage')
+    grok.template('containermanagepage')
     pnav = 4
     title = 'Manage student section'
@@ -233 +233 @@
     grok.name('index')
     grok.require('waeup.viewStudent')
-    grok.template('studentpage')
+    grok.template('basepage')
     form_fields = grok.AutoFields(IStudentBase).omit('password')
     pnav = 4
@@ -247 +247 @@
     grok.view(StudentBaseDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit'
+    text = 'Manage'
     target = 'edit_base'
 
@@ -257 +257 @@
     grok.require('waeup.manageStudents')
     form_fields = grok.AutoFields(IStudentBase).omit('student_id')
-    grok.template('studentbasemanagepage')
-    label = 'Edit base data'
+    grok.template('basemanagepage')
+    label = 'Manage base data'
     title = 'Base Data'
     pnav = 4
@@ -303 +303 @@
     grok.name('view_clearance')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IStudentClearance)
+    form_fields = grok.AutoFields(IStudentClearance).omit('clearance_locked')
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     title = 'Clearance Data'
@@ -317 +317 @@
     grok.view(StudentClearanceDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit'
+    text = 'Manage'
     target = 'edit_clearance'
 
@@ -327 +327 @@
     grok.require('waeup.manageStudents')
     form_fields = grok.AutoFields(IStudentClearance)
-    label = 'Edit clearance data'
+    label = 'Manage clearance data'
     title = 'Clearance Data'
     pnav = 4
@@ -337 +337 @@
         return super(StudentClearanceManageFormPage, self).update()
 
+    @grok.action('Save')
+    def save(self, **data):
+        changed_fields = self.applyData(self.context, **data)
+        changed_fields = changed_fields.values()
+        fields_string = '+'.join(' + '.join(str(i) for i in b) for b in changed_fields)
+        self.context._p_changed = True
+        form = self.request.form
+        self.flash('Form has been saved.')
+        ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
+        if fields_string:
+            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+        return
+
 class StudentPersonalDisplayFormPage(WAeUPDisplayFormPage):
     """ Page to display student personal data
@@ -356 +369 @@
     grok.view(StudentPersonalDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit'
+    text = 'Manage'
     target = 'edit_personal'
 
@@ -366 +379 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentPersonal)
-    label = 'Edit personal data'
+    label = 'Manage personal data'
     title = 'Personal Data'
     pnav = 4
@@ -390 +403 @@
     grok.view(StudyCourseDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit'
+    text = 'Manage'
     target = 'edit'
 
@@ -400 +413 @@
     grok.require('waeup.manageStudents')
     form_fields = grok.AutoFields(IStudentStudyCourse)
-    label = 'Edit clearance data'
     title = 'Study Course'
-    label = 'Edit study course'
+    label = 'Manage study course'
     pnav = 4
 
@@ -466 +478 @@
     grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(IStudentBaseEdit).omit('student_id')
-    grok.template('studentbaseeditpage')
+    grok.template('baseeditpage')
     label = 'Change password'
     title = 'Base Data'
@@ -491 +503 @@
             IUserAccount(self.context).setPassword(form['form.password'])
         return
+
+class StudentClearanceEditActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentClearanceDisplayFormPage)
+    grok.require('waeup.handleStudent')
+    text = 'Edit and submit'
+    target = 'cedit'
+
+class StudentClearanceEditFormPage(StudentClearanceManageFormPage):
+    """ View to edit student clearance data by student
+    """
+    grok.context(IStudent)
+    grok.name('cedit')
+    grok.require('waeup.handleStudent')
+    form_fields = grok.AutoFields(IStudentClearanceEdit).omit('clearance_locked')
+    #grok.template('clearanceeditpage')
+    label = 'Edit clerance data'
+    title = 'Clearance Data'
+    pnav = 4
+    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')

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

@@ -49 +49 @@
             raise TypeError(
                 'StudentsContainers contain only IStudent instances')
+        student.clearance_locked = True
         self[student.student_id] = student
         studycourse = StudentStudyCourse()

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

@@ -91 +91 @@
         )
 
+    clearance_locked = schema.Bool(
+        title = u'Clearance form locked',
+        default = False,
+        )
+
 class IStudentPersonal(IWAeUPObject):
     """Representation of student personal data.

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

@@ -24 +24 @@
 from waeup.sirp.interfaces import IObjectHistory
 from waeup.sirp.students.interfaces import (
-    IStudent, IStudentNavigation, IStudentBaseEdit,
-    )
+    IStudent, IStudentNavigation, IStudentBaseEdit, IStudentClearanceEdit,
+    IStudentPersonalEdit)
 from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.students.utils import generate_student_id
@@ -34 +34 @@
     """
     grok.implements(IStudent, IStudentNavigation,
-        IStudentBaseEdit)
+        IStudentBaseEdit, IStudentClearanceEdit, IStudentPersonalEdit)
     grok.provides(IStudent)
 

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

@@ -199 +199 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.student_path)
-        self.browser.getLink("Edit").click()
+        self.browser.getLink("Manage").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.manage_student_path)
@@ -213 +213 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.clearance_student_path)
-        self.browser.getLink("Edit").click()
+        self.browser.getLink("Manage").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_clearance_student_path)
@@ -221 +221 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.personal_student_path)
-        self.browser.getLink("Edit").click()
+        self.browser.getLink("Manage").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_personal_student_path)
@@ -229 +229 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.studycourse_student_path)
-        self.browser.getLink("Edit").click()
-        self.assertTrue('Edit study course' in self.browser.contents)
+        self.browser.getLink("Manage").click()
+        self.assertTrue('Manage study course' in self.browser.contents)
 
         self.browser.open(self.student_path)
@@ -274 +274 @@
         # We can login again with the new password
         self.browser.getLink("Login").click()
-        #self.browser.open(self.login_path)
+        self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.test_student_id
         self.browser.getControl(name="form.password").value = 'new_password'
@@ -280 +280 @@
         self.assertEqual(self.browser.url, self.student_path)
         self.assertTrue('You logged in' in self.browser.contents)
-        return
+
+        return