Changeset 742 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

24 Oct 2006, 16:32:10 (18 years ago)

Author:

joachim

Message:

added pay-hostel-maintainance fee

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getMaintainancePrefix.py (added)
• getStudentInfo.py (modified) (3 diffs)
• layout_student_acco_create.pt (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/layout_enter_access_code.pt)
• layout_student_acco_edit.pt (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/layout_enter_access_code.pt) (1 diff)
• layout_student_acco_view.pt (added)
• layout_student_acco_view_slip.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/layout_accommodation_view_slip.pt)
• reserve_accommodation.py (modified) (4 diffs)
• student_index.py (modified) (1 diff)
• widget_scratch_card_pin_render.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -28 +28 @@
     if context.isManager() and 'students' in path_info:
         student_id = path_info[path_info.index('students')+1]
-##        if context.portal_type == 'Student':
-##            student_id = context.getId()
-##        elif context.aq_parent.portal_type == 'Student':
-##            student_id = context.aq_parent.getId()
-##        elif context.aq_parent.aq_parent.portal_type == 'Student':
-##            student_id = context.aq_parent.aq_parent.getId()
-##        elif context.aq_parent.aq_parent.aq_parent.portal_type == 'Student':
-##            student_id = context.aq_parent.aq_parent.aq_parent.getId()
-##        else:
-##            student_id = member_id
     else:
-        student_id = member_id
+        student_id = member_id 
 else:
     student_id = student.getId()
 res = context.portal_catalog(id = student_id,portal_type='Student')
-if not res or len(res) > 1:
+if not res:# or len(res) > 1:
     return None
 brain = res[-1]
 student = brain.getObject()
 student_path = brain.getPath()
-info['review_state'] = wf.getInfoFor(student,'review_state','keiner')
+info['review_state'] = wf.getInfoFor(student,'review_state',None)
 info['student'] = student
 info['id'] = student.getId()
@@ -66 +56 @@
     info['acco'] = acco
     info['acco_doc'] = acco.getContent()
+    info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None) 
 else:
     info['acco'] = None
@@ -96 +87 @@
         row['s_edit_link'] = "%s/%s" % (student.absolute_url(),se_link)
     row['review_state'] = so.review_state
-    row['display'] = so.review_state in ('opened','closed')
+    row['display'] = so.review_state in ('opened','closed',) or so.portal_type == "StudentAccommodation"
     items.append(row)
 info['items'] = items
+request.set('student_id',student_id)
+request.set('student_url',info['url'])
 return info

WAeUP_SRP/trunk/skins/waeup_student/layout_student_acco_edit.pt

@@ -1 @@
-<tal:block define="global creation python:1;
+<tal:block define="global creation python:0;
                    global formaction string:apply_admission" />
 <!-- a layout_lib macro -->

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -11 +11 @@
 
 info = context.getStudentInfo()
-validate = REQUEST.has_key("cpsdocument_create_button")
+validate = REQUEST.has_key("cpsdocument_create_button") or\
+           REQUEST.has_key("cpsdocument_edit_button")
 
 lt = context.portal_layouts
@@ -19 +20 @@
 info = context.getStudentInfo()
 student = info['student']
-if info['acco']:
-    return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
-res,psm,ds = lt.renderLayout(layout_id= 'student_accommodation',
+mode = 'create'
+if info.has_key('acco') and info['acco']:
+    if info['acco_review_state'] == "maintainance_fee_payed":
+        return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
+    else:
+        mode = 'edit'
+d = {}
+if mode == 'edit':
+    info = context.getStudentInfo()
+    d['acco_res_date'] = info['acco_doc'].acco_res_date
+    d['acco_res_sc_pin'] = info['acco_doc'].acco_res_sc_pin
+    d['bed'] = info['acco_doc'].bed
+    d['session'] = info['acco_doc'].session
+res,psm,ds = lt.renderLayout(layout_id= 'student_accommodation_fe',
                       schema_id= 'student_accommodation',
                       context=context,
                       mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
+                      ob=d,
+                      layout_mode=mode,
                       formaction = "reserve_accommodation",
                       button = "Book",
@@ -47 +59 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
-    pin = str(ds.get('acco_res_ac_pin'))
-
-    pa = context.portal_accommodation
-    code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
-    if code < 0:
-        return context.accommodation_pin_form(rendered = res,
+    if mode == 'create':
+        pin = str(ds.get('acco_res_sc_pin'))
+        pa = context.portal_accommodation
+        code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
+        if code < 0:
+            return context.accommodation_pin_form(rendered = res,
                                  psm = bed,
                                  firstlayout = True,
@@ -58 +70 @@
                                  ds = ds,
                                  )
-student.invokeFactory('StudentAccommodation',acco_id)
+        student.invokeFactory('StudentAccommodation',acco_id)
+        acco = getattr(student,acco_id)
+        ds.set('acco_res_date', current)
+        ds.set('bed', bed)
+        ds.set('session', session)
+        acco.getContent().edit(mapping=ds)
+        #wftool.doActionFor(acco,'pay_maintainance_fee',dest_container=acco)
+        return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % student.absolute_url())
+pin = str(ds.get('acco_main_sc_pin'))
+pp = context.portal_pins
 acco = getattr(student,acco_id)
-wftool.doActionFor(acco,'open',dest_container=acco)
-ds.set('acco_res_date', current)
-ds.set('bed', bed)
-ds.set('session', session)
+ds.set('acco_maint_date', current)
 acco.getContent().edit(mapping=ds)
+wftool.doActionFor(acco,'pay_maintainance_fee',dest_container=acco)
 return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % student.absolute_url())
+
 ##return context.accommodation_pin_form(rendered = res,
 ##                                 psm = "successfully reserved bed %s" % bed,

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -34 +34 @@
     elif state == 'application_pin_entered':
         return redirect("%s/passport_entry_view" % student.absolute_url())
+    return redirect("%s/student_view" % student.absolute_url())
 
 

WAeUP_SRP/trunk/skins/waeup_student/widget_scratch_card_pin_render.pt

@@ -1 +1 @@
 <tal:block define="mode options/mode;
                    id here/getWidgetId;
+                   id_p string:${id}_p;
                    id_b string:${id}_b;
                    id_n string:${id}_n;
-                   prefix options/prefix;
+                   prefix options/datastructure/?id_p;
                    batch options/datastructure/?id_b;
                    nr options/datastructure/?id_n;