Skip to content

Commit 773b7ad

Browse files
gonzalesedwin1123gonzalesedwin1123
authored
Merge pull request #370 from OpenSPP/369-add-events-data-models-and-ui-for-laos-farmer-registry-module
Add event data models and UIs to the Laos Farmer Registry module and minor fixes on UIs
2 parents 98c3945 + c31796b commit 773b7ad

File tree

110 files changed

+19103
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+19103
-49
lines changed

‎spp_base_demo/__manifest__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"g2p_programs",
1515
# "spp_helpdesk",
1616
"product",
17+
"stock",
1718
],
1819
"data": [
1920
"data/users_data.xml",

‎spp_base_gis/controllers/main.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ class MainController(http.Controller):
66
@http.route("/get_maptiler_api_key", type="json", auth="user")
77
def get_maptiler_api_key(self):
88
map_tiler_api_key = request.env["ir.config_parameter"].sudo().get_param("spp_base_gis.map_tiler_api_key")
9-
return {"mapTilerKey": map_tiler_api_key}
9+
web_base_url = request.env["ir.config_parameter"].sudo().get_param("web.base.url")
10+
return {"mapTilerKey": map_tiler_api_key, "webBaseUrl": web_base_url}

‎spp_base_gis/static/src/images/laos_farm.png‎

58.4 KB
Loading

‎spp_base_gis/static/src/js/widgets/gis_edit_map/field_gis_edit_map.esm.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export class FieldGisEditMap extends Component {
6363
const response = await this.rpc("/get_maptiler_api_key");
6464
if (response.mapTilerKey) {
6565
this.mapTilerKey = response.mapTilerKey;
66+
this.webBaseUrl = response.webBaseUrl;
6667
} else {
6768
console.log("Error: Api Key not found.");
6869
}
@@ -202,6 +203,15 @@ export class FieldGisEditMap extends Component {
202203

203204
this.map.on("draw.create", updateArea);
204205
this.map.on("draw.update", updateArea);
206+
207+
const url = `/spp_base_gis/static/src/images/laos_farm.png`;
208+
209+
this.map.on("click", `${this.sourceId}-polygon-layerid`, (e) => {
210+
new maptilersdk.Popup()
211+
.setLngLat(e.lngLat)
212+
.setHTML(`<img src="${url}" height="200" width="300" alt="Placeholder Image">`)
213+
.addTo(this.map);
214+
});
205215
}
206216

207217
addDrawInteractionStyle() {

‎spp_base_gis/static/src/js/widgets/gis_edit_map/field_gis_edit_map.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@
1111
width: 100%;
1212
height: 100%;
1313
}
14+
15+
/* Increasing specificity */
16+
.maplibregl-popup .maplibregl-popup-content {
17+
width: 320px !important; /* Custom width */
18+
height: 220px !important; /* Custom height */
19+
}

‎spp_farmer_registry_laos/__manifest__.py‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,57 @@
2121
"spp_farmer_registry_base",
2222
"spp_registry_group_hierarchy",
2323
"spp_event_data",
24+
"spp_area",
2425
"g2p_programs",
2526
"queue_job",
2627
],
2728
"data": [
2829
"security/ir.model.access.csv",
2930
"data/group_kind_data.xml",
31+
"data/ethnic_group_data.xml",
32+
"data/crops_data.xml",
33+
"data/livestock_data.xml",
3034
"views/farmer_group_view.xml",
3135
"views/group_view.xml",
36+
"views/individual_view.xml",
3237
"views/event_data_view.xml",
38+
"views/event_data_gen_info_view.xml",
3339
"views/generate_farmer_data_view.xml",
40+
"views/event_data_poverty_indicator_view.xml",
41+
"views/event_data_hh_labor_view.xml",
42+
"views/event_data_hh_assets_view.xml",
43+
"views/event_data_agri_land_ownership_use_view.xml",
44+
"views/event_data_food_security_view.xml",
45+
"views/event_data_agri_ws_view.xml",
46+
"views/event_data_agri_tech_ws_view.xml",
47+
"views/event_data_agri_ds_view.xml",
48+
"views/event_data_agri_ds_hot_view.xml",
49+
"views/event_data_permanent_crops_view.xml",
50+
"views/event_data_livestock_farming_view.xml",
51+
"views/event_data_inc_agri_view.xml",
52+
"views/event_data_inc_non_agri_view.xml",
53+
"views/event_data_wash_ind_view.xml",
54+
"views/event_data_hh_resilience_index_view.xml",
55+
"views/event_data_min_dietary_score_view.xml",
56+
"wizard/create_event_wizard.xml",
3457
"wizard/create_event_farm_wizard.xml",
58+
"wizard/create_event_gen_info_wizard.xml",
59+
"wizard/create_event_poverty_indicator_wizard.xml",
60+
"wizard/create_event_hh_labor_wizard.xml",
61+
"wizard/create_event_hh_assets_wizard.xml",
62+
"wizard/create_event_agri_land_ownership_use_wizard.xml",
63+
"wizard/create_event_food_security_wizard.xml",
64+
"wizard/create_event_agri_ws_wizard.xml",
65+
"wizard/create_event_agri_tech_ws_wizard.xml",
66+
"wizard/create_event_agri_ds_wizard.xml",
67+
"wizard/create_event_agri_ds_hot_wizard.xml",
68+
"wizard/create_event_permanent_crops_wizard.xml",
69+
"wizard/create_event_livestock_farming_wizard.xml",
70+
"wizard/create_event_inc_agri_wizard.xml",
71+
"wizard/create_event_inc_non_agri_wizard.xml",
72+
"wizard/create_event_wash_ind_wizard.xml",
73+
"wizard/create_event_hh_resilience_index_wizard.xml",
74+
"wizard/create_event_min_dietary_score_wizard.xml",
3575
],
3676
"assets": {},
3777
"demo": [],

‎spp_farmer_registry_laos/data/crops_data.xml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
<odoo noupdate="1">
2+
3+
<!-- CROPS -->
4+
<record id="rice_farm_species" model="spp.farm.species">
5+
<field name="name">Rice</field>
6+
<field name="species_type">crop</field>
7+
</record>
8+
<record id="black_red_beans_farm_species" model="spp.farm.species">
9+
<field name="name">Black and red beans</field>
10+
<field name="species_type">crop</field>
11+
</record>
12+
<record id="cantaloup_farm_species" model="spp.farm.species">
13+
<field name="name">Cantaloup (melon)</field>
14+
<field name="species_type">crop</field>
15+
</record>
16+
<record id="corn_animal_feed_farm_species" model="spp.farm.species">
17+
<field name="name">Corn (animal feed)</field>
18+
<field name="species_type">crop</field>
19+
</record>
20+
<record id="corn_human_cons_farm_species" model="spp.farm.species">
21+
<field name="name">Corn (human consumption)</field>
22+
<field name="species_type">crop</field>
23+
</record>
24+
<record id="cucumber_farm_species" model="spp.farm.species">
25+
<field name="name">Cucumber</field>
26+
<field name="species_type">crop</field>
27+
</record>
28+
<record id="peanuts_farm_species" model="spp.farm.species">
29+
<field name="name">Peanuts</field>
30+
<field name="species_type">crop</field>
31+
</record>
32+
<record id="potatoes_farm_species" model="spp.farm.species">
33+
<field name="name">Potatoes</field>
34+
<field name="species_type">crop</field>
35+
</record>
36+
<record id="pumpkin_farm_species" model="spp.farm.species">
37+
<field name="name">Pumpkin</field>
38+
<field name="species_type">crop</field>
39+
</record>
40+
<record id="fruitbearing_veg_farm_species" model="spp.farm.species">
41+
<field name="name">Fruitbearing vegetables (tomatoes, chili, sweet peppers, eggplants…)</field>
42+
<field name="species_type">crop</field>
43+
</record>
44+
<record id="gourd_farm_species" model="spp.farm.species">
45+
<field name="name">Gourd (snake gourd, luffah, squash, chayote…)</field>
46+
<field name="species_type">crop</field>
47+
</record>
48+
<record id="green_manure_farm_species" model="spp.farm.species">
49+
<field name="name">Green manure</field>
50+
<field name="species_type">crop</field>
51+
</record>
52+
<record id="leafy_stem_veg_farm_species" model="spp.farm.species">
53+
<field
54+
name="name"
55+
>Leafy stem vegetables (lettuces, cabbages, cauliflower, pakchoi, mustard, kale, coriander, morning glory…)</field>
56+
<field name="species_type">crop</field>
57+
</record>
58+
<record id="long_beans_farm_species" model="spp.farm.species">
59+
<field name="name">Long beans</field>
60+
<field name="species_type">crop</field>
61+
</record>
62+
<record id="mungbeans_farm_species" model="spp.farm.species">
63+
<field name="name">Mungbeans</field>
64+
<field name="species_type">crop</field>
65+
</record>
66+
<record id="roots_bulbs_tuberous_farm_species" model="spp.farm.species">
67+
<field name="name">Roots, bulbs and tuberous (ginger, onions, garlic…)</field>
68+
<field name="species_type">crop</field>
69+
</record>
70+
<record id="sesame_farm_species" model="spp.farm.species">
71+
<field name="name">Sesame</field>
72+
<field name="species_type">crop</field>
73+
</record>
74+
<record id="soybean_farm_species" model="spp.farm.species">
75+
<field name="name">Soybean</field>
76+
<field name="species_type">crop</field>
77+
</record>
78+
<record id="weet_falang_farm_species" model="spp.farm.species">
79+
<field name="name">Weet / falang beans</field>
80+
<field name="species_type">crop</field>
81+
</record>
82+
<record id="sweet_potatoes_farm_species" model="spp.farm.species">
83+
<field name="name">Sweet potatoes</field>
84+
<field name="species_type">crop</field>
85+
</record>
86+
<record id="tobacco_farm_species" model="spp.farm.species">
87+
<field name="name">Tobacco</field>
88+
<field name="species_type">crop</field>
89+
</record>
90+
<record id="watermelon_farm_species" model="spp.farm.species">
91+
<field name="name">Watermelon</field>
92+
<field name="species_type">crop</field>
93+
</record>
94+
<record id="winged_beans_farm_species" model="spp.farm.species">
95+
<field name="name">Winged beans</field>
96+
<field name="species_type">crop</field>
97+
</record>
98+
<record id="cassave_farm_species" model="spp.farm.species">
99+
<field name="name">Cassava</field>
100+
<field name="species_type">crop</field>
101+
</record>
102+
<record id="sugarcane_farm_species" model="spp.farm.species">
103+
<field name="name">Sugarcane</field>
104+
<field name="species_type">crop</field>
105+
</record>
106+
<record id="upland_rice_farm_species" model="spp.farm.species">
107+
<field name="name">Upland rice</field>
108+
<field name="species_type">crop</field>
109+
</record>
110+
<record id="jobs_tear_farm_species" model="spp.farm.species">
111+
<field name="name">Job’s tear</field>
112+
<field name="species_type">crop</field>
113+
</record>
114+
<record id="coffee_farm_species" model="spp.farm.species">
115+
<field name="name">Coffee</field>
116+
<field name="species_type">crop</field>
117+
</record>
118+
<record id="tea_farm_species" model="spp.farm.species">
119+
<field name="name">Tea</field>
120+
<field name="species_type">crop</field>
121+
</record>
122+
<record id="tree_fruits_farm_species" model="spp.farm.species">
123+
<field name="name">Tree fruits</field>
124+
<field name="species_type">crop</field>
125+
</record>
126+
<record id="cardamon_farm_species" model="spp.farm.species">
127+
<field name="name">Cardamom</field>
128+
<field name="species_type">crop</field>
129+
</record>
130+
<record id="ruber_farm_species" model="spp.farm.species">
131+
<field name="name">Ruber</field>
132+
<field name="species_type">crop</field>
133+
</record>
134+
<record id="pine_farm_species" model="spp.farm.species">
135+
<field name="name">Pine</field>
136+
<field name="species_type">crop</field>
137+
</record>
138+
<record id="palm_tree_farm_species" model="spp.farm.species">
139+
<field name="name">Palm tree</field>
140+
<field name="species_type">crop</field>
141+
</record>
142+
<record id="teak_farm_species" model="spp.farm.species">
143+
<field name="name">Teak</field>
144+
<field name="species_type">crop</field>
145+
</record>
146+
<record id="other_crops_farm_species" model="spp.farm.species">
147+
<field name="name">Other Crops</field>
148+
<field name="species_type">crop</field>
149+
</record>
150+
151+
</odoo>

‎spp_farmer_registry_laos/data/ethnic_group_data.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<odoo noupdate="1">
2+
3+
<!-- Ethnic Groups -->
4+
<record id="lao_ethnic_group" model="spp.ethnic.group">
5+
<field name="name">Lao</field>
6+
<field name="ethnic_group_id">1</field>
7+
</record>
8+
<record id="hmong_ethnic_group" model="spp.ethnic.group">
9+
<field name="name">Hmong</field>
10+
<field name="ethnic_group_id">2</field>
11+
</record>
12+
<record id="khmu_ethnic_group" model="spp.ethnic.group">
13+
<field name="name">Khmu</field>
14+
<field name="ethnic_group_id">3</field>
15+
</record>
16+
<record id="lue_ethnic_group" model="spp.ethnic.group">
17+
<field name="name">Lue</field>
18+
<field name="ethnic_group_id">4</field>
19+
</record>
20+
<record id="youan_ethnic_group" model="spp.ethnic.group">
21+
<field name="name">Youan</field>
22+
<field name="ethnic_group_id">5</field>
23+
</record>
24+
<record id="taidam_ethnic_group" model="spp.ethnic.group">
25+
<field name="name">Taidam</field>
26+
<field name="ethnic_group_id">6</field>
27+
</record>
28+
<record id="taideng_ethnic_group" model="spp.ethnic.group">
29+
<field name="name">Taideng</field>
30+
<field name="ethnic_group_id">7</field>
31+
</record>
32+
<record id="pailor_ethnic_group" model="spp.ethnic.group">
33+
<field name="name">Pailor</field>
34+
<field name="ethnic_group_id">8</field>
35+
</record>
36+
<record id="iu_mien_ethnic_group" model="spp.ethnic.group">
37+
<field name="name">Iu-Mien</field>
38+
<field name="ethnic_group_id">9</field>
39+
</record>
40+
<record id="tai_ethnic_group" model="spp.ethnic.group">
41+
<field name="name">Tai</field>
42+
<field name="ethnic_group_id">10</field>
43+
</record>
44+
<record id="edu_ethnic_group" model="spp.ethnic.group">
45+
<field name="name">Edu</field>
46+
<field name="ethnic_group_id">11</field>
47+
</record>
48+
<record id="taiphouan_ethnic_group" model="spp.ethnic.group">
49+
<field name="name">Taiphouan</field>
50+
<field name="ethnic_group_id">12</field>
51+
</record>
52+
<record id="phorng_ethnic_group" model="spp.ethnic.group">
53+
<field name="name">Phorng</field>
54+
<field name="ethnic_group_id">13</field>
55+
</record>
56+
<record id="others_ethnic_group" model="spp.ethnic.group">
57+
<field name="name">Others</field>
58+
<field name="ethnic_group_id">14</field>
59+
</record>
60+
61+
</odoo>

‎spp_farmer_registry_laos/data/livestock_data.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<odoo noupdate="1">
2+
3+
<!-- Livestock -->
4+
<record id="buffalo_farm_species" model="spp.farm.species">
5+
<field name="name">Buffalo</field>
6+
<field name="species_type">livestock</field>
7+
</record>
8+
<record id="cow_meat_farm_species" model="spp.farm.species">
9+
<field name="name">Cow (Meat)</field>
10+
<field name="species_type">livestock</field>
11+
</record>
12+
<record id="cow_milk_farm_species" model="spp.farm.species">
13+
<field name="name">Cow (Milk)</field>
14+
<field name="species_type">livestock</field>
15+
</record>
16+
<record id="goat_farm_species" model="spp.farm.species">
17+
<field name="name">Goat</field>
18+
<field name="species_type">livestock</field>
19+
</record>
20+
<record id="pig_farm_species" model="spp.farm.species">
21+
<field name="name">Pig</field>
22+
<field name="species_type">livestock</field>
23+
</record>
24+
<record id="piglets_farm_species" model="spp.farm.species">
25+
<field name="name">Piglets</field>
26+
<field name="species_type">livestock</field>
27+
</record>
28+
<record id="poultry_farm_species" model="spp.farm.species">
29+
<field name="name">Poultry (Eggs, Chicken, Duck, Goose)</field>
30+
<field name="species_type">livestock</field>
31+
</record>
32+
<record id="aquatic_animals_farm_species" model="spp.farm.species">
33+
<field name="name">Aquatic animals (Fish, Shrimp)</field>
34+
<field name="species_type">livestock</field>
35+
</record>
36+
<record id="frog_farm_species" model="spp.farm.species">
37+
<field name="name">Frog</field>
38+
<field name="species_type">livestock</field>
39+
</record>
40+
<record id="other_livestock_farm_species" model="spp.farm.species">
41+
<field name="name">Other Livestock</field>
42+
<field name="species_type">livestock</field>
43+
</record>
44+
45+
46+
</odoo>

‎spp_farmer_registry_laos/models/__init__.py‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
22

33
from . import farm_activity
4+
from . import ethnic_group
5+
from . import event_data
6+
from . import event_data_gen_info
7+
from . import event_data_poverty_indicator
8+
from . import event_data_hh_labor
9+
from . import event_data_hh_assets
10+
from . import event_data_agri_land_ownership_use
11+
from . import event_data_food_security
12+
from . import event_data_agricultural_ws
13+
from . import event_data_agricultural_tech_ws
14+
from . import event_data_agri_ds
15+
from . import event_data_agri_ds_hot
16+
from . import event_data_permanent_crops
17+
from . import event_data_livestock_farming
18+
from . import event_data_inc_agri
19+
from . import event_data_inc_non_agri
20+
from . import event_data_wash_ind
21+
from . import event_data_hh_resilience_index
22+
from . import event_data_min_dietary_score
423
from . import farm
524
from . import farmer
6-
from . import event_data
725
from . import generate_farmer_data

0 commit comments

Comments
 (0)