Changeset 1417 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
15 Feb 2007, 10:56:43 (18 years ago)
Author:
joachim
Message:

Edit student_study course added
verdicts vocabulary added
new levels are only created, when no level there,
allow loggin for returning students, which have been created with add_student

Location:
WAeUP_SRP/trunk/skins
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

    r1347 r1417  
    113113                             p_review_state == 'created' :
    114114            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)
    116118        if s_review_state == "application_pin_entered":
    117119            redirect_url = "%s/application_edit_form" % student.absolute_url()
     
    122124        elif s_review_state == "cleared_and_validated":
    123125            redirect_url = "%s/personal_edit_form" % student.absolute_url()
    124         elif s_review_state == "returning":
     126        elif s_review_state == "returning" and is_imported:
    125127            redirect_url = "%s/session_results_view" % student.absolute_url()
    126128        else:
  • WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py

    r1366 r1417  
    5353            context.students_catalog.modifyRecord(id = student_id,
    5454                                                  course = course,
     55                                                  level = ds.get('current_level'),
     56                                                  verdict = ds.get('current_verdict'),
    5557                                                  faculty = c_path[-4],
    5658                                                  department = c_path[-3],
  • WAeUP_SRP/trunk/skins/waeup_student/add_student.py

    r1416 r1417  
    4949matric_no = ds.get('matric_no')
    5050res = context.students_catalog(matric_no = matric_no)
    51 psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
    5251if res:
     52    psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
    5353    return context.add_student_form(rendered = rendered,
    5454                                 psm = psm,
  • WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

    r1413 r1417  
    88pr = context.portal_registration
    99
     10request = context.REQUEST
    1011returning = context.returning_import
    1112results = context.results_import
     
    4546
    4647res = returning(matric_no = matric_no)
    47 student_from_returning = res[0]
     48if res:
     49    student_from_returning = res[0]
     50else:
     51    return None
     52
    4853res = results(matric_no = matric_no)
    4954results = res
  • WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

    r1403 r1417  
    4545current_level = sbrain.level
    4646levels = context.objectIds()
    47 if current_level not in levels:
     47#levels.sort()
     48#if int(current_level) > int(levels[-1]):
     49if not levels:
    4850    context.invokeFactory('StudentStudyLevel',"%s" % current_level)
    4951    level = getattr(context,"%s" % current_level)
  • WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

    r1380 r1417  
    1111      </a>
    1212      <h3>
    13         <span tal:condition="python:is_so and s_info">
     13        <span tal:condition="is_so">
    1414          <span tal:content="info/student/name" />:
    1515        </span>
Note: See TracChangeset for help on using the changeset viewer.