Changeset 1025 for WAeUP_SRP/trunk/skins

Timestamp:

10 Dec 2006, 18:39:15 (18 years ago)

Author:

joachim

Message:

Removed all fields except study_course from student_study_course
adde StudyCourse? Widget
M profiles/default/layouts/student_study_course.xml
M skins/waeup_default/waeup_edit.py
M Widgets.py
catch unauthorised errors
M skins/waeup_student/application_edit_form.pt
M skins/waeup_student/getStudentInfo.py
M skins/waeup_student/study_course_view.pt
AM skins/waeup_student/getStudentId.py

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/waeup_edit.py (modified) (2 diffs)
• waeup_student/application_edit_form.pt (modified) (2 diffs)
• waeup_student/getStudentId.py (added)
• waeup_student/getStudentInfo.py (modified) (2 diffs)
• waeup_student/study_course_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py

@@ -23 +23 @@
 # (We don't call getEditableContent here, validate does it when needed.)
 doc = context.getContent()
+if context.portal_type == "StudentStudyCourse":
+    if len(context.objectIds()) > 0:
+        psm = 'Edit of StudyCourse is only possible if there are no levels'
+        args = getFormUidUrlArg(REQUEST)
+        args['portal_status_message'] = psm
+        url = context.absolute_url() + '?' + urlencode(args)
+        REQUEST.RESPONSE.redirect(url)
+        
 is_valid, ds = doc.validate(request=REQUEST, proxy=context, cluster=cluster,
                             use_session=True)
@@ -36 +44 @@
     comments = REQUEST.get('comments')
     context.cpsdocument_notify_modification(comments=comments)
+    if context.portal_type == "StudentStudyCourse":
+        course = ds.get('study_course')
+        student_id = context.getStudentId()
+        res = context.portal_catalog(portal_type='Certificate',id = course)
+        if res:
+            c_brain = res[0]
+            c_path = c_brain.getPath().split('/')
+            student_id = context.getStudentId()
+            context.students_catalog.modifyRecord(id = student_id,
+                                                  course = course,
+                                                  faculty = c_path[-4],
+                                                  department = c_path[-3],
+                                                  )
     if cpsdocument_edit_and_view_button is not None:
         action = ''

WAeUP_SRP/trunk/skins/waeup_student/application_edit_form.pt

@@ -1 @@
-<metal:html tal:define="info context/getStudentInfo;
-            rendered_main python:info['app_doc'].render(
+<metal:html tal:define="info context/getStudentInfo">
+  <span tal:condition="not: info">
+    <metal:block use-macro="here/error_not_found/macros/not_found" />
+  </span>
+<metal:block tal:condition="info"> 
+<metal:block tal:define="rendered_main python:info['app_doc'].render(
                       layout_mode='edit',
                       schema_id = 'student_application',
@@ -50 +54 @@
     </metal:main>
   </metal:body>
+</metal:block>
+</metal:block>
 </metal:html>

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -43 +43 @@
             logger.info("student %s tried to access %s" % (member_id,requested_id))
             student_id = member_id
-            #mtool.assertViewable(context)
+            mtool.assertViewable(context)
             break
         student_id = member_id
@@ -78 +78 @@
         info['sex'] = 'female'
 course = getattr(student,'study_course',None)
-info['course'] = course
 if course:
-    info['course_doc'] = student.study_course.getContent()
+    cert_id = course.getContent().study_course
+    res = context.portal_catalog(portal_type = "Certificate", id = cert_id)
+    ci = {}
+    if len(res) > 0:
+        info['course'] = course
+        brain = res[0]
+        ci['study_course'] = brain.getId
+        ci['title'] = brain.Title
+        pl = brain.getPath().split('/')
+        ci['faculty'] = pl[-4]
+        ci['department'] = pl[-3]
+        info['course_doc'] = ci
+    else:
+        info['course'] = None
 #
 acco = getattr(student,'accommodation_2006',None)

WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt

@@ -19 +19 @@
     </metal:block>
     <metal:main fill-slot="main">
-      <span tal:omit-tag=""  
+      <span tal:omit-tag="" tal:condition="nothing"
             tal:content="structure python: info['doc'].render(layout_mode='view')" />
+      <table tal:define="sc python: s_info['course_doc']">
+        <tr>
+          <td width="180px">Certificate:</td> 
+          <td><span tal:content="sc/title" /></td>
+        </tr>
+        <tr>
+          <td>Certificate ID:</td>
+          <td tal:content="sc/study_course" />
+        </tr>
+          <span tal:define="f_id sc/faculty;
+          d_id sc/department;
+          f_title context/academics/?f_id/Title|string:Faculty not yet in Prospectus;
+          d_title context/academics/?f_id/?d_id/Title|string:Department not yet in Prospectus"
+          >
+            <tr>
+              <td>Faculty:</td>
+              <td tal:content="f_title" />
+            </tr>
+            <tr>
+              <td>Department:</td> 
+              <td><span tal:content="d_title" /></td>
+            </tr>
+          </span>
+        </table>        
       
       <form action="" method="post" class="group"