Changeset 1520

Timestamp:

6 Mar 2007, 18:26:05 (18 years ago)

Author:

joachim

Message:

Ghana changes

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/schemas/student_course_result.xml (modified) (1 diff)
• skins/waeup_pins/batch_view.pt (modified) (1 diff)
• skins/waeup_student/add_course_result.py (modified) (2 diffs)
• skins/waeup_student/getNewStudentStatistics.py (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
-<object name="course_results" meta_type="CPS Schema">
+<object name="student_course_results" meta_type="CPS Schema">
  <field name="code" meta_type="CPS String Field"/>
  <field name="title" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -28 +28 @@
         <span tal:replace="info/batch_doc/no_of_pins" /></h3>
         <span tal:replace="structure rendered" />
-        <table tal:condition="nothing">
+        <table tal:condition="info/used">
           <tr tal:repeat="pin info/used">
             <td tal:content="python:path('repeat/pin/index')+1" />

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -13 +13 @@
 """
 from urllib import urlencode
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 request = context.REQUEST
 course_cat = context.courses_catalog
@@ -38 +43 @@
     url = "%s?%s" % (context.absolute_url(),urlencode(args))
     return request.RESPONSE.redirect(url)
-##cert_id = context.aq_parent.getContent().study_course
-##res = context.portal_catalog(portal_type="Certificate", id = cert_id)
-##l = []
-##if res:
-##    cert = res[0]
-##    path = cert.getPath()
-##    query = Eq("path",path) &\
-##            Eq('portal_type','CertificateCourse') &\
-##            Eq('SearchableText', "%s" % student.level) &\
-##            Eq('id',course_id)
-##course = aq_portal(query)[0]
 cr_id = context.invokeFactory('StudentCourseResult',course_id)
-##d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
-##getattr(context,cr_id).getContent().edit(mapping=d)
+#set_trace()
+cr = getattr(context,cr_id)
+context.portal_workflow.doActionFor(cr,'open')
+cr.getContent().edit(mapping=d)
+context.portal_workflow.doActionFor(cr,'close')
 args['course_id'] = course_id
 from urllib import urlencode

WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

@@ -29 +29 @@
 dep['id'] = "All Faculties"
 
-umequery = Eq('level','100')
+umequery = Eq('level','100') | (Eq('level','200') & Eq('entry_mode','DE'))
+#umequery = Eq('level','100')
 #dequery = Eq('entry_mode','DE')  # only correct for 2006/2007
 #total_new = aq_students(umequery or dequery)