Ignore:
Timestamp:
16 Jan 2015, 06:52:21 (10 years ago)
Author:
Henrik Bettermann
Message:

Pin waeup.kofa 1.3.1. Adjust to changes made in base package.

Location:
main/kofacustom.sampleuni/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.sampleuni/trunk/CHANGES.txt

    r11829 r12482  
    22*******
    33
    4 1.2dev (unreleased)
    5 ===================
     41.2.dev0 (unreleased)
     5=====================
     6
     7* Pin waeup.kofa 1.3.1
    68
    79* Adjust to layout changes made in base package.

  • main/kofacustom.sampleuni/trunk/layout/static/css/base.css

    r11731 r12482  
    9898}
    9999
    100 .wfstatus {
     100.wfstatus, .wfstatus-sub {
    101101    text-align: center;
    102102    background-color: #909090;
    … …  
    320320}
    321321
     322 /* docutils stuff */
     323
     324.section h1 {
     325    font-size: 30px}
     326
     327.section h2 {
     328    font-size: 24px}
     329
     330.section h3 {
     331    font-size: 18px}
     332
     333.section h4 {
     334    font-size: 14px}
     335
    322336/* Smartphone styles */
    323337

  • main/kofacustom.sampleuni/trunk/setup.py

    r11709 r12482  
    99    'grokui.admin',
    1010    'grokcore.startup',
    11     'waeup.kofa >= 1.2',
     11    'waeup.kofa >= 1.3.1',
    1212    ],
    1313

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

    r11687 r12482  
    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.sampleuni.applicants.interfaces import ICustomApplicant
    2424
    25 class CustomApplicantsExporter(ApplicantsExporter):
     25class CustomApplicantExporter(ApplicantExporter):
    2626    """Exporter for Custom Applicants.
    2727    """

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

    r11687 r12482  
    2929from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
    3030from waeup.kofa.applicants.tests.test_batching import ApplicantImportExportSetup
    31 from kofacustom.sampleuni.applicants.export import CustomApplicantsExporter
     31from kofacustom.sampleuni.applicants.export import CustomApplicantExporter
    3232from kofacustom.sampleuni.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()

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

    r11687 r12482  
    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.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_export.py

    r11687 r12482  
    77from kofacustom.sampleuni.utils.utils import CustomKofaUtils
    88from kofacustom.sampleuni.students.export import (
    9     CustomStudentsExporter, CustomStudentPaymentsExporter)
     9    CustomStudentExporter, CustomStudentPaymentsExporter)
    1010from kofacustom.sampleuni.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.sampleuni/trunk/src/kofacustom/sampleuni/students/viewlets.py

    r11687 r12482  
    2222from kofacustom.sampleuni.students.interfaces import (
    2323    ICustomStudentStudyCourse, ICustomStudentStudyLevel)
    24 from waeup.kofa.students.viewlets import (
    25     FileDisplay, FileUpload, Image)
     24from waeup.kofa.students.fileviewlets import (
     25    StudentFileDisplay, StudentFileUpload, Image)
    2626from waeup.kofa.students.browser import (
    2727    ExportPDFClearanceSlipPage, StudyCourseDisplayFormPage,

  • main/kofacustom.sampleuni/trunk/versions.cfg

    r11706 r12482  
    151151zc.zodbrecipes = 2.0.0
    152152
    153 # Added by buildout at 2014-06-24 13:10:20.531045
    154 waeup.kofa = 1.2
     153waeup.kofa = 1.3.1
     154
     155# Added by buildout at 2015-01-16 07:34:12.267717
     156
     157# Required by:
     158# waeup.kofa==1.3.1
     159psutil = 2.2.0
Note: See TracChangeset for help on using the changeset viewer.