Changeset 12876 for main


Ignore:
Timestamp:
23 Apr 2015, 21:12:47 (10 years ago)
Author:
Henrik Bettermann
Message:

Adjust to changes in base package.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
3 edited

Legend:

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

    r11846 r12876  
    8989    grok.context(ICustomStudentStudyLevel)
    9090    form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
    91         'total_credits', 'gpa')
     91        'total_credits', 'gpa', 'level')
    9292    form_fields[
    9393        'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     
    100100    form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
    101101        'level_session', 'level_verdict',
    102         'validated_by', 'validation_date', 'gpa')
     102        'validated_by', 'validation_date', 'gpa', 'level')
    103103
    104104    omit_fields = ('password', 'suspended', 'suspended_comment',
  • main/waeup.aaue/trunk/src/waeup/aaue/students/export.py

    r12081 r12876  
    2626    NigeriaStudentExporter, NigeriaStudentStudyCourseExporter,
    2727    NigeriaStudentStudyLevelExporter,
    28     NigeriaCourseTicketExporter, NigeriaStudentPaymentsExporter)
     28    NigeriaCourseTicketExporter, NigeriaStudentPaymentExporter)
    2929from waeup.kofa.utils.helpers import iface_names
    3030
     
    5858    #: Fieldnames considered by this exporter
    5959    fields = tuple(sorted(iface_names(
    60         ICustomStudentStudyLevel) + ['level'])) + (
     60        ICustomStudentStudyLevel))) + (
    6161        'student_id', 'number_of_tickets','certcode')
    6262
    63 class CustomStudentPaymentsExporter(NigeriaStudentPaymentsExporter):
     63class CustomStudentPaymentExporter(NigeriaStudentPaymentExporter):
    6464    """Exporter for OnlinePayment instances.
    6565    """
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_export.py

    r12429 r12876  
    77from waeup.aaue.utils.utils import CustomKofaUtils
    88from waeup.aaue.students.export import (
    9     CustomStudentExporter, CustomStudentPaymentsExporter,
     9    CustomStudentExporter, CustomStudentPaymentExporter,
    1010    CustomStudentStudyLevelExporter)
    1111from waeup.aaue.testing import FunctionalLayer
     
    7474        return
    7575
    76 class CustomStudentPaymentsExporterTest(StudentImportExportSetup):
     76class CustomStudentPaymentExporterTest(StudentImportExportSetup):
    7777
    7878    layer = FunctionalLayer
    7979
    8080    def setUp(self):
    81         super(CustomStudentPaymentsExporterTest, self).setUp()
     81        super(CustomStudentPaymentExporterTest, self).setUp()
    8282        self.setup_for_export()
    8383        return
     
    8585    def test_ifaces(self):
    8686        # make sure we fullfill interface contracts
    87         obj = CustomStudentPaymentsExporter()
     87        obj = CustomStudentPaymentExporter()
    8888        verifyObject(ICSVExporter, obj)
    89         verifyClass(ICSVExporter, CustomStudentPaymentsExporter)
     89        verifyClass(ICSVExporter, CustomStudentPaymentExporter)
    9090        return
    9191
     
    9696        self.student['payments']['my-payment'].r_company = 'interswatch'
    9797        self.student['payments']['my-payment'].r_card_num = '789'
    98         exporter = CustomStudentPaymentsExporter()
     98        exporter = CustomStudentPaymentExporter()
    9999        exporter.export_all(self.app, self.outfile)
    100100        result = open(self.outfile, 'rb').read()
Note: See TracChangeset for help on using the changeset viewer.