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

Timestamp:

25 Jun 2011, 17:18:28 (14 years ago)

Author:

Henrik Bettermann

Message:

Remove application_date from schema. This date should not be displayed on forms and slips since we have the same information in the object history. It's needed in export files for sorting and filtering.

Location:

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

Files:

• applicants.py (modified) (1 diff)
• browser.py (modified) (3 diffs)
• interfaces.py (modified) (3 diffs)

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

@@ -46 +46 @@
         super(Applicant, self).__init__()
         IWorkflowInfo(self).fireTransition('init')
+        self.application_date = None
         return
 

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

@@ -697 +697 @@
     grok.name('edit_full')
     grok.require('waeup.manageApplications')
-    form_fields = grok.AutoFields(IApplicant)   #.omit('locked')
+    form_fields = grok.AutoFields(IApplicant)
     form_fields['passport'].custom_widget = EncodingImageFileWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
@@ -753 +753 @@
     grok.require('waeup.handleApplication')
     form_fields = grok.AutoFields(IApplicantEdit).omit(
-        'locked', 'course_admitted', 'application_date', 'student_id',
+        'locked', 'course_admitted', 'student_id',
         'screening_score',
         )
@@ -810 +810 @@
             return
         IWorkflowInfo(self.context).fireTransition('submit')
+        self.context.application_date = datetime.now()
         self.context.locked = True
         self.flash('Form has been submitted.')

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

@@ -295 +295 @@
     history = Attribute('Object history, a list of messages.')
     state = Attribute('Returns the application state of an applicant')
-
-    def getApplicantsRootLogger():
-        """Returns the logger from the applicants root object
+    application_date = Attribute('Date of submission, used for export only')
+
+    #def getApplicantsRootLogger():
+    #    """Returns the logger from the applicants root object
+    #    """
+
+    def loggerInfo(ob_class, comment):
+        """Adds an INFO message to the log file
         """
 
@@ -369 +374 @@
     # Process Data
     #
-    application_date = schema.Date(
-        title = u'Application Date',
-        required = False,
-        readonly = True,
-        )
     screening_score = schema.Int(
         title = u'Screening Score',
@@ -388 +388 @@
         required = False,
         )
-    # entry_session is inherited from the container
-    #entry_session = schema.Choice(
-    #    source = entry_session_vocab,
-    #    title = u'Entry Session',
-    #    required = False,
-    #    )
     notice = schema.Text(
         title = u'Notice',