Index: waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 103)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 106)
@@ -512,4 +512,64 @@
 ###)
 
+accobook = { ###(
+    'widgets': {
+        'sc_id': {
+            'type': 'String Widget',
+            'data': {
+                'title': 'SC ID',
+                'fields': ('accommodation_sc_id',),
+                'is_required': False,
+                'label': 'Card Serial Number ',
+                'label_edit': 'Card Serial Number',
+                'description': 'Card Serial Number ',
+                'help': 'This can be found on the bottom right of the reverse side of your Scratch Card',
+                'is_i18n': False,
+                'readonly_layout_modes': (),
+                'hidden_layout_modes': (),
+                'hidden_readonly_layout_modes': (),
+                'hidden_empty': False,
+                'hidden_if_expr': 'python:1',
+                'css_class': '',
+                'widget_mode_expr': '',
+                'display_width': 10,
+                'size_max': 0,
+            },
+        },
+        'sc_pin': {
+            'type': 'Scratchcard Pin Widget',
+            'data': {
+                'title': 'SC Pin',
+                'fields': ('accommodation_sc_pin'),
+                'is_required': True,
+                'label': 'PIN',
+                'label_edit': 'PIN',
+                'description': '',
+                'help': 'PIN-(Personal Identification Number) is an 8 or 12 digit number on the reverse side of the scratch card which you can purchase from many Banks',
+                'is_i18n': False,
+                'readonly_layout_modes': (),
+                'hidden_layout_modes': (),
+                'hidden_readonly_layout_modes': (),
+                'hidden_empty': False,
+                'hidden_if_expr': '',
+                'css_class': '',
+                'widget_mode_expr': '',
+                'display_width': 10,
+                'size_max': 10,
+            },
+        },
+    },
+   'layout': {
+        'style_prefix': 'layout_accobook_',
+        'flexible_widgets': (),
+        'ncols': 1,
+        'rows': [
+            #[{'widget_id': 'sc_id', 'ncols': 1},],
+            [{'widget_id': 'sc_pin', 'ncols': 1},],
+            [{'widget_id': 'jamb_id', 'ncols': 1},],
+        ]
+    },
+}
+###)
+
 admission_status = { ###(
     'widgets': {        
@@ -645,5 +705,5 @@
                 'title': 'Faculty',
                 'fields': ('faculty',),
-                'is_required': False,
+                'is_required': True,
                 'label': 'faculty',
                 'label_edit': 'faculty',
@@ -652,4 +712,17 @@
                 'is_i18n': False,
                 'vocabulary': 'faculties',
+            },
+        },
+        'course': {
+            'type': 'String Widget',
+            'data': {
+                'title': 'Study Course',
+                'fields': ('course',),
+                'is_required': True,
+                'label': 'Study Course',
+                'label_edit': 'Study Course',
+                'description': '',
+                'help': 'The course to study',
+                'is_i18n': False,
             },
         },
@@ -789,4 +862,5 @@
             [{'widget_id': 'aggregate', 'ncols': 1},],
             [{'widget_id': 'faculty', 'ncols': 1},],
+            [{'widget_id': 'course', 'ncols': 1},],
             [{'widget_id': 'listing_date', 'ncols': 1},],
             #[{'widget_id': '2nd_choice', 'ncols': 1},],
@@ -816,4 +890,5 @@
             [{'widget_id': 'aggregate', 'ncols': 1},],
             [{'widget_id': 'faculty', 'ncols': 1},],
+            [{'widget_id': 'course', 'ncols': 1},],
             [{'widget_id': 'listing_date', 'ncols': 1},],
             #[{'widget_id': '2nd_choice', 'ncols': 1},],
Index: waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 103)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 106)
@@ -47,4 +47,58 @@
         },
     },
+    'course': {
+        'type': 'CPS String Field',
+        'data': {
+            'default_expr': 'string:',
+            'is_searchabletext': True,
+            'acl_read_permissions': '',
+            'acl_read_roles': '',
+            'acl_read_expr': '',
+            'acl_write_permissions': '',
+            'acl_write_roles': '',
+            'acl_write_expr': '',
+            'read_ignore_storage': False,
+            'read_process_expr': '',
+            'read_process_dependent_fields': (),
+            'write_ignore_storage': False,
+            'write_process_expr': '',
+        },
+    },
+    'accomodation_sc_id': {
+        'type': 'CPS String Field',
+        'data': {
+            'default_expr': 'string:',
+            'is_searchabletext': True,
+            'acl_read_permissions': '',
+            'acl_read_roles': '',
+            'acl_read_expr': '',
+            'acl_write_permissions': '',
+            'acl_write_roles': '',
+            'acl_write_expr': '',
+            'read_ignore_storage': False,
+            'read_process_expr': '',
+            'read_process_dependent_fields': (),
+            'write_ignore_storage': False,
+            'write_process_expr': '',
+        },
+    },
+    'accomodation_sc_pin': {
+        'type': 'CPS String Field',
+        'data': {
+            'default_expr': 'string:',
+            'is_searchabletext': True,
+            'acl_read_permissions': '',
+            'acl_read_roles': '',
+            'acl_read_expr': '',
+            'acl_write_permissions': '',
+            'acl_write_roles': '',
+            'acl_write_expr': '',
+            'read_ignore_storage': False,
+            'read_process_expr': '',
+            'read_process_dependent_fields': (),
+            'write_ignore_storage': False,
+            'write_process_expr': '',
+        },
+    },
 }
 #
@@ -178,4 +232,11 @@
     },
     'faculty': {
+        'type': 'CPS String Field',
+        'data': {
+            'default_expr': 'string:',
+            'is_searchabletext': False,
+        },
+    },
+    'course': {
         'type': 'CPS String Field',
         'data': {
Index: waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 103)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 106)
@@ -36,12 +36,14 @@
                 {'id': 'add_faculty',
                  'name': 'Add a Faculty',
+                 'condition': "python:member and not 'Student'in member.getRoles()",
                  'action'    : 'string:${object/absolute_url}/create_common?type_name=Faculty',
                  #'action': 'folder_factories',
-                 'permissions': (ModifyPortalContent,UniversityManage,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'add_accommodation',
-                 'name': 'Add an Accomodation Hall',
+                 'name': 'Add an Accommodation Hall',
+                 'condition': "python:member and not 'Student'in member.getRoles()",
                  'action'    : 'string:${object/absolute_url}/add_accommodation',
                  #'action': 'folder_factories',
-                 'permissions': (ModifyPortalContent,UniversityManage,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'contents',
                  'name': 'action_folder_contents',
@@ -62,5 +64,5 @@
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
+          'permissions': (UniversityManage,StudentManage)
           },
                  )
@@ -286,5 +288,5 @@
     'description': '',
     'content_icon': '',
-    'content_meta_type': 'CPS Document',
+    'content_meta_type': 'StudentPersonal',
     'product': 'WAeUP',
     'factory': 'addStudentPersonal',
@@ -298,5 +300,4 @@
     'cps_display_as_document_in_listing': True,
     'cps_is_portalbox': False,
-    #'schemas': ['common','metadata','jamb'],
     'schemas': ['student_personal'],
     'layouts': ['student_personal'],
@@ -310,5 +311,4 @@
           'action': 'string:${object_url}/student_personal_index_html',
           #'action': 'string:${object_url}/cpsdocument_view',
-          'condition': '',
           'permission': ('View',),
           'category': 'object',
Index: waeup_product/trunk/skins/waeup_default/portlet_session_info.pt
===================================================================
--- waeup_product/trunk/skins/waeup_default/portlet_session_info.pt	(revision 103)
+++ waeup_product/trunk/skins/waeup_default/portlet_session_info.pt	(revision 106)
@@ -11,4 +11,6 @@
          tal:attributes="href string:${here/portal_url}/sections/waeup/students/${member}">goto your personal area</a>
     </span><br />
+    <a href="" tal:condition="python: 0" tal:attributes="href string:${context/portal_url}/cpsdirectory_entry_view?dirname=members&id=${member}">Edit your Preferences</a><br />
+   <br />
     (<a href="" i18n:translate=""
         tal:attributes="href string:${here/portal_url}/sections/waeup/logout">log out</a>)
