Changeset 1417 for WAeUP_SRP/trunk/skins
- Timestamp:
- 15 Feb 2007, 10:56:43 (18 years ago)
- Location:
- WAeUP_SRP/trunk/skins
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
r1347 r1417 113 113 p_review_state == 'created' : 114 114 wftool.doActionFor(student_per,'open') 115 115 res = context.students_catalog(id = str(member)) 116 matric_no = res[0].matric_no 117 is_imported = context.returning_import(matric_no = matric_no) 116 118 if s_review_state == "application_pin_entered": 117 119 redirect_url = "%s/application_edit_form" % student.absolute_url() … … 122 124 elif s_review_state == "cleared_and_validated": 123 125 redirect_url = "%s/personal_edit_form" % student.absolute_url() 124 elif s_review_state == "returning" :126 elif s_review_state == "returning" and is_imported: 125 127 redirect_url = "%s/session_results_view" % student.absolute_url() 126 128 else: -
WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py
r1366 r1417 53 53 context.students_catalog.modifyRecord(id = student_id, 54 54 course = course, 55 level = ds.get('current_level'), 56 verdict = ds.get('current_verdict'), 55 57 faculty = c_path[-4], 56 58 department = c_path[-3], -
WAeUP_SRP/trunk/skins/waeup_student/add_student.py
r1416 r1417 49 49 matric_no = ds.get('matric_no') 50 50 res = context.students_catalog(matric_no = matric_no) 51 psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)52 51 if res: 52 psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id) 53 53 return context.add_student_form(rendered = rendered, 54 54 psm = psm, -
WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py
r1413 r1417 8 8 pr = context.portal_registration 9 9 10 request = context.REQUEST 10 11 returning = context.returning_import 11 12 results = context.results_import … … 45 46 46 47 res = returning(matric_no = matric_no) 47 student_from_returning = res[0] 48 if res: 49 student_from_returning = res[0] 50 else: 51 return None 52 48 53 res = results(matric_no = matric_no) 49 54 results = res -
WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py
r1403 r1417 45 45 current_level = sbrain.level 46 46 levels = context.objectIds() 47 if current_level not in levels: 47 #levels.sort() 48 #if int(current_level) > int(levels[-1]): 49 if not levels: 48 50 context.invokeFactory('StudentStudyLevel',"%s" % current_level) 49 51 level = getattr(context,"%s" % current_level) -
WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt
r1380 r1417 11 11 </a> 12 12 <h3> 13 <span tal:condition=" python:is_so and s_info">13 <span tal:condition="is_so"> 14 14 <span tal:content="info/student/name" />: 15 15 </span>
Note: See TracChangeset for help on using the changeset viewer.