Bump latest gwml2 version

README.md

@@ -1,6 +1,7 @@
 # IGRAC-GGIS
 
 ## QUICK INSTALLATION GUIDE
+
 ```
 git clone https://github.com/kartoza/IGRAC-GGIS.git
 cd IGRAC-GGIS/deployment
@@ -12,11 +13,85 @@ make collectstatic
 The web will be available at `http://localhost/`
 
 To stop containers:
+
 ```
 make kill
 ```
 
 To stop and delete containers:
+
 ```
 make rm
 ```
+
+# Commands
+
+Here is the list command for IGRAC
+
+## generate_data_wells_cache
+
+For generating cache of wells for download file.
+
+### Parameters
+
+```
+--id : id of well that will be checked
+--from_id : id start of well to be checked
+--country_code : country that will be used to filter the wells
+--force : use this to regenerate the cache, without it, it will just check if cache if not generated yet
+--generator : ['general_information','hydrogeology','management','drilling_and_construction','monitor'] in comma separator
+```
+
+## generate_well_measurement_cache
+
+For generating cache of wells for measurements for graph.
+
+### Parameters
+
+```
+--id : id of well that will be checked
+--measurement_name : name of measurement: WellLevelMeasurement, WellQualityMeasurement, WellYieldMeasurement
+--from_id : id start of well to be checked
+--country_code : country that will be used to filter the wells
+```
+
+## generate_data_countries_cache
+
+For generating cache of country for download file.
+
+### Parameters
+
+```
+--country_code : country that will be regenerate
+```
+
+## generate_data_organisations_cache
+
+For generating cache of organisations for download file.
+
+### Parameters
+
+```
+--id : id of organisation that will be checked
+--from_id : id start of organisation to be checked
+```
+
+## update_measurement_type
+
+For updating measurement type of well.
+
+### Parameters
+
+```
+--form : id start of well to be checked
+```
+
+## update_number_of_measurements_well
+
+For updating number of measurement of well.
+
+### Parameters
+
+```
+--form : id start of well to be checked
+```

deployment/.env

@@ -189,7 +189,7 @@ BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Monitoring
-MONITORING_ENABLED=False
+MONITORING_ENABLED=True
 MONITORING_DATA_TTL=365
 USER_ANALYTICS_ENABLED=True
 USER_ANALYTICS_GZIP=True

deployment/docker/Dockerfile

@@ -36,7 +36,7 @@ WORKDIR /home/web/django_project
 RUN rm -rf /home/web/django_project/gwml2
 
 # Installing gwml2
-ENV GWML2_VERSION 4.9.8
+ENV GWML2_VERSION 4.9.9
 RUN git clone --branch $GWML2_VERSION https://github.com/kartoza/IGRAC-WellAndMonitoringDatabase.git /home/web/django_project/gwml2
 RUN echo $GWML2_VERSION > /home/web/django_project/gwml2/version.txt
 

django_project/core/settings/base.py

@@ -211,6 +211,7 @@
         "generate_data_wells_cache",
         "generate_well_measurement_cache",
         "generate_uploader_report",
+        "update_measurement_type",
     ]
     + ast.literal_eval(
         os.getenv("MANAGEMENT_COMMANDS_EXPOSED_OVER_HTTP ", "[]"))

django_project/igrac/templates/base.html

@@ -154,7 +154,7 @@
           $parent.addClass('open')
         }
         return false
-      })
+      });
 
       {# Google analytic #}
       {% if GOOGLE_ANALYTIC_KEY %}

django_project/version/commit.txt

@@ -1 +1 @@
-5c7f3c8e28f8d2fce1a365d7e28c2a66a4967af1
+572c57ce56cc42154373ab9f1371ccc14f87ea11

django_project/version/version.txt

@@ -1 +1 @@
-4.9.9
+4.9.10