Changeset 3494 for WAeUP_SRP

Timestamp:

8 May 2008, 09:35:54 (17 years ago)

Author:

joachim

Message:

implement certificates_catalog

Location:

WAeUP_SRP

Files:

• base/Widgets.py (modified) (1 diff)
• base/exportimport.py (modified) (1 diff)
• base/skins/waeup_academics/getCertificatesVoc.py (modified) (1 diff)
• uniben/profiles/default/certificates_catalog.xml (added)
• uniben/profiles/default/toolset.xml (modified) (2 diffs)

WAeUP_SRP/base/Widgets.py

@@ -857 +857 @@
             application_category = "basic"
         if not hasattr(self,'_v_certificates_docs'):
-            res = self.portal_catalog_real.search({'meta_type': "Certificate"})
+            # res = self.portal_catalog_real.search({'meta_type': "Certificate"})
+            # d = {}
+            # for cert in res:
+            #     c = cert.getObject().getContent()
+            #     if getattr(c,'application_category',''):
+            #         d[cert.getId] = c
+            res = self.certificates_catalog()
             d = {}
             for cert in res:
-                c = cert.getObject().getContent()
-                if getattr(c,'application_category',''):
-                    d[cert.getId] = c
+                if getattr(cert,'application_category',''):
+                    d[cert.code] = cert
             self._v_certificates_docs = d
         l  = [('','','')]

WAeUP_SRP/base/exportimport.py

@@ -125 +125 @@
     importWAeUPTable(site.portal_accommodation, '', context,'accommodation')
     importWAeUPTable(site.courses_catalog, '', context,'courses_catalog')
+    importWAeUPTable(site.certificates_catalog, '', context,'certificates_catalog')
     importWAeUPTable(site.payments_catalog, '', context,'payments_catalog')
     importWAeUPTable(site.online_payments_import, '', context,'online_payments_import')

WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py

@@ -5 +5 @@
 
 """
+# if key is None:
+#     res = context.portal_catalog.search({'meta_type': "Certificate"})
+#     return [(d.getId,d.Title,) for d in res]
+# res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
+# if res:
+#     return res[0].Title
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Certificate"})
-    return [(d.getId,d.Title,) for d in res]
-res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
+    res = context.certificates_catalog()
+    return [(d.code,d.title,) for d in res]
+res = context.certificates_catalog(code=key)
 if res:
-    return res[0].Title
+    return res[0].title
 raise KeyError

WAeUP_SRP/uniben/profiles/default/toolset.xml

@@ -7 +7 @@
  <required tool_id="portal_accommodation"
            class="Products.WAeUP_SRP.WAeUPTables.AccommodationTable"/>
+ <required tool_id="applicants_catalog"
+           class="Products.WAeUP_SRP.WAeUPTables.ApplicantsCatalog"/>
+ <required tool_id="certificates_catalog"
+           class="Products.WAeUP_SRP.WAeUPTables.CertificatesCatalog"/>
  <required tool_id="courses_catalog"
            class="Products.WAeUP_SRP.WAeUPTables.CoursesCatalog"/>
+ <required tool_id="course_results"
+           class="Products.WAeUP_SRP.WAeUPTables.CourseResults"/>
  <required tool_id="payments_catalog"
            class="Products.WAeUP_SRP.WAeUPTables.PaymentsCatalog"/>
@@ -23 +29 @@
  <required tool_id="students_catalog"
            class="Products.WAeUP_SRP.WAeUPTables.StudentsCatalog"/>
- <required tool_id="applicants_catalog"
-           class="Products.WAeUP_SRP.WAeUPTables.ApplicantsCatalog"/>
- <required tool_id="course_results"
-           class="Products.WAeUP_SRP.WAeUPTables.CourseResults"/>
  <required tool_id="waeup_tool"
            class="Products.WAeUP_SRP.WAeUPTool.WAeUPTool"/>