Changeset 6858 for WAeUP_SRP/trunk/skins/waeup_futminna
- Timestamp:
- 4 Oct 2011, 06:05:39 (13 years ago)
- Location:
- WAeUP_SRP/trunk/skins/waeup_futminna
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/trunk/skins/waeup_futminna/getStudentLevelsVoc.py
r6855 r6858 36 36 else: 37 37 raise KeyError 38 39 # FUTMinna only 40 if ikey == 501: 41 return "100 Level Carryover Courses" 42 38 43 level_nr,repeat = divmod(ikey, 100) 39 44 l = [] -
WAeUP_SRP/trunk/skins/waeup_futminna/getStudyCourseInfo.py
r6857 r6858 94 94 (student_record.entry_mode.startswith('pd') and current_level == '500')) #fceokene only 95 95 96 info['may_register_501'] = (current_level == '500') and '501' not in levels 97 96 98 missing_data = has_paid and\ 97 99 current_level not in levels and\ -
WAeUP_SRP/trunk/skins/waeup_futminna/getStudyLevelInfo.py
r6855 r6858 47 47 info['has_verdict'] = has_verdict = level_doc.verdict 48 48 49 info['submission_allowed']= school_fee_paid and is_current_level and not has_verdict 50 info['validation_allowed']= review_state == 'courses_registered' and is_current_level 51 info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated','returning',) and is_current_level 49 info['submission_allowed']= school_fee_paid and is_current_level and not has_verdict and level_id != '501' 50 info['validation_allowed']= review_state == 'courses_registered' and is_current_level and level_id != '501' 51 info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated','returning',) and\ 52 is_current_level and level_id != '501' 52 53 info['validated'] = level_doc.validated_by and not (is_current_level and review_state in ('courses_registered',)) 53 54 info['show_check_boxes'] = (is_ca and school_fee_paid and is_current_level and not has_verdict) or\ 54 55 (info['is_student'] and school_fee_paid and is_current_level and not has_verdict) or\ 56 level_id == '501' or\ 55 57 (is_so) # and is_current_level and not has_verdict) 56 58 … … 60 62 61 63 info['choosen_ids'] = request.get('ids',[]) 62 63 #info['status_info'] = ""64 #if is_student:65 # if review_state == 'courses_registered':66 # info['status_info'] = "Request for course validation pending"67 # elif review_state == 'courses_validated':68 # info['status_info'] = "Courses validated"69 #elif is_ca:70 # if review_state == 'courses_registered':71 # info['status_info'] = "Please validate these courses"72 # elif review_state == 'courses_validated':73 # info['status_info'] = "Courses validated"74 64 75 65 cert_id = student.course … … 96 86 row['score'] = 0 97 87 info['without_cascore'] = True 98 #end customization99 88 100 89 info['max_credits'] = max_credits 101 90 info['credits_exceeded'] = total_credits > max_credits 102 91 current_session = student.session 92 info['show_submit'] = not info['credits_exceeded'] and level_id != '501' 93 info['show_update'] = level_id != '501' 94 #end customization 103 95 104 96 info['gpa'] = gpa -
WAeUP_SRP/trunk/skins/waeup_futminna/study_course_view.pt
r6856 r6858 133 133 </table> 134 134 </form> 135 136 <form action="" method="post" class="group" onsubmit="return submit_once()" 137 tal:attributes="action string:${context/absolute_url}/create_level_501" 138 tal:define="rows python: info['items'];" 139 tal:condition="info/may_register_501" 140 > 141 <table width="100%" cellspacing="0" cellpadding="2" 142 summary="contents of the folder" 143 class="folderButtons"> 144 <tr> 145 <td align="left" valign="top" rowspan="3"></td> 146 <td align="left" valign="top"> 147 <input type="submit" name="create_level" 148 class="destructive" 149 tal:attributes="value string: Register 100L Carryover Courses" 150 /> 151 </td> 152 </tr> 153 </table> 154 </form> 135 155 136 156 <div tal:condition="info/missing_data"> -
WAeUP_SRP/trunk/skins/waeup_futminna/study_level_view.pt
r6855 r6858 13 13 is_ca info/is_ca; 14 14 show_check_boxes info/show_check_boxes; 15 show_update info/show_update; 15 16 has_verdict info/has_verdict; 16 17 submission_allowed info/submission_allowed; … … 209 210 ('Do you really want to delete selected courses?', )" 210 211 /> 211 <input tal:condition=" python: 1" type="submit" name="refresh_level:method"212 <input tal:condition="show_update" type="submit" name="refresh_level:method" 212 213 class="context" value="Update" 213 214 /> … … 215 216 216 217 <br /><br /> 217 <input tal:condition=" not: info/credits_exceeded"218 <input tal:condition="info/show_submit" 218 219 type="submit" name="register_courses:method" 219 220 class="context" value="Submit to Course Adviser" … … 229 230 <br /><br /> 230 231 231 <span tal:condition=" python: 1">232 <span tal:condition="show_update"> 232 233 <strong>Note:</strong> 'Update' checks for all courses in your certificate and will add them to your course list irrespective of 233 234 prior deletion, i.e. already deleted courses will show up again. … … 257 258 ('Do you really want to delete the courses selected?', )" 258 259 /> 259 <input 260 <input tal:condition="show_update" 260 261 type="submit" name="refresh_level:method" 261 262 class="context" value="Update" … … 294 295 ('Do you really want to delete the courses selected?', )" 295 296 /> 296 <input tal:condition="show_ check_boxes"297 <input tal:condition="show_update" 297 298 type="submit" name="refresh_level:method" 298 299 class="context" value="Update"
Note: See TracChangeset for help on using the changeset viewer.