Changeset 7665 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

17 Feb 2012, 12:06:10 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename attribute core_or_elective to mandatory.

The following commands in debug mode will fix existing databases:

from zope.component import getUtility
from zope.catalog.interfaces import ICatalog
from zope.intid.interfaces import IIntIds
import transaction
sm = rootfutminna?.getSiteManager()
cat = sm.getUtility(ICatalog, name='certcourses_catalog')
cat.values()[0].documentCount()
results = cat.apply({'course_code':(None,None)})
uidutil = getUtility(IIntIds, context=cat)
for r in results:

... o = uidutil.getObject(r)
... o.mandatory = o.core_or_elective
...

cat = sm.getUtility(ICatalog, name='coursetickets_catalog')
cat.values()[0].documentCount()
results = cat.apply({'code':(None,None)})
uidutil = getUtility(IIntIds, context=cat)
for r in results:

... o = uidutil.getObject(r)
... o.mandatory = o.core_or_elective
...

transaction.commit()

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (3 diffs)
• browser_templates/studyleveleditpage.pt (modified) (1 diff)
• browser_templates/studylevelmanagepage.pt (modified) (1 diff)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• studycourse.py (modified) (2 diffs)
• tests/sample_courseticket_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -681 +681 @@
                          ('Dept.','dcode', 1.5), ('Faculty','fcode', 1.5),
                          ('Cred.', 'credits', 1.5),
-                         ('Mand.', 'core_or_elective', 1.5),
+                         ('Mand.', 'mandatory', 1.5),
                          ('Score', 'score', 1.5),('Auto', 'automatic', 1.5)
                          ],
@@ -1684 +1684 @@
         for id in child_id:
             # Students are not allowed to remove core tickets
-            if not self.context[id].core_or_elective:
+            if not self.context[id].mandatory:
                 try:
                     del self.context[id]
@@ -1710 +1710 @@
     grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(ICourseTicketAdd).omit(
-        'grade', 'score', 'core_or_elective', 'automatic', 'carry_over')
+        'grade', 'score', 'mandatory', 'automatic', 'carry_over')
 
     def update(self):

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveleditpage.pt

@@ -22 +22 @@
         <input type="checkbox" name="val_id"
                   tal:attributes="value value/__name__"
-        tal:condition="not: value/core_or_elective" />
+        tal:condition="not: value/mandatory" />
       </td>
       <td tal:content="value/semester">SEMESTER</td>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt

@@ -73 +73 @@
           <td tal:content="value/fcode">FACULTY</td>
           <td tal:content="value/credits">CREDITS</td>
-          <td tal:content="value/core_or_elective">MANDATORY</td>
+          <td tal:content="value/mandatory">MANDATORY</td>
           <td tal:content="value/score">SCORE</td>
           <td tal:content="value/carry_over">CO</td>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt

@@ -53 +53 @@
       <td tal:content="value/fcode">FACULTY</td>
       <td tal:content="value/credits">CREDITS</td>
-      <td tal:content="value/core_or_elective">MANDATORY</td>
+      <td tal:content="value/mandatory">MANDATORY</td>
       <td tal:content="value/score">SCORE</td>
       <td tal:content="value/carry_over">CO</td>

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -357 +357 @@
     dcode = Attribute('department code of the original course')
 
-    core_or_elective = schema.Bool(
+    mandatory = schema.Bool(
         title = u'Mandatory',
         default = False,

main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py

@@ -57 +57 @@
                 ticket.code = val.getCourseCode()
                 ticket.automatic = True
-                ticket.core_or_elective = val.core_or_elective
+                ticket.mandatory = val.mandatory
                 ticket.title = val.course.title
                 ticket.fcode = val.course.__parent__.__parent__.__parent__.code
@@ -83 +83 @@
                         co_ticket = CourseTicket()
                         for name in ['code', 'title', 'credits', 'passmark',
-                                     'semester', 'core_or_elective',
+                                     'semester', 'mandatory',
                                      'fcode', 'dcode']:
                             setattr(co_ticket, name, getattr(val, name))

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/sample_courseticket_data.csv

@@ -1 @@
-reg_number,matric_number,level,code,score,core_or_elective
+reg_number,matric_number,level,code,score,mandatory
 1,,100,COURSE1,1,True
 2,,100,COURSE1,2,False

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py

@@ -523 +523 @@
         self.assertEqual(courseticket.__parent__.__parent__.certificate.code, u'CERT1')
         self.assertEqual(courseticket.score, 1)
-        self.assertEqual(courseticket.core_or_elective, True)
+        self.assertEqual(courseticket.mandatory, True)
         self.assertEqual(courseticket.fcode, 'NA')
         self.assertEqual(courseticket.dcode, 'NA')

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -1206 +1206 @@
         self.assertRaises(
             LookupError, self.browser.getControl, name='val_id')
-        self.student['studycourse']['200']['COURSE1'].core_or_elective = False
+        self.student['studycourse']['200']['COURSE1'].mandatory = False
         self.browser.open(self.student_path + '/studycourse/200/edit')
         # Now the student can remove the ticket