Ignore:
Timestamp:
16 Jun 2014, 08:29:22 (11 years ago)
Author:
Henrik Bettermann
Message:

Remove dependencies on kofacustom.nigeria.

Location:
main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni
Files:
1 deleted
36 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r10765 r11687  
    2121from waeup.kofa.applicants.applicant import ApplicantFactory
    2222from waeup.kofa.utils.helpers import attrs_to_fields
    23 from kofacustom.nigeria.applicants.applicant import NigeriaApplicant
    24 from kofacustom.skeleton.applicants.interfaces import(
    25     ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit, IPUTMEApplicantEdit)
     23from waeup.kofa.applicants.applicant import Applicant
     24from kofacustom.sampleuni.applicants.interfaces import(
     25    ICustomApplicant, ICustomApplicantEdit)
    2626
    27 class CustomApplicant(NigeriaApplicant):
     27class CustomApplicant(Applicant):
    2828
    29     grok.implements(ICustomApplicant, ICustomUGApplicantEdit,
    30         ICustomPGApplicantEdit, IPUTMEApplicantEdit)
     29    grok.implements(ICustomApplicant, ICustomApplicantEdit)
    3130    grok.provides(ICustomApplicant)
    3231

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

    r11543 r11687  
    2020from waeup.kofa.utils.batching import BatchProcessor
    2121from waeup.kofa.applicants.batching import ApplicantProcessor
    22 from kofacustom.skeleton.applicants.interfaces import (
    23     ICustomApplicant, ICustomApplicantUpdateByRegNo)
     22from kofacustom.sampleuni.applicants.interfaces import ICustomApplicant
    2423
    2524class CustomApplicantProcessor(ApplicantProcessor):
    … …  
    3635    """
    3736    iface = ICustomApplicant
    38     iface_byregnumber = ICustomApplicantUpdateByRegNo

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

    r10765 r11687  
    2121from waeup.kofa.applicants.browser import (
    2222    ApplicantRegistrationPage, ApplicantsContainerPage)
    23 from kofacustom.nigeria.applicants.browser import (
    24     NigeriaApplicantDisplayFormPage,
    25     NigeriaPDFApplicationSlip)
     23from kofacustom.sampleuni.interfaces import MessageFactory as _
    2624
    27 from kofacustom.skeleton.interfaces import MessageFactory as _
    28 

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

    r11543 r11687  
    2020import grok
    2121from waeup.kofa.applicants.interfaces import IApplicantBaseData
    22 from kofacustom.nigeria.applicants.export import NigeriaApplicantsExporter
    23 from kofacustom.nigeria.applicants.interfaces import (
    24     INigeriaUGApplicant, INigeriaPGApplicant)
    25 from kofacustom.skeleton.applicants.interfaces import (
    26     ICustomUGApplicant, ICustomPGApplicant)
     22from waeup.kofa.applicants.export import ApplicantsExporter
     23from kofacustom.sampleuni.applicants.interfaces import ICustomApplicant
    2724
    28 class CustomApplicantsExporter(NigeriaApplicantsExporter):
     25class CustomApplicantsExporter(ApplicantsExporter):
    2926    """Exporter for Custom Applicants.
    3027    """
    3128
    3229    fields = tuple(sorted(set(
    33         ICustomUGApplicant.names() +
    34         ICustomPGApplicant.names() +
    35         INigeriaUGApplicant.names() +
    36         INigeriaPGApplicant.names() +
     30        ICustomApplicant.names() +
    3731        IApplicantBaseData.names()
    3832        ))) + ('container_code',)

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

    r10765 r11687  
    1919"""
    2020
    21 from zope import schema
    2221from waeup.kofa.applicants.interfaces import (
    2322    IApplicantBaseData,
    24     AppCatCertificateSource, CertificateSource)
    25 from waeup.kofa.schoolgrades import ResultEntryField
    26 from waeup.kofa.interfaces import (
    27     SimpleKofaVocabulary, academic_sessions_vocab, validate_email)
    28 from waeup.kofa.schema import FormattedDate, TextLineChoice
    29 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
    30 from waeup.kofa.applicants.interfaces import contextual_reg_num_source
    31 from kofacustom.nigeria.applicants.interfaces import (
    32     LGASource, high_qual, high_grade, exam_types,
    33     INigeriaUGApplicant, INigeriaPGApplicant,
    34     INigeriaApplicantOnlinePayment,
    35     INigeriaUGApplicantEdit, INigeriaPGApplicantEdit,
    36     INigeriaApplicantUpdateByRegNo,
    37     IPUTMEApplicantEdit,
     23    IApplicantOnlinePayment,
     24    IApplicantEdit,
    3825    )
    39 from kofacustom.skeleton.interfaces import MessageFactory as _
    40 from kofacustom.skeleton.payments.interfaces import ICustomOnlinePayment
     26from kofacustom.sampleuni.interfaces import MessageFactory as _
    4127
    42 class ICustomUGApplicant(INigeriaUGApplicant):
    43     """An undergraduate applicant.
     28class ICustomApplicant(IApplicantBaseData):
     29    """A custom applicant.
    4430
    45     This interface defines the least common multiple of all fields
    46     in ug application forms. In customized forms, fields can be excluded by
    47     adding them to the UG_OMIT* tuples.
    4831    """
    4932
    50 class ICustomPGApplicant(INigeriaPGApplicant):
    51     """A postgraduate applicant.
    52 
    53     This interface defines the least common multiple of all fields
    54     in pg application forms. In customized forms, fields can be excluded by
    55     adding them to the PG_OMIT* tuples.
    56     """
    57 
    58 
    59 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant):
    60     """An interface for both types of applicants.
    61 
    62     Attention: The ICustomPGApplicant field seetings will be overwritten
    63     by ICustomPGApplicant field settings. If a field is defined
    64     in both interfaces zope.schema validates only against the
    65     constraints in ICustomUGApplicant. This does not affect the forms
    66     since they are build on either ICustomUGApplicant or ICustomPGApplicant.
    67     """
    68 
    69     def writeLogMessage(view, comment):
    70         """Adds an INFO message to the log file
    71         """
    72 
    73     def createStudent():
    74         """Create a student object from applicant data
    75         and copy applicant object.
    76         """
    77 
    78 class ICustomUGApplicantEdit(INigeriaUGApplicantEdit):
    79     """An undergraduate applicant interface for edit forms.
     33class ICustomApplicantEdit(IApplicantEdit):
     34    """A custom applicant interface for editing.
    8035
    8136    Here we can repeat the fields from base data and set the
    … …  
    8843    """
    8944
    90 class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
    91     """A postgraduate applicant interface for editing.
    92 
    93     Here we can repeat the fields from base data and set the
    94     `required` and `readonly` attributes to True to further restrict
    95     the data access. Or we can allow only certain certificates to be
    96     selected by choosing the appropriate source.
    97 
    98     We cannot omit fields here. This has to be done in the
    99     respective form page.
    100     """
    101 
    102 class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
    103     """An applicant payment via payment gateways.
     45class ICustomApplicantOnlinePayment(IApplicantOnlinePayment):
     46    """A custom applicant payment via payment gateways.
    10447
    10548    """
    10649
    107 class IPUTMEApplicantEdit(IPUTMEApplicantEdit):
    108     """An undergraduate applicant interface for editing.
    109 
    110     Here we can repeat the fields from base data and set the
    111     `required` and `readonly` attributes to True to further restrict
    112     the data access. Or we can allow only certain certificates to be
    113     selected by choosing the appropriate source.
    114 
    115     We cannot omit fields here. This has to be done in the
    116     respective form page.
    117     """
    118 
    119 class ICustomApplicantUpdateByRegNo(INigeriaApplicantUpdateByRegNo):
    120     """Representation of an applicant.
    121 
    122     Skip regular reg_number validation if reg_number is used for finding
    123     the applicant object.
    124     """

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

    r10765 r11687  
    2424from waeup.kofa.applicants.payment import ApplicantOnlinePayment
    2525from waeup.kofa.utils.helpers import attrs_to_fields
    26 from kofacustom.skeleton.applicants.interfaces import ICustomApplicantOnlinePayment
     26from kofacustom.sampleuni.applicants.interfaces import ICustomApplicantOnlinePayment
    2727
    2828class CustomApplicantOnlinePayment(ApplicantOnlinePayment):

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

    r10765 r11687  
    3030from waeup.kofa.interfaces import IFileStoreHandler, IFileStoreNameChooser
    3131from waeup.kofa.testing import FunctionalTestCase
    32 from kofacustom.skeleton.applicants.applicant import (
     32from kofacustom.sampleuni.applicants.applicant import (
    3333    CustomApplicant, CustomApplicantFactory,
    3434    )
    35 from kofacustom.skeleton.applicants.interfaces import ICustomApplicant
    36 from kofacustom.skeleton.testing import FunctionalLayer
     35from kofacustom.sampleuni.applicants.interfaces import ICustomApplicant
     36from kofacustom.sampleuni.testing import FunctionalLayer
    3737
    3838class CustomApplicantTest(FunctionalTestCase):

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

    r11543 r11687  
    2424from zope.catalog.interfaces import ICatalog
    2525from zope.intid.interfaces import IIntIds
    26 from kofacustom.skeleton.testing import FunctionalLayer
     26from kofacustom.sampleuni.testing import FunctionalLayer
     27from waeup.kofa.schoolgrades import ResultEntry
     28from waeup.kofa.utils.utils import KofaUtils
    2729from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
    2830from waeup.kofa.applicants.tests.test_batching import ApplicantImportExportSetup
    29 from kofacustom.skeleton.applicants.export import CustomApplicantsExporter
    30 from kofacustom.skeleton.applicants.batching import CustomApplicantProcessor
     31from kofacustom.sampleuni.applicants.export import CustomApplicantsExporter
     32from kofacustom.sampleuni.applicants.batching import CustomApplicantProcessor
    3133
    3234class CustomApplicantUITests(ApplicantsFullSetup):
    … …  
    5355        applicant.lastname = u'Tester'
    5456        applicant.middlename = u'M.'
    55         applicant.nationality = u'NG'
    5657        applicant.date_of_birth = datetime.date(1981, 2, 4)
    5758        applicant.sex = 'f'
    … …  
    6263        applicant.course_admitted = self.certificate
    6364        applicant.notice = u'Some notice\nin lines.'
    64         applicant.screening_score = 98
    65         applicant.screening_venue = u'Exam Room'
    66         applicant.screening_date = u'Saturday, 16th June 2012 2:00:00 PM'
    6765        applicant.password = 'any password'
     66        result_entry = ResultEntry(
     67            KofaUtils.EXAM_SUBJECTS_DICT.keys()[0],
     68            KofaUtils.EXAM_GRADES[0][0]
     69            )
     70        applicant.school_grades = [
     71            result_entry]
    6872        return applicant
    6973
    … …  
    7579        exporter.export_all(self.app, self.outfile)
    7680        result = open(self.outfile, 'rb').read()
    77         self.assertMatches(result,
    78             'aggregate,applicant_id,application_date,application_number,'
    79             'course1,course2,course_admitted,date_of_birth,display_fullname,'
    80             'email,emp2_end,emp2_position,emp2_reason,emp2_start,emp_end,'
    81             'emp_position,emp_reason,emp_start,employer,employer2,'
    82             'firstname,history,hq_degree,hq_disc,hq_matric_no,hq_school,'
    83             'hq_session,hq_type,jamb_score,jamb_subjects,lastname,lga,'
    84             'locked,middlename,nationality,notice,nysc_lga,nysc_year,'
    85             'password,phone,pp_school,presently_inst,reg_number,'
    86             'result_uploaded,screening_date,screening_score,'
    87             'screening_venue,sex,special_application,'
    88             'state,student_id,suspended,container_code\r\n'
    89             ',dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
    90             'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,'
    91             '[u\'2012-10-28 21:27:52 WAT - Application initialized by system\']'
    92             ',,,,,,,,,Tester,,0,M.,NG,"Some notice\nin lines.",,,'
    93             'any password,+234-123-12345#,,,123456,,'
    94             '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,initialized,,'
    95             '0,dp2011\r\n')
     81        self.assertTrue(
     82            'applicant_id,application_date,application_number,course1,course2,'
     83            'course_admitted,date_of_birth,display_fullname,email,firstname,'
     84            'history,lastname,locked,middlename,notice,password,phone,'
     85            'reg_number,sex,special_application,state,'
     86            'student_id,suspended,container_code\r\n'
     87            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
     88            'Anna M. Tester,anna@sample.com,Anna,'
     89            in result)
     90        self.assertTrue(
     91            'Application initialized by system\'],'
     92            'Tester,0,M.,"Some notice\nin lines.",any password,'
     93            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
     94            in result)
    9695        # We can import the same file if we ignore some columns.
    9796        # Since the applicants_catalog hasn't been notified, the same
    … …  
    10099        result = processor.doImport(
    101100            self.outfile,
    102             ['aggreagate','ignore_applicant_id','application_date',
     101            ['ignore_applicant_id','application_date',
    103102            'ignore_application_number','course1','course2',
    104             'course_admitted','date_of_birth','ignore3','email','emp2_end',
    105             'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
    106             'emp_reason','emp_start','employer','employer2','firstname','ignore4',
    107             'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
    108             'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
    109             'nationality','notice','nysc_lga',
    110             'nysc_year','password','phone','pp_school','presently_inst',
    111             'reg_number','result_uploaded',
    112             'screening_date','screening_score','screening_venue','sex',
    113             'special_application',
    114             'state','student_id','suspended','container_code'],
     103            'course_admitted','date_of_birth',
     104            'ignore_display_fullname','email','firstname',
     105            'ignore_history','lastname','locked','middlename',
     106            'notice','password','phone',
     107            'reg_number','sex','special_application','state',
     108            'student_id','suspended','container_code'],
    115109            mode='create')
    116110        num_succ, num_fail, finished_path, failed_path = result
    … …  
    118112        self.assertEqual(num_succ,1)
    119113        self.assertEqual(num_fail,0)
    120         # Now we ignore also the container_code and import the same file
    121         # in update mode which means that INigeriaApplicantUpdateByRegNo
    122         # is used for field conversion. applicant_id must be ignored
    123         # too since the previous import has notified the applicants_catalog
    124         # so that the portal 'knows' that reg_number is in use.
    125         processor = CustomApplicantProcessor()
    126         result = processor.doImport(
    127             self.outfile,
    128             ['aggregate','ignore_applicant_id','application_date',
    129             'ignore_application_number','course1','course2',
    130             'course_admitted','date_of_birth','ignore3','email','emp2_end',
    131             'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
    132             'emp_reason','emp_start','employer','employer2','firstname','ignore4',
    133             'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
    134             'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
    135             'nationality','notice','nysc_lga',
    136             'nysc_year','password','phone','pp_school','presently_inst',
    137             'reg_number','result_uploaded','screening_date','screening_score',
    138             'screening_venue','sex','special_application',
    139             'state','student_id','suspended','ignore_container_code'],
    140             mode='update')
    141         num_succ, num_fail, finished_path, failed_path = result
    142         self.assertEqual(num_succ,1)
    143         self.assertEqual(num_fail,0)
    144114        return

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

    r10765 r11687  
    1919"""
    2020
    21 from kofacustom.nigeria.applicants.utils import NigeriaApplicantsUtils
    22 from waeup.kofa.applicants.workflow import (INITIALIZED,
    23     STARTED, PAID, ADMITTED, NOT_ADMITTED, SUBMITTED, CREATED)
    24 from kofacustom.skeleton.interfaces import MessageFactory as _
     21from waeup.kofa.applicants.utils import ApplicantsUtils
     22from kofacustom.sampleuni.interfaces import MessageFactory as _
    2523
    26 
    27 
    28 class ApplicantsUtils(NigeriaApplicantsUtils):
     24class ApplicantsUtils(ApplicantsUtils):
    2925    """A collection of parameters and methods subject to customization.
    3026    """

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

    r10765 r11687  
    2121    LoginPage, CertificatePage, CertificateManageFormPage)
    2222from waeup.kofa.university.interfaces import ICertificate
    23 from kofacustom.skeleton.interfaces import (
     23from kofacustom.sampleuni.interfaces import (
    2424    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
    2525

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/browser/tests.py

    r11272 r11687  
    2222from zope.security.interfaces import Unauthorized
    2323from waeup.kofa.testing import FunctionalTestCase
    24 from kofacustom.skeleton.testing import FunctionalLayer
     24from kofacustom.sampleuni.testing import FunctionalLayer
    2525from waeup.kofa.app import University
    2626
    … …  
    4848        clearSite()
    4949        shutil.rmtree(self.dc_root)
    50 
    51     def test_access_live_url(self):
    52         # We can't access the system with basic authentication
    53         self.browser.addHeader('Authorization', 'Basic grok:grok')
    54         self.assertRaises(
    55             Unauthorized, self.browser.open, 'https://skeleton-kofa.waeup.org')
    56         return

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/configuration.py

    r10765 r11687  
    2424from waeup.kofa.configuration import (
    2525    SessionConfigurationFactory, SessionConfiguration)
    26 from kofacustom.skeleton.interfaces import (
     26from kofacustom.sampleuni.interfaces import (
    2727    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
    2828

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/configure.zcml

    r10765 r11687  
    11<configure xmlns="http://namespaces.zope.org/zope"
    22           xmlns:grok="http://namespaces.zope.org/grok">
    3   <include package="kofacustom.skeleton" file="locales.zcml" />
     3  <include package="kofacustom.sampleuni" file="locales.zcml" />
    44
    5   <!-- kofacustom.nigeria configures everything we basically need.
    6   -->
    7   <include package="kofacustom.nigeria" />
    8 
     5  <include package="waeup.kofa" />
    96  <grok:grok package="." />
    107

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/ftesting.zcml

    r10765 r11687  
    22   xmlns="http://namespaces.zope.org/zope"
    33   xmlns:kofa="http://namespaces.waeup.org/kofa"
    4    i18n_domain="kofacustom.skeleton"
    5    package="kofacustom.skeleton"
     4   i18n_domain="kofacustom.sampleuni"
     5   package="kofacustom.sampleuni"
    66   >
    77
    8   <include package="kofacustom.skeleton" />
    9   <include package="kofacustom.skeleton" file="mail.zcml"/>
     8  <include package="kofacustom.sampleuni" />
     9  <include package="kofacustom.sampleuni" file="mail.zcml"/>
    1010
    1111  <!-- Where should the datacenter reside by default? -->

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/interfaces.py

    r10765 r11687  
    2323    ISessionConfiguration, academic_sessions_vocab)
    2424
    25 _ = MessageFactory = zope.i18nmessageid.MessageFactory('kofacustom.skeleton')
     25_ = MessageFactory = zope.i18nmessageid.MessageFactory('kofacustom.sampleuni')
    2626
    2727# It's recommended to replicate all fields from the base package here.

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/payments/interfaces.py

    r10765 r11687  
    1818from zope.interface import Attribute
    1919from zope import schema
    20 from kofacustom.nigeria.payments.interfaces import INigeriaOnlinePayment
    21 from kofacustom.skeleton.interfaces import MessageFactory as _
     20from waeup.kofa.payments.interfaces import IOnlinePayment
     21from kofacustom.sampleuni.interfaces import MessageFactory as _
    2222
    23 class ICustomOnlinePayment(INigeriaOnlinePayment):
     23class ICustomOnlinePayment(IOnlinePayment):
    2424    """A payment via payment gateways.
    2525

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/permissions.py

    r10765 r11687  
    2020
    2121
    22 class CRPUOfficer(CCOfficer):
     22class CustomCCOfficer(CCOfficer):
    2323    """ Permissions of Computer Center members.
    2424
    … …  
    2828
    2929    grok.name('waeup.CCOfficer')
    30     grok.title(u'CC Officer')
     30    grok.title(u'Our CC Officer')

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

    r10765 r11687  
    2424students, studycourses, payment tickets and accommodation tickets.
    2525"""
    26 from kofacustom.skeleton.students.interfaces import (
     26from kofacustom.sampleuni.students.interfaces import (
    2727    ICustomStudent, ICustomStudentUpdateByRegNo,
    2828    ICustomStudentUpdateByMatricNo,

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

    r10765 r11687  
    3232from waeup.kofa.students.interfaces import IStudentsUtils, ICourseTicket
    3333from waeup.kofa.students.workflow import FORBIDDEN_POSTGRAD_TRANS
    34 from kofacustom.nigeria.students.browser import (
    35     NigeriaOnlinePaymentDisplayFormPage,
    36     NigeriaStudentBaseManageFormPage,
    37     NigeriaStudentClearanceEditFormPage,
    38     NigeriaOnlinePaymentAddFormPage,
    39     NigeriaExportPDFPaymentSlipPage,
    40     NigeriaExportPDFClearanceSlipPage,
    41     )
    42 
    43 from kofacustom.skeleton.students.interfaces import (
     34from kofacustom.sampleuni.students.interfaces import (
    4435    ICustomStudentOnlinePayment, ICustomStudentStudyCourse,
    4536    ICustomStudentStudyLevel)
    46 from kofacustom.skeleton.interfaces import MessageFactory as _
     37from kofacustom.sampleuni.interfaces import MessageFactory as _
    4738

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

    r11545 r11687  
    1818"""Exporters for student related stuff.
    1919"""
    20 from kofacustom.skeleton.students.interfaces import (
     20from kofacustom.sampleuni.students.interfaces import (
    2121    ICustomStudent,
    2222    ICustomStudentStudyCourse,
    … …  
    2424    ICustomCourseTicket,
    2525    ICustomStudentOnlinePayment)
    26 from kofacustom.nigeria.students.export import (
    27     NigeriaStudentsExporter,
    28     NigeriaStudentStudyCourseExporter,
    29     NigeriaStudentStudyLevelExporter,
    30     NigeriaCourseTicketExporter,
    31     NigeriaStudentPaymentsExporter)
     26from waeup.kofa.students.export import (
     27    StudentsExporter,
     28    StudentStudyCourseExporter,
     29    StudentStudyLevelExporter,
     30    CourseTicketExporter,
     31    StudentPaymentsExporter)
    3232from waeup.kofa.utils.helpers import iface_names
    3333
    34 class CustomStudentsExporter(NigeriaStudentsExporter):
     34class CustomStudentsExporter(StudentsExporter):
    3535    """Exporter for Students.
    3636    """
    … …  
    4141        'current_level', 'current_session')
    4242
    43 class CustomStudentStudyCourseExporter(NigeriaStudentStudyCourseExporter):
     43class CustomStudentStudyCourseExporter(StudentStudyCourseExporter):
    4444    """Exporter for StudentStudyCourses.
    4545    """
    … …  
    4848        sorted(iface_names(ICustomStudentStudyCourse))) + ('student_id',)
    4949
    50 class CustomStudentStudyLevelExporter(NigeriaStudentStudyLevelExporter):
     50class CustomStudentStudyLevelExporter(StudentStudyLevelExporter):
    5151    """Exporter for StudentStudyLevels.
    5252    """
    … …  
    5656        'student_id', 'number_of_tickets','certcode')
    5757
    58 class CustomCourseTicketExporter(NigeriaCourseTicketExporter):
     58class CustomCourseTicketExporter(CourseTicketExporter):
    5959    """Exporter for CourseTickets.
    6060    """
    … …  
    6464        'certcode', 'display_fullname')
    6565
    66 class CustomStudentPaymentsExporter(NigeriaStudentPaymentsExporter):
     66class CustomStudentPaymentsExporter(StudentPaymentsExporter):
    6767    """Exporter for OnlinePayment instances.
    6868    """

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

    r10765 r11687  
    1818
    1919from zope import schema
    20 from kofacustom.nigeria.students.interfaces import (
    21     INigeriaStudentBase, INigeriaUGStudentClearance, INigeriaPGStudentClearance,
    22     INigeriaStudentPersonal, INigeriaStudentStudyLevel,
    23     INigeriaStudentStudyCourse, INigeriaCourseTicket,
    24     INigeriaStudentUpdateByRegNo, INigeriaStudentUpdateByMatricNo,
     20from waeup.kofa.students.interfaces import (
     21    IStudentBase, IUGStudentClearance, IPGStudentClearance,
     22    IStudentPersonal, IStudentStudyLevel,
     23    IStudentStudyCourse, ICourseTicket,
     24    IStudentUpdateByRegNo, IStudentUpdateByMatricNo,
    2525    )
    26 from kofacustom.skeleton.payments.interfaces import ICustomOnlinePayment
    27 from kofacustom.skeleton.interfaces import MessageFactory as _
     26from kofacustom.sampleuni.payments.interfaces import ICustomOnlinePayment
     27from kofacustom.sampleuni.interfaces import MessageFactory as _
    2828
    29 class ICustomStudentBase(INigeriaStudentBase):
     29class ICustomStudentBase(IStudentBase):
    3030    """Representation of student base data.
    3131
    3232    """
    3333
    34 class ICustomStudentPersonal(INigeriaStudentPersonal):
     34class ICustomStudentPersonal(IStudentPersonal):
    3535    """Student personal data.
    3636
    3737    """
    3838
    39 class ICustomUGStudentClearance(INigeriaUGStudentClearance):
     39class ICustomUGStudentClearance(IUGStudentClearance):
    4040    """Representation of ug student clearance data.
    4141
    4242    """
    4343
    44 class ICustomPGStudentClearance(INigeriaPGStudentClearance):
     44class ICustomPGStudentClearance(IPGStudentClearance):
    4545    """Representation of pg student clearance data.
    4646
    … …  
    5454    """
    5555
    56 class ICustomStudentStudyCourse(INigeriaStudentStudyCourse):
     56class ICustomStudentStudyCourse(IStudentStudyCourse):
    5757    """A container for student study levels.
    5858
    5959    """
    6060
    61 class ICustomStudentStudyLevel(INigeriaStudentStudyLevel):
     61class ICustomStudentStudyLevel(IStudentStudyLevel):
    6262    """A container for course tickets.
    6363
    … …  
    8585    'p_session'].order
    8686
    87 class ICustomCourseTicket(INigeriaCourseTicket):
     87class ICustomCourseTicket(ICourseTicket):
    8888    """A course ticket.
    8989
    9090    """
    9191
    92 class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):
     92class ICustomStudentUpdateByRegNo(IStudentUpdateByRegNo):
    9393    """Representation of a student. Skip regular reg_number validation.
    9494
    9595    """
    9696
    97 class ICustomStudentUpdateByMatricNo(INigeriaStudentUpdateByMatricNo):
     97class ICustomStudentUpdateByMatricNo(IStudentUpdateByMatricNo):
    9898    """Representation of a student. Skip regular matric_number validation.
    9999

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

    r10765 r11687  
    2626    StudentOnlinePayment, StudentOnlinePaymentFactory)
    2727from waeup.kofa.utils.helpers import attrs_to_fields
    28 from kofacustom.skeleton.students.interfaces import ICustomStudentOnlinePayment
     28from kofacustom.sampleuni.students.interfaces import ICustomStudentOnlinePayment
    2929
    3030class CustomStudentOnlinePayment(StudentOnlinePayment):

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

    r10765 r11687  
    2525from waeup.kofa.students.interfaces import IStudentNavigation
    2626from waeup.kofa.utils.helpers import get_current_principal
    27 from kofacustom.nigeria.students.student import NigeriaStudent
    28 from kofacustom.skeleton.students.interfaces import ICustomStudent
     27from waeup.kofa.students.student import Student
     28from kofacustom.sampleuni.students.interfaces import ICustomStudent
    2929
    3030
    31 class CustomStudent(NigeriaStudent):
     31class CustomStudent(Student):
    3232    """This is a student container for the various objects
    3333    owned by students.
    … …  
    3939    def transcript_enabled(self):
    4040        user = get_current_principal()
    41         if user.id in ('admin', 'isouaba', 'niyi', 'delejason'):
     41        if user.id in ('admin'):
    4242            return True
    4343        return False

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

    r10765 r11687  
    2626from waeup.kofa.students.interfaces import IStudentNavigation
    2727from waeup.kofa.students.workflow import CLEARED, RETURNING, PAID
    28 from kofacustom.nigeria.students.studycourse import NigeriaStudentStudyCourse
    29 from kofacustom.skeleton.students.interfaces import ICustomStudentStudyCourse
     28from waeup.kofa.students.studycourse import StudentStudyCourse
     29from kofacustom.sampleuni.students.interfaces import ICustomStudentStudyCourse
    3030
    31 class CustomStudentStudyCourse(NigeriaStudentStudyCourse):
     31class CustomStudentStudyCourse(StudentStudyCourse):
    3232    """This is a container for study levels.
    3333    """

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

    r10765 r11687  
    2828    CourseTicketFactory, StudentStudyLevelFactory)
    2929from waeup.kofa.students.interfaces import IStudentNavigation
    30 from kofacustom.skeleton.students.interfaces import (
     30from kofacustom.sampleuni.students.interfaces import (
    3131    ICustomStudentStudyLevel, ICustomCourseTicket)
    3232

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

    r10765 r11687  
    3434    IExtFileStore, IFileStoreNameChooser)
    3535from waeup.kofa.students.interfaces import IStudentsUtils
    36 from kofacustom.skeleton.testing import FunctionalLayer
     36from kofacustom.sampleuni.testing import FunctionalLayer
    3737

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

    r11543 r11687  
    55from waeup.kofa.schoolgrades import ResultEntry
    66from waeup.kofa.students.tests.test_batching import StudentImportExportSetup
    7 from kofacustom.skeleton.utils.utils import CustomKofaUtils
    8 from kofacustom.skeleton.students.export import (
     7from kofacustom.sampleuni.utils.utils import CustomKofaUtils
     8from kofacustom.sampleuni.students.export import (
    99    CustomStudentsExporter, CustomStudentPaymentsExporter)
    10 from kofacustom.skeleton.testing import FunctionalLayer
     10from kofacustom.sampleuni.testing import FunctionalLayer
    1111
    1212
    … …  
    4646        result = open(self.outfile, 'rb').read()
    4747        self.assertMatches(
    48             'adm_code,alr_date,alr_fname,alr_no,alr_results,clearance_locked,'
    49             'clr_code,date_of_birth,def_adm,disabled,email,emp2_end,'
    50             'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
    51             'emp_reason,emp_start,employer,employer2,firstname,former_matric,'
    52             'fst_sit_date,fst_sit_fname,fst_sit_no,fst_sit_results,'
    53             'fst_sit_type,hq2_degree,hq2_disc,hq2_matric_no,hq2_school,'
    54             'hq2_session,hq2_type,hq_degree,hq_disc,hq_fname,hq_matric_no,'
    55             'hq_school,hq_session,hq_type,is_staff,lastname,lga,'
    56             'marit_stat,matric_number,middlename,nationality,'
    57             'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
    58             'nysc_lga,nysc_location,nysc_year,officer_comment,'
    59             'perm_address,personal_updated,phone,reg_number,'
    60             'religion,scd_sit_date,scd_sit_fname,scd_sit_no,'
    61             'scd_sit_results,scd_sit_type,sex,student_id,'
    62             'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
    63             'current_level,current_session\r\nmy adm code,,,,'
    64             '"[(\'visual_art\', \'A1\')]",0,my clr code,1981-02-04#,,,'
    65             'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'visual_art\', \'A1\')]"'
    66             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
    67             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,,,,,'
    68             '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,,created,'
    69             '[u\'2012-11-06 13:16:41 WAT - Record created by system\'],'
     48            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
     49            'employer,firstname,lastname,matric_number,middlename,'
     50            'nationality,officer_comment,perm_address,personal_updated,'
     51            'phone,reg_number,sex,student_id,suspended,suspended_comment,'
     52            'password,state,history,certcode,is_postgrad,current_level,'
     53            'current_session\r\nmy adm code,0,my clr code,1981-02-04#,'
     54            'anna@sample.com,,Anna,Tester,234,M.,NG,,'
     55            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,'
     56            'f,A111111,0,,,created,'
     57            '[u\'2014-06-16 08:23:55 UTC - Record created by system\'],'
    7058            'CERT1,0,200,2012\r\n',
    7159            result
    … …  
    9987        result = open(self.outfile, 'rb').read()
    10088        self.assertMatches(
    101             'ac,amount_auth,creation_date,gateway_amt,p_category,p_current,'
    102             'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
    103             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
    104             'r_pay_reference,thirdparty_amt,student_id,state,'
    105             'current_session\r\n'
    106             '666,12.12,2012-04-01 13:12:01,,schoolfee,1,my-id,p-item,'
    107             '100,2012,paid,2012-04-01 14:12:01,,12.12,'
    108             '789,r-code,interswatch,,,,A111111,created,2012\r\n',
     89            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
     90            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
     91            '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,,'
     94            'A111111,created,2012\r\n',
    10995            result
    11096            )

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_student.py

    r10765 r11687  
    2222from zope.interface import verify
    2323from waeup.kofa.testing import FunctionalTestCase
    24 from kofacustom.skeleton.students.student import CustomStudent, CustomStudentFactory
    25 from kofacustom.skeleton.students.studycourse import (
     24from kofacustom.sampleuni.students.student import CustomStudent, CustomStudentFactory
     25from kofacustom.sampleuni.students.studycourse import (
    2626    CustomStudentStudyCourse, CustomStudentStudyCourseFactory)
    27 from kofacustom.skeleton.students.studylevel import (
     27from kofacustom.sampleuni.students.studylevel import (
    2828    CustomStudentStudyLevel, CustomCourseTicket,
    2929    CustomStudentStudyLevelFactory,
    3030    CustomCourseTicketFactory)
    31 from kofacustom.skeleton.students.interfaces import (
     31from kofacustom.sampleuni.students.interfaces import (
    3232    ICustomStudent, ICustomStudentStudyCourse,
    3333    ICustomStudentStudyLevel, ICustomCourseTicket)
    34 from kofacustom.skeleton.testing import FunctionalLayer
     34from kofacustom.sampleuni.testing import FunctionalLayer
    3535
    3636

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

    r10765 r11687  
    2020from waeup.kofa.interfaces import (IKofaUtils,
    2121    CLEARED, RETURNING, PAID, REGISTERED, VALIDATED)
    22 from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
    23 from kofacustom.skeleton.interfaces import MessageFactory as _
     22from waeup.kofa.students.utils import StudentsUtils
     23from kofacustom.sampleuni.interfaces import MessageFactory as _
    2424
    25 class CustomStudentsUtils(NigeriaStudentsUtils):
     25class CustomStudentsUtils(StudentsUtils):
    2626    """A collection of customized methods.
    2727

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

    r10765 r11687  
    2020from waeup.kofa.interfaces import REQUESTED
    2121from waeup.kofa.browser.viewlets import ManageActionButton
    22 from kofacustom.skeleton.students.interfaces import (
     22from kofacustom.sampleuni.students.interfaces import (
    2323    ICustomStudentStudyCourse, ICustomStudentStudyLevel)
    2424from waeup.kofa.students.viewlets import (
    … …  
    2828    StudyLevelDisplayFormPage)
    2929
    30 from kofacustom.nigeria.interfaces import MessageFactory as _
     30from waeup.kofa.interfaces import MessageFactory as _

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/testing.py

    r10765 r11687  
    1919"""
    2020import os.path
    21 import kofacustom.skeleton
     21import kofacustom.sampleuni
    2222from zope.app.testing.functional import ZCMLLayer
    2323
    2424ftesting_zcml = os.path.join(
    25     os.path.dirname(kofacustom.skeleton.__file__), 'ftesting.zcml')
     25    os.path.dirname(kofacustom.sampleuni.__file__), 'ftesting.zcml')
    2626FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
    2727                            allow_teardown=True)

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/tests/test_configuration.py

    r10765 r11687  
    2525from waeup.kofa.tests.test_configuration import (
    2626    ConfigurationTest, SessionConfigurationFactoryTest)
    27 from kofacustom.skeleton.configuration import (
     27from kofacustom.sampleuni.configuration import (
    2828    CustomSessionConfiguration, CustomSessionConfigurationFactory)
    29 from kofacustom.skeleton.interfaces import(
     29from kofacustom.sampleuni.interfaces import(
    3030    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
    31 from kofacustom.skeleton.testing import FunctionalLayer
     31from kofacustom.sampleuni.testing import FunctionalLayer
    3232
    3333class ConfigurationTest(ConfigurationTest):

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/tests/test_datacenter.py

    r10765 r11687  
    1818from waeup.kofa.datacenter import DataCenter
    1919from waeup.kofa.testing import FunctionalTestCase
    20 from kofacustom.skeleton.testing import FunctionalLayer
     20from kofacustom.sampleuni.testing import FunctionalLayer
    2121
    2222

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/tests/test_smtp.py

    r10765 r11687  
    3333    send_mail)
    3434from waeup.kofa.testing import FunctionalTestCase
    35 from kofacustom.skeleton.testing import FunctionalLayer
     35from kofacustom.sampleuni.testing import FunctionalLayer
    3636
    3737#

  • main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/utils/tests.py

    r10765 r11687  
    1717##
    1818from waeup.kofa.testing import FunctionalTestCase
    19 from kofacustom.skeleton.testing import FunctionalLayer
     19from kofacustom.sampleuni.testing import FunctionalLayer
    2020
    2121

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

    r10765 r11687  
    1818"""Customize general helper utilities for Kofa.
    1919"""
    20 from kofacustom.nigeria.utils.utils import NigeriaKofaUtils
     20from waeup.kofa.utils.utils import KofaUtils
    2121
    22 class CustomKofaUtils(NigeriaKofaUtils):
     22class CustomKofaUtils(KofaUtils):
    2323    """A collection of methods subject to customization.
    2424    """
Note: See TracChangeset for help on using the changeset viewer.