Changeset 2516

Timestamp:

3 Nov 2007, 18:59:28 (17 years ago)

Author:

Henrik Bettermann

Message:

new deadline

layout and schema should be called application (like the other layouts)

Location:

WAeUP_SRP

Files:

• base/skins/waeup_student/apply_admission.py (modified) (1 diff)
• base/skins/waeup_utilities/moveCourseResults.py (modified) (2 diffs)
• fceokene/profiles/default/layouts.xml (modified) (1 diff)
• fceokene/profiles/default/layouts/import_applicant.xml (deleted)
• fceokene/profiles/default/schemas.xml (modified) (2 diffs)
• fceokene/profiles/default/schemas/application.xml (deleted)
• fceokene/profiles/default/schemas/import_applicant.xml (deleted)
• fceokene/profiles/default/schemas/import_application.xml (added)
• fceokene/profiles/default/vocabularies/import_names.xml (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -99 +99 @@
 deadline = {}
 deadline['pume'] = '[Date of PUME Deadline]'
-deadline['pde'] = 'Saturday, 3rd November 2007'
+deadline['pde'] = 'Sunday, 4th November 2007'
 deadline['prence'] = '[Date of PRENCE Deadline]'
 deadline['pce'] = '[Date of PCE Deadline]'

WAeUP_SRP/base/skins/waeup_utilities/moveCourseResults.py

@@ -49 +49 @@
 moved_sids = context.course_results.uniqueValuesFor('student_id')
 for brain in brains:
-    count += 1    
+    count += 1
     if brain.id in moved_sids:
         continue
@@ -67 +67 @@
         context.course_results.moveResultsHere(study_level,brain.id)
         moved += 1
-        logger.info("moved  results of student %s" % (brain.id))
+        logger.info("moved results of student %s" % (brain.id))
         if moved and not moved % commit_after:
             context.waeup_tool.doCommit()

WAeUP_SRP/fceokene/profiles/default/layouts.xml

@@ -12 +12 @@
   <object name="application_manage" meta_type="CPS Layout"/>
   <object name="certificate" meta_type="CPS Layout"/>
+  <object name="certificate_course" meta_type="CPS Layout"/>
+  <object name="course" meta_type="CPS Layout"/>
+  
+  <object name="import_certificate_course" meta_type="CPS Layout"/>
   <object name="import_certificate" meta_type="CPS Layout"/>
-  <object name="certificate_course" meta_type="CPS Layout"/>
-  <object name="import_certificate_course" meta_type="CPS Layout"/>
-  <object name="course" meta_type="CPS Layout"/>
-  <object name="import_applicant" meta_type="CPS Layout"/>
+  <object name="import_student" meta_type="CPS Layout"/>
   <object name="import_course" meta_type="CPS Layout"/>
   <object name="import_course_result" meta_type="CPS Layout"/>
   <object name="import_department" meta_type="CPS Layout"/>
   <object name="import_application" meta_type="CPS Layout"/>
+  <object name="import_faculty" meta_type="CPS Layout"/>
+  
   <object name="department" meta_type="CPS Layout"/>
-  <object name="import_faculty" meta_type="CPS Layout"/>
   <object name="faculty" meta_type="CPS Layout"/>
   <object name="import" meta_type="CPS Layout"/>
-  <object name="import_student" meta_type="CPS Layout"/>
   <object name="add_student" meta_type="CPS Layout"/>
   <object name="members" meta_type="CPS Layout"/>

WAeUP_SRP/fceokene/profiles/default/schemas.xml

@@ -7 +7 @@
  <object name="acco_hall" meta_type="CPS Schema"/>
  <object name="acco_bed_booking" meta_type="CPS Schema"/>
- <object name="application" meta_type="CPS Schema"/>
  <object name="certificate" meta_type="CPS Schema"/>
+ <object name="certificate_course" meta_type="CPS Schema"/>
+
+ <object name="import_application" meta_type="CPS Schema"/>
  <object name="import_certificate" meta_type="CPS Schema"/>
- <object name="certificate_course" meta_type="CPS Schema"/>
  <object name="import_certificate_course" meta_type="CPS Schema"/>
- <object name="import_applicant" meta_type="CPS Schema"/>
  <object name="import_course" meta_type="CPS Schema"/>
  <object name="import_course_result" meta_type="CPS Schema"/>
+ <object name="import_department" meta_type="CPS Schema"/>
+ <object name="import" meta_type="CPS Schema"/>
+ <object name="import_student" meta_type="CPS Schema"/>
+ <object name="import_student_level_data" meta_type="CPS Schema"/>
+ <object name="import_student_course_results" meta_type="CPS Schema"/>
+ 
  <object name="course" meta_type="CPS Schema"/>
- <object name="import_department" meta_type="CPS Schema"/>
  <object name="department" meta_type="CPS Schema"/>
  <object name="faculty" meta_type="CPS Schema"/>
@@ -25 +30 @@
  <object name="student" meta_type="CPS Schema"/>
  <object name="scratch_card_batch" meta_type="CPS Schema"/>
- <object name="import" meta_type="CPS Schema"/>
- <object name="import_student" meta_type="CPS Schema"/>
- <object name="add_student" meta_type="CPS Schema"/> 
- <object name="import_student_level_data" meta_type="CPS Schema"/>
- <object name="import_student_course_results" meta_type="CPS Schema"/>
+ <object name="add_student" meta_type="CPS Schema"/>
  <object name="student_accommodation" meta_type="CPS Schema"/>
  <object name="student_application" meta_type="CPS Schema"/>

WAeUP_SRP/fceokene/profiles/default/vocabularies/import_names.xml

@@ -13 +13 @@
  <item key="certificate" msgid="">Certificate Data</item>
  <item key="certificate_course" msgid="">Certificate Course Data</item>
- <item key="applicant" msgid="">Application Data</item>
+ <item key="application" msgid="">Application Data</item>
 </object>