Changeset 1032 for WAeUP_SRP/trunk


Ignore:
Timestamp:
12 Dec 2006, 10:00:51 (18 years ago)
Author:
Henrik Bettermann
Message:

logging messages modified
Study Course always listed
date labels chsnged

Location:
WAeUP_SRP/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Widgets.py

    r1030 r1032  
    538538                        s_logger.info('"%s","%s", "checked admission though logged in", "%s"' % (s_id,ref,pin))
    539539                        break
    540                     s_logger.info('"%s","%s", "successfully used pin", "%s"' % (s_id,ref,pin))
     540                    if ok == 1:   
     541                        s_logger.info('"%s","%s", "successfully used pin", "%s"' % (s_id,ref,pin))
     542                    else:
     543                        s_logger.info('"%s","%s", "repeatedly used pin", "%s"' % (s_id,ref,pin))
    541544                    break
    542545                else:
    … …  
    545548                if student is None:
    546549                    err = "Student not found."
    547                     s_logger.info('"%s","not found in admission list"' % (ref)) 
     550                    s_logger.info('"%s","not found in admission list"' % (ref))
    548551                    break
    549552                s_id = student.getId()
    … …  
    552555                        if hasattr(self.portal_directories.students,s_id):
    553556                            err = "Please login with your Student Id %s and 10-digit PIN." % s_id
    554                             s_logger.info('"%s","%s", "repeatedly checked admission with pin", "%s"' % (s_id,ref,pin))   
     557                            s_logger.info('"%s","%s", "repeatedly checked admission with pin", "%s"' % (s_id,ref,pin))
    555558                            break
    556559                        else:
    557                             s_logger.info('"%s","%s","(non-member) repeatedly checked admission with pin", "%s"' % (s_id,ref,pin)) 
     560                            s_logger.info('"%s","%s","(non-member) repeatedly checked admission with pin", "%s"' % (s_id,ref,pin))
    558561                    else:
    559562                        err = "Unknown error" % s_id
    560                         s_logger.info('"%s","%s", "repeatedly activated service with pin", "%s"' % (s_id,ref,pin))   
     563                        s_logger.info('"%s","%s", "repeatedly activated service with pin", "%s"' % (s_id,ref,pin))
    561564                        break
    562565                try:
    … …  
    565568                except:
    566569                    err = "Please login with your Student Id %s and 10-digit PIN." % s_id
    567                     s_logger.info('"%s","%s", "could not be made a member with pin", "%s"' % (s_id,ref,pin)) 
     570                    s_logger.info('"%s","%s", "could not be made a member with pin", "%s"' % (s_id,ref,pin))
    568571                    break
    569572            break

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml

    r1028 r1032  
    6363   <element value="alr_date"/>
    6464  </property>
    65   <property name="label">Exam Date (dd/mm/yyyy)</property>
    66   <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     65  <property name="label">Exam Date</property>
     66  <property name="label_edit">Exam Date</property>
    6767  <property name="readonly_layout_modes"/>
    6868  <property name="hidden_layout_modes">
    … …  
    153153   <element value="birthday"/>
    154154  </property>
    155   <property name="label">Date of Birth (dd/mm/yyyy)</property>
     155  <property name="label">Date of Birth</property>
    156156  <property name="label_edit">Date of Birth (dd/mm/yyyy)</property>
    157157  <property name="readonly_layout_modes"/>
    … …  
    231231   <element value="entry_date"/>
    232232  </property>
    233   <property name="label">Entry Date (dd/mm/yyyy)</property>
    234   <property name="label_edit">Entry Date (dd/mm/yyyy)</property>
     233  <property name="label">Entry Date</property>
     234  <property name="label_edit">Entry Date</property>
    235235  <property name="readonly_layout_modes">
    236236   <element value="edit"/>
    … …  
    247247   <element value="request_date"/>
    248248  </property>
    249   <property name="label">Request Date (dd/mm/yyyy)</property>
    250   <property name="label_edit">Request Date (dd/mm/yyyy)</property>
     249  <property name="label">Request Date</property>
     250  <property name="label_edit">Request Date</property>
    251251  <property name="readonly_layout_modes">
    252252   <element value="edit"/>
    … …  
    263263   <element value="cleared_date"/>
    264264  </property>
    265   <property name="label">Cleared Date (dd/mm/yyyy)</property>
    266   <property name="label_edit">Cleared Date (dd/mm/yyyy)</property>
     265  <property name="label">Cleared Date</property>
     266  <property name="label_edit">Cleared Date</property>
    267267  <property name="readonly_layout_modes">
    268268   <element value="edit"/>
    … …  
    323323   <element value="fst_sit_date"/>
    324324  </property>
    325   <property name="label">Exam Date (dd/mm/yyyy)</property>
    326   <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     325  <property name="label">Exam Date</property>
     326  <property name="label_edit">Exam Date</property>
    327327  <property name="readonly_layout_modes"/>
    328328  <property name="hidden_layout_modes">
    … …  
    637637   <element value="scd_sit_date"/>
    638638  </property>
    639   <property name="label">Exam Date (dd/mm/yyyy)</property>
    640   <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     639  <property name="label">Exam Date</property>
     640  <property name="label_edit">Exam Date</property>
    641641  <property name="readonly_layout_modes"/>
    642642  <property name="hidden_layout_modes">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml

    r1028 r1032  
    153153   <element value="birthday"/>
    154154  </property>
    155   <property name="label">Date of Birth (dd/mm/yyyy)</property>
     155  <property name="label">Date of Birth</property>
    156156  <property name="label_edit">Date of Birth (dd/mm/yyyy)</property>
    157157  <property name="readonly_layout_modes"/>
    … …  
    231231   <element value="entry_date"/>
    232232  </property>
    233   <property name="label">Entry Date (dd/mm/yyyy)</property>
    234   <property name="label_edit">Entry Date (dd/mm/yyyy)</property>
     233  <property name="label">Entry Date</property>
     234  <property name="label_edit">Entry Date</property>
    235235  <property name="readonly_layout_modes">
    236236   <element value="edit"/>
    … …  
    247247   <element value="request_date"/>
    248248  </property>
    249   <property name="label">Request Date (dd/mm/yyyy)</property>
    250   <property name="label_edit">Request Date (dd/mm/yyyy)</property>
     249  <property name="label">Request Date</property>
     250  <property name="label_edit">Request Date</property>
    251251  <property name="readonly_layout_modes">
    252252   <element value="edit"/>
    … …  
    263263   <element value="cleared_date"/>
    264264  </property>
    265   <property name="label">Cleared Date (dd/mm/yyyy)</property>
    266   <property name="label_edit">Cleared Date (dd/mm/yyyy)</property>
     265  <property name="label">Cleared Date</property>
     266  <property name="label_edit">Cleared Date</property>
    267267  <property name="readonly_layout_modes">
    268268   <element value="edit"/>
    … …  
    324324   <element value="fst_sit_date"/>
    325325  </property>
    326   <property name="label">Exam Date (dd/mm/yyyy)</property>
     326  <property name="label">Exam Date</property>
    327327  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
    328328  <property name="readonly_layout_modes"/>
    … …  
    641641   <element value="scd_sit_date"/>
    642642  </property>
    643   <property name="label">Exam Date (dd/mm/yyyy)</property>
     643  <property name="label">Exam Date</property>
    644644  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
    645645  <property name="readonly_layout_modes"/>

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

    r1027 r1032  
    4949args = {}
    5050action = "/external_clearance_edit_form"
     51if context.isStudent():
     52    action = "/clearance_edit_form"
     53
    5154if is_valid:
    5255    if cpsdocument_edit_button:
    5356        psm = "Content changed!"
    54         if context.isStudent():
    55            action = "/clearance_edit_form"
    5657        if clear_doc.clr_ac_pin == "":
    5758            res = context.portal_pins(student=member_id)
    … …  
    7576            logger.info('"%s","repeatedly requested clearance"' % (student_id))
    7677            psm = "You have already requested clearance!"
    77             if context.isStudent():
    78                action = "/clearance_edit_form"
    7978        else:
    8079            psm = "You must tick the acknowledgement check box before submission!"
    81             if context.isStudent():
    82                action = "/clearance_edit_form"
    8380    elif clear_and_validate_button and info['review_state'] == "clearance_requested":
    8481        logger.info('"%s","cleared","%s"' % (member_id,student_id ))

  • WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

    r1025 r1032  
    144144        row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
    145145    row['review_state'] = so.review_state
    146     row['display'] = so.review_state in ('opened','closed',)
     146    row['display'] = so.review_state in ('opened','closed',) or so.portal_type == 'StudentStudyCourse'
    147147    items.append(row)
    148148info['items'] = items

  • WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

    r1030 r1032  
    4242error = False
    4343if session.get("clicked",None):
    44     psm = 'Please wait a moment, until "Clearance started" turns green, then click on the green link'
     44    psm = 'Please wait a moment until "Clearance started" turns green, then click on the green link!'
    4545    error = True
     46    logger.info('"%s","repeatedly pressed the clearance button"' % (info['id']))
    4647elif app_doc.passport is None:
    4748    psm = "You must upload your passport picture before you can start the registration process!"
    4849    error = True
     50    logger.info('"%s", "tried to start clerance without passport picture"' % (info['id']))
    4951elif review_state == "clearance_pin_entered":
    50     psm = "You have already entered a clearance pin"
     52    psm = "You have already entered a clearance pin!"
    5153    error = True
     54    logger.info('"%s", "tried to start clearance though already started"' % (info['id']))
    5255elif psm == 'invalid':
    5356    psm = "Please correct your input!"
    5457    error = True
     58    logger.info('"%s","entered wrong clearance pin"' % (info['id']))
    5559if error:
    5660    return context.clearance_pin_form(rendered = res,
    … …  
    6266session.set("clicked","clicked")
    6367pin = str(ds.get('clr_ac_pin'))
    64 logger.info('"%s", "entered clearance pin", "%s"' % (info['id'],pin))
     68logger.info('"%s", "started clearance with pin", "%s"' % (info['id'],pin))
    6569wf.doActionFor(info['student'],'enter_clearance_pin')
    6670wf.doActionFor(info['clear'],'open')
Note: See TracChangeset for help on using the changeset viewer.