Changeset 2678 for WAeUP_SRP/base


Ignore:
Timestamp:
16 Nov 2007, 13:41:44 (17 years ago)
Author:
Henrik Bettermann
Message:
  • fix previous_verdict for payments in session 04
  • fix missing_data notice
Location:
WAeUP_SRP/base/skins
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

    r2476 r2678  
    8282next_transition = next_info['next_transition']
    8383next_verdict = next_info['next_verdict']
     84previous_verdict = next_info['previous_verdict']
    8485
    8586if  resp == '00':
     
    9394            pass
    9495        verdict = s_brain.verdict
    95         if verdict == 'N/A':
    96             verdict = ''
     96        if previous_verdict == 'N/A':
     97            previous_verdict = ''
    9798        study_course.getContent().edit(mapping= {'current_level': next_level_id,
    9899                                                 'current_session': next_session_id,
    99100                                                 'current_verdict': next_verdict,
    100                                                  'previous_verdict': verdict,
     101                                                 'previous_verdict': previous_verdict,
    101102                                                 })
    102103        if next_transition:
  • WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

    r2664 r2678  
    4444next_transition = next_info['next_transition']
    4545next_verdict = next_info['next_verdict']
     46next_previous_verdict = next_info['next_previous_verdict']
    4647
    4748validate = request.has_key("cpsdocument_create_button")
     
    116117    except:
    117118        pass
    118     verdict = s_brain.verdict
    119119    study_course.getContent().edit(mapping= {'current_level': next_level_id,
    120120                                             'current_session': next_session_id,
    121121                                             'current_verdict': next_verdict,
    122                                              'previous_verdict': verdict,
     122                                             'previous_verdict': next_previous_verdict,
    123123                                             })
    124124    if next_transition:
  • WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

    r2664 r2678  
    3535info['next_level_id'] = next_level_id = level_id
    3636info['next_verdict'] = verdict
     37info['next_previous_verdict'] = ''
    3738verdicts_voc = context.portal_vocabularies.verdicts
    3839if review_state == 'cleared_and_validated':
     
    4445        info['next_transition'] = "pay_school_fee"
    4546        info['next_verdict'] = ''
     47        info['next_previous_verdict'] = verdict
    4648        if verdict in ('A','B',):
    4749            info['next_level_id'] = "%s" % (int(level_id) + 100)
  • WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

    r2674 r2678  
    9494               current_level == '100' or\
    9595               (sbrain.mode.startswith('de') and current_level == '200'))
    96                
     96
    9797missing_data = has_paid and\
    9898               current_level not in levels and\
    9999               not (previous_verdict or sbrain.level) and\
    100100               not (current_level == '100' or\
    101                (sbrain.mode.startswith('de') and current_level == '200'))           
     101               (sbrain.mode.startswith('de') and current_level == '200'))
    102102
    103103info['missing_data'] = missing_data
     
    105105info['create_level'] = None
    106106student_levels_voc = context.portal_vocabularies.student_levels
    107 if not missing_data:
     107if may_register:
    108108    info['create_level'] = current_level
    109109    info['create_level_str'] = student_levels_voc.get(current_level)
  • WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

    r2674 r2678  
    141141    </form> 
    142142   
    143     <div tal:condition="not: create_level">
     143    <div tal:condition="info/missing_data">
    144144       <font color='red'>
    145145          Your faculty has not yet provided the results and verdict of the previous session.
Note: See TracChangeset for help on using the changeset viewer.