[IMP] roles, functions to generate non idpass IDs

Author: emjay0921

spp_idqueue/models/id_batch.py

@@ -49,6 +49,8 @@ class OpenSPPPrintBatch(models.Model):
         ],
         default="draft",
     )
+    id_type = fields.Many2one("g2p.id.type")
+    idpass_id = fields.Many2one("spp.id.pass", string="ID Pass Template")
     approved_by = fields.Many2one("res.users")
     printed_by = fields.Many2one("res.users")
     distributed_by = fields.Many2one("res.users")
@@ -157,7 +159,10 @@ def mark_as_done(self, rec):
                 "date": datetime.now().strftime("%B %d, %Y at %H:%M"),
             }
             rec.save_to_mail_thread(message)
-            rec.pass_api_param()
+            if rec.idpass_id:
+                rec.pass_api_param()
+            else:
+                rec.merge_status = "merged"
         else:
             raise ValidationError(_("Some IDs are not generated"))
 

spp_idqueue/security/ir.model.access.csv

@@ -12,16 +12,19 @@ spp_idpass_requestor,ID Pass Requestor Access,spp_idpass.model_spp_id_pass,spp_i
 spp_idbatch_requestor,ID Batch Requestor Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_requestor,1,1,1,0
 spp_batch_create_wizard_requestor,Batch Create Wizard Requestor Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0
 spp_multi_id_request_wizard_requestor,Multiple ID Request Wizard Requestor Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0
+spp_area_requestor,Area Requestor Access,spp_area_base.model_spp_area,spp_idqueue.group_g2p_id_requestor,1,1,1,0
 
 spp_idpass_valdiator,ID Pass Validator Access,spp_idpass.model_spp_id_pass,spp_idqueue.group_g2p_id_validator,1,1,1,0
 spp_idqueue_validator,ID Queue Validator Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_validator,1,1,1,0
 spp_idbatch_validator,ID Batch Validator Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_validator,1,1,1,0
 spp_batch_create_wizard_validator,Batch Create Wizard Validator Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_validator,1,1,1,0
 spp_multi_id_request_wizard_validator,Multiple ID Request Wizard Validator Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_validator,1,1,1,0
+spp_area_validator,Area Validator Access,spp_area_base.model_spp_area,spp_idqueue.group_g2p_id_validator,1,1,1,0
 
 spp_idpass_distributor,ID Pass Distributor Access,spp_idpass.model_spp_id_pass,spp_idqueue.group_g2p_id_distributor,1,1,1,0
 spp_idqueue_distributor,ID Queue Distributor Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_distributor,1,1,1,0
 ir_model_distributor_access,IR Model Data Distributor Access,base.model_ir_model_data,spp_idqueue.group_g2p_id_distributor,1,1,1,0
 spp_idbatch_distributor,ID Batch Distributor Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_distributor,1,1,1,0
 spp_batch_create_wizard_distributor,Batch Create Wizard Distributor Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_distributor,1,1,1,0
 spp_multi_id_request_wizard_distributor,Multiple ID Request Wizard Distributor Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_distributor,1,1,1,0
+spp_area_distributor,Area Distributor Access,spp_area_base.model_spp_area,spp_idqueue.group_g2p_id_distributor,1,1,1,0

spp_idqueue/views/id_batch_view.xml

@@ -217,7 +217,7 @@
                     <div
                         class="alert alert-info text-center o_form_header"
                         role="status"
-                        status="status != 'generated' or merge_status != 'sent'"
+                        invisible="(status != 'generated' or merge_status != 'sent') or not idpass_id"
                     >
                         IDs for this Batch is being merged. Click <button
                             name="refresh_data"
@@ -247,6 +247,7 @@
                                     widget="binary"
                                     string="Merged File"
                                     readonly="1"
+                                    invisible="not idpass_id"
                                 />
                                 <field name="id_pdf_filename" invisible="1" />
                                 <field name="create_date" readonly="1" />
@@ -261,12 +262,17 @@
                                     readonly="1"
                                     force_save="1"
                                 />-->
-                                <field name="merge_status" readonly="1" force_save="1" />
+                                <field
+                                    name="merge_status"
+                                    readonly="1"
+                                    force_save="1"
+                                    invisible="not idpass_id"
+                                />
                                 <field
                                     name="date_merged"
                                     readonly="1"
                                     force_save="1"
-                                    invisible="merge_status != 'merged'"
+                                    invisible="merge_status != 'merged' or not idpass_id"
                                 />
                                 <field name="queued_ids" readonly="1">
                                     <tree>
@@ -309,6 +315,17 @@
                                     <field name="date_distributed" readonly="1" force_save="1" />
                                 </group>
                             </group>
+                            <group>
+                                <group>
+                                    <field name="id_type" string="ID Type" readonly="1" force_save="1" />
+                                    <field
+                                        name="idpass_id"
+                                        string="ID Pass Template"
+                                        readonly="1"
+                                        force_save="1"
+                                    />
+                                </group>
+                            </group>
 
                         </page>
                         <field name="status" invisible="1" />

spp_idqueue/wizard/batch_create_wizard.py

@@ -90,7 +90,12 @@ def create_batch(self):
             batch_name = rec.name
             if batches_count > 1:
                 batch_name = _("%s - 1", rec.name)
-            batch_id = self.env["spp.print.queue.batch"].create({"name": batch_name})
+            vals = {
+                "name": batch_name,
+                "id_type": rec.id_type.id or False,
+                "idpass_id": rec.idpass_id.id or False,
+            }
+            batch_id = self.env["spp.print.queue.batch"].create(vals)
             current_batch_count = 1
             queue_ids = []
             for queue in rec.queue_ids:
@@ -103,7 +108,12 @@ def create_batch(self):
                         queue_ids = []
                         if not current_batch_count == batches_count:
                             batch_name = f"{rec.name or ''} - {current_batch_count + 1}"
-                            batch_id = self.env["spp.print.queue.batch"].create({"name": batch_name})
+                            vals = {
+                                "name": batch_name,
+                                "id_type": rec.id_type.id or False,
+                                "idpass_id": rec.idpass_id.id or False,
+                            }
+                            batch_id = self.env["spp.print.queue.batch"].create(vals)
                             queue_ids.append([4, queue.id])
                             id_count = 1
                             current_batch_count += 1