Changeset 3682

Timestamp:

21 Sep 2008, 06:01:55 (16 years ago)

Author:

Henrik Bettermann

Message:

• Implement Student Pastoral Report for secondary schools

Location:

WAeUP_SRP

Files:

• base/CHANGES.txt (modified) (1 diff)
• base/Students.py (modified) (2 diffs)
• base/__init__.py (modified) (3 diffs)
• base/profiles/default/layouts.xml (modified) (1 diff)
• base/profiles/default/layouts/student_pastoral_report.xml (added)
• base/profiles/default/schemas.xml (modified) (1 diff)
• base/profiles/default/schemas/student_pastoral_report.xml (added)
• base/profiles/default/types.xml (modified) (1 diff)
• base/profiles/default/types/StudentPastoralReport.xml (added)
• base/profiles/default/types/StudentStudyLevel.xml (modified) (3 diffs)
• base/profiles/default/vocabularies.xml (modified) (1 diff)
• base/profiles/default/vocabularies/pastoral_grade.xml (added)
• base/profiles/default/vocabularies/terms.xml (added)
• base/profiles/default/workflows.xml (modified) (1 diff)
• base/skins/waeup_default/waeup_document_create_do.py (modified) (1 diff)
• base/skins/waeup_default/waeup_edit_form.pt (modified) (2 diffs)
• base/skins/waeup_student/academic_report_view.pt (modified) (3 diffs)
• base/skins/waeup_student/getPastoralReportInfo.py (added)
• base/skins/waeup_student/getStudentObjectTitles.py (modified) (1 diff)
• base/skins/waeup_student/pastoral_report_view.pt (added)
• base/skins/waeup_student/student_index.py (deleted)
• ois/waeup_custom/getStudyLevelInfo.py (modified) (2 diffs)
• ois/waeup_custom/student_index.py (added)

WAeUP_SRP/base/CHANGES.txt

@@ -26 +26 @@
 - admitOneStudent uses entry_session from applicants_catalog instead
   of static argument (not yet tested)
+  
+1.4 (2008-09-21)
+-----------------
+- Implement Student Pastoral Report for secondary schools
+

WAeUP_SRP/base/Students.py

@@ -907 +907 @@
 ###)
 
+
 class StudentPume(CPSDocument): ###(
     """
@@ -927 +928 @@
     ob = StudentPume(id, **kw)
     return CPSBase_adder(container, ob, REQUEST=REQUEST)
-
-
+###)
+
+
+class StudentPastoralReport(CPSDocument): ###(
+    """
+    Student Pastoral Report
+    """
+    meta_type = 'StudentPastoralReport'
+    portal_type = meta_type
+    security = ClassSecurityInfo()
+
+InitializeClass(StudentPastoralReport)
+
+def addStudentPastoralReport(container, id, REQUEST=None, **kw):
+    """Add a Student Pastoral Report."""
+    ob = StudentPastoralReport(id, **kw)
+    return CPSBase_adder(container, ob, REQUEST=REQUEST)
+###)
 
 # Backward Compatibility StudyLevel

WAeUP_SRP/base/__init__.py

@@ -8 +8 @@
 from Products.GenericSetup import profile_registry
 from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import BASE
 
 from Products.CPSCore.interfaces import ICPSSite
@@ -56 +57 @@
          #"Semester",
          "StudentCourseResult",
+         "StudentPastoralReport",
          # move to Academics later
          #"Semester",
@@ -125 +127 @@
     temp = root.unrestrictedTraverse( "/temp_folder", None )
     if temp is not None and not sess_container_name in temp.objectIds():
-        addSessionDataContainer( temp, sess_container_name, 9600, 4800, 
+        addSessionDataContainer( temp, sess_container_name, 9600, 4800,
                   lazy=True, title='Faster session data container')
 

WAeUP_SRP/base/profiles/default/layouts.xml

@@ -59 +59 @@
   <object name="student_transfer" meta_type="CPS Layout"/>
   <object name="study_level" meta_type="CPS Layout"/>
+  <object name="student_pastoral_report" meta_type="CPS Layout"/>
   <object name="university" meta_type="CPS Layout"/>
   <object name="upload" meta_type="CPS Layout"/>

WAeUP_SRP/base/profiles/default/schemas.xml

@@ -43 +43 @@
  <object name="students" meta_type="CPS Schema"/>
  <object name="student_study_level" meta_type="CPS Schema"/>
+ <object name="student_pastoral_report" meta_type="CPS Schema"/>
  <object name="study_level" meta_type="CPS Schema"/>
  <object name="university" meta_type="CPS Schema"/>

WAeUP_SRP/base/profiles/default/types.xml

@@ -35 +35 @@
  <object name="UploadsFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Upload" meta_type="CPS Flexible Type Information"/>
+ <object name="StudentPastoralReport" meta_type="CPS Flexible Type Information"/>
 </object>

WAeUP_SRP/base/profiles/default/types/StudentStudyLevel.xml

@@ -13 +13 @@
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
-  <element value="Semester"/>
+  <element value="StudentPastoralReport"/>
  </property>
  <property name="allow_discussion">False</property>
@@ -31 +31 @@
  <alias from="(Default)" to="student_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
- <alias from="created" to=""/>
  <alias from="view" to="student_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
@@ -37 +36 @@
   <permission value="View"/>
  </action>
- <action title="Add Course" action_id="new_entry" category="object"
+ <action title="Add Pastoral Report" action_id="new_entry" category="object"
     condition_expr=""
-    url_expr="string:${object_url}/content_create?type_name=StudentCourseResult"
-    visible="False">
+    url_expr="string:${object_url}/content_create?type_name=StudentPastoralReport"
+    visible="True">
   <permission value="Add portal content"/>
  </action>
 </object>
+
+
+

WAeUP_SRP/base/profiles/default/vocabularies.xml

@@ -53 +53 @@
  <object name="aos" meta_type="CPS Vocabulary"/>
  <object name="application_status" meta_type="CPS Vocabulary"/>
+ <object name="pastoral_grade" meta_type="CPS Vocabulary"/>
+ <object name="terms" meta_type="CPS Vocabulary"/>
  </object>

WAeUP_SRP/base/profiles/default/workflows.xml

@@ -130 +130 @@
    <bound-workflow workflow_id="waeup_document_wf"/>
   </type>
+  <type type_id="StudentPastoralReport">
+   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
+  </type>
  </bindings>
 </object>

WAeUP_SRP/base/skins/waeup_default/waeup_document_create_do.py

@@ -11 +11 @@
 request = context.REQUEST
 
-if type_name in ("StudyLevel","StudentStudyLevel","WAeUPDocument"):
+if type_name in ("StudyLevel","StudentStudyLevel","WAeUPDocument","StudentPastoralReport"):
     id = datamodel.get('code')
 else:

WAeUP_SRP/base/skins/waeup_default/waeup_edit_form.pt

@@ -9 +9 @@
            is_allowed context/isSectionOfficer;
            metadata metadata|nothing;
-           template here/main_template/macros/master;"
+           template here/main_template/macros/master;
+           info here/getDocumentInfo;"
            >
   <metal:block define-macro="edit_form">
@@ -78 +79 @@
       <tal:block condition="not: metadata"
         i18n:translate="">Edit <span id="page_title" i18n:name="title"
-        tal:content="here/title_or_id">Page Title</span>
+        tal:content="info/title">Page Title</span>
       </tal:block>
       <tal:block tal:condition="metadata"

WAeUP_SRP/base/skins/waeup_student/academic_report_view.pt

@@ -42 +42 @@
     </div>    
     </span>
-
-
           
     <a href=""
@@ -61 +59 @@
     
         <br />
+           
         <table>
+           <tr>
+            <th valign='top'>Pastoral Reports:</th> 
+            <td>
+              <span tal:repeat="item python:info['items']">
+                <a href="view" 
+                   tal:attributes="href item/id"
+                   tal:content="item/title"/><br />
+              </span>
+            </td>
+          </tr>
           <tr>
             <th>Session:</th> 
@@ -99 +108 @@
         </tr>                
         <tr tal:repeat="row python:info[sem[2]]"
-            
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
           <td align="left" valign="middle" style="width: 5%;"

WAeUP_SRP/base/skins/waeup_student/getStudentObjectTitles.py

@@ -19 +19 @@
               'StudentStudyCourse': 'Study Course',
               'PaymentsFolder': 'Payments',
+              'StudentPastoralReport': 'Pastoral Report',
               }

WAeUP_SRP/ois/waeup_custom/getStudyLevelInfo.py

@@ -76 +76 @@
 cert_id = student.course
 info['cert_id'] = cert_id
-if context.objectIds():
-    course_results.moveResultsHere(context,student_id)
-    logger.info("%s initiated moveResultsHere for %s in level %s" % (member_id,student_id,level_id))
 total_credits,gpa,carry_overs,normal1,normal2,normal3 = course_results.getCourses(student_id,level_id)
 info['total_credits'] = total_credits
@@ -84 +81 @@
 #start customization
 
+
+
 max_credits = 58
 info['without_score'] = False
 info['without_cascore'] = False
 
-
-
-
-
-
-
+items = []
+subobjects = context.objectValues()
+for subobject in subobjects:
+    row = {}
+    row['id'] = subobject.getId()
+    row['title'] = '%s' % context.portal_vocabularies.terms.get(subobject.getId())
+    items.append(row)
+info['items'] = items