Changeset 9209 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/viewlets.py

Timestamp:

20 Sep 2012, 08:49:37 (12 years ago)

Author:

uli

Message:

Merge changes from update branch (includes trunk changes until r9107).

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/viewlets.py (modified) (16 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/viewlets.py

@@ -1 @@
-## $Id$
+3## $Id$
 ##
 ## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
@@ -150 +150 @@
 
 class ContactActionButton(ManageActionButton):
-    grok.order(4)
+    grok.order(5)
     grok.context(IStudent)
     grok.view(StudentBaseDisplayFormPage)
@@ -165 +165 @@
     text = _('Manage')
     target = 'manage_base'
+
+class AdmissionSlipActionButton(ManageActionButton):
+    grok.order(4)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_pdf.png'
+    text = _('Download admission letter')
+    target = 'admission_slip.pdf'
+
+class StudentTransfernButton(ManageActionButton):
+    grok.order(6)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.manageStudent')
+    text = _('Transfer student')
+    target = 'transfer'
+    icon = 'actionicon_redo.png'
+
+class StudentDeactivateActionButton(ManageActionButton):
+    grok.order(7)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.manageStudent')
+    text = _('Deactivate account')
+    target = 'deactivate'
+    icon = 'actionicon_traffic_lights_red.png'
+
+    @property
+    def target_url(self):
+        if self.context.suspended:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+    @property
+    def onclick(self):
+        return "return window.confirm(%s);" % _(
+            "'A history message will be added. Are you sure?'")
+
+class StudentActivateActionButton(ManageActionButton):
+    grok.order(7)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.manageStudent')
+    text = _('Activate account')
+    target = 'activate'
+    icon = 'actionicon_traffic_lights_green.png'
+
+    @property
+    def target_url(self):
+        if not self.context.suspended:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+    @property
+    def onclick(self):
+        return "return window.confirm(%s);" % _(
+            "'A history message will be added. Are you sure?'")
 
 class StudentClearanceManageActionButton(ManageActionButton):
@@ -231 +289 @@
     target = 'view_personal'
 
+class StudentPersonalManageActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentPersonalDisplayFormPage)
+    grok.require('waeup.manageStudent')
+    text = _('Manage')
+    target = 'manage_personal'
+
 class StudentPersonalEditActionButton(ManageActionButton):
-    grok.order(1)
+    grok.order(2)
     grok.context(IStudent)
     grok.view(StudentPersonalDisplayFormPage)
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleStudent')
     text = _('Edit')
     target = 'edit_personal'
@@ -247 +313 @@
     target = 'manage'
 
+    @property
+    def target_url(self):
+        if self.context.is_current:
+            return self.view.url(self.view.context, self.target)
+        return False
+
 class StudyLevelManageActionButton(ManageActionButton):
     grok.order(1)
@@ -254 +326 @@
     text = _('Manage')
     target = 'manage'
+
+    @property
+    def target_url(self):
+        is_current = self.context.__parent__.is_current
+        if not is_current:
+            return ''
+        return self.view.url(self.view.context, self.target)
 
 class StudentValidateCoursesActionButton(ManageActionButton):
@@ -266 +345 @@
     @property
     def target_url(self):
+        is_current = self.context.__parent__.is_current
         if self.context.student.state != REGISTERED or \
-            str(self.context.__parent__.current_level) != self.context.__name__:
+            str(self.context.__parent__.current_level) != self.context.__name__ or\
+            not is_current:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -282 +363 @@
     @property
     def target_url(self):
+        is_current = self.context.__parent__.is_current
         if self.context.student.state not in (VALIDATED, REGISTERED) or \
-            str(self.context.__parent__.current_level) != self.context.__name__:
+            str(self.context.__parent__.current_level) != self.context.__name__ or\
+            not is_current:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -296 +379 @@
     target = 'course_registration.pdf'
 
+    @property
+    def target_url(self):
+        is_current = self.context.__parent__.is_current
+        if not is_current:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
 class CourseTicketManageActionButton(ManageActionButton):
     grok.order(1)
@@ -313 +403 @@
 
 class PaymentReceiptActionButton(ManageActionButton):
-    grok.order(1)
+    grok.order(9) # This button should always be the last one.
     grok.context(IStudentOnlinePayment)
     grok.view(OnlinePaymentDisplayFormPage)
@@ -327 +417 @@
         return self.view.url(self.view.context, self.target)
 
-
 class ApprovePaymentActionButton(ManageActionButton):
-    grok.order(2)
+    grok.order(8)
     grok.context(IStudentOnlinePayment)
     grok.view(OnlinePaymentDisplayFormPage)
@@ -437 +526 @@
     grok.require('waeup.handleStudent')
     icon = 'actionicon_start.gif'
-    text = _('Start session')
+    text = _('Start new session')
     target = 'start_session'
 
     @property
     def target_url(self):
-        if self.context.next_session_allowed:
+        if self.context.next_session_allowed and self.context.is_current:
             return self.view.url(self.view.context, self.target)
         return False
@@ -460 +549 @@
         condition2 = str(student['studycourse'].current_level) in \
             self.view.context.keys()
-        if condition1 or condition2:
+        condition3 = not self.context.is_current
+        if condition1 or condition2 or condition3:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -469 +559 @@
     grok.view(StudyLevelDisplayFormPage)
     grok.require('waeup.handleStudent')
-    text = _('Add and remove courses')
+    text = _('Edit course list')
     target = 'edit'
 
@@ -478 +568 @@
         condition2 = student[
             'studycourse'].current_level != self.view.context.level
-        if condition1 or condition2:
+        is_current = self.context.__parent__.is_current
+        if condition1 or condition2 or not is_current:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -542 +633 @@
     @property
     def targets(self):
-        student_url = self.view.application_url() + (
-            '/students/%s' % self.request.principal.id)
-        #app_slip = getUtility(IExtFileStore).getFileByContext(
-        #    self.context.student, 'application_slip')
+        student = grok.getSite()['students'][self.request.principal.id]
+        student_url = self.view.url(student)
+        app_slip = getUtility(IExtFileStore).getFileByContext(
+            student, 'application_slip')
         targets = []
-        #if app_slip:
-        #    targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
+        if app_slip:
+            targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
         targets += [
             {'url':student_url, 'title':'Base Data'},