Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

    r10279 r10436  
    130130        value_dict['grade'] = value.grade
    131131        value_dict['weight'] = value.weight
     132        semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
     133        value_dict['semester'] = semester_dict[value.semester]
    132134        yield value_dict
    133135
     
    11271129    def render(self):
    11281130        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
    1129         Sem = translate(_('Sem.'), 'waeup.kofa', target_language=portal_language)
     1131        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
    11301132        Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
    11311133        Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)
     
    11391141        tableheader = [(Code,'code', 2.5),
    11401142                         (Title,'title', 7),
    1141                          (Sem, 'semester', 1.5),
     1143                         (Term, 'semester', 1.5),
    11421144                         (Cred, 'credits', 1.5),
    11431145                         (Score, 'score', 1.5),
     
    12871289    def render(self):
    12881290        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
    1289         Sem = translate(_('Sem.'), 'waeup.kofa', target_language=portal_language)
     1291        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
    12901292        Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
    12911293        Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studyleveleditpage.pt

    r9895 r10436  
    1212    <tr>
    1313      <th>&nbsp;</th>
    14       <th i18n:translate="">Sem.</th>
     14      <th i18n:translate="">Term</th>
    1515      <th i18n:translate="">Code</th>
    1616      <th i18n:translate="">Title</th>
     
    2929        tal:condition="value/removable_by_student" />
    3030      </td>
    31       <td tal:content="value/semester">SEMESTER</td>
     31      <td tal:content="value/semester">TERM</td>
    3232      <td> <a tal:attributes="href value/__name__">
    3333      <span tal:content="value/code">CODE</span>
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelmanagepage.pt

    r9895 r10436  
    3333        <tr>
    3434          <th>&nbsp;</th>
    35           <th i18n:translate="">Sem.</th>
     35          <th i18n:translate="">Term</th>
    3636          <th i18n:translate="">Code</th>
    3737          <th i18n:translate="">Title</th>
     
    5151                  tal:attributes="value value/__name__" />
    5252          </td>
    53           <td tal:content="value/semester">SEMESTER</td>
     53          <td tal:content="value/semester">TERM</td>
    5454          <td> <a tal:attributes="href value/__name__">
    5555          <span tal:content="value/code">CODE</span>
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt

    r9810 r10436  
    2323  <thead>
    2424    <tr>
    25       <th i18n:translate="">Sem.</th>
     25      <th i18n:translate="">Term</th>
    2626      <th i18n:translate="">Code</th>
    2727      <th i18n:translate="">Title</th>
     
    3838  <tbody>
    3939    <tr tal:repeat="value view/translated_values" class="gradeC">
    40       <td tal:content="value/semester">SEMESTER</td>
     40      <td tal:content="value/semester">TERM</td>
    4141      <td> <a tal:attributes="href value/__name__">
    4242      <span tal:content="value/code">CODE</span>
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcript.pt

    r10266 r10436  
    3434      <th i18n:translate="">Level</th>
    3535      <th i18n:translate="">Session</th>
    36       <th i18n:translate="">Semester</th>
     36      <th i18n:translate="">Term</th>
    3737      <th i18n:translate="">Course</th>
    3838      <th i18n:translate="">Title</th>
  • main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

    r8606 r10436  
    6161
    6262class SemesterSource(ContextualDictSourceFactoryBase):
    63     """An institution type source delivers semester or term descriptors.
     63    """An institution type source delivers semester and/or term descriptors.
    6464    """
    6565    #: name of dict to deliver from kofa utils.
Note: See TracChangeset for help on using the changeset viewer.