Skip to content

Commit 1438110

Browse files
Add area_id in the farmer group and farmer UIs
1 parent 13023d6 commit 1438110

26 files changed

+270
-234
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+
"spp_area",
2425
"g2p_programs",
2526
"queue_job",
2627
],

spp_farmer_registry_laos/models/generate_farmer_data.py

Lines changed: 238 additions & 202 deletions
Large diffs are not rendered by default.

spp_farmer_registry_laos/views/farmer_group_view.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@
123123
options="{'no_open':True, 'no_create_edit':True,'no_create':True}"
124124
readonly="disabled"
125125
/>
126+
<field
127+
name="area_id"
128+
placeholder="Area"
129+
options="{'no_open': True, 'no_create': True}"
130+
readonly="disabled"
131+
/>
126132
</group>
127133
<notebook>
128134
<page string="Members" name="members">

spp_farmer_registry_laos/views/group_view.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<xpath expr="//page[@name='relationships']" position="attributes">
2020
<attribute name="invisible">1</attribute>
2121
</xpath>
22+
<xpath expr="//field[@name='kind']" position="after">
23+
<xpath expr="//field[@name='area_id']" position="move" />
24+
</xpath>
2225
<xpath expr="//page[@name='basic_info']" position="attributes">
2326
<attribute name="invisible">1</attribute>
2427
</xpath>

spp_farmer_registry_laos/wizard/create_event_agri_ds_hot_wizard.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class SPPCreateEventAgriculturalDSHotWizard(models.TransientModel):
3030

3131
def create_event(self):
3232
for rec in self:
33-
vals_list = {
34-
"survey_sched": rec.survey_sched
35-
}
33+
vals_list = {"survey_sched": rec.survey_sched}
3634
if rec.agri_prod_ids:
3735
produce_vals = []
3836
for produce in rec.agri_prod_ids:

spp_farmer_registry_laos/wizard/create_event_agri_ds_hot_wizard.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
1717
<label for="survey_sched" />
1818
<div>
1919
</div>
20-
<field name="survey_sched" required="1"/>
20+
<field name="survey_sched" required="1" />
2121
</div>
2222
</div>
2323
</div>

spp_farmer_registry_laos/wizard/create_event_agri_ds_wizard.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class SPPCreateEventAgriculturalDSWizard(models.TransientModel):
3030

3131
def create_event(self):
3232
for rec in self:
33-
vals_list = {
34-
"survey_sched": rec.survey_sched
35-
}
33+
vals_list = {"survey_sched": rec.survey_sched}
3634
if rec.agri_prod_ids:
3735
produce_vals = []
3836
for produce in rec.agri_prod_ids:

spp_farmer_registry_laos/wizard/create_event_agri_ds_wizard.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
1717
<label for="survey_sched" />
1818
<div>
1919
</div>
20-
<field name="survey_sched" required="1"/>
20+
<field name="survey_sched" required="1" />
2121
</div>
2222
</div>
2323
</div>

spp_farmer_registry_laos/wizard/create_event_agri_land_ownership_use_wizard.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
1717
<label for="survey_sched" />
1818
<div>
1919
</div>
20-
<field name="survey_sched" required="1"/>
20+
<field name="survey_sched" required="1" />
2121
</div>
2222
</div>
2323
</div>

spp_farmer_registry_laos/wizard/create_event_agri_tech_ws_wizard.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class SPPCreateEventAgriculturalTechWSWizard(models.TransientModel):
2020

2121
def create_event(self):
2222
for rec in self:
23-
vals_list = {
24-
"survey_sched": rec.survey_sched
25-
}
23+
vals_list = {"survey_sched": rec.survey_sched}
2624
if rec.agri_prod_sales_cost_tech_ids:
2725
tech_vals = []
2826
for tech in rec.agri_prod_sales_cost_tech_ids:

0 commit comments

Comments
 (0)