Changeset 152 for waeup_product/trunk/skins

Timestamp:

4 Nov 2005, 17:07:18 (19 years ago)

Author:

joachim

Message:

=studylevel + Title

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPLayouts.py (modified) (1 diff)
• waeup_default/getWAeUPSchemas.py (modified) (2 diffs)
• waeup_default/getWAeUPTypes.py (modified) (7 diffs)
• waeup_student/create_jamb.py (modified) (4 diffs)
• waeup_student/process_waeup_login.py (modified) (1 diff)
• waeup_student/register_level.py (modified) (2 diffs)

waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py

@@ -1021 +1021 @@
         'rows': [
             [{'widget_id': 'Title', 'ncols': 1},],
+            #[{'widget_id': 'Year', 'ncols': 1},],
         ]
     },

waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py

@@ -105 +105 @@
         },
     },
+}
+#
+###)
+
+studylevel = { ###(
 }
 #
@@ -486 +491 @@
 schemas['students'] = students_folder_schema
 schemas['student'] = student_schema
+schemas['studylevel'] = studylevel
 schemas['course_results'] = course_results_schema
 schemas['student_personal'] = student_personal_schema

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -131 +131 @@
                  'name': 'delegate',
                  'action': 'folder_localrole_form',
-                 'permissions': (ModifyPortalContent),
-                 'visible' : 0,
+                 'permissions': (ModifyPortalContent,UniversityManage),
+                 'visible' : 1,
                 },
 ##                {'id': 'contents',
@@ -319 +319 @@
     'description': 'The data from JAMB',
     'content_icon': '',
-    'content_meta_type': 'CPS Document',
-    'product': 'CPSDocument',
-    'factory': 'addCPSDocument',
+    'content_meta_type': 'Jamb',
+    'product': 'WAeUP',
+    'factory': 'addJamb',
     'immediate_view': 'cpsdocument_view',
     'global_allow': True,
@@ -426 +426 @@
     'content_meta_type': 'Level',
     'product': 'WAeUP',
-    'factory': 'addLevelFolder',
+    'factory': 'addStudyLevel',
     'immediate_view': 'folder_view',
     'global_allow': True,
@@ -477 +477 @@
     'content_meta_type': 'Semester',
     'product': 'WAeUP',
-    'factory': 'addLevelFolder',
+    'factory': 'addSemester',
     'immediate_view': 'folder_view',
     'global_allow': True,
@@ -505 +505 @@
           {'id': 'add_course_ticket',
           'name': 'Add Course Ticket',
-          'condition': "python:member and 'Student'in member.getRoles()",
           'action'    : 'add_course_ticket',
           #'action': 'folder_factories',
-          'permissions': (StudentManage,)},
+          'permissions': (ModifyPortalContent,UniversityManage,StudentManage)},
          {'id': 'metadata',
           'name': 'action_metadata',
           'action': 'cpsdocument_metadata',
-          'condition': "python:member and 'Manager' in member.getRoles()",
-          'permissions': (UniversityManage,)},
+          'permissions': (ModifyPortalContent,UniversityManage,)},
           {'id': 'localroles',
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,),
+          'permissions': (ModifyPortalContent,UniversityManage,StudentManage),
           'visible': 0,
           },
@@ -531 +529 @@
     'product': 'WAeUP',
     'factory': 'addCourseTicket',
-    'immediate_view': 'folder_view',
+    'immediate_view': 'cpsdocument_view',
     'global_allow': True,
     'filter_content_types': True,
@@ -791 +789 @@
           {'id': 'add_accommodation',
           'name': 'Add Accommodation Hall',
-          'condition': "python:member and 'UniversityManager'in member.getRoles()",
+          #'condition': "python:member and 'UniversityManager'in member.getRoles()",
           'action'    : 'add_accommodation',
           #'action': 'folder_factories',

waeup_product/trunk/skins/waeup_student/create_jamb.py

@@ -37 +37 @@
 elif psm == 'valid':
     s_id = "s%s" % ds.get('reg_nr')
-    name = ds.get('name')
-    skw = {'title': name}
+    skw = {'title': "%(firstname)s %(lastname)s" % ds}
     context.invokeFactory('Student',s_id) 
     student = getattr(context,s_id)    
@@ -46 +45 @@
     student.invokeFactory('Jamb',jamb_id) 
     jamb = getattr(student,jamb_id)    
-    ds.set('title', name)
+    ds.set('title', "%(reg_nr)s (%(lastname)s)" % ds)
     jamb.getContent().edit(mapping=ds)
     context.notifyCPSDocumentCreation(ob=jamb)
@@ -57 +56 @@
     if noCPSMember:
         pr.addMember(s_id, 'UnSeT',roles=('Member','Student','Contributor'))
+    student.manage_setLocalRoles(s_id, ['Owner'])
+    jamb.manage_setLocalRoles(s_id, ['Owner'])
+##    student.getContent().setOwnership(s_id)
+##    jamb.getContent().setOwnership(s_id)
 ##    groups = context.portal_directories.groups
 ##    gm = list(groups.getEntry('Students')['members'])
@@ -63 +66 @@
 ##                      'members': gm})  
     return context.students_folder_view_manager(psm=psm)
-##    return context.create_jamb_form(rendered = res,
-##                                 psm = psm,
-##                                 ds = ds,
-##                                 )
-    
-return res,psm,ds
 

waeup_product/trunk/skins/waeup_student/process_waeup_login.py

@@ -25 +25 @@
 pd = getattr(ma,pdid)
 pkw = {}
-pkw['sex'] = getattr(jamb,'sex')
-pkw['firstname'] = getattr(jamb,'firstname')
-pkw['middlename'] = getattr(jamb,'middlename')
-pkw['lastname'] = getattr(jamb,'lastname')
-pkw['aggregate'] = getattr(jamb,'aggregate')
-pkw['faculty'] = getattr(jamb,'faculty')
-pkw['age'] = getattr(jamb,'age')
-pkw['state'] = getattr(jamb,'state')
+jc = jamb.getContent()
+pkw['sex'] = getattr(jc,'sex')
+pkw['firstname'] = getattr(jc,'firstname')
+pkw['middlename'] = getattr(jc,'middlename')
+pkw['lastname'] = getattr(jc,'lastname')
+pkw['aggregate'] = getattr(jc,'aggregate')
+pkw['faculty'] = getattr(jc,'faculty')
+pkw['age'] = getattr(jc,'age')
+pkw['state'] = getattr(jc,'state')
 
-pd.edit(mapping=pkw)
+pd.getContent().edit(mapping=pkw)
 context.notifyCPSDocumentCreation(ob=pd)
 return response.redirect(ma.absolute_url())

waeup_product/trunk/skins/waeup_student/register_level.py

@@ -28 +28 @@
                                  create = 1,
                                  type_name = type_name,
-                                 psm = 'Not yet active',
-                                 #psm = 'Please correct your errors',
+                                 #psm = 'Not yet active',
+                                 psm = 'Please correct your errors',
                                  )
 elif psm == '':
@@ -42 +42 @@
     psm = (ds)
     oid = ds.get('Title')
-    return context.common_edit_form(rendered = res,
+    if hasattr(context,oid):
+        return context.common_edit_form(rendered = res,
                                  create = 1,
                                  type_name = type_name,
-                                 psm = 'Not yet active',
-                                 #psm = 'Please correct your errors',
+                                 psm = 'You already registered for that level',
                                  )
-    
-    halls = getattr(context,'accommodation').contentValues()
-    beds = []
-    student = context.PERSONAL.getContent()
-    sf = context.getContent()
-    for hall in halls:
-        h = hall.getContent()
-        ba = int(getattr(h,'beds_assigned',0))
-        bal = getattr(h,'beds_assigned_list',[])
-        nr_of_beds = int(h.nr_of_blocks) * int(h.nr_of_floors) * int(h.rooms_per_floor) * int(h.beds_per_room)
-        if h.which_sex == student.sex and nr_of_beds > len(bal):
-            break
-    dict = {'heading': h.heading,
-            'text': h.text,
-            'which_sex': h.which_sex,
-            'nr_of_blocks': h.nr_of_blocks,
-            'nr_of_floors': h.nr_of_floors,
-            'rooms_per_floor': h.rooms_per_floor,
-            'beds_per_room': h.beds_per_room,
-            'nr_of_free': nr_of_beds,
-            'beds_assigned': ba,
-             }
-    ba += 1
-    dict['beds_assigned'] = ba
-    bal.append(('%s:%d' % (pm.getAuthenticatedMember(),ba)))
-    dict['beds_assigned_list'] = bal
-    psm = "h:%(heading)s free:%(nr_of_free)s %(beds_assigned)s" % dict
-    sf.edit(mapping = ds)
-    h.edit(mapping = dict)
-    #psm = "Your not admitted"
-    return context.booked_accommodation(v=dict)
+    context.invokeFactory(type_name,oid) 
+    object = getattr(context,oid)
+    voc = pv.courselevel
+    ds.set('Title',voc.get(oid))
+    object.getContent().edit(mapping=ds,proxy=object)
+    context.notifyCPSDocumentCreation(ob=object)
+    psm = 'new %s created' % oid
+    semester_id = 'Semester_1_%s_%s' % (oid,context.getId())
+    object.invokeFactory('Semester',semester_id)
+    semester = getattr(object,semester_id)
+    semester.getContent().edit(mapping={'Title': 'First Semester'})
+    semester_id = 'Semester_2_%s_%s' % (oid,context.getId())
+    object.invokeFactory('Semester',semester_id)
+    semester = getattr(object,semester_id)
+    semester.getContent().edit(mapping={'Title': 'Second Semester'})
+    context_ti = context.portal_types[context.portal_type] 
+    index = context_ti.getActionById('view','university_view')
+    return getattr(context,index)(psm=psm)