Changeset 4993 for main

Timestamp:

3 Feb 2010, 11:55:41 (15 years ago)

Author:

Henrik Bettermann

Message:

Remove category attribute.
max_pass and application_category must not be required.

Location:

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

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• browser/browser.txt (modified) (5 diffs)
• browser/templates/certificatepage.pt (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• university/certificate.py (modified) (1 diff)
• university/certificate.txt (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt

@@ -284 +284 @@
 
     >>> open('certificates.csv', 'wb').write(
-    ... """code,faculty_code,department_code,title,category,study_mode,start_level,end_level,max_pass,application_category
-    ... CERT1,FAC1,DEP1,Certificate 1,UG,uf_ft,100,500,30,basic
-    ... CERT2,FAC1,DEP1,Certificate 2,UG,uf_ft,200,400,30,cest
+    ... """code,faculty_code,department_code,title,study_mode,start_level,end_level,max_pass,application_category
+    ... CERT1,FAC1,DEP1,Certificate 1,uf_ft,100,500,30,basic
+    ... CERT2,FAC1,DEP1,Certificate 2,uf_ft,200,400,30,cest
     ... """)
 

main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

@@ -441 +441 @@
 Set the remaining required fields:
 
-  >>> browser.getControl(name='form.category').value = 'UME'
   >>> browser.getControl(name='form.study_mode').value = 'combined'
   >>> browser.getControl(name='form.start_level').value = '100'
@@ -459 +458 @@
   >>> ctrl.value = 'Another cert with same code'
   >>> browser.getControl(name='form.code').value = 'CERT1'
-  >>> browser.getControl(name='form.category').value = 'UME'
   >>> browser.getControl(name='form.study_mode').value = 'combined'
   >>> browser.getControl(name='form.start_level').value = '100'
@@ -581 +579 @@
   >>> browser.getControl(name='form.code').value = 'CERT1'
   >>> browser.getControl(name='form.title').value = 'Certificate 1'
-  >>> browser.getControl(name='form.category').value = 'UME'
   >>> browser.getControl(name='form.study_mode').value = 'combined'
   >>> browser.getControl(name='form.start_level').value = '100'
@@ -594 +591 @@
   >>> browser.getControl(name='form.code').value = 'CERT2'
   >>> browser.getControl(name='form.title').value = 'Certificate 2'
-  >>> browser.getControl(name='form.category').value = 'UME'
   >>> browser.getControl(name='form.study_mode').value = 'combined'
   >>> browser.getControl(name='form.start_level').value = '100'
@@ -837 +833 @@
 
   >>> open('certificates.csv', 'wb').write(
-  ... """code,title,faculty_code,department_code,category,study_mode,end_level,m_prefix,max_pass,start_level,application_category,review_state
+  ... """code,title,faculty_code,department_code,study_mode,end_level,m_prefix,max_pass,start_level,application_category,review_state
   ... LBA,BACHELOR OF LITERATURE,FA,LIT,UG,ug_ft,500,LIT,30,100,basic,checked
   ... LMA,MASTER OF LITERATURE,FA,LIT,UG,ug_pt,500,LIT,30,100,cest,checked

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt

@@ -18 +18 @@
     </tr>
     <tr class="odd">
-      <td>Application Category:</td>
-      <td tal:content="context/category">CATEGORY</td>
-    </tr>
-    <tr class="even">
       <td>Study Mode:</td>
       <td tal:content="context/study_mode">STUDY_MODE</td>

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

@@ -217 +217 @@
         )
 
-    category = schema.TextLine(
-        title = u'category',
-        )
-
     study_mode = schema.TextLine(
         title = u'study mode',
@@ -238 +234 @@
     application_category = schema.TextLine(
         title = u'application category',
-        required = True,
+        required = False,
         )
     
     max_pass = schema.TextLine(
         title = u'maximum pass',
+        required = False,
         )
     

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py

@@ -15 +15 @@
 
     def __init__(self, code=u'NA', title=u'Unnamed Certificate',
-                 category=None, study_mode=None, start_level=None,
+                 study_mode=None, start_level=None,
                  end_level=None, application_category=None, max_pass = u''):
         super(Certificate, self).__init__()
         self.code = code
         self.title = title
-        self.category = category
         self.study_mode = study_mode
         self.start_level = start_level

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt

@@ -23 +23 @@
 --------------------
 
-.. class:: Certificate([code=u'NA',[ title=u'Unnamed Certificate',[ category=None,[ study_mode=None,[ start_level=None,[ end_level=None,[ application_category=None,[ m_prefix=u'',[  max_pass = u'']]]]]]]]])
+.. class:: Certificate([code=u'NA',[ title=u'Unnamed Certificate',[ study_mode=None,[ start_level=None,[ end_level=None,[ application_category=None,[ m_prefix=u'',[  max_pass = u'']]]]]]]])
 
    Create a certificate object with the given parameters.
@@ -77 +77 @@
          :meth:`Certificate.check` -- mark a certificate as ``checked``
 
-   .. attribute:: category
-
-      Each :class:`Certificate` instance has a category:
-
-        >>> print mycertificate.category
-        None
-
-      .. XXX: This is not a proper description
 
    .. attribute:: study_mode