Changeset 10804 for main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco

Timestamp:

28 Nov 2013, 16:14:39 (11 years ago)

Author:

Henrik Bettermann

Message:

Start interpreting students as customers.

Location:

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (3 diffs)
• locales/kofacustom.ekodisco.pot (added)
• students/browser.py (modified) (2 diffs)
• students/browser_templates/studycoursemanagepage.pt (added)
• students/browser_templates/studycoursepage.pt (added)
• students/student.py (modified) (1 diff)
• students/studycourse.py (modified) (1 diff)
• students/viewlets.py (modified) (2 diffs)

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -206 +206 @@
 
 msgid "Applicant Id"
-msgstr ""
+msgstr "Subscriber Id"
 
 msgid "${a} <br /> Application Form ${b}"
@@ -261 +261 @@
 msgid "Edit application record"
 msgstr "Edit subscriber record"
-
-msgid "Download application slip"
-msgstr "Download subscriber data slip"
 
 msgid "Application"
@@ -297 +294 @@
 msgstr "Or simply forgot your customer id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
 
+msgid "Students"
+msgstr "Customers"
+
+msgid "Student Id"
+msgstr "Customer Id"
+
+msgid "Login as student"
+msgstr "Login as customer"
+
+msgid "Transfer student"
+msgstr "Transfer customer"
+
+msgid "Study Course"
+msgstr "Main Contract"
+
+msgid "admitted"
+msgstr "approved"
+
+msgid "Start new session"
+msgstr "Start new subscription period"
+
+msgid "Current Session"
+msgstr "Current Subscription Period"
+
+msgid "Entry Session"
+msgstr "First Subscription Period"
+
+msgid "Application Slip"
+msgstr "Subscription Slip"
+

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/students/browser.py

@@ -29 +29 @@
     StudentBasePDFFormPage, ExportPDFCourseRegistrationSlipPage,
     CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
-    msave, emit_lock_message)
-from waeup.kofa.students.interfaces import IStudentsUtils, ICourseTicket
+    msave, emit_lock_message, StudyCourseDisplayFormPage,
+    StudyCourseManageFormPage)
+from waeup.kofa.students.interfaces import (
+    IStudentsUtils, ICourseTicket)
 from waeup.kofa.students.workflow import FORBIDDEN_POSTGRAD_TRANS
 from kofacustom.nigeria.students.browser import (
@@ -43 +45 @@
 from kofacustom.ekodisco.students.interfaces import (
     ICustomStudentOnlinePayment, ICustomStudentStudyCourse,
-    ICustomStudentStudyLevel)
+    ICustomStudentStudyLevel, ICustomStudentStudyCourse,
+    ICustomStudentStudyCourse)
 from kofacustom.ekodisco.interfaces import MessageFactory as _
 
+
+class CustomStudyCourseDisplayFormPage(StudyCourseDisplayFormPage):
+    """ Page to display the student study course data
+    """
+    grok.context(ICustomStudentStudyCourse)
+    grok.template('studycoursepage')
+
+    form_fields = grok.AutoFields(ICustomStudentStudyCourse).select(
+                'certificate', 'entry_session', 'current_session')
+
+class CustomStudyCourseManageFormPage(StudyCourseManageFormPage):
+    """ Page to edit the student study course data
+    """
+    grok.context(ICustomStudentStudyCourse)
+    grok.template('studycoursemanagepage')
+
+    form_fields = grok.AutoFields(ICustomStudentStudyCourse).select(
+                'certificate', 'entry_session', 'current_session')

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/students/student.py

@@ -37 +37 @@
 
     @property
-    def transcript_enabled(self):
-        user = get_current_principal()
-        if user.id in ('admin', 'isouaba', 'niyi', 'delejason'):
-            return True
+    def is_postgrad(self):
         return False
 

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/students/studycourse.py

@@ -35 +35 @@
     grok.provides(ICustomStudentStudyCourse)
 
+
+    @property
+    def is_postgrad(self):
+        return False
+
+
+    @property
+    def next_session_allowed(self):
+        return True
+
+
 CustomStudentStudyCourse = attrs_to_fields(CustomStudentStudyCourse)
 

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/students/viewlets.py

@@ -17 +17 @@
 ##
 
-from waeup.kofa.students.viewlets import StudentsTab
+from waeup.kofa.students.viewlets import (
+    StudentsTab, AdmissionSlipActionButton, StudentManageClearanceLink,
+    StudentManagePersonalLink, StudentManageAccommodationLink)
 
 from kofacustom.ekodisco.interfaces import MessageFactory as _
@@ -25 +27 @@
     """
 
-    @property
-    def link_target(self):
-        return None
+    #@property
+    #def link_target(self):
+    #    return None
+
+class AdmissionSlipActionButton(AdmissionSlipActionButton):
+    target = ''
+
+class StudentManageClearanceLink(StudentManageClearanceLink):
+    link = ''
+
+class CustomStudentManagePersonalLink(StudentManagePersonalLink):
+    link = ''
+
+class CustomStudentManageAccommodationLink(StudentManageAccommodationLink):
+    link = ''