Changeset 575

Timestamp:

28 Sep 2006, 07:18:24 (18 years ago)

Author:

Henrik Bettermann

Message:

email field added to personal schema and layout
title method for AccoFolder? added

Location:

WAeUP_SRP/trunk

Files:

• Accommodation.py (modified) (7 diffs)
• Extensions/waeup_management_theme.zexp (deleted)
• Extensions/waeup_plain_theme.zexp (deleted)
• profiles/default/layouts/student_personal.xml (modified) (5 diffs)
• profiles/default/schemas/student_personal.xml (modified) (1 diff)
• profiles/default/types/AcademicsFolder.xml (modified) (1 diff)
• profiles/default/vocabularies/pin_prefixes.xml (modified) (1 diff)

WAeUP_SRP/trunk/Accommodation.py

@@ -6 +6 @@
 from Products.CMFCore.permissions import View
 from Products.CMFCore.permissions import ModifyPortalContent
-from Products.CPSCore.CPSBase import CPSBase_adder, CPSBaseFolder 
-#from Products.CPSCore.CPSBase import CPSBaseDocument as BaseDocument 
-from Products.CPSDocument.CPSDocument import CPSDocument 
-from Products.CPSCore.CPSBase import CPSBaseBTreeFolder as BaseBTreeFolder 
+from Products.CPSCore.CPSBase import CPSBase_adder, CPSBaseFolder
+#from Products.CPSCore.CPSBase import CPSBaseDocument as BaseDocument
+from Products.CPSDocument.CPSDocument import CPSDocument
+from Products.CPSCore.CPSBase import CPSBaseBTreeFolder as BaseBTreeFolder
 from Products.WAeUP_SRP.WAeUPTables import AccommodationTable
 
 class AccoFolder(CPSDocument): ###(
     """
-    WAeUP AccoFolder containing Accommodation halls 
+    WAeUP AccoFolder containing Accommodation halls
     """
     meta_type = 'AccoFolder'
@@ -20 +20 @@
     security = ClassSecurityInfo()
     
+    security.declareProtected(View,"Title")
+    def Title(self):
+        """compose title"""
+        return "Accommodation"    
+
     security.declareProtected(ModifyPortalContent,"generateFreeBedsList") ###(
     def generateFreeBedsList(self):
@@ -26 +31 @@
         """
         freelist = AccommodationTable()
-        l = self.portal_catalog({'meta_type': "Accommodation"}) 
+        l = self.portal_catalog({'meta_type': "Accommodation"})
         halls = []
         for h in l:
@@ -52 +57 @@
                             elif bed in h.beds_for_final:
                                 bt = 'fi'
-                            bt = "%(sex)s_%(bt)s" % vars()  
+                            bt = "%(sex)s_%(bt)s" % vars()
                             uid = '%s_%d_%s' % (hall.getId(),room_nr,bed)
                             print bt,uid
@@ -60 +65 @@
                             except ValueError,e:
                                 freelist.deleteRecord(uid)
-                    
+
         return self.accommodation.academics_contents()
 
@@ -75 +80 @@
 class Accommodation(CPSDocument): ###(
     """
-    WAeUP Accommodation containing Departments 
+    WAeUP Accommodation containing Departments
     """
     meta_type = 'Accommodation'
     portal_type = meta_type
     security = ClassSecurityInfo()
-    
+
     security.declareProtected(View,"Title") ###(
     def Title(self):
@@ -91 +96 @@
 
 ###)
-                
+
 InitializeClass(Accommodation)
 

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

@@ -72 +72 @@
  </widget>
 
-
  <widget name="for_lga" meta_type="String Widget">
   <property name="title">Foreign Student Local Government Area</property>
@@ -174 +173 @@
 
 
+ <widget name="email" meta_type="Email Widget">
+  <property name="title">Email</property>
+  <property name="fields">
+   <element value="email"/>
+  </property>
+  <property name="label">Email</property>
+  <property name="label_edit">Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
  <widget name="next_kin_firstname" meta_type="String Widget">
   <property name="title">Next of Kin Firstname</property>
@@ -264 +275 @@
  </widget>
 
- <widget name="next_kin_email" meta_type="String Widget">
+ <widget name="next_kin_email" meta_type="Email Widget">
   <property name="title">Next of Kin Email</property>
   <property name="fields">
@@ -367 +378 @@
  </widget>
 
- <widget name="sponsor_email" meta_type="String Widget">
+ <widget name="sponsor_email" meta_type="Email Widget">
   <property name="title">Sponsor Email</property>
   <property name="fields">
@@ -509 +520 @@
   </row>
   <row>
+   <cell name="email"/>
+  </row>  
+  <row>
    <cell name="next_kin_firstname"/>
   </row>

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

@@ -24 +24 @@
  <field name="campus_address" meta_type="CPS String Field"/>
  <field name="phone" meta_type="CPS String Field"/>
+ <field name="email" meta_type="CPS String Field" />
 
  <field name="next_kin_firstname" meta_type="CPS String Field"/>

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

@@ -70 +70 @@
   <permission value="Modify portal content"/>
  </action>
- <action title="CertCourses" action_id="import_certificate_courses"
+ <action title="CertificateCourses" action_id="import_certificate_courses"
     category="import" condition_expr=""
     url_expr="string:${object_url}/loadCertificateCoursesFromCSV"

WAeUP_SRP/trunk/profiles/default/vocabularies/pin_prefixes.xml

@@ -9 +9 @@
     <item key="CLR" msgid="">Clearance</item>
     <item key="HOS" msgid="">Hostel Application</item>
-    <item key="HMU" msgid="">Old Hostels (Halls 1, 2, 3, 4)</item>
-    <item key="HMF" msgid="">New Hostel (Hall 5)</item>
-    <item key="HMP" msgid="">Postgraduate Hostel</item>
+    <item key="HMU" msgid="">Old Hostel (Halls 1, 2, 3, 4) Maintenance</item>
+    <item key="HMF" msgid="">New Hostel (Hall 5) Maintenance</item>
+    <item key="HMP" msgid="">Postgraduate Hostel Maintenance</item>
     <item key="GWN" msgid="">Gown Hiring</item>