Make value for measurement from surface or top as positive

kartoza · Dec 4, 2024 · b7ba27b · b7ba27b
1 parent 0f71083
commit b7ba27b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/admin/general.py b/admin/general.py
@@ -3,9 +3,6 @@
 from gwml2.models.general import (
     Unit, UnitConvertion, UnitGroup, Country, Quantity
 )
-from gwml2.tasks.data_file_cache.country_recache import (
-    generate_data_country_cache
-)
 
 
 class UnitConvertionInline(admin.TabularInline):
@@ -24,4 +21,8 @@ class UnitAdmin(admin.ModelAdmin):
 admin.site.register(UnitGroup, UnitGroupAdmin)
 admin.site.register(Unit, UnitAdmin)
 admin.site.register(Quantity)
-admin.site.register(Country)
+
+
+@admin.register(Country)
+class CountryAdmin(admin.ModelAdmin):
+    list_display = ('name', 'code')
diff --git a/static/gwml2/js/measurement-chart.js b/static/gwml2/js/measurement-chart.js
@@ -198,12 +198,11 @@ function getTrendlines(chartData, steps) {
         });
         return [data, jumps]
     } catch (e) {
-        console.log(e)
         return [[], []]
     }
 }
 
-function renderMeasurementChart(identifier, chart, data, xLabel, yLabel, stepTrenlineData, toggleSeries, onChartClicked, title = '') {
+function renderMeasurementChart(identifier, chart, data, xLabel, yLabel, stepTrenlineData, toggleSeries, onChartClicked, title = '', reverse = false, unit = '') {
     switch (identifier) {
         case 'WellLevelMeasurement':
         case 'level_measurement':
@@ -236,6 +235,12 @@ function renderMeasurementChart(identifier, chart, data, xLabel, yLabel, stepTre
         yAxis: {
             title: {
                 text: yLabel
+            },
+            labels: {
+                formatter: function () {
+                    const val = reverse ? Math.abs(this.value) : this.value;
+                    return `${val} ${unit}`;
+                }
             }
         },
         xAxis: {
@@ -280,6 +285,12 @@ function renderMeasurementChart(identifier, chart, data, xLabel, yLabel, stepTre
                 dataGrouping: { groupPixelWidth: 50, units: [['hour', [4]], ['day', [1]], ['week', [1, 2]], ['month', [1]]] }
             }
         },
+        tooltip: {
+            pointFormatter: function () {
+                const val = reverse ? Math.abs(this.y) : this.y;
+                return `<span style="color:${this.color}">●</span> ${this.series.name}: <b>${parseFloat(val.toFixed(this.series.tooltipOptions.valueDecimals))} ${unit}</b><br/>`;
+            }
+        },
         series: [
             {
                 id: 'value',
@@ -615,6 +626,7 @@ let MeasurementChartObj = function (
         }
 
         let title = getParamGroup(this.parameterTo)
+        const reverse = [FROM_TOP_WELL, FROM_GROUND_LEVEL].includes(this.parameterTo);
         this.chart = renderMeasurementChart(
             this.identifier, this.chart,
             cleanData[this.parameterTo],
@@ -625,7 +637,9 @@ let MeasurementChartObj = function (
                     onNewStep(date.getTime());
                 }
             },
-            title
+            title,
+            reverse,
+            this.unitTo
         )
         this.$loading.hide();
     };

diff --git a/templates/groundwater_form/main.html b/templates/groundwater_form/main.html
@@ -214,7 +214,7 @@ <h5>{% trans "Well and Monitoring Data Record" %}</h5>
     <script src="{% static "js/highcharts/9.1.2/stock/indicators/indicators.js" %}"></script>
     <script src="{% static "js/highcharts/9.1.2/stock/indicators/trendline.js" %}"></script>
     <script src="{% static 'gwml2/js/unit-converter.js' %}"></script>
-    <script src="{% static 'gwml2/js/measurement-chart.js' %}?v=1"></script>
+    <script src="{% static 'gwml2/js/measurement-chart.js' %}?v=2"></script>
     <script src="{% static 'gwml2/js/utilities.js' %}"></script>
     <script src="{% static 'gwml2/js/scripts.js' %}"></script>
     <script src="{% static 'gwml2/js/many-to-many-script.js' %}"></script>

diff --git a/templates/plugins/measurements_chart_page.html b/templates/plugins/measurements_chart_page.html
@@ -21,7 +21,7 @@
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/js/select2.min.js"></script>
 
     <script src="{% static 'gwml2/js/unit-converter.js' %}"></script>
-    <script src="{% static 'gwml2/js/measurement-chart.js' %}?v=1"></script>
+    <script src="{% static 'gwml2/js/measurement-chart.js' %}?v=2"></script>
 </head>
 <body>
 <script>