Changeset 10436

Timestamp:

29 Jul 2013, 15:10:02 (11 years ago)

Author:

Henrik Bettermann

Message:

The academic year is generally divided into terms not semesters. A semester structure is a special case. The base package uses the semester system.

Rename semester to term. Use values instead of keys of the SEMESTER_DICT.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• students/browser.py (modified) (4 diffs)
• students/browser_templates/studyleveleditpage.pt (modified) (2 diffs)
• students/browser_templates/studylevelmanagepage.pt (modified) (2 diffs)
• students/browser_templates/studylevelpage.pt (modified) (2 diffs)
• students/browser_templates/transcript.pt (modified) (1 diff)
• university/vocabularies.py (modified) (1 diff)

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

@@ -130 +130 @@
         value_dict['grade'] = value.grade
         value_dict['weight'] = value.weight
+        semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
+        value_dict['semester'] = semester_dict[value.semester]
         yield value_dict
 
@@ -1127 +1129 @@
     def render(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        Sem = translate(_('Sem.'), 'waeup.kofa', target_language=portal_language)
+        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
         Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
         Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)
@@ -1139 +1141 @@
         tableheader = [(Code,'code', 2.5),
                          (Title,'title', 7),
-                         (Sem, 'semester', 1.5),
+                         (Term, 'semester', 1.5),
                          (Cred, 'credits', 1.5),
                          (Score, 'score', 1.5),
@@ -1287 +1289 @@
     def render(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        Sem = translate(_('Sem.'), 'waeup.kofa', target_language=portal_language)
+        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
         Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
         Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)

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

@@ -12 +12 @@
     <tr>
       <th>&nbsp;</th>
-      <th i18n:translate="">Sem.</th>
+      <th i18n:translate="">Term</th>
       <th i18n:translate="">Code</th>
       <th i18n:translate="">Title</th>
@@ -29 +29 @@
         tal:condition="value/removable_by_student" />
       </td>
-      <td tal:content="value/semester">SEMESTER</td>
+      <td tal:content="value/semester">TERM</td>
       <td> <a tal:attributes="href value/__name__">
       <span tal:content="value/code">CODE</span>

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

@@ -33 +33 @@
         <tr>
           <th>&nbsp;</th>
-          <th i18n:translate="">Sem.</th>
+          <th i18n:translate="">Term</th>
           <th i18n:translate="">Code</th>
           <th i18n:translate="">Title</th>
@@ -51 +51 @@
                   tal:attributes="value value/__name__" />
           </td>
-          <td tal:content="value/semester">SEMESTER</td>
+          <td tal:content="value/semester">TERM</td>
           <td> <a tal:attributes="href value/__name__">
           <span tal:content="value/code">CODE</span>

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

@@ -23 +23 @@
   <thead>
     <tr>
-      <th i18n:translate="">Sem.</th>
+      <th i18n:translate="">Term</th>
       <th i18n:translate="">Code</th>
       <th i18n:translate="">Title</th>
@@ -38 +38 @@
   <tbody>
     <tr tal:repeat="value view/translated_values" class="gradeC">
-      <td tal:content="value/semester">SEMESTER</td>
+      <td tal:content="value/semester">TERM</td>
       <td> <a tal:attributes="href value/__name__">
       <span tal:content="value/code">CODE</span>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcript.pt

@@ -34 +34 @@
       <th i18n:translate="">Level</th>
       <th i18n:translate="">Session</th>
-      <th i18n:translate="">Semester</th>
+      <th i18n:translate="">Term</th>
       <th i18n:translate="">Course</th>
       <th i18n:translate="">Title</th>

main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

@@ -61 +61 @@
 
 class SemesterSource(ContextualDictSourceFactoryBase):
-    """An institution type source delivers semester or term descriptors.
+    """An institution type source delivers semester and/or term descriptors.
     """
     #: name of dict to deliver from kofa utils.