Changeset 576 for WAeUP_SRP

Timestamp:

28 Sep 2006, 11:07:55 (18 years ago)

Author:

joachim

Message:

fixed export

File:

• WAeUP_SRP/trunk/Academics.py (modified) (5 diffs)

WAeUP_SRP/trunk/Academics.py

@@ -806 +806 @@
                 department_d = department.getContent()
                 try:
-                    di['code'] = department_d.code
+                    di['code'] =  department.getId()
                     di['title'] = department_d.title
                     di['title_prefix'] = department_d.title_prefix
-                    di['code'] = di['code'] or department.id
                     di['review_state'] = self.portal_workflow.getInfoFor(department,'review_state','no_state')
                     export.append('"%(code)s","%(review_state)s","%(title)s","%(title_prefix)s","%(faculty_code)s"' % di)
@@ -837 +836 @@
         export.append(heading)
         #import pdb;pdb.set_trace()
-        fields = ("code",
-                  "title",
+        fields = ("title",
                   "credits",
                   "org_code",
@@ -851 +849 @@
                 di['department_code'] = department.id
                 for course in department.courses.objectValues():
+                    di['code'] = course.getId()
                     course_d = course.getContent()
                     for f in fields:
@@ -890 +889 @@
                 for certificate in department.certificates.objectValues():
                     certificate_d = certificate.getContent()
-                    di['code'] = getattr(certificate_d,'code',None)
+                    di['code'] = certificate.id
+                    #di['code'] = getattr(certificate_d,'code',None)
                     di['title'] = getattr(certificate_d,'title',None)
                     di['category'] = getattr(certificate_d,'category',None)
@@ -949 +949 @@
                                 di['semester'] = semesters.index(sem) + 1
                                 for course in semester.objectValues():
+                                    di['code'] = course.getId()
                                     course_d = course.getContent()
-                                    di['code'] = course_d.get('code',None)
                                     di['core_or_elective'] = getattr(course_d,'core_or_elective',None)
-                                    di['code'] = di['code'] or course.id
                                     di['review_state'] = self.portal_workflow.getInfoFor(course,'review_state','no_state')
                                     try: