Changeset 1612 for WAeUP_SRP

Timestamp:

20 Mar 2007, 18:35:57 (18 years ago)

Author:

joachim

Message:

add validated_by and validation_date to student_study_level schema.
edit these in validate_courses
show these in course_registration_slip
modyfiy getRolesInContext to make edit work

could only do moderate testing cause of readconflict errors

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSUserFolderUserFolder.py (modified) (2 diffs)
• profiles/default/schemas/student_study_level.xml (modified) (1 diff)
• skins/waeup_student/course_registration_slip.pt (modified) (1 diff)
• skins/waeup_student/validate_courses.py (modified) (2 diffs)

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py

@@ -96 +96 @@
         if sc is None:
             break
-        #from pdb import set_trace;set_trace()
         sc_obj = sc.getContent()
         cert_id = sc_obj.study_course
@@ -123 +122 @@
                                                 )
         if real_object.portal_type == "StudentStudyLevel":
-            context_obj = getattr(certificate_obj,real_object.getId(),None)
+            if real_object.meta_type != "StudentStudyLevel":
+                context_obj = getattr(certificate_obj,real_object.getId(),None)
+            else:
+                context_obj = getattr(certificate_obj,real_object.aq_parent.getId(),None)
             if context_obj is None:
+                #from pdb import set_trace;set_trace()
                 break
             allowed = set(('CourseAdviser', 'SectionManager'))

WAeUP_SRP/trunk/profiles/default/schemas/student_study_level.xml

@@ -4 +4 @@
  <field name="code" meta_type="CPS String Field"/>
  <field name="session" meta_type="CPS String Field"/>
- <field name="gpa" meta_type="CPS Float Field"/>
- <field name="status" meta_type="CPS String Field"/>
  <field name="verdict" meta_type="CPS String Field"/>
-  <field name="imported_gpa" meta_type="CPS Float Field"/>
+ <field name="validated_by" meta_type="CPS String Field"/>
+ <field name="validation_date" meta_type="CPS DateTime Field"/>
 </object>

WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

@@ -19 +19 @@
       
       <div tal:condition="validated">
-        - validated by Course Adviser -
+        - validated by Course Adviser - 
+      <span tal:condition="info/doc/validated_by|nothing" tal:omit-tag="">
+        <span tal:replace="info/doc/validated_by" /> on <span tal:replace="info/doc/validation_date" />
+      </span>
       </div>
       <div tal:condition="not: validated">

WAeUP_SRP/trunk/skins/waeup_student/validate_courses.py

@@ -13 +13 @@
 """
 from Products.CMFCore.WorkflowCore import WorkflowException
+import DateTime
+current = DateTime.DateTime()
 try:
     from Products.zdb import set_trace
@@ -30 +32 @@
 student_id = context.getStudentId()
 student = getattr(students_folder,student_id)
+level_doc = context.getContent()
+if level_doc.portal_type == 'StudentStudyLevel':
+    level_doc.edit(mapping={'validated_by': member_id,
+                            'validation_date': current,})
 try:
     wftool.doActionFor(student,'validate_courses')