Changeset 379 for WAeUP_SRP/trunk

Timestamp:

16 Aug 2006, 08:12:45 (18 years ago)

Author:

joachim

Message:

added import fields:
Courses: Category AdmStatus? FORMERCODE
Faculty: CollegeCode?
Certificate: MaxLoad? MaxElect?
CertficateCourse?: AdmStatus?

M profiles/default/schemas/certificate.xml
M profiles/default/schemas/course.xml
M profiles/default/schemas/faculty.xml
M profiles/default/layouts/certificate.xml
M profiles/default/layouts/course.xml
M profiles/default/layouts/faculty.xml
M Academics.py

Location:

WAeUP_SRP/trunk

Files:

• Academics.py (modified) (3 diffs)
• profiles/default/layouts/certificate.xml (modified) (3 diffs)
• profiles/default/layouts/course.xml (modified) (2 diffs)
• profiles/default/layouts/faculty.xml (modified) (2 diffs)
• profiles/default/schemas/certificate.xml (modified) (1 diff)
• profiles/default/schemas/course.xml (modified) (2 diffs)
• profiles/default/schemas/faculty.xml (modified) (1 diff)

WAeUP_SRP/trunk/Academics.py

@@ -83 +83 @@
             d["degree_grade"] = faculty.get("degree_grade")
             d['institution_type'] = 'faculty'
+            d['Description'] = ''
+            d['college_code'] = faculty.get('CollegeCode')
             f.getContent().edit(mapping=d)
         return self.academics.academics_contents()
@@ -197 +199 @@
             if len(course_id) == 3:
                 course_id = "%s000" % course_id
-##            elif course_id.startswith('CHEM'):
-##                tid = course_id.replace('CHEM','CHE')
-##                logger.info("invalid course_code %(course_id)s renaming to %(tid)s" % vars())
-##                course_id = tid
-##            elif course_id.startswith('DAIC'):
-##                tid = course_id.replace('DAIC','DAC')
-##                logger.info("invalid course_code %(course_id)s renaming to %(tid)s" % vars())
-##                course_id = tid
-##            elif course_id.startswith('DAIM'):
-##                tid = course_id.replace('DAIM','DAM')
-##                logger.info("invalid course_code %(course_id)s renaming to %(tid)s" % vars())
-##                course_id = tid
             elif len(course_id) > 10:
                 logger.info("invalid course_code %(CourseCode)s" % course)
@@ -230 +220 @@
             dict['session'] = course.get('Session')
             dict['category'] = course.get('Category')
+            dict['adm_status'] = course.get('AdmStatus')
+            dict['former_code'] = course.get('FORMERCODE')
             pm = course.get('PassMark')
             if pm.find(',') > -1:

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

@@ -40 +40 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="vocabulary">courselevel</property>
+ </widget>
+ <widget name="m_prefix" meta_type="String Widget">
+  <property name="title">MPREFIX</property>
+  <property name="fields">
+   <element value="m_prefix"/>
+  </property>
+  <property name="label">MPREFIX</property>
+  <property name="label_edit">MPREFIX</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="max_elect" meta_type="String Widget">
+  <property name="title">Max Elect</property>
+  <property name="fields">
+   <element value="max_elect"/>
+  </property>
+  <property name="label">Max Elect</property>
+  <property name="label_edit">Max Elect</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
  </widget>
  <widget name="max_load" meta_type="Int Widget">
@@ -146 +168 @@
   </row>
   <row>
+   <cell name="max_load"/>
+  </row>
+  <row>
    <cell name="promotion_credits"/>
   </row>
@@ -163 +188 @@
    <cell name="n_core"/>
   </row>
+  <row>
+   <cell name="max_elect"/>
+  </row>
+  <row>
+   <cell name="m_prefix"/>
+  </row>
  </table>
 </object>

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

@@ -7 +7 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
+ <widget name="adm_status" meta_type="String Widget">
+  <property name="title">Adm Status</property>
+  <property name="fields">
+   <element value="adm_status"/>
+  </property>
+  <property name="label">Adm Status</property>
+  <property name="label_edit">Adm Status</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="category" meta_type="String Widget">
   <property name="title">Category</property>
@@ -25 +36 @@
   <property name="label">Credits</property>
   <property name="label_edit">Credits</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="former_code" meta_type="String Widget">
+  <property name="title">Former Code</property>
+  <property name="fields">
+   <element value="former_code"/>
+  </property>
+  <property name="label">Former Code</property>
+  <property name="label_edit">Former Code</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>

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

@@ -39 +39 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="college_code" meta_type="String Widget">
+  <property name="title">College Code</property>
+  <property name="fields">
+   <element value="college_code"/>
+  </property>
+  <property name="label">College Code</property>
+  <property name="label_edit">College Code</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="degree_grade" meta_type="String Widget">
   <property name="title">Degree Grade</property>
@@ -75 +86 @@
    <cell name="degree_grade"/>
   </row>
+  <row>
+   <cell name="college_code"/>
+  </row>
  </table>
 </object>

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

@@ -11 +11 @@
  <field name="heading" meta_type="CPS String Field"/>
  <field name="m_prefix" meta_type="CPS String Field"/>
+ <field name="max_elect" meta_type="CPS String Field"/>
  <field name="max_load" meta_type="CPS Int Field"/>
  <field name="max_pass" meta_type="CPS Int Field"/>

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

@@ -1 +1 @@
 <?xml version="1.0"?>
 <object name="course" meta_type="CPS Schema">
+ <field name="adm_status" meta_type="CPS String Field"/>
  <field name="category" meta_type="CPS String Field"/>
  <field name="code" meta_type="CPS String Field">
@@ -6 +7 @@
  </field>
  <field name="credits" meta_type="CPS Int Field"/>
+ <field name="former_code" meta_type="CPS String Field"/>
  <field name="org_code" meta_type="CPS String Field">
   <property name="is_searchabletext">True</property>

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

@@ -3 +3 @@
  <field name="bank_code" meta_type="CPS String Field"/>
  <field name="code" meta_type="CPS String Field"/>
+ <field name="college_code" meta_type="CPS String Field"/>
  <field name="degree_grade" meta_type="CPS String Field"/>
  <field name="institution_type" meta_type="CPS String Field"/>