Changeset 7351 for main/waeup.sirp/trunk/src/waeup

Timestamp:

15 Dec 2011, 12:04:13 (13 years ago)

Author:

Henrik Bettermann

Message:

The StudentApplication? class is deprecated. We want to store the application_slip pdf file file instead.

Prepare everything in the students package for downloading such a pdf file.

Location:

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

Files:

• applicants/applicant.py (modified) (1 diff)
• applicants/browser.py (modified) (5 diffs)
• applicants/interfaces.py (modified) (1 diff)
• students/application.py (deleted)
• students/browser.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_student.py (modified) (3 diffs)
• students/viewlets.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py

@@ -115 +115 @@
         student['studycourse'].certificate = self.course_admitted
         # Create StudentApplication object ...
-        application = createObject(u'waeup.StudentApplication')
+        #application = createObject(u'waeup.StudentApplication')
         # ... copy applicant base data
-        form_fields = grok.AutoFields(IApplicantBaseData)
-        field_names = [i.__name__ for i in form_fields]
-        for name in field_names:
-            value = getattr(self,name,None)
-            if value:
-                setattr(application,name,value)
-        site['students'][student.student_id]['application'] = application
+        #form_fields = grok.AutoFields(IApplicantBaseData)
+        #field_names = [i.__name__ for i in form_fields]
+        #for name in field_names:
+        #    value = getattr(self,name,None)
+        #    if value:
+        #        setattr(application,name,value)
+        #site['students'][student.student_id]['application'] = application
         return True, 'Student %s created' % student.student_id
 

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

@@ -473 +473 @@
         """
         course_admitted = self.context.course_admitted
-        if ICertificate.providedBy(course_admitted):
+        if getattr(course_admitted, '__parent__',None):
             url = self.url(course_admitted)
             title = course_admitted.title
@@ -688 +688 @@
         """
         course_admitted = self.context.course_admitted
-        if ICertificate.providedBy(course_admitted):
+        #if ICertificate.providedBy(course_admitted):
+        if getattr(course_admitted, '__parent__',None):
             title = course_admitted.title
             code = course_admitted.code
@@ -763 +764 @@
 
         course_admitted = self.context.course_admitted
-        if ICertificate.providedBy(course_admitted):
+        if getattr(course_admitted, '__parent__',None):
             f_label = '<font size=12>Department:</font>'
             f_text = '<font size=12>%s</font>' % (
@@ -847 +848 @@
     form_fields = grok.AutoFields(IApplicant)
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
+    form_fields['student_id'].for_display = True
     grok.template('applicanteditpage')
     manage_applications = True
@@ -993 +995 @@
             actions = [['Save', 'Final Submit'],
                        ['Remove selected tickets']]
-        elif state == SUBMITTED:
+        else:
             actions = [[],[]]
         return actions

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

@@ -396 +396 @@
         title = u'Student Id',
         required = False,
-        readonly = True,
+        readonly = False,
         )
     locked = schema.Bool(

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

@@ -102 +102 @@
         return self.context.fullname
 
-class ApplicationBreadcrumb(Breadcrumb):
-    """A breadcrumb for the application data.
-    """
-    grok.context(IApplicantBaseData)
-    title = 'Application'
-
 class SudyCourseBreadcrumb(Breadcrumb):
     """A breadcrumb for the student study course.
@@ -475 +469 @@
             write_log_message(self, 'saved: % s' % fields_string)
         return
-
-class StudentApplicationDisplayFormPage(SIRPDisplayFormPage):
-    """ Page to display application data
-    """
-    grok.context(IApplicantBaseData)
-    grok.name('index')
-    grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IApplicantBaseData)
-    form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
-    title = 'Application Data'
-    pnav = 4
-
-    @property
-    def label(self):
-        return '%s: Application Data' % self.context.getStudent().fullname
 
 class StudentClearanceDisplayFormPage(SIRPDisplayFormPage):

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

@@ -368 +368 @@
         self.assertMatches('...Student admitted by zope.mgr...',
                            self.browser.contents)
-        # Only the StudentApplication object does not exist
-        self.assertFalse('Application Data' in self.browser.contents)
+        # Only the Application Slip does not exist
+        self.assertFalse('Application Slip' in self.browser.contents)
         return
 

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

@@ -21 +21 @@
 from zope.interface import verify
 from waeup.sirp.students.student import Student, StudentFactory
-from waeup.sirp.students.application import StudentApplication
 from waeup.sirp.students.studycourse import StudentStudyCourse
 from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
@@ -40 +39 @@
         super(StudentTest, self).setUp()
         self.student = Student()
-        self.application = StudentApplication()
         self.studycourse = StudentStudyCourse()
         self.studylevel = StudentStudyLevel()
@@ -56 +54 @@
         verify.verifyClass(IStudent, Student)
         verify.verifyObject(IStudent, self.student)
-        verify.verifyClass(IApplicantBaseData, StudentApplication)
-        verify.verifyObject(IApplicantBaseData, self.application)
         verify.verifyClass(IStudentStudyCourse, StudentStudyCourse)
         verify.verifyObject(IStudentStudyCourse, self.studycourse)

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

@@ -67 +67 @@
 class StudentManageApplicationLink(StudentManageLink):
     grok.order(2)
-    link = 'application'
-    text = u'Application Data'
+    link = 'application_slip'
+    text = u'Application Slip'
 
     def render(self):
-        application = self.context.getStudent().get(self.link)
-        if application is not None:
-            url = self.view.url(application)
+        slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.getStudent(), attr=self.link)
+        if slip:
+            url = self.view.url(self.context,self.link)
             return u'<div class="portlet"><a href="%s">%s</a></div>' % (
                     url, self.text)
@@ -141 +142 @@
     text = u'Base Data'
 
-class StudentApplicationLink(StudentLink):
+class ApplicationSlipLink(StudentLink):
     grok.order(2)
-    link = 'application'
-    text = u'Application Data'
+    link = 'application_slip'
+    text = u'Application Slip'
 
     @property
     def target_url(self):
-        application = self.context.getStudent().get(self.link)
-        if application is not None:
-            return self.view.url(application)
+        slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.getStudent(), attr=self.link)
+        if slip:
+            return self.view.url(self.context,self.link)
         return
 
@@ -437 +439 @@
 
 class Image(grok.View):
-    """Renders jpeg images for students.
+    """Renders images for students.
     """
     grok.baseclass()
@@ -472 +474 @@
     grok.context(IStudent)
 
+class ApplicationSlipImage(Image):
+    """Renders application slip scan.
+    """
+    grok.name('application_slip')
+    download_name = u'application_slip'
+
 class BirthCertificateImage(Image):
-    """Renders birth certificate jpeg scan.
+    """Renders birth certificate scan.
     """
     grok.name('birth_certificate')
@@ -479 +487 @@
 
 class AcceptanceLetterImage(Image):
-    """Renders acceptance letter jpeg scan.
+    """Renders acceptance letter scan.
     """
     grok.name('acceptance_letter')