Merge pull request #580 from OpenSPP/spp_starter_improvements

Spp starter improvements

Author: kneckinator

spp_starter/tests/test_spp_starter.py

@@ -18,33 +18,65 @@ def setUpClass(cls):
         )
 
     def test_01_action_last_state(self):
-        self.test_record.state = "5"
+        self.test_record.state = "2"
+        self.test_record.registry_target = "spmis"
+        self.test_record.state_spmis = "2"
         self.test_record.action_last_state()
-        self.assertEqual(self.test_record.state, "4")
-        self.test_record.action_last_state()
-        self.assertEqual(self.test_record.state, "3")
+        self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_spmis, "1")
+
         self.test_record.action_last_state()
         self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
         self.test_record.action_last_state()
         self.assertEqual(self.test_record.state, "1")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
         self.test_record.action_last_state()
         self.assertEqual(self.test_record.state, "0")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
+        self.test_record.state = "2"
+        self.test_record.registry_target = "farmer"
+        self.test_record.action_last_state()
+        self.assertEqual(self.test_record.state, "1")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
         self.test_record.action_last_state()
         self.assertEqual(self.test_record.state, "0")
+        self.assertEqual(self.test_record.state_spmis, "0")
 
     def test_02_action_next_state(self):
+        self.test_record.registry_target = "spmis"
+
         self.test_record.action_next_state()
         self.assertEqual(self.test_record.state, "1")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
         self.test_record.action_next_state()
         self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_spmis, "0")
+
         self.test_record.action_next_state()
-        self.assertEqual(self.test_record.state, "3")
+        self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_spmis, "1")
+
         self.test_record.action_next_state()
-        self.assertEqual(self.test_record.state, "4")
+        self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_spmis, "2")
+
+        self.test_record.registry_target = "farmer"
+        self.test_record.state = "0"
+        self.test_record.state_farmer = "0"
+
         self.test_record.action_next_state()
-        self.assertEqual(self.test_record.state, "5")
+        self.assertEqual(self.test_record.state, "1")
+        self.assertEqual(self.test_record.state_farmer, "0")
+
         self.test_record.action_next_state()
-        self.assertEqual(self.test_record.state, "5")
+        self.assertEqual(self.test_record.state, "2")
+        self.assertEqual(self.test_record.state_farmer, "0")
 
     def test_03_reopen(self):
         res = self.test_record._reopen()

spp_starter/wizards/spp_starter.py

@@ -5,18 +5,37 @@ class SppStarter(models.TransientModel):
     _name = "spp.starter"
     _description = "SPP Starter"
 
+    STATE_SELECTION = [
+        ("0", "Organization Setup"),
+        ("1", "Registry Setup"),
+        ("2", "Chosen Registry Setup"),
+    ]
+    SP_MIS_STATE_SELECTION = [
+        ("0", "SP-MIS"),
+        ("1", "Service Points"),
+        ("2", "Cash Transfer"),
+        ("3", "In-Kind Transfer"),
+    ]
+    FARMER_STATE_SELECTION = [
+        ("0", "Farmer Registry"),
+    ]
+
     state = fields.Selection(
-        selection=[
-            ("0", "Organization"),
-            ("1", "Registry"),
-            ("2", "Service Points"),
-            ("3", "Cash Transfer"),
-            ("4", "In-Kind Transfer"),
-            ("5", "Grievance Redress Mechanism"),
-        ],
+        selection=STATE_SELECTION,
+        required=True,
+        default="0",
+    )
+    state_spmis = fields.Selection(
+        selection=SP_MIS_STATE_SELECTION,
         required=True,
         default="0",
     )
+    state_farmer = fields.Selection(
+        selection=FARMER_STATE_SELECTION,
+        required=True,
+        default="0",
+    )
+    is_last_step = fields.Boolean(compute="_compute_is_last_step")
     # STEP 1
     org_name = fields.Char(
         readonly=True,
@@ -37,16 +56,16 @@ class SppStarter(models.TransientModel):
         help="To set the default currency for financial transactions.",
     )
     # STEP 2
-    managing_target = fields.Selection(
+    registry_target = fields.Selection(
         selection=[
-            ("individual", "Individual"),
-            ("group", "Group"),
-            ("both", "Both"),
+            ("spmis", "SP-MIS"),
+            ("farmer", "Farmer Registry"),
         ],
         readonly=True,
-        default="both",
+        default="spmis",
         help="To customize data models and interfaces.",
     )
+
     location_assignment = fields.Selection(
         selection=[
             ("yes", "Yes"),
@@ -65,7 +84,18 @@ class SppStarter(models.TransientModel):
         default="yes",
         help="To determine if identity management modules should be installed.",
     )
-    # STEP 3
+    # STEP 3 SP-MIS
+    sp_mis_demo_management = fields.Selection(
+        selection=[
+            ("yes", "Yes"),
+            ("no", "No"),
+        ],
+        readonly=True,
+        default="yes",
+        help="To gauge whether demo module for SP-MIS is needed.",
+    )
+
+    # STEP 4 SP-MIS
     service_point_management = fields.Selection(
         selection=[
             ("yes", "Yes"),
@@ -75,7 +105,7 @@ class SppStarter(models.TransientModel):
         default="yes",
         help="To gauge whether additional logistics modules are needed.",
     )
-    # STEP 4
+    # STEP 5 SP-MIS
     cash_transfer_needed = fields.Selection(
         selection=[
             ("yes", "Yes"),
@@ -94,7 +124,7 @@ class SppStarter(models.TransientModel):
         default="yes",
         help="To add functionality for storing financial information.",
     )
-    # STEP 5
+    # STEP 6 SP-MIS
     conducting_inkind_transfer = fields.Selection(
         selection=[
             ("yes", "Yes"),
@@ -104,17 +134,29 @@ class SppStarter(models.TransientModel):
         default="yes",
         help="To decide if modules for inventory management are needed.",
     )
-    # STEP 6
-    complaint_management = fields.Selection(
+
+    # STEP 3 Farmer Registry
+    farmer_demo_management = fields.Selection(
         selection=[
             ("yes", "Yes"),
             ("no", "No"),
         ],
         readonly=True,
-        default="yes",
-        help="To add modules for complaint management if needed.",
+        default="no",
+        help="To gauge whether demo module for farmer registry is needed.",
     )
 
+    def _compute_is_last_step(self):
+        for rec in self:
+            if rec.registry_target == "spmis":
+                rec.is_last_step = (
+                    rec.state == rec.STATE_SELECTION[-1][0] and rec.state_spmis == rec.SP_MIS_STATE_SELECTION[-1][0]
+                )
+            if rec.registry_target == "farmer":
+                rec.is_last_step = (
+                    rec.state == rec.STATE_SELECTION[-1][0] and rec.state_farmer == rec.FARMER_STATE_SELECTION[-1][0]
+                )
+
     def action_done(self):
         self.ensure_one()
         self._adjust_main_company_details()
@@ -127,15 +169,27 @@ def action_done(self):
     def action_last_state(self):
         self.ensure_one()
         state_int = int(self.state)
-        if state_int > 0:
-            self.state = str(state_int - 1)
+        if state_int == len(self.STATE_SELECTION) - 1:
+            if self.registry_target == "spmis" and int(self.state_spmis) > 0:
+                self.state_spmis = str(int(self.state_spmis) - 1)
+            elif self.registry_target == "farmer" and int(self.state_farmer) > 0:
+                self.state_farmer = str(int(self.state_farmer) - 1)
+            else:
+                self.state = str(state_int - 1)
+        else:
+            self.state = str(max(state_int - 1, 0))
         return self._reopen()
 
     def action_next_state(self):
         self.ensure_one()
         state_int = int(self.state)
-        if state_int < 5:
+        if state_int < len(self.STATE_SELECTION) - 1:
             self.state = str(state_int + 1)
+        if state_int == len(self.STATE_SELECTION) - 1:
+            if self.registry_target == "spmis":
+                self.state_spmis = str(int(self.state_spmis) + 1)
+            if self.registry_target == "farmer":
+                self.state_farmer = str(int(self.state_farmer) + 1)
         return self._reopen()
 
     def _adjust_main_company_details(self):
@@ -156,24 +210,37 @@ def find_module(module_name):
             return self.env.ref(f"base.module_{module_name}", raise_if_not_found=False)
 
         res = find_module("theme_openspp_muk")
-        if self.managing_target == "individual":
-            res |= find_module("g2p_registry_individual")
-        if self.managing_target == "group":
-            res |= find_module("g2p_registry_group")
-        if self.managing_target == "both":
-            res |= find_module("g2p_registry_membership")
-        if self.location_assignment == "yes":
-            res |= find_module("spp_area")
+        if self.registry_target == "spmis":
+            res |= find_module("spp_base")
+            res |= find_module("spp_programs")
+            res |= find_module("spp_change_request")
+            res |= find_module("spp_change_request_change_info")
+            res |= find_module("spp_event_data")
+            if self.sp_mis_demo_management == "yes":
+                res |= find_module("spp_demo")
+            if self.location_assignment == "yes":
+                res |= find_module("spp_area")
+            if self.service_point_management == "yes":
+                res |= find_module("spp_service_points")
+            if self.cash_transfer_needed == "yes":
+                res |= find_module("spp_entitlement_cash")
+            if self.bank_details_needed == "yes":
+                res |= find_module("g2p_bank")
+            if self.conducting_inkind_transfer == "yes":
+                res |= find_module("spp_entitlement_in_kind")
+
+        if self.registry_target == "farmer":
+            # TODO: needs to change this once the module for farmer registry default UI is created
+            res |= find_module("spp_farmer_registry_base")
+            if self.location_assignment == "yes":
+                res |= find_module("spp_area_gis")
+            if self.farmer_demo_management == "yes":
+                res |= find_module("spp_farmer_registry_demo")
+                res |= find_module("spp_programs")
+
         if self.id_management == "yes":
             res |= find_module("spp_idpass")
-        if self.service_point_management == "yes":
-            res |= find_module("spp_service_points")
-        if self.cash_transfer_needed == "yes":
-            res |= find_module("spp_entitlement_cash")
-        if self.bank_details_needed == "yes":
-            res |= find_module("g2p_bank")
-        if self.conducting_inkind_transfer == "yes":
-            res |= find_module("spp_entitlement_in_kind")
+
         return res
 
     def _remove_default_products_if_needed(self):