Changeset 12611 for main

Timestamp:

13 Feb 2015, 10:15:44 (10 years ago)

Author:

Henrik Bettermann

Message:

Add Accepting Pupil Pharmacist for Internship Training contract.

Location:

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn

Files:

• customers/batching.py (modified) (2 diffs)
• customers/browser.py (modified) (2 diffs)
• customers/contracts.py (modified) (3 diffs)
• customers/export.py (modified) (2 diffs)
• customers/interfaces.py (modified) (8 diffs)
• customers/tests/test_contract.py (modified) (4 diffs)
• customers/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/batching.py

@@ -31 +31 @@
     IRPCContract,
     IIPPMVLContract,
-    IRPPMVLContract)
+    IRPPMVLContract,
+    IAPPITContract
+    )
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -115 +117 @@
     iface = IRPPMVLContract
     factory_name = 'waeup.RPPMVLContract'
+
+class APPITContractProcessor(ContractProcessorBase):
+    """A batch processor for IRPPMVLContract objects.
+    """
+    util_name = 'appitcontractprocessor'
+    grok.name(util_name)
+    name = _('Accepting Pupil Pharmacist for Internship Training (Contract) Processor')
+    iface = IAPPITContract
+    factory_name = 'waeup.APPITContract'

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/browser.py

@@ -23 +23 @@
     PDFContractSlipPage, CustomerBaseEditFormPage)
 from ikobacustom.pcn.interfaces import MessageFactory as _
-from ikobacustom.pcn.customers.interfaces import IRPCContract
+from ikobacustom.pcn.customers.interfaces import IRPCContract, IAPPITContract
 
 class PDFContractSlipPage(PDFContractSlipPage):
@@ -51 +51 @@
                 )
 
+class PDFAPPITContractSlipPage(PDFContractSlipPage):
+    """Deliver pdf file including metadata.
+    """
+
+    grok.context(IAPPITContract)
+
+    def _sigsInFooter(self):
+        return (_('Date, Signature of Internee'),
+                _('Date, Signature of Supervisor'),
+                )
+
 class CustomerBaseEditFormPage(CustomerBaseEditFormPage):
     """ View to edit customer base data

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/contracts.py

@@ -52 +52 @@
     IRPPMVLContractProcess,
     IRPPMVLContractOfficialUse,
+    IAPPITContract,
+    IAPPITContractEdit,
+    IAPPITContractProcess,
+    IAPPITContractOfficialUse,
     )
 
@@ -244 +248 @@
         return implementedBy(IPPMVLContract)
 
+
 class RPPMVLContract(ContractBase):
     """Renewal of Patent and Proprietary Medicines Vendors License contract.
@@ -281 +286 @@
         return implementedBy(RPPMVLContract)
 
+
+class APPITContract(ContractBase):
+    """Accepting Pupil Pharmacist for Internship Training contract.
+    """
+
+    grok.implements(
+        IAPPITContractProcess,
+        IAPPITContract,
+        IAPPITContractEdit,
+        ICustomerNavigation)
+
+    contract_category = 'appit'
+
+    form_fields_interface = IAPPITContract
+
+    edit_form_fields_interface = IAPPITContractEdit
+
+    ou_form_fields_interface = IAPPITContractOfficialUse
+
+    check_docs_interface = IAPPITContract
+
+APPITContract = attrs_to_fields(APPITContract)
+
+
+class APPITContractFactory(grok.GlobalUtility):
+    """A factory for contracts.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.APPITContract')
+    title = u"Create a new license contract.",
+    description = u"This factory instantiates new contract instances."
+
+    def __call__(self, *args, **kw):
+        return APPITContract(*args, **kw)
+
+    def getInterfaces(self):
+        return implementedBy(APPITContract)
+

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/export.py

@@ -29 +29 @@
     IRPCContractProcess,
     IIPPMVLContractProcess,
-    IRPPMVLContractProcess)
+    IRPPMVLContractProcess,
+    IAPPITContractProcess)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -104 +105 @@
     title = _(u'Renewal of Patent and Proprietary Medicines Vendors Licenses')
     class_name = 'RPPMVLContract'
+
+class APPITContractExporter(ContractExporterBase):
+    """Exporter for Contract instances.
+    """
+    grok.name('appitcontracts')
+    iface = IAPPITContractProcess
+    title = _(u'Accepting Pupil Pharmacist for Internship Training Contracts')
+    class_name = 'APPITContract'

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/interfaces.py

@@ -47 +47 @@
             'manufacturing',
             'retail and dispensing',
+            'research and training',
+            'hospital practice',
             'wholesale',
             ]
@@ -110 +112 @@
         )
 
-    work_email = schema.ASCIILine(
+    work_email = schema.TextLine(
         title = _(u'Work Email Address'),
         required = False,
@@ -563 +565 @@
         )
 
+    occupation = schema.TextLine(
+        title = _(u'Occupation'),
+        required = False,
+        readonly = False,
+        )
+
     qualifications = schema.Text(
         title = _(u'Educational Qualifications'),
@@ -600 +608 @@
         )
 
-    shop_email = schema.ASCIILine(
+    shop_email = schema.TextLine(
         title = _(u'Shop Email Address'),
         required = False,
@@ -736 +744 @@
         )
 
+    occupation = schema.TextLine(
+        title = _(u'Occupation'),
+        required = False,
+        readonly = False,
+        )
+
+    qualifications = schema.Text(
+        title = _(u'Educational Qualifications'),
+        description = u'Enter a list of certificates obtained.',
+        required = False,
+        readonly = False,
+        )
+
     shop_address = schema.Text(
         title = _(u'Patent Vendor\'s Shop'),
@@ -742 +763 @@
         )
 
+    ppmv_signpost = schema.TextLine(
+        title = _(u'PPMV Sign-post Number'),
+        required = False,
+        readonly = False,
+        )
+
     shop_lga = schema.Choice(
         source = LGASource(),
@@ -748 +775 @@
         )
 
-    shop_email = schema.ASCIILine(
+    shop_email = schema.TextLine(
         title = _(u'Shop Email Address'),
         required = False,
@@ -843 +870 @@
 
     """
+
+class IAPPITContract(IContract):
+    """A Accepting Pupil Pharmacist for Internship Training contract.
+
+    """
+
+    institution_address = schema.Text(
+        title = _(u'Institution'),
+        description= _('Enter name and address of institution.'),
+        required = False,
+        )
+
+    approved = schema.Bool(
+        title= _('Institution Approved'),
+        description= _('Tick box if the institution is approved for internship.'),
+        required = False,
+        )
+
+    inst_certificate = schema.TextLine(
+        title = _(u'Institution Certificate'),
+        description= _('Enter the institutions certificate number and date.'),
+        required = False,
+        readonly = False,
+        )
+
+    employer_address = schema.Text(
+        title = _(u'Employer'),
+        description= _('Enter name and address of employer.'),
+        required = False,
+        )
+
+    internee_name = schema.TextLine(
+        title = _(u'Internee Name'),
+        required = False,
+        readonly = False,
+        )
+
+    internee_address = schema.Text(
+        title = _(u'Internee Address'),
+        required = False,
+        )
+
+    provisional_registration = schema.TextLine(
+        title = _(u'Provisional Registration'),
+        description= _('Enter number and date of certificate of '
+                       'provisional regsitration of the internee.'),
+        required = False,
+        readonly = False,
+        )
+
+    educational_institution = schema.Text(
+        title = _(u'Educational Institution Attended'),
+        description= _('Enter name, address of institution and period of attendance.'),
+        required = False,
+        readonly = False,
+        )
+
+    educational_period = schema.TextLine(
+        title = _(u'Period'),
+        description= _('Enter period of attendance.'),
+        required = False,
+        readonly = False,
+        )
+
+    educational_qualification = schema.TextLine(
+        title = _(u'Qualification'),
+        description= _('Enter qualification obtained.'),
+        required = False,
+        readonly = False,
+        )
+
+    supervisor = schema.TextLine(
+        title = _(u'Supervising Pharmacist'),
+        required = False,
+        readonly = False,
+        )
+
+    supervisor_designation = schema.TextLine(
+        title = _(u'Designation'),
+        description= _('Enter designation of supervisor.'),
+        required = False,
+        readonly = False,
+        )
+
+    supervisor_year = schema.TextLine(
+        title = _(u'Year of Qualification'),
+        description= _('Enter year of qualification of supervisor.'),
+        required = False,
+        readonly = False,
+        )
+
+    supervisor_regnumber = schema.TextLine(
+        title = _(u'Registration Number'),
+        description= _('Enter registration number of supervisor.'),
+        required = False,
+        readonly = False,
+        )
+
+    license_regnumber = schema.TextLine(
+        title = _(u'Annual License to Practice'),
+        description= _('Enter number and date of annual license to practice '
+                       'of supervisor.'),
+        required = False,
+        readonly = False,
+        )
+
+
+    scope_practice = schema.List(
+        title = _(u'Scope of Practice'),
+        value_type = schema.Choice(source=PracticeSource()),
+        description= _('Select scopes of pharmaceutical practice currently '
+                       'undertaken at the institution.'),
+        required = False,
+        default = [],
+        )
+
+class IAPPITContractOfficialUse(IIkobaObject):
+    """Interface for editing APPIT official use data.
+
+    """
+
+    comment = schema.Text(
+        title= _('Reason for rejection'),
+        required = False,
+        )
+
+
+class IAPPITContractProcess(IAPPITContract, IAPPITContractOfficialUse):
+    """Interface for processing APPIT data.
+    """
+
+    product_options = schema.List(
+        title = _(u'Options/Fees'),
+        value_type = ProductOptionField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+
+class IAPPITContractEdit(IAPPITContract):
+    """Interface for editing APPIT data by customers.
+
+    """

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_contract.py

@@ -36 +36 @@
     IPPMVLContract,
     RPPMVLContract,
+    APPITContract,
     )
 from ikobacustom.pcn.customers.interfaces import (
@@ -44 +45 @@
     IIPPMVLContract,
     IRPPMVLContract,
+    IAPPITContract,
     )
 
@@ -64 +66 @@
         verify.verifyObject(IIPPMVLContract, IPPMVLContract())
         verify.verifyObject(ICustomerNavigation, IPPMVLContract())
+        verify.verifyObject(IAPPITContract, APPITContract())
+        verify.verifyObject(ICustomerNavigation, APPITContract())
         return
 
@@ -104 +108 @@
         self.assertEqual(container[id6], contract6)
         self.assertEqual(contract6.class_name, 'RPPMVLContract')
+
+        contract7= createObject(u'waeup.APPITContract')
+        id7 = contract7.contract_id
+        container.addContract(contract7)
+        self.assertEqual(container[id7], contract7)
+        self.assertEqual(contract7.class_name, 'APPITContract')
         return

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/utils.py

@@ -62 +62 @@
         'RPPMVLContract': _(
             'Renewal of Patent and Proprietary Medicines Vendors License'),
+        'APPITContract': _(
+            'Accepting Pupil Pharmacist for Internship Training'),
         }
+
+
+
 
     SELECTABLE_DOCTYPES_DICT = deepcopy(DOCTYPES_DICT)
@@ -77 +82 @@
         'rpccontracts',
         'ippmvlcontracts',
-        'rppmvlcontracts')
+        'rppmvlcontracts',
+        'appitcontracts')

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/utils/utils.py

@@ -52 +52 @@
         'ippmvl': 'Issuance of Patent and Proprietary Medicines Vendors License',
         'rppmvl': 'Renewal of Patent and Proprietary Medicines Vendors License',
+        'appit': 'Accepting Pupil Pharmacist for Internship Training',
         'no': 'no license',
         }
@@ -78 +79 @@
         'rpccontracts',
         'ippmvlcontracts',
-        'rppmvlcontracts')
+        'rppmvlcontracts',
+        'appitcontracts')
 
     BATCH_PROCESSOR_NAMES = (
@@ -90 +92 @@
         'ippmvlcontractprocessor',
         'rppmvlcontractprocessor',
+        'appitcontractprocessor'
         'pcnproductprocessor',
         'pdfdocumentprocessor',