Changeset 472


Ignore:
Timestamp:
2 Sep 2006, 14:51:14 (18 years ago)
Author:
Henrik Bettermann
Message:

admission renamed, now application

Location:
WAeUP_SRP/trunk
Files:
11 added
12 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Students.py

    r469 r472  
    102102                logger.info('%(tr_count)s: Creating Student with ID %(sid)s Matric_no %(matric_no)s ' % vars())
    103103                s = getattr(self,sid)
    104                 s.invokeFactory('StudentAdmission','admission')
    105                 da = {'Title': 'Admission Data'}
     104                s.invokeFactory('StudentApplication','application')
     105                da = {'Title': 'Application Data'}
    106106                s.invokeFactory('StudentPersonal','personal')
    107107                da['jamb_reg_no'] = student.get('EntryRegNo')
    … …  
    112112                dc = {'Title': 'Clearance Data'}
    113113                dc['matric_no'] = matric_no
    114                 lga = student.get('State') + ' / ' + student.get('LGA')               
     114                lga = student.get('State') + ' / ' + student.get('LGA')
    115115                dc['lga'] = lga
    116116                dc['nationality'] = student.get('Nationality')
    … …  
    125125                d['campus_address'] = student.get('CampusAddress')
    126126                d['phone'] = student.get('PhoneNumber')
    127                 s.admission.getContent().edit(mapping=da)
     127                s.application.getContent().edit(mapping=da)
    128128                sp.getContent().edit(mapping=d)
    129129                sc.getContent().edit(mapping=dc)
    … …  
    295295            logger.info('processing %(REG-NO)s,%(NAME)s,%(SEX)s,%(STATE)s,%(LGA)s,%(ENG-SCORE)s,%(SUBJ1)s,%(SUBJ1-SCORE)s,%(SUBJ2)s,%(SUBJ2-SCORE)s,%(SUBJ3)s,%(SUBJ3-SCORE)s,%(AGGREGATE)s,%(UNIV1)s,%(FACULTY1)s,%(COURSE1)s,%(UNIV2)s,%(FACULTY2)s,%(COURSE2)s\n' % jamb)
    296296            jamb_reg_no = jamb.get('REG-NO')
    297             res = self.portal_catalog({'meta_type': "StudentAdmission",
     297            res = self.portal_catalog({'meta_type': "StudentApplication",
    298298                                     'jamb_reg_no': jamb_reg_no })
    299299            if res:
    … …  
    314314            logger.info('%(tr_count)s: Creating Student with ID %(sid)s REG-NO %(jamb_reg_no)s ' % vars())
    315315            s = getattr(self,sid)
    316             s.invokeFactory('StudentAdmission','admission')
    317             da = {'Title': 'Admission Data'}
     316            s.invokeFactory('StudentApplication','application')
     317            da = {'Title': 'Application Data'}
    318318##            s.invokeFactory('StudentPersonal','personal')
    319319##            sp = s.personal
    … …  
    334334            da["jamb_second_uni"] = jamb.get("UNIV2")
    335335##            s.personal.getContent().edit(mapping=d)
    336             s.admission.getContent().edit(mapping=da)
     336            s.application.getContent().edit(mapping=da)
    337337        return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
    338338    ###)
    339                
    340            
     339
     340
    341341
    342342    security.declareProtected(View,"Title")
    … …  
    369369            content = data.getContent()
    370370            return "%s %s" % (content.firstname,content.lastname)
    371         data = getattr(self,'admission',None)
     371        data = getattr(self,'application',None)
    372372        if data:
    373373            content = data.getContent()
    … …  
    446446        """compose title"""
    447447        return "Level %s" % self.aq_parent.getId()
    448    
     448
    449449
    450450InitializeClass(StudyLevel)
    … …  
    489489            return sum/course_count
    490490        return 0.0
    491    
     491
    492492InitializeClass(StudentStudyLevel)
    493493
    … …  
    523523###)
    524524
    525 class StudentAdmission(CPSDocument): ###(
    526     """
    527     WAeUP Student container for the various student data
    528     """
    529     meta_type = 'StudentAdmission'
    530     portal_type = meta_type
    531     security = ClassSecurityInfo()
    532 
    533     security.declareProtected(View,"Title")
    534     def Title(self):
    535         """compose title"""
    536         return "Admission Data"
    537 
    538 
    539 InitializeClass(StudentAdmission)
    540 
    541 def addStudentAdmission(container, id, REQUEST=None, **kw):
     525class StudentApplication(CPSDocument): ###(
     526    """
     527    WAeUP Student container for the various student data
     528    """
     529    meta_type = 'StudentApplication'
     530    portal_type = meta_type
     531    security = ClassSecurityInfo()
     532
     533    security.declareProtected(View,"Title")
     534    def Title(self):
     535        """compose title"""
     536        return "Application Data"
     537
     538
     539InitializeClass(StudentApplication)
     540
     541def addStudentApplication(container, id, REQUEST=None, **kw):
    542542    """Add a Students eligibility data."""
    543     ob = StudentAdmission(id, **kw)
     543    ob = StudentApplication(id, **kw)
    544544    return CPSBase_adder(container, ob, REQUEST=REQUEST)
    545545
    … …  
    587587    portal_type = meta_type
    588588    security = ClassSecurityInfo()
    589    
     589
    590590    def getCourseEntry(self,cid):
    591591        res = self.portal_catalog({'meta_type': "StudentCourse",

  • WAeUP_SRP/trunk/Widgets.py

    r463 r472  
    232232                err = 'Invalid Registration Number in the format: %s%s with N = Number, L = Letter' % (self.digits_str,self.letters_str)
    233233            else:
    234                 search = self.portal_catalog({'meta_type': 'StudentAdmission',
     234                search = self.portal_catalog({'meta_type': 'StudentApplication',
    235235                                              'jamb_reg_no': value,
    236236                                              })
    237                 if len(search) < 1: 
     237                if len(search) < 1:
    238238                    err = 'No JAMB data for %s' % (value)
    239239            if err:

  • WAeUP_SRP/trunk/__init__.py

    r467 r472  
    4141         "StudentStudyCourse",
    4242         "StudentCourseResult",
    43          "StudentAdmission",
     43         "StudentApplication",
    4444         "StudentClearance",
    4545         "StudentPersonal",

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

    r463 r472  
    1313 <object name="student_check_pin" meta_type="CPS Layout"/>
    1414 <object name="student_study_course" meta_type="CPS Layout"/>
    15  <object name="student_admission" meta_type="CPS Layout"/>
    16  <object name="student_admission_fe" meta_type="CPS Layout"/>
     15 <object name="student_application" meta_type="CPS Layout"/>
     16 <object name="student_application_fe" meta_type="CPS Layout"/>
    1717 <object name="student_clearance" meta_type="CPS Layout"/>
    1818 <object name="student_clearance_fe" meta_type="CPS Layout"/>

  • WAeUP_SRP/trunk/profiles/default/schemas.xml

    r454 r472  
    1616 <object name="scratch_card_batch.xml" meta_type="CPS Schema"/>
    1717 <object name="student_accommodation" meta_type="CPS Schema"/>
    18  <object name="student_admission" meta_type="CPS Schema"/>
     18 <object name="student_application" meta_type="CPS Schema"/>
    1919 <object name="student_clearance" meta_type="CPS Schema"/>
    2020 <object name="student_personal" meta_type="CPS Schema"/>

  • WAeUP_SRP/trunk/profiles/default/types.xml

    r464 r472  
    2121 <object name="StudentCourseResult" meta_type="CPS Flexible Type Information"/>
    2222 <object name="StudentPersonal" meta_type="CPS Flexible Type Information"/>
    23  <object name="StudentAdmission" meta_type="CPS Flexible Type Information"/>
     23 <object name="StudentApplication" meta_type="CPS Flexible Type Information"/>
    2424 <object name="StudentSemester" meta_type="CPS Flexible Type Information"/>
    2525 <object name="StudentsFolder" meta_type="CPS Flexible Type Information"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml

    r470 r472  
    3939    condition_expr="" url_expr="string:${object/absolute_url}/create_jamb"
    4040    visible="False"/>
    41  <action title="Check Admission Status" action_id="check_admission"
     41 <action title="Check Application Status" action_id="check_application"
    4242    category="object"
    4343    condition_expr="object/portal_membership/isAnonymousUser"
    44     url_expr="string:${object/absolute_url}/check_admission" visible="False">
     44    url_expr="string:${object/absolute_url}/check_application" visible="False">
    4545  <permission value="View"/>
    4646 </action>

  • WAeUP_SRP/trunk/profiles/default/workflows.xml

    r464 r472  
    7171   <bound-workflow workflow_id="waeup_student_wf"/>
    7272  </type>
    73   <type type_id="StudentAdmission">
     73  <type type_id="StudentApplication">
    7474   <bound-workflow workflow_id="waeup_student_wf"/>
    7575  </type>

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

    r455 r472  
    66 <permission>Modify portal content</permission>
    77 <permission>View</permission>
    8  <state state_id="admission_pin_entered" title="">
    9   <exit-transition transition_id="request_admission"/>
     8 <state state_id="application_pin_entered" title="">
     9  <exit-transition transition_id="apply"/>
    1010 </state>
    1111 <state state_id="admission_rejected" title="">
    1212  <exit-transition transition_id="finally_reject"/>
    1313 </state>
    14  <state state_id="admission_requested" title="">
     14 <state state_id="applied" title="">
    1515  <exit-transition transition_id="pume_fail"/>
    1616  <exit-transition transition_id="pume_pass"/>
    … …  
    3333 <state state_id="created" title="">
    3434  <exit-transition transition_id="create_content"/>
    35   <exit-transition transition_id="enter_admission_pin"/>
     35  <exit-transition transition_id="enter_application_pin"/>
    3636  <exit-transition transition_id="open"/>
    3737  <permission-map name="Modify portal content"
    … …  
    6161  <exit-transition transition_id="reject_admission"/>
    6262 </state>
    63  <state state_id="rejected" title="">
    64  </state>
    65  <state state_id="sleeping_mode" title="">
    66   <exit-transition transition_id="enter_admission_pin"/>
    67  </state>
     63
    6864 <transition transition_id="admit" title=""
    6965             new_state="admitted" trigger="USER"
    7066             before_script="" after_script="open_clearance">
    71  
     67
    7268  <guard>
    7369   <guard-role>Manager</guard-role>
    … …  
    8076             trigger="USER" before_script=""
    8177             after_script="open_personal">
    82  
     78
    8379  <guard>
    8480   <guard-role>Manager</guard-role>
    … …  
    9086             new_state="closed" trigger="USER"
    9187             before_script="" after_script="">
    92  
     88
    9389  <guard>
    9490   <guard-role>Manager</guard-role>
    … …  
    9995             new_state="created" trigger="USER"
    10096             before_script="" after_script="">
    101  
     97
    10298  <guard>
    10399  </guard>
    … …  
    108104             new_state="" trigger="USER" before_script=""
    109105             after_script="">
    110  
     106
    111107  <guard>
    112108  </guard>
    … …  
    114110  <transition-behavior behavior_id="allow-sub-delete"/>
    115111 </transition>
    116  <transition transition_id="enter_admission_pin" title=""
    117              new_state="admission_pin_entered"
     112 <transition transition_id="enter_application_pin" title=""
     113             new_state="application_pin_entered"
    118114             trigger="USER"
    119              before_script="validate_admission_pin"
    120              after_script="open_admission">
    121  
     115             before_script="validate_application_pin"
     116             after_script="open_application">
     117
    122118  <guard>
    123119   <guard-role>Manager</guard-role>
    … …  
    131127             before_script="validate_clearance_pin"
    132128             after_script="open_clearance">
    133  
     129
    134130  <guard>
    135131   <guard-role>Manager</guard-role>
    … …  
    141137             new_state="finally_rejected" trigger="USER"
    142138             before_script="" after_script="">
    143  
     139
    144140  <guard>
    145141   <guard-role>Manager</guard-role>
    … …  
    151147             new_state="opened" trigger="USER"
    152148             before_script="" after_script="">
    153  
     149
    154150  <guard>
    155151   <guard-role>Manager</guard-role>
    … …  
    160156             new_state="pume_failed" trigger="USER"
    161157             before_script="" after_script="">
    162  
     158
    163159  <guard>
    164160   <guard-role>Manager</guard-role>
    … …  
    170166             new_state="pume_passed" trigger="USER"
    171167             before_script="" after_script="">
    172  
     168
    173169  <guard>
    174170   <guard-role>Manager</guard-role>
    … …  
    180176             new_state="rejected" trigger="USER"
    181177             before_script="" after_script="">
    182  
     178
    183179  <guard>
    184180  </guard>
    … …  
    187183             new_state="admission_rejected" trigger="USER"
    188184             before_script="" after_script="">
    189  
     185
    190186  <guard>
    191187   <guard-role>Manager</guard-role>
    … …  
    198194             trigger="USER" before_script="open_clearance"
    199195             after_script="">
    200  
     196
    201197  <guard>
    202198   <guard-role>Manager</guard-role>
    … …  
    205201  </guard>
    206202 </transition>
    207  <transition transition_id="request_admission" title=""
    208              new_state="admission_requested" trigger="USER"
    209              before_script="" after_script="close_admission">
    210  
     203 <transition transition_id="apply" title=""
     204             new_state="applied" trigger="USER"
     205             before_script="" after_script="close_application">
     206
    211207  <guard>
    212208   <guard-role>Manager</guard-role>
    … …  
    218214             new_state="clearence_requested" trigger="USER"
    219215             before_script="" after_script="close_clearance">
    220  
    221   <guard>
    222    <guard-role>Manager</guard-role>
    223    <guard-role>SectionManager</guard-role>
    224    <guard-role>Owner</guard-role>
    225   </guard>
    226  </transition>
    227  <script script_id="close_admission" type="Script (Python)"
    228          filename="workflows/waeup_student_wf/scripts/close_admission.py"/>
     216
     217  <guard>
     218   <guard-role>Manager</guard-role>
     219   <guard-role>SectionManager</guard-role>
     220   <guard-role>Owner</guard-role>
     221  </guard>
     222 </transition>
     223 <script script_id="close_application" type="Script (Python)"
     224         filename="workflows/waeup_student_wf/scripts/close_application.py"/>
    229225 <script script_id="close_clearance" type="Script (Python)"
    230226         filename="workflows/waeup_student_wf/scripts/close_clearance.py"/>
    231227 <script script_id="close_personal" type="Script (Python)"
    232228         filename="workflows/waeup_student_wf/scripts/close_personal.py"/>
    233  <script script_id="open_admission" type="Script (Python)"
    234          filename="workflows/waeup_student_wf/scripts/open_admission.py"/>
     229 <script script_id="open_application" type="Script (Python)"
     230         filename="workflows/waeup_student_wf/scripts/open_application.py"/>
    235231 <script script_id="open_clearance" type="Script (Python)"
    236232         filename="workflows/waeup_student_wf/scripts/open_clearance.py"/>
    237233 <script script_id="open_personal" type="Script (Python)"
    238234         filename="workflows/waeup_student_wf/scripts/open_personal.py"/>
    239  <script script_id="validate_admission_pin"
     235 <script script_id="validate_application_pin"
    240236         type="Script (Python)"
    241          filename="workflows/waeup_student_wf/scripts/validate_admission_pin.py"/>
     237         filename="workflows/waeup_student_wf/scripts/validate_application_pin.py"/>
    242238 <script script_id="validate_clearance_pin"
    243239         type="Script (Python)"

  • WAeUP_SRP/trunk/skins/waeup_academics/academics_contents_display_buttons.py

    r454 r472  
    1010# $Id: folder_delete.py 30246 2005-12-02 20:10:18Z fguillaume $
    1111"""
    12 buttons shouldn't be displayed if 
     12buttons shouldn't be displayed if
    1313"""
    1414
    … …  
    1717                           'StudyLevel',
    1818                           'Student',
    19                            'StudentAdmission',
     19                           'StudentApplication',
    2020                           'StudentClearance',
    2121                           'StudentPersonal',

  • WAeUP_SRP/trunk/skins/waeup_default/display_content.py

    r454 r472  
    1010# $Id: folder_delete.py 30246 2005-12-02 20:10:18Z fguillaume $
    1111"""
    12 content  should be displayed if 
     12content  should be displayed if
    1313"""
    1414return context.portal_type in ('Certificate',
    1515                                'Department',
    16                                 'StudentAdmission',
     16                                'StudentApplication',
    1717                                'StudentClearance',
    1818                                'StudentPersonal',

  • WAeUP_SRP/trunk/skins/waeup_default/process_waeup_login.py

    r350 r472  
    1717##member_id = str(member)
    1818##ma = getattr(context,member_id)
    19 ##jkw = {'admission_sc_pin': sc_pin}
     19##jkw = {'application_sc_pin': sc_pin}
    2020##jamb = getattr(ma,'JAMB')
    2121##jamb.getContent().edit(mapping=jkw)

  • WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt

    r460 r472  
    1818    <tal:block tal:condition="python:context.portal_type == 'Student'" tal:omit-tag=""> 
    1919      <tal:block tal:define="
    20                           adm python:here.admission;
    21                           adm_proxy python:adm.getContent();
     20                          appl python:here.application;
     21                          appl_proxy python:appl.getContent();
    2222                          clear python:here.clearance;
    2323                          clear_proxy python:clear.getContent();
    … …  
    2929 
    3030   
    31       <tal:block tal:content="structure python:adm_proxy.render(cluster='adm_slip')" />
    32       <tal:block tal:content="structure python:clear_proxy.render(cluster='adm_slip')" />
    33       <tal:block tal:content="structure python:pers_proxy.render(cluster='adm_slip')" />
     31      <tal:block tal:content="structure python:appl_proxy.render(cluster='appl_slip')" />
     32      <tal:block tal:content="structure python:clear_proxy.render(cluster='appl_slip')" />
     33      <tal:block tal:content="structure python:pers_proxy.render(cluster='appl_slip')" />
    3434
    3535
Note: See TracChangeset for help on using the changeset viewer.