Changeset 106 for waeup_product/trunk/skins/waeup_student

Timestamp:

27 Oct 2005, 19:30:56 (19 years ago)

Author:

joachim

Message:

=fixes for Henrik

Location:

waeup_product/trunk/skins/waeup_student

Files:

• check_admission.py (modified) (2 diffs)
• create_jamb.py (modified) (1 diff)
• process_waeup_login.py (modified) (1 diff)
• student_personal_view_student.pt (modified) (1 diff)
• students_folder_view.py (modified) (1 diff)

waeup_product/trunk/skins/waeup_student/check_admission.py

@@ -35 +35 @@
 elif psm == 'valid':
     s_id = "s%s" % ds.get('jamb_id')
-    sf = getattr(context,s_id,None)
-    if sf is None:
+    catalog = context.portal_catalog
+    search = catalog(SearchableText = "%s*" % s_id)
+    if len(search) < 1:
         psm = "Your not admitted"
         return context.check_admission_form(rendered = res,
-                                 psm = psm,
+                                 psm = psm + str(search),
                                  ds = ds,
                                  )
-    elif hasattr(sf,'PERSONAL'):
-        psm = "Your already admitted"
+    sf = getattr(context,s_id,None)
+    if sf and getattr(sf,'PERSONAL',None):
+        psm = "Your already admitted, pleae login"
         return context.check_admission_form(rendered = res,
                                  psm = psm,
@@ -52 +54 @@
     return REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=UnSeT&sc_pin=%s" 
                                     % (context.absolute_url(),s_id,sc_pin))
-    return context.student_admitted_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 student = student,
-                                 jamb = jamb,
-                                 pd = pd,
-                                 )
-    
-return res,psm,ds
+##    return context.student_admitted_form(rendered = res,
+##                                 psm = psm,
+##                                 ds = ds,
+##                                 student = student,
+##                                 jamb = jamb,
+##                                 pd = pd,
+##                                 )
+##    
+##return res,psm,ds
 

waeup_product/trunk/skins/waeup_student/create_jamb.py

@@ -52 +52 @@
     noCPSMember = False
     try:
-        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student'))
+        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student','Contributor'))
     except:
         noCPSMember = True
     if noCPSMember:
-        pr.addMember(s_id, 'UnSeT',roles=('Member',))
+        pr.addMember(s_id, 'UnSeT',roles=('Member','Student','Contributor'))
 ##    groups = context.portal_directories.groups
 ##    gm = list(groups.getEntry('Students')['members'])

waeup_product/trunk/skins/waeup_student/process_waeup_login.py

@@ -18 +18 @@
 jkw = {'admission_sc_pin': sc_pin}
 jamb = getattr(ma,'JAMB')
-jamb.edit(mapping=jkw)
+jamb.getContent().edit(mapping=jkw)
 #pdid = 'personal%s' % member_id
 pdid = 'PERSONAL'

waeup_product/trunk/skins/waeup_student/student_personal_view_student.pt

@@ -13 +13 @@
     <metal:block fill-slot="main">
       <tal:block tal:content="structure rendered_main|python:doc.render(proxy=here)" />
-      <p>
-        <a href="" tal:attributes="href string:${context/absolute_url}/student_personal_edit_form">edit</a>
-      </p>
     </metal:block>
     <metal:block fill-slot="sub">

waeup_product/trunk/skins/waeup_student/students_folder_view.py

@@ -14 +14 @@
         return context.students_folder_view_manager(psm=psm)
     elif 'Student' in roles:
-        return context.students_folder_view_student(psm=psm)
+        return getattr(context, str(member))()
+context_ti = context.portal_types['University'] 
+index = context_ti.getActionById('view','university_view')
+return getattr(context,index)(psm=psm)
 return context.students_folder_view_all(psm=psm)