Skip to content

Commit 2774be0

Browse files
committed
modify event data
1 parent 4c1a323 commit 2774be0

File tree

8 files changed

+234
-1083
lines changed

8 files changed

+234
-1083
lines changed

spp_farmer_registry_laos/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"spp_farmer_registry_base",
2222
"spp_registry_group_hierarchy",
2323
"spp_event_data",
24+
"g2p_programs",
2425
"queue_job",
2526
],
2627
"data": [
Lines changed: 17 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
22

3-
43
from odoo import fields, models
54

65

7-
class OpenSPPStatisticsCycle2a(models.Model):
8-
_name = "spp.event.cycle2a"
9-
_description = "FG member in round 1"
10-
6+
class OpenSPPStatisticsCycle(models.Model):
7+
_name = "spp.event.cycle"
8+
_description = "Event Cycle"
9+
10+
program_id = fields.Many2one("g2p.program", "Program")
11+
cycle_id = fields.Many2one("g2p.cycle", "Cycle")
12+
event_type = fields.Selection(
13+
[
14+
("fgmemr1", "FG member in round 1"),
15+
("wumem", "WU member, but not received production grant"),
16+
("fgmemr2", "FG member in round 2"),
17+
("impagri", "Implementation of agriculture production grants (round 1)"),
18+
("implive", "Implementation of livestock production grants (round 1)"),
19+
],
20+
default="fgmemr1",
21+
string="Event Type",
22+
)
1123
no_hh_member = fields.Integer("No. of HH Member")
1224
no_indigenous = fields.Integer("No. of Indigenous")
1325
percent_indigenous = fields.Float("% of Indigenous")
@@ -20,36 +32,12 @@ class OpenSPPStatisticsCycle2a(models.Model):
2032
no_male = fields.Integer("No. of Male")
2133
no_female = fields.Integer("No. of Female")
2234
no_both = fields.Integer("No. of Both")
23-
24-
def get_view_id(self):
25-
"""
26-
This retrieves the View ID of this model
27-
"""
28-
return self.env["ir.ui.view"].search([("model", "=", self._name), ("type", "=", "form")], limit=1).id
29-
30-
31-
class OpenSPPStatisticsCycle2b(models.Model):
32-
_name = "spp.event.cycle2b"
33-
_description = "Implementation of agriculture production grants (round 1)"
34-
3535
no_implemented = fields.Integer("No. of Implemented")
3636
no_on_going = fields.Integer("No. of On-going")
3737
no_not_implemented = fields.Integer("No. of Not Implemented")
3838
production_area = fields.Float("Production Area (ha)")
3939
agricultural_yield = fields.Float("Agricultural Yield (ton)")
4040
agricultural_productivity = fields.Float("Agricultural Productivity (ton/ha)")
41-
42-
def get_view_id(self):
43-
"""
44-
This retrieves the View ID of this model
45-
"""
46-
return self.env["ir.ui.view"].search([("model", "=", self._name), ("type", "=", "form")], limit=1).id
47-
48-
49-
class OpenSPPStatisticsCycle2c(models.Model):
50-
_name = "spp.event.cycle2c"
51-
_description = "Implementation of livestock production grants (round 1)"
52-
5341
no_livestock_project = fields.Integer("No. of Livestock provided by project")
5442
no_livestock_present = fields.Integer("No. of Livestock at present")
5543
no_livestock_consumption = fields.Integer("No. of Livestock consumption")
@@ -61,51 +49,3 @@ def get_view_id(self):
6149
This retrieves the View ID of this model
6250
"""
6351
return self.env["ir.ui.view"].search([("model", "=", self._name), ("type", "=", "form")], limit=1).id
64-
65-
66-
class OpenSPPStatisticsCycle3a(models.Model):
67-
_name = "spp.event.cycle3a"
68-
_description = "WU member, but not received production grant"
69-
70-
no_hh_member = fields.Integer("No. of HH Member")
71-
no_indigenous = fields.Integer("No. of Indigenous")
72-
percent_indigenous = fields.Float("% of Indigenous")
73-
no_15_35 = fields.Integer("No. of Member in 15-35")
74-
percent_15_35 = fields.Float("% of Member in 15-35")
75-
no_woman_headed = fields.Integer("No. of Woman-headed HH")
76-
no_better_off = fields.Integer("No. of Better-off HH")
77-
no_medium = fields.Integer("No. of Medium HH")
78-
no_poor = fields.Integer("No. of Poor HH")
79-
no_male = fields.Integer("No. of Male")
80-
no_female = fields.Integer("No. of Female")
81-
no_both = fields.Integer("No. of Both")
82-
83-
def get_view_id(self):
84-
"""
85-
This retrieves the View ID of this model
86-
"""
87-
return self.env["ir.ui.view"].search([("model", "=", self._name), ("type", "=", "form")], limit=1).id
88-
89-
90-
class OpenSPPStatisticsCycle3b(models.Model):
91-
_name = "spp.event.cycle3b"
92-
_description = "FG member in round 2"
93-
94-
no_hh_member = fields.Integer("No. of HH Member")
95-
no_indigenous = fields.Integer("No. of Indigenous")
96-
percent_indigenous = fields.Float("% of Indigenous")
97-
no_15_35 = fields.Integer("No. of Member in 15-35")
98-
percent_15_35 = fields.Float("% of Member in 15-35")
99-
no_woman_headed = fields.Integer("No. of Woman-headed HH")
100-
no_better_off = fields.Integer("No. of Better-off HH")
101-
no_medium = fields.Integer("No. of Medium HH")
102-
no_poor = fields.Integer("No. of Poor HH")
103-
no_male = fields.Integer("No. of Male")
104-
no_female = fields.Integer("No. of Female")
105-
no_both = fields.Integer("No. of Both")
106-
107-
def get_view_id(self):
108-
"""
109-
This retrieves the View ID of this model
110-
"""
111-
return self.env["ir.ui.view"].search([("model", "=", self._name), ("type", "=", "form")], limit=1).id
Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22

3-
from odoo import api, fields, models
3+
from odoo import _, api, fields, models
44

55
_logger = logging.getLogger(__name__)
66

@@ -9,52 +9,49 @@ class Farm(models.Model):
99
_inherit = "res.partner"
1010

1111
farm_prod_ids = fields.One2many("spp.farm.activity", "prod_farm_id", string="Products")
12-
active_event_cycle2a = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle2a")
13-
active_event_cycle2b = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle2b")
14-
active_event_cycle2c = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle2c")
15-
active_event_cycle3a = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle3a")
16-
active_event_cycle3b = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle3b")
12+
active_event_cycle = fields.Many2one("spp.event.data", compute="_compute_active_event_cycle")
1713

1814
@api.depends("event_data_ids")
19-
def _compute_active_event_cycle2a(self):
15+
def _compute_active_event_cycle(self):
2016
"""
2117
This computes the active farm event of the group
2218
"""
2319
for rec in self:
24-
rec.active_event_cycle2a = rec._get_active_event_id("spp.event.cycle2a")
25-
26-
@api.depends("event_data_ids")
27-
def _compute_active_event_cycle2b(self):
28-
"""
29-
This computes the active farm event of the group
30-
"""
31-
for rec in self:
32-
rec.active_event_cycle2b = rec._get_active_event_id("spp.event.cycle2b")
33-
34-
@api.depends("event_data_ids")
35-
def _compute_active_event_cycle2c(self):
36-
"""
37-
This computes the active farm event of the group
38-
"""
39-
for rec in self:
40-
rec.active_event_cycle2c = rec._get_active_event_id("spp.event.cycle2c")
41-
42-
@api.depends("event_data_ids")
43-
def _compute_active_event_cycle3a(self):
44-
"""
45-
This computes the active farm event of the group
46-
"""
47-
for rec in self:
48-
rec.active_event_cycle3a = rec._get_active_event_id("spp.event.cycle3a")
49-
50-
@api.depends("event_data_ids")
51-
def _compute_active_event_cycle3b(self):
52-
"""
53-
This computes the active farm event of the group
54-
"""
55-
for rec in self:
56-
rec.active_event_cycle3b = rec._get_active_event_id("spp.event.cycle3b")
20+
rec.active_event_cycle = rec._get_active_event_id("spp.event.cycle")
5721

5822
# overwrite for now since we will not create an individual per group in this module
5923
def create_update_farmer(self, farm):
6024
pass
25+
26+
def open_create_event_wizard(self):
27+
for rec in self:
28+
model_name = "spp.event.cycle"
29+
# compute wizard model name
30+
31+
wizard_list = model_name.split(".")
32+
wizard_model = "%s.create." % wizard_list[0]
33+
wizard_list.pop(0)
34+
view_name = self.env["ir.model"].search([("model", "=", model_name)]).name
35+
for split_wizard in wizard_list:
36+
wizard_model += "%s." % split_wizard
37+
wizard_model += "wizard"
38+
view_id = self.env.ref("spp_farmer_registry_laos.create_event_cycle_form_view").id
39+
# create the event data and pass it to event_data_model wizard
40+
vals_list = {
41+
"model": model_name,
42+
"partner_id": rec.id,
43+
}
44+
event_id = self.env["spp.event.data"].create(vals_list)
45+
46+
wiz = self.env[wizard_model].create({"event_id": event_id.id})
47+
48+
return {
49+
"name": _("Create %s", view_name),
50+
"view_mode": "form",
51+
"res_model": wizard_model,
52+
"res_id": wiz.id,
53+
"view_id": view_id,
54+
"type": "ir.actions.act_window",
55+
"target": "new",
56+
"context": self.env.context,
57+
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
2-
spp_event_cycle2a_admin,SPP Cycle2A Admin Access,spp_farmer_registry_laos.model_spp_event_cycle2a,g2p_registry_base.group_g2p_admin,1,1,1,1
3-
spp_event_cycle2b_admin,SPP Cycle2B Admin Access,spp_farmer_registry_laos.model_spp_event_cycle2b,g2p_registry_base.group_g2p_admin,1,1,1,1
4-
spp_event_cycle2c_admin,SPP Cycle2C Admin Access,spp_farmer_registry_laos.model_spp_event_cycle2c,g2p_registry_base.group_g2p_admin,1,1,1,1
5-
spp_event_cycle3a_admin,SPP Cycle3A Admin Access,spp_farmer_registry_laos.model_spp_event_cycle3a,g2p_registry_base.group_g2p_admin,1,1,1,1
6-
spp_event_cycle3b_admin,SPP Cycle3B Admin Access,spp_farmer_registry_laos.model_spp_event_cycle3b,g2p_registry_base.group_g2p_admin,1,1,1,1
7-
spp_create_event_cycle2a_wizard_admin,SPP Cycle2A Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle2a_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
8-
spp_create_event_cycle2b_wizard_admin,SPP Cycle2B Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle2b_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
9-
spp_create_event_cycle2c_wizard_admin,SPP Cycle2C Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle2c_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
10-
spp_create_event_cycle3a_wizard_admin,SPP Cycle3A Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle3a_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
11-
spp_create_event_cycle3b_wizard_admin,SPP Cycle3B Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle3b_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
2+
spp_event_cycle_admin,SPP Event Cycle Admin Access,spp_farmer_registry_laos.model_spp_event_cycle,g2p_registry_base.group_g2p_admin,1,1,1,1
3+
spp_create_event_cycle_wizard_admin,SPP Event Cycle Wizard Admin Access,spp_farmer_registry_laos.model_spp_create_event_cycle_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
124

135
spp_laos_generate_farmer_data_admin,SPP Laos Generate Farmer Data Admin Access,spp_farmer_registry_laos.model_spp_laos_generate_farmer_data,g2p_registry_base.group_g2p_admin,1,1,1,1
146
spp_laos_generate_farmer_data_registrar,SPP Laos Generate Farmer Data Registrar Access,spp_farmer_registry_laos.model_spp_laos_generate_farmer_data,g2p_registry_base.group_g2p_registrar,1,1,1,1

0 commit comments

Comments
 (0)