Ignore:
Timestamp:
20 Sep 2011, 08:50:26 (13 years ago)
Author:
Henrik Bettermann
Message:

Set default value of verdicts.

Location:
main/waeup.sirp/trunk/src/waeup/sirp/students
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketpage.pt

    r6796 r6804  
    1515    <tr>
    1616      <td class="fieldname">
     17          Department:
     18      </td>
     19      <td>
     20          <span tal:replace="context/department">DEPARTMENT</span>
     21      </td>
     22    </tr>
     23    <tr>
     24      <td class="fieldname">
    1725          Faculty:
    1826      </td>
    1927      <td>
    2028          <span tal:replace="context/faculty">FACULTY</span>
    21       </td>
    22     </tr>
    23     <tr>
    24       <td class="fieldname">
    25           Department:
    26       </td>
    27       <td>
    28           <span tal:replace="context/department">DEPARTMENT</span>
    2929      </td>
    3030    </tr>

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

    r6802 r6804  
    194194        title = u'Current Verdict',
    195195        source = verdicts,
    196         default = None,
     196        default = '0',
    197197        required = False,
    198198        )

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

    r6801 r6804  
    374374        self.assertEqual(student['studycourse'].current_session, 2005) # +1
    375375        self.assertEqual(student['studycourse'].current_level, 200) # +100
    376         self.assertEqual(student['studycourse'].current_verdict, '') # empty
     376        self.assertEqual(student['studycourse'].current_verdict, '0') # 0 = not set
    377377        self.assertEqual(student['studycourse'].previous_verdict, 'A')
    378378        self.browser.getControl(name="transition").value = ['register_courses']

  • main/waeup.sirp/trunk/src/waeup/sirp/students/utils.py

    r6749 r6804  
    1616    student['studycourse'].current_session += 1
    1717    verdict = student['studycourse'].current_verdict
    18     student['studycourse'].current_verdict = ''
     18    student['studycourse'].current_verdict = '0'
    1919    student['studycourse'].previous_verdict = verdict
    2020    return

  • main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

    r6787 r6804  
    6969
    7070verdicts = SimpleWAeUPVocabulary(
    71     ('Not set',''),
     71    ('not yet','0'),
    7272    ('Successful student','A'),
    7373    ('Student with carryover courses','B'),
Note: See TracChangeset for help on using the changeset viewer.