Merge branch 'laos-dirty-quick-fix' of https://github.com/OpenSPP/openspp-modules into 369-add-events-data-models-and-ui-for-laos-farmer-registry-module

Author: reichie020212

spp_base_demo/__manifest__.py

@@ -14,6 +14,7 @@
         "g2p_programs",
         # "spp_helpdesk",
         "product",
+        "stock",
     ],
     "data": [
         "data/users_data.xml",

spp_base_gis/controllers/main.py

@@ -6,4 +6,5 @@ class MainController(http.Controller):
     @http.route("/get_maptiler_api_key", type="json", auth="user")
     def get_maptiler_api_key(self):
         map_tiler_api_key = request.env["ir.config_parameter"].sudo().get_param("spp_base_gis.map_tiler_api_key")
-        return {"mapTilerKey": map_tiler_api_key}
+        web_base_url = request.env["ir.config_parameter"].sudo().get_param("web.base.url")
+        return {"mapTilerKey": map_tiler_api_key, "webBaseUrl": web_base_url}

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

@@ -63,6 +63,7 @@ export class FieldGisEditMap extends Component {
             const response = await this.rpc("/get_maptiler_api_key");
             if (response.mapTilerKey) {
                 this.mapTilerKey = response.mapTilerKey;
+                this.webBaseUrl = response.webBaseUrl;
             } else {
                 console.log("Error: Api Key not found.");
             }
@@ -202,6 +203,22 @@ export class FieldGisEditMap extends Component {
 
         this.map.on("draw.create", updateArea);
         this.map.on("draw.update", updateArea);
+
+        const model = this.props.record._config.resModel;
+        const url = `${this.webBaseUrl}/web/image?model=${model}&id=${this.props.record._config.resId}&field=geo_img_file`;
+
+        this.map.on("click", `${this.sourceId}-polygon-layerid`, (e) => {
+            new maptilersdk.Popup()
+                .setLngLat(e.lngLat)
+                .setHTML(`<img src="${url}" height="200" width="300" alt="Placeholder Image">`)
+                .addTo(this.map);
+        });
+        this.map.on("click", `${this.sourceId}-point-layerid`, (e) => {
+            new maptilersdk.Popup()
+                .setLngLat(e.lngLat)
+                .setHTML(`<img src="${url}" height="200" width="300" alt="Placeholder Image">`)
+                .addTo(this.map);
+        });
     }
 
     addDrawInteractionStyle() {

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

@@ -11,3 +11,9 @@
     width: 100%;
     height: 100%;
 }
+
+/* Increasing specificity */
+.maplibregl-popup .maplibregl-popup-content {
+    width: 320px !important; /* Custom width */
+    height: 220px !important; /* Custom height */
+}

spp_farmer_registry_laos/models/farmer.py

@@ -14,6 +14,8 @@ class Farmer(models.Model):
             ("married_polygamous", "Married Polygamous"),
         ]
     )
+    geo_img_file = fields.Binary(string="Geometry Image File")
+    geo_img_file_filename = fields.Char(string="File Name")
 
 
 class TempFarmer(models.Model):

spp_farmer_registry_laos/views/group_view.xml

@@ -65,6 +65,9 @@
                     <field name="land_geo_polygon" />
                 </page>
             </xpath>
+            <xpath expr="//field[@name='disabled_reason']" position="after">
+                <field name="geo_img_file" filename="geo_img_file_filename" />
+            </xpath>
         </field>
     </record>