Merge branch '17.0' of https://github.com/OpenSPP/openspp-modules into spp_attendance

Author: reichie020212

spp_farmer_registry_base/models/agricultural_activity.py

@@ -31,7 +31,9 @@ class AgriculturalActivity(models.Model):
         ],
     )
 
-    species_id = fields.Many2one("spp.farm.species", string="Species", domain="[('species_type', '=', activity_type)]")
+    species_id = fields.Many2one(
+        "spp.farm.species", ondelete="restrict", string="Species", domain="[('species_type', '=', activity_type)]"
+    )
 
     @api.onchange("crop_farm_id")
     def _onchange_farm_id(self):

spp_farmer_registry_demo/models/generate_farmer_data.py

@@ -7,6 +7,7 @@
 
 from odoo import Command, api, fields, models
 
+from odoo.addons.queue_job.delay import group
 from odoo.addons.spp_base_demo.locale_providers import create_faker
 
 from .. import tools
@@ -57,16 +58,52 @@ class SPPGenerateFarmerData(models.Model):
         required=True,
     )
 
+    locked = fields.Boolean(default=False)
+    locked_reason = fields.Char(readonly=True)
+
+    GROUPS_PER_BATCH = 100
+
     def generate_sample_data(self):
-        batches = math.ceil(self.num_groups / 1000)
+        batches = math.ceil(self.num_groups / self.GROUPS_PER_BATCH)
+
+        self.locked = True
+        self.locked_reason = "Generating Sample Data"
+        num_groups = self.num_groups
+
+        jobs = []
 
         for _ in range(0, batches):
+            jobs.append(self.delayable()._generate_sample_data(res=self, num_groups=num_groups))
+            batch_num_groups = min(num_groups, self.GROUPS_PER_BATCH)
+            num_groups -= batch_num_groups
             # self.with_delay()._generate_sample_data(res_id=self.id)
-            self._generate_sample_data(res=self)
+            # self._generate_sample_data(res=self)
+
+        main_job = group(*jobs)
+        main_job.on_done(self.delayable()._mark_done())
+        main_job.delay()
+
+    def _mark_done(self):
+        self.ensure_one()
+        self.locked = False
+        self.locked_reason = ""
+
+    def refresh_page(self):
+        """
+        The function `refresh_page` returns a dictionary with the type and tag values to reload the
+        page.
+        :return: The code is returning a dictionary with two key-value pairs. The "type" key has the
+        value "ir.actions.client" and the "tag" key has the value "reload".
+        """
+        return {
+            "type": "ir.actions.client",
+            "tag": "reload",
+        }
 
     @api.model
     def _generate_sample_data(self, **kwargs):
         res = kwargs.get("res")
+        num_groups = kwargs.get("num_groups")
 
         kind_farm_id = self.env.ref("spp_farmer_registry_base.kind_farm").id
 
@@ -77,7 +114,7 @@ def _generate_sample_data(self, **kwargs):
         sex_choices = [option.value for option in options]
         sex_choice_range = sex_choices * 50
 
-        num_groups = min(res.num_groups, 1000)
+        num_groups = min(num_groups, self.GROUPS_PER_BATCH)
 
         for i in range(0, num_groups):
             group_id = res._generate_group_data(i, fake, sex_choice_range, kind_farm_id)

spp_farmer_registry_demo/views/generate_farmer_data_view.xml

@@ -24,8 +24,25 @@
                 <header>
                     <field name="state" widget="statusbar" statusbar_visible="draft,generate" />
                 </header>
+                <field name="locked" invisible="True" />
+                <div
+                    class="alert alert-warning text-center o_form_header"
+                    role="status"
+                    invisible="not locked"
+                >
+                    <span>Warning: Operation in progress: </span>
+                    <field name="locked_reason" class="o_stat_value" />
+                    <button
+                        name="refresh_page"
+                        type="object"
+                        class="btn_warning"
+                        icon="fa-refresh"
+                        title="Refresh Page"
+                        string="Refresh"
+                    />
+                </div>
                 <sheet>
-                    <div class="oe_button_box" name="button_box">
+                    <div class="oe_button_box" name="button_box" invisible="locked">
                         <button
                             type="object"
                             class="oe_stat_button"