Changeset 1490 for WAeUP_SRP/trunk

Timestamp:

25 Feb 2007, 00:32:45 (18 years ago)

Author:

joachim

Message:

fix

Location:

WAeUP_SRP/trunk

Files:

• doc/srp_documentation.mm (modified) (1 diff)
• skins/waeup_default/getSessionString.py (added)
• skins/waeup_student/getStudentReviewState.py (modified) (1 diff)
• skins/waeup_student/getStudyCourseInfo.py (modified) (2 diffs)
• skins/waeup_utilities/fixLevelForNewStudents.py (modified) (1 diff)

WAeUP_SRP/trunk/doc/srp_documentation.mm

@@ -104 +104 @@
 <node CREATED="1170083649773" ID="Freemind_Link_329050457" LINK="../profiles/default/schemas/student_personal.xml" MODIFIED="1170959011444" TEXT="Schema: student_personal"/>
 </node>
-<node CREATED="1170082392807" FOLDED="true" ID="Freemind_Link_1979443941" MODIFIED="1171711179966" TEXT="Study Course">
+<node CREATED="1170082392807" ID="Freemind_Link_1979443941" MODIFIED="1171711179966" TEXT="Study Course">
 <node CREATED="1170930140692" ID="Freemind_Link_607082969" MODIFIED="1171009488850" TEXT="Id: study_course"/>
 <node CREATED="1170930264337" ID="Freemind_Link_1384807180" LINK="../profiles/default/types/StudentStudyCourse.xml" MODIFIED="1172159914623" TEXT="Type: StudentStudyCourse"/>

WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py

@@ -10 +10 @@
 # $Id$
 """
-return Info about the current Student
+return the review_state of the Student
 """
 try:
     from Products.AdvancedQuery import Eq, Between, Le,In
-    evalAQ = context.portal_catalog.evalAdvancedQuery
+    aq_portal = context.portal_catalog.evalAdvancedQuery
 except:
-    evalAdvancedQuery = None
+    aq_portal = None
 student_id = context.getStudentId()
-#res = context.portal_catalog(id = student_id,portal_type='Student')
 query = Eq('id',student_id)
-res = evalAQ(query)
-if not res:# or len(res) > 1:
+res = aq_portal(query)
+if not res:
     return None
-return res[-1].review_state
+return res[0].review_state

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -14 +14 @@
 request = context.REQUEST
 
-wf = context.portal_workflow
+wftool = context.portal_workflow
 path_info = request.get('PATH_INFO').split('/')
 
@@ -47 +47 @@
 #review_state = wftool.getInfoFor(context,'review_state',None)
 #if review_state != 'content_addable':
-#    context.portal_workflow.doActionFor(context,'close_for_edit')
-
+#    wftool.doActionFor(context,'close_for_edit')
+student_review_state = context.getStudentReviewState()
+may_register = student_review_state in ('shool_fee_payed',)
 #levels.sort()
-#if not levels:
+#if not levels and may_register:
 #    context.invokeFactory('StudentStudyLevel',"%s" % current_level)
 #    level = getattr(context,"%s" % current_level)

WAeUP_SRP/trunk/skins/waeup_utilities/fixLevelForNewStudents.py

@@ -47 +47 @@
 ##res = aq_portal(query)
 query = Eq('level','100')
-res = aq_students(query)
+#res = aq_students(query)
+res = students_cat(level='100')
 #set_trace()
 count = 0
+count_full = 0
 commit_count = 0
 logger.info("started for %s students" % len(res))
 for sbrain in res:
+    #count_full += 1
+    #rwrite("%s: %s %s %s <br />" % (count_full,sbrain.id,sbrain.entry_mode,sbrain.level))
     student_obj = getattr(students,sbrain.id)
     if sbrain.entry_mode == "":