Changeset 12234


Ignore:
Timestamp:
14 Dec 2014, 21:48:41 (10 years ago)
Author:
Henrik Bettermann
Message:

Repair package. Hopefully we'll never need this package.

Location:
main/kofacustom.pcn/trunk/src/kofacustom/pcn
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/applicants/export.py

    r11832 r12234  
    2020import grok
    2121from waeup.kofa.applicants.interfaces import IApplicantBaseData
    22 from waeup.kofa.applicants.export import ApplicantsExporter
     22from waeup.kofa.applicants.export import ApplicantExporter
    2323from kofacustom.pcn.applicants.interfaces import ICustomApplicant
    2424
    25 class CustomApplicantsExporter(ApplicantsExporter):
     25class CustomApplicantExporter(ApplicantExporter):
    2626    """Exporter for Custom Applicants.
    2727    """

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/applicants/interfaces.py

    r11843 r12234  
    5151    state, depending on use-case.
    5252    """
    53 
    54     def writeLogMessage(view, comment):
    55         """Adds an INFO message to the log file
    56         """
    57 
    58     def createStudent():
    59         """Create a student object from applicatnt data
    60         and copy applicant object.
    61         """
    6253
    6354    history = Attribute('Object history, a list of messages')

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/applicants/tests/test_browser.py

    r11832 r12234  
    2929from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
    3030from waeup.kofa.applicants.tests.test_batching import ApplicantImportExportSetup
    31 from kofacustom.pcn.applicants.export import CustomApplicantsExporter
     31from kofacustom.pcn.applicants.export import CustomApplicantExporter
    3232from kofacustom.pcn.applicants.batching import CustomApplicantProcessor
    3333
    … …  
    3737    layer = FunctionalLayer
    3838
    39 class ApplicantsExporterTest(ApplicantImportExportSetup):
     39class ApplicantExporterTest(ApplicantImportExportSetup):
    4040
    4141    layer = FunctionalLayer
    4242
    4343    def setUp(self):
    44         super(ApplicantsExporterTest, self).setUp()
     44        super(ApplicantExporterTest, self).setUp()
    4545        self.outfile = os.path.join(self.workdir, 'myoutput.csv')
    4646        self.cat = getUtility(ICatalog, name='applicants_catalog')
    … …  
    7676        # set values we can expect in export file
    7777        self.applicant = self.setup_applicant(self.applicant)
    78         exporter = CustomApplicantsExporter()
     78        exporter = CustomApplicantExporter()
    7979        exporter.export_all(self.app, self.outfile)
    8080        result = open(self.outfile, 'rb').read()
    … …  
    110110        num_succ, num_fail, finished_path, failed_path = result
    111111        #content = open(failed_path).read()
     112
    112113        self.assertEqual(num_succ,1)
    113114        self.assertEqual(num_fail,0)

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/browser/pages.py

    r11894 r12234  
    2828    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
    2929
    30 from kofacustom.pcn.university.faculty import IDepartment, IFaculty
     30from kofacustom.pcn.university.faculty import ICustomDepartment, ICustomFaculty
    3131
    3232grok.templatedir('templates')
    … …  
    4646    """ Page form to add a new faculty to a faculty container.
    4747    """
    48     form_fields = grok.AutoFields(IFaculty)
     48    form_fields = grok.AutoFields(ICustomFaculty)
    4949
    5050class FacultyManageFormPage(FacultyManageFormPage):
    5151    """Manage the basic properties of a `Faculty` instance.
    5252    """
    53     form_fields = grok.AutoFields(IFaculty).omit('code')
     53    form_fields = grok.AutoFields(ICustomFaculty).omit('code')
    5454
    5555class DepartmentPage(DepartmentPage):
    … …  
    6161    """
    6262    grok.template('departmentmanagepage')
    63     form_fields = grok.AutoFields(IDepartment).omit(
     63    form_fields = grok.AutoFields(ICustomDepartment).omit(
    6464        'code', 'score_editing_disabled')
    6565
    … …  
    6767    """Department index page.
    6868    """
    69     form_fields = grok.AutoFields(IDepartment).omit('score_editing_disabled')
     69    form_fields = grok.AutoFields(ICustomDepartment).omit('score_editing_disabled')
    7070
    7171class CertificatePage(CertificatePage):

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/locales/en/LC_MESSAGES/waeup.kofa.po

    r11895 r12234  
    326326msgid "Integer used for constructing the next matriculation number"
    327327msgstr " "
     328
     329msgid "First Choice"
     330msgstr "Desired License"

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/students/export.py

    r11832 r12234  
    2525    ICustomStudentOnlinePayment)
    2626from waeup.kofa.students.export import (
    27     StudentsExporter,
     27    StudentExporter,
    2828    StudentStudyCourseExporter,
    2929    StudentStudyLevelExporter,
    … …  
    3232from waeup.kofa.utils.helpers import iface_names
    3333
    34 class CustomStudentsExporter(StudentsExporter):
     34class CustomStudentExporter(StudentExporter):
    3535    """Exporter for Students.
    3636    """

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/students/tests/test_export.py

    r11832 r12234  
    77from kofacustom.pcn.utils.utils import CustomKofaUtils
    88from kofacustom.pcn.students.export import (
    9     CustomStudentsExporter, CustomStudentPaymentsExporter)
     9    CustomStudentExporter, CustomStudentPaymentsExporter)
    1010from kofacustom.pcn.testing import FunctionalLayer
    1111
    1212
    13 class CustomStudentsExporterTest(StudentImportExportSetup):
     13class CustomStudentExporterTest(StudentImportExportSetup):
    1414
    1515    layer = FunctionalLayer
    1616
    1717    def setUp(self):
    18         super(CustomStudentsExporterTest, self).setUp()
     18        super(CustomStudentExporterTest, self).setUp()
    1919        self.setup_for_export()
    2020        result_entry = ResultEntry(
    … …  
    3232    def test_ifaces(self):
    3333        # make sure we fullfill interface contracts
    34         obj = CustomStudentsExporter()
     34        obj = CustomStudentExporter()
    3535        verifyObject(ICSVExporter, obj)
    36         verifyClass(ICSVExporter, CustomStudentsExporter)
     36        verifyClass(ICSVExporter, CustomStudentExporter)
    3737        return
    3838
    … …  
    4242        # set values we can expect in export file
    4343        self.setup_student(self.student)
    44         exporter = CustomStudentsExporter()
     44        exporter = CustomStudentExporter()
    4545        exporter.export_all(self.app, self.outfile)
    4646        result = open(self.outfile, 'rb').read()
    … …  
    9090            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    9191            'r_code,r_desc,student_id,state,current_session\r\n666,'
    92             '12.12,2012-04-01 13:12:01,schoolfee,1,my-id,p-item,'
    93             '100,2012,paid,2012-04-01 14:12:01,12.12,r-code,,'
     92            '12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,p-item,'
     93            '100,2012,paid,2012-04-01 14:12:01#,12.12,r-code,,'
    9494            'A111111,created,2012\r\n',
    9595            result

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/university/batching.py

    r11840 r12234  
    11from waeup.kofa.university.batching import FacultyProcessor
    2 from kofacustom.pcn.university.faculty import IFaculty
     2from kofacustom.pcn.university.faculty import ICustomFaculty
    33
    44class FacultyProcessor(FacultyProcessor):
    55    """A batch processor for IFaculty objects.
    66    """
    7     iface = IFaculty
     7    iface = ICustomFaculty

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/university/faculty.py

    r11841 r12234  
    2424
    2525
    26 class IFaculty(IKofaContainer):
     26class ICustomFaculty(IKofaContainer):
    2727    """Representation of a university faculty.
    2828    """
    … …  
    6161    """A university faculty.
    6262    """
    63     grok.implements(IFaculty)
     63    grok.implements(ICustomFaculty)
    6464
    6565    local_roles = [
    … …  
    9191        return implementedBy(CustomFaculty)
    9292
    93 class IDepartment(IKofaObject):
     93class ICustomDepartment(IKofaObject):
    9494    """Representation of a department.
    9595    """
    … …  
    126126    certificates = Attribute("A container for certificates.")
    127127
     128
    128129class CustomDepartment(Department):
    129130    """A university department.
    130131    """
    131     grok.implements(IDepartment)
     132    grok.implements(ICustomDepartment)
    132133
    133134    local_roles = [

  • main/kofacustom.pcn/trunk/src/kofacustom/pcn/utils/utils.py

    r11844 r12234  
    3131    STUDY_MODES_DICT = {
    3232        'na': 'not applicable',
     33        'ug_ft': 'not applicable',
    3334        }
    3435
    … …  
    4041        'pmrp': 'Pharmaceutical and Medical Representative Permit',
    4142        'sop': 'Scientific Office Permit',
     43        'basic': 'Not applicable',
    4244        }
    4345
    4446    PAYMENT_CATEGORIES = {
    4547        'application': 'Registration Fee',
     48        'schoolfee': 'Not applicable',
    4649        }
    4750
Note: See TracChangeset for help on using the changeset viewer.