Changeset 2579


Ignore:
Timestamp:
8 Nov 2007, 10:14:35 (17 years ago)
Author:
Henrik Bettermann
Message:

Ziwschenversion

Ich arbeite noch an layout_application_edit.pt

Location:
WAeUP_SRP
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/WAeUPTables.py

    r2561 r2579  
    517517
    518518        records = self.searchResults(student = student_id)
    519         if len(records) > 0 and prefix in ('CLR','APP'):
    520             for r in records:
    521                 if r.pin != uid and r.prefix_batch.startswith(prefix):
    522                     return -2
     519        #if len(records) > 0 and prefix in ('CLR','APP'):
     520        #    for r in records:
     521        #        if r.pin != uid and r.prefix_batch.startswith(prefix):
     522        #            return -2
    523523        records = self.searchResults({"%s" % self.key : uid})
    524524        if len(records) > 1:

  • WAeUP_SRP/base/WAeUPTool.py

    r2576 r2579  
    658658            password = pin_parts[2]
    659659            self.makeStudentMember(student_id,password = password)
    660         else:
    661             self.makeStudentMember(student_id)
    662660        student_object.manage_setLocalRoles(student_id, ['Owner',])
    663661        #logger.info("creating %s reg_no %s" % (student_id,brain.reg_no))

  • WAeUP_SRP/base/skins/cps_custom/logged_in.py

    r2489 r2579  
    149149        # 1. add pin and application date to app_doc
    150150
    151         if s_review_state in ("student_created","admitted") and\
    152                              a_review_state == 'created' :
     151        if s_review_state == "student_created":
     152            wftool.doActionFor(student,'admit')
     153            s_review_state = 'admitted'       
     154
     155        if s_review_state == "admitted" and a_review_state == 'created':
    153156            wftool.doActionFor(student_app,'open')
    154157            #if student_pume is not None:
    … …  
    231234                    lnr = context.getLevelFromResultsCosCode(has_results)
    232235                    dsc['current_level'] = "%d00" % lnr
    233                 elif not has_level and s_review_state == 'school_fee_paid':     
     236                elif not has_level and s_review_state == 'school_fee_paid':
    234237                    lnr = context.getLevelFromResultsCosCode(has_results)
    235238                    cv = context.getVerdict(has_results[0].Verdict)[0]

  • WAeUP_SRP/base/skins/waeup_default/waeup_edit_form.pt

    r2042 r2579  
    109109        </div>
    110110
    111         <tal:block condition="python: 0 and not creation">
    112           <div class="tooltipArea" style="visibility: hidden;"
    113                id="transition_comments_help"
    114                onclick="showElement(false, 'transition_comments_help')"
    115                i18n:translate="help_transition_comments_modification">
    116             In this field you can give the reason for the modification
    117             on this document. Your comments may be used to notify other users.
    118           </div>
    119           <dl>
    120             <dt><label for="comments"
    121                        i18n:translate="transition_comments_modification"
    122                        >Reason of the modification</label>
    123               <button type="button" class="tooltipControl"
    124                       onclick="toggleElementVisibility('transition_comments_help')"> ? </button>
    125             </dt>
    126             <dd>
    127               <textarea name="comments" id="comments" cols="60" rows="3"
    128                         tal:content="nothing">
    129               </textarea>
    130             </dd>
    131           </dl>         
    132         </tal:block>
    133111        <metal:block use-macro="python:path('context/%s_edit_buttons/macros/buttons' % form_type)"/>
    134112        </div>

  • WAeUP_SRP/base/skins/waeup_layout/layout_application_edit.pt

    r2243 r2579  
    1 <metal:block define-macro="default_edit"
     1<metal:define tal:define="isStaff context/isStaff;
     2                          isStudent context/isStudent;">
     3
     4<metal:block tal:condition="isStaff">             
     5<metal:block use-macro="here/layout_waeup_edit/macros/default_edit"/>             
     6</metal:block>       
     7
     8
     9<metal:block define-macro="application_student_edit"
     10  tal:condition="isStudent"
    211  tal:define="layout options/layout;
    312  ds options/datastructure;
    … …  
    817  proceed options/proceed|nothing;
    918  widgets python:context.getRenderedWidgets(layout);
    10   ">
     19  fields python:( 'app_email',
     20                  'app_mobile',)">
    1121  <table class="layoutDefault" summary="Form layout"
    1222         tal:condition="layout/rows">
    … …  
    107117  </table>
    108118</metal:block>
     119</metal:define>

  • WAeUP_SRP/base/skins/waeup_student/admission_form.pt

    r1808 r2579  
    3030            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
    3131            layout_mode='view_info',
    32             layout_id='student_application_fe')"
     32            layout_id='student_application')"
    3333            />
    3434

  • WAeUP_SRP/base/skins/waeup_student/admission_slip.pt

    r1977 r2579  
    2020            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
    2121            layout_mode='view_info',
    22             layout_id='student_application_fe')"
     22            layout_id='student_application')"
    2323            />
    2424

  • WAeUP_SRP/base/skins/waeup_student/application_edit.py

    r2390 r2579  
    3939is_valid, ds = app_doc.validate(request=REQUEST,
    4040                                schema_id = 'student_application',
    41                                 layout_id = 'student_application_fe',
     41                                layout_id = 'student_application',
    4242                                proxy=app,
    4343                                use_session=False)

  • WAeUP_SRP/base/skins/waeup_student/clearance_slip.pt

    r1737 r2579  
    1414              tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
    1515              layout_mode='view_info',
    16               layout_id='student_application_fe')"
     16              layout_id='student_application')"
    1717              />       
    1818             

  • WAeUP_SRP/base/skins/waeup_student/course_registration_slip.pt

    r2489 r2579  
    3131            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
    3232            layout_mode='view_info',
    33             layout_id='student_application_fe')"
     33            layout_id='student_application')"
    3434            />           
    3535      <table  cellpadding="2" cellspacing="0">

  • WAeUP_SRP/fceokene/profiles/default/workflows/waeup_student_wf/definition.xml

    r2572 r2579  
    217217             new_state="admitted" trigger="USER"
    218218             before_script="" after_script="">
    219  
    220  
     219
     220
    221221  <guard>
    222222   <guard-role>SectionOfficer</guard-role>
    … …  
    224224   <guard-role>Manager</guard-role>
    225225   <guard-role>SectionManager</guard-role>
     226   <guard-role>Owner</guard-role>
    226227  </guard>
    227228 </transition>
    … …  
    229230             new_state="cleared_and_validated"
    230231             trigger="USER" before_script="" after_script="">
    231  
    232  
     232
     233
    233234  <guard>
    234235   <guard-role>SectionOfficer</guard-role>
    … …  
    241242             new_state="student_created" trigger="USER"
    242243             before_script="" after_script="">
    243  
    244  
     244
     245
    245246  <guard>
    246247   <guard-role>Manager</guard-role>
    … …  
    254255             new_state="" trigger="USER" before_script=""
    255256             after_script="">
    256  
    257  
     257
     258
    258259  <guard>
    259260   <guard-role>Manager</guard-role>
    … …  
    268269             new_state="deactivated" trigger="USER"
    269270             before_script="" after_script="">
    270  
    271  
     271
     272
    272273  <guard>
    273274   <guard-role>SectionOfficer</guard-role>
    … …  
    279280             new_state="deferred" trigger="USER"
    280281             before_script="" after_script="">
    281  
    282  
     282
     283
    283284  <guard>
    284285   <guard-role>SectionOfficer</guard-role>
    … …  
    291292             new_state="clearance_pin_entered"
    292293             trigger="USER" before_script="" after_script="">
    293  
    294  
     294
     295
    295296  <guard>
    296297   <guard-role>SectionOfficer</guard-role>
    … …  
    303304             new_state="school_fee_paid" trigger="USER"
    304305             before_script="" after_script="">
    305  
    306  
     306
     307
    307308  <guard>
    308309   <guard-role>Manager</guard-role>
    … …  
    315316             new_state="objection_raised" trigger="USER"
    316317             before_script="" after_script="">
    317  
    318  
     318
     319
    319320  <guard>
    320321   <guard-role>SectionOfficer</guard-role>
    … …  
    328329             new_state="courses_registered" trigger="USER"
    329330             before_script="" after_script="">
    330  
    331  
     331
     332
    332333  <guard>
    333334   <guard-role>CourseAdviser</guard-role>
    … …  
    341342             new_state="clearance_pin_entered"
    342343             trigger="USER" before_script="" after_script="">
    343  
    344  
     344
     345
    345346  <guard>
    346347   <guard-role>SectionOfficer</guard-role>
    … …  
    353354             new_state="school_fee_paid" trigger="USER"
    354355             before_script="" after_script="">
    355  
    356  
     356
     357
    357358  <guard>
    358359   <guard-role>CourseAdviser</guard-role>
    … …  
    365366             new_state="clearance_requested" trigger="USER"
    366367             before_script="" after_script="">
    367  
    368  
     368
     369
    369370  <guard>
    370371   <guard-role>SectionOfficer</guard-role>
    … …  
    377378             new_state="returning" trigger="USER"
    378379             before_script="" after_script="">
    379  
    380  
     380
     381
    381382  <guard>
    382383   <guard-role>SectionOfficer</guard-role>
    … …  
    388389             new_state="courses_validated" trigger="USER"
    389390             before_script="" after_script="">
    390  
    391  
     391
     392
    392393  <guard>
    393394   <guard-role>CourseAdviser</guard-role>
    … …  
    401402  <description>Time of the last transition</description>
    402403  <default>
    403    
     404
    404405   <expression>state_change/getDateTime</expression>
    405406  </default>
Note: See TracChangeset for help on using the changeset viewer.