Changeset 12571 for main/ikobacustom.pcn/trunk

Timestamp:

9 Feb 2015, 08:30:13 (10 years ago)

Author:

Henrik Bettermann

Message:

Add 'Registration in the Provisional Register' contract.

Location:

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

Files:

• customers/batching.py (modified) (2 diffs)
• customers/contracts.py (modified) (2 diffs)
• customers/export.py (modified) (2 diffs)
• customers/interfaces.py (modified) (3 diffs)
• customers/tests/test_contract.py (modified) (3 diffs)
• customers/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -27 +27 @@
     IPCNCustomerPDFDocument,
     IRONContract,
-    IROPContract)
+    IROPContract,
+    IRPRContract)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -75 +76 @@
     iface = IROPContract
     factory_name = 'waeup.ROPContract'
+
+class RPRContractProcessor(ContractProcessorBase):
+    """A batch processor for IRPRContract objects.
+    """
+    util_name = 'rprcontractprocessor'
+    grok.name(util_name)
+    name = _('Registration in the Provisional Register Contract Processor')
+    iface = IRPRContract
+    factory_name = 'waeup.RPRContract'

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

@@ -28 +28 @@
 from ikobacustom.pcn.interfaces import MessageFactory as _
 from ikobacustom.pcn.customers.interfaces import (
-    IRONContract, IRONContractEdit, IRONContractProcess,
-    IROPContract, IROPContractEdit, IROPContractProcess,
-    IRONContractOfficialUse, IROPContractOfficialUse)
+    IRONContract,
+    IRONContractEdit,
+    IRONContractProcess,
+    IRONContractOfficialUse,
+    IROPContract,
+    IROPContractEdit,
+    IROPContractProcess, 
+    IROPContractOfficialUse,
+    IRPRContract,
+    IRPRContractEdit,
+    IRPRContractProcess,
+    IRPRContractOfficialUse,
+    )
 
 
@@ -107 +117 @@
     def getInterfaces(self):
         return implementedBy(ROPContract)
+
+
+class RPRContract(ContractBase):
+    """Registration in the Provisional Register contract.
+    """
+
+    grok.implements(
+        IRPRContractProcess,
+        IRPRContract,
+        IRPRContractEdit,
+        ICustomerNavigation)
+
+    contract_category = 'rpr'
+
+    form_fields_interface = IRPRContract
+
+    edit_form_fields_interface = IRPRContractEdit
+
+    ou_form_fields_interface = IRPRContractOfficialUse
+
+    check_docs_interface = IRPRContract
+
+RPRContract = attrs_to_fields(RPRContract)
+
+
+class RPRContractFactory(grok.GlobalUtility):
+    """A factory for contracts.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.RPRContract')
+    title = u"Create a new license contract.",
+    description = u"This factory instantiates new contract instances."
+
+    def __call__(self, *args, **kw):
+        return RPRContract(*args, **kw)
+
+    def getInterfaces(self):
+        return implementedBy(RPRContract)

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

@@ -23 +23 @@
 from ikobacustom.pcn.customers.interfaces import (
     IPCNCustomer, IPCNCustomerJPGDocument,
-    IPCNCustomerPDFDocument, IRONContractProcess, IROPContractProcess)
+    IPCNCustomerPDFDocument,
+    IRONContractProcess,
+    IROPContractProcess,
+    IRPRContractProcess)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -66 +69 @@
     title = _(u'Registration of Premises Contracts')
     class_name = 'ROPContract'
+
+class RPRContractExporter(ContractExporterBase):
+    """Exporter for Contract instances.
+    """
+    grok.name('rprcontracts')
+    iface = IRPRContractProcess
+    title = _(u'Registration in the Provisional Register Contracts')
+    class_name = 'RPRContract'

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

@@ -30 +30 @@
 from ikobacustom.pcn.interfaces import MessageFactory as _
 from ikobacustom.pcn.interfaces import LGASource
+from ikobacustom.pcn.customers.schoolgrades import ResultEntryField
 
 def year_range():
@@ -104 +105 @@
         )
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     work_address = schema.Text(
         title = _(u'Work Address'),
@@ -293 +289 @@
     #    required = True,
     #    )
+
+class IRPRContract(IContract):
+    """A Registration in the Provisional Register contract.
+
+    """
+
+    state_of_origin = schema.Choice(
+        vocabulary = nats_vocab,
+        title = _(u'State of Origin'),
+        required = False,
+        )
+
+    res_address = schema.Text(
+        title = _(u'Residential Address'),
+        required = False,
+        )
+
+    qualifications = schema.List(
+        title = _(u'Qualifications'),
+        value_type = ResultEntryField(),
+        required = False,
+        default = [],
+        )
+
+    certificates = schema.Choice(
+        title = _(u'Certificates'),
+        source = CustomerDocumentSource(),
+        required = False,
+        )
+
+    referee1_name = schema.TextLine(
+        title = _(u'First Referee Name'),
+        required = False,
+        readonly = False,
+        )
+
+    referee1_address = schema.Text(
+        title = _(u'First Referee Address'),
+        required = False,
+        readonly = False,
+        )
+
+    referee1_license = schema.TextLine(
+        title = _(u'First Referee License Number'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_name = schema.TextLine(
+        title = _(u'Second Referee Name'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_address = schema.Text(
+        title = _(u'Second Referee Address'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_license = schema.TextLine(
+        title = _(u'Second Referee License Number'),
+        required = False,
+        readonly = False,
+        )
+
+    internship_address = schema.Text(
+        title = _(u'Internship'),
+        description = u'Enter address of company where you want to serve your internship.',
+        required = False,
+        readonly = False,
+        )
+
+
+
+class IRPRContractOfficialUse(IIkobaObject):
+    """Interface for editing RON official use data.
+
+    """
+
+    comment = schema.Text(
+        title= _('Reason for rejection'),
+        required = False,
+        )
+
+
+class IRPRContractProcess(IRPRContract, IRPRContractOfficialUse):
+    """Interface for processing RON data.
+    """
+
+    product_options = schema.List(
+        title = _(u'Options/Fees'),
+        value_type = ProductOptionField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+
+class IRPRContractEdit(IRPRContract):
+    """Interface for editing RON data by customers.
+
+    """
+
+    certificates = schema.Choice(
+        title = _(u'Certificates'),
+        source = CustomerDocumentSource(),
+        required = True,
+        )

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

@@ -29 +29 @@
 
 from ikobacustom.pcn.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.pcn.customers.contracts import RONContract, ROPContract
-from ikobacustom.pcn.customers.interfaces import IRONContract, IROPContract
+from ikobacustom.pcn.customers.contracts import (
+    RONContract,
+    ROPContract,
+    RPRContract,
+    )
+from ikobacustom.pcn.customers.interfaces import (
+    IRONContract,
+    IROPContract,
+    IRPRContract,
+    )
 
 
@@ -44 +52 @@
         verify.verifyObject(IROPContract, ROPContract())
         verify.verifyObject(ICustomerNavigation, ROPContract())
+        verify.verifyObject(IRPRContract, RPRContract())
+        verify.verifyObject(ICustomerNavigation, RPRContract())
         return
 
@@ -59 +69 @@
         container.addContract(contract2)
         self.assertEqual(container[id2], contract2)
-        self.assertRaises(TypeError, container.addContract, object())
         self.assertEqual(contract2.class_name, 'ROPContract')
+
+        contract3 = createObject(u'waeup.RPRContract')
+        id3 = contract3.contract_id
+        container.addContract(contract3)
+        self.assertEqual(container[id3], contract3)
+        self.assertEqual(contract3.class_name, 'RPRContract')
         return

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

@@ -56 +56 @@
         'RONContract': _('Retention of Name on the Registrar'),
         'ROPContract': _('Registration of Premises'),
+        'RPRContract': _('Registration in the Provisional Register'),
         }
 
@@ -67 +68 @@
         'pcncustomerpdfdocuments',
         'roncontracts',
-        'ropcontracts')
+        'ropcontracts',
+        'rprcontracts')

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

@@ -48 +48 @@
         'ron': 'Retention of Name',
         'rop': 'Registration of Premises',
+        'rpr': 'Registration in the Provisional Register',
         'no': 'no license',
         }