Changeset 731 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

20 Oct 2006, 20:18:25 (18 years ago)

Author:

joachim

Message:

add and delete for student_study_level and student_course_result

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• add_course_result.py (added)
• searchStudents.py (modified) (5 diffs)
• student_course_result_created.py (added)
• study_level_view.pt (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -59 +59 @@
 with_review = state != "all"
 onlyreview = with_review and not term
-with_level_results = state.startswith("category") and evalAdvancedQuery is not None
+with_level_results = state.startswith("category") or\
+                     state in ('content_addable',) and\
+                     evalAdvancedQuery is not None
 bools = "with_review = %s<br\> onlyreview = %s<br\> with_level_results = %s" % (with_review,onlyreview,with_level_results)
 if not term and not with_review:
@@ -87 +89 @@
 elif onlyreview and with_level_results:
     query_step = 2
-    query =  Eq('portal_type','StudentStudyLevel') & Eq('review_state',state) 
+    query =  (Eq('portal_type','StudentStudyLevel') | 
+             Eq('portal_type','StudentStudyCourse')) & Eq('review_state',state) 
     res = evalAdvancedQuery(query)
 elif what == "student_id":
@@ -135 +138 @@
         st = "%s*" % term.strip()
     query = Eq('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip().lower())\
-                | Eq('portal_type','StudentStudyLevel') & Eq('review_state',state) 
+                | ((Eq('portal_type','StudentStudyLevel') | 
+                   Eq('portal_type','StudentStudyCourse')) & Eq('review_state',state))
     try:
         res = evalAdvancedQuery(query)
@@ -149 +153 @@
 if res:
     for r in res:
-        if r.portal_type in ("StudentApplication","StudentPersonal",):
+        if r.portal_type in ("StudentApplication","StudentPersonal","StudentStudyCourse",):
             student = r.getObject().aq_parent
         elif r.portal_type in ("StudentStudyLevel",):
@@ -167 +171 @@
         students.append(context.getStudentInfo(item))
     return context.students_manager_view(rendered = rend,
-                             psm = "%d matching Students found" % len(items),
+                             psm = "%d matching Students found QS = %s" % (len(items),query_step),
                              students = students,
                              is_manager = is_manager,

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -27 +27 @@
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
               <td align="left" valign="middle" style="width: 5px;" 
-                  tal:condition="python:0 and is_manager">
+                  tal:condition="python:1 and is_manager">
                 <input type="checkbox" name="ids:list" value="" id="" class="noborder"
                        tal:condition="is_manager"
@@ -63 +63 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="python:0 and is_manager">
+              <span tal:condition="python:1 and is_manager">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"
@@ -70 +70 @@
                        % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                        />
-                <input type="submit" name="approve_checked:method"
+                <input tal:condition="python:0" type="submit" name="approve_checked:method"
                        class="context" value="Approve" />
-                <input type="submit" name="retract_checked:method"
+                <input tal:condition="python:0" type="submit" name="retract_checked:method"
                        class="context" value="Retract" />
                 <input type="submit" name="folder_delete:method" value="button_delete"
@@ -79 +79 @@
                        (cpsmcat('description_confirm_delete'), )" 
                        />
-                <input tal:condition="python: context.portal_type not in ('Semester','Certificate')"
+                <input tal:condition="python: 0"
                        type="submit" name="id_rename_form:method"
                        class="context" value="Change Object ID" i18n:attributes="value"