This is the **RTM** (_Release To Manufacturing_) Version 4.0.1 ready for a production environment.

If updating from a previous version, please follow the instruction available in the [Update ](https://github.com/CSOIreland/PxStat/wiki/Update) Wiki page.

### Issues for Milestone `4.0.1`
* [Enhancements](https://github.com/CSOIreland/PxStat/issues?q=is%3Aissue+milestone%3A%224.0.1+RTM%22+label%3Aenhancement+label%3Areleased)
* [Bugs](https://github.com/CSOIreland/PxStat/issues?q=is%3Aissue+milestone%3A%224.0.1+RTM%22+label%3Abug+label%3Areleased)

Author: lorenzobruni

client/config/config.json

@@ -127,6 +127,23 @@
 				"experimental": "https://domain.extension/path"
 			}
 		},
+		"map": {
+			"baseMap": {
+				"leaflet": [
+					{
+						"url": "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+						"options": {
+							"attribution": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
+						}
+					}
+				],
+				"esri": [
+					{
+						"url": "https://tiles.arcgis.com/tiles/uWTLlTypaM5QTKd2/arcgis/rest/services/Basemap%20Public/MapServer"
+					}
+				]
+			}
+		},
 		"build": {
 			"threshold": {
 				"soft": 1000000
@@ -151,7 +168,7 @@
 			}
 		},
 		"analytic": {
-			"dateRangePicker": 29
+			"dateRangePicker": 7
 		}
 	},
 	"plugin": {
@@ -258,6 +275,49 @@
 					}
 				}
 			}
+		},
+		"firebase": {
+			"enabled": false,
+			"config": {
+                "apiKey": "",
+                "authDomain": "",
+                "projectId": "",
+                "storageBucket": "",
+                "messagingSenderId": "",
+                "appId": ""
+            },
+			"signInProvider": {
+				"providers": {
+					"google": true,
+					"facebook": true,
+					"gitHub": true,
+					"twitter": true
+				}
+			}
+		},
+		"leaflet": {
+			"colourScale": [
+				{
+					"value": "red",
+					"name": "red"
+				},
+				{
+					"value": "yellow",
+					"name": "yellow"
+				},
+				{
+					"value": "blue",
+					"name": "blue"
+				},
+				{
+					"value": "darkorange",
+					"name": "orange"
+				},
+				{
+					"value": "darkviolet",
+					"name": "violet"
+				}
+			]
 		}
 	}
 }

client/css/app.media.css

@@ -23,4 +23,10 @@ Application - Media
         min-width: 100% !important;
         max-width: 100% !important;
     }
+    .modal-backdrop.show {
+        opacity: 0;
+    }
+    #return-to-top {
+        display: none;
+    }
 }

client/entity/analytic/index.html

@@ -69,6 +69,10 @@
                 <div class="bg-default border-right col-4 p-2 text-right" label="m2m"></div>
                 <div name="analytic-sum-m2m" class="col-8 p-2"></div>
             </div>
+            <div class="border-top border-right border-left row mx-0">
+                <div class="bg-default border-right col-4 p-2 text-right" label="widgets"></div>
+                <div name="analytic-sum-widgets" class="col-8 p-2"></div>
+            </div>
             <div class="border-top border-right border-left row mx-0">
                 <div class="bg-default border-right col-4 p-2 text-right" label="users"></div>
                 <div name="analytic-sum-users" class="col-8 p-2"></div>
@@ -92,6 +96,7 @@
                         <th label="date-published"></th>
                         <th label="bots"></th>
                         <th label="m2m"></th>
+                        <th label="widgets"></th>
                         <th label="users"></th>
                         <th label="total"></th>
                     </tr>

client/entity/analytic/js/analytic.library.js

@@ -272,6 +272,7 @@ app.analytic.callback.readAnalytics = function (data) {
                 },
                 { data: "NltBot" },
                 { data: "NltM2m" },
+                { data: "NltWidget" },
                 { data: "NltUser" },
                 { data: "Total" }
             ],
@@ -293,6 +294,7 @@ app.analytic.callback.readAnalytics = function (data) {
         });
     }
     var totalBot = 0;
+    var totalWidgets = 0;
     var totalM2M = 0;
     var totalUsers = 0;
     $("#summary-card").find("[name=analytic-sum-bots]").text(function () {
@@ -301,6 +303,12 @@ app.analytic.callback.readAnalytics = function (data) {
         });
         return app.library.utility.formatNumber(totalBot)
     });
+    $("#summary-card").find("[name=analytic-sum-widgets]").text(function () {
+        $.each(data, function (index, value) {
+            totalWidgets = totalWidgets + value.NltWidget;
+        });
+        return app.library.utility.formatNumber(totalWidgets)
+    });
     $("#summary-card").find("[name=analytic-sum-m2m]").text(function () {
         $.each(data, function (index, value) {
             totalM2M = totalM2M + value.NltM2m;
@@ -874,6 +882,11 @@ app.analytic.callback.readTimeline = function (data, selector) {
         data: [],
         fill: false
     };
+    var widgets = {
+        label: app.label.static["widgets"],
+        data: [],
+        fill: false
+    };
     var users = {
         label: app.label.static["users"],
         data: [],
@@ -888,12 +901,12 @@ app.analytic.callback.readTimeline = function (data, selector) {
     $.each(data, function (key, el) {
         bots.data.push(el.NltBot);
         M2M.data.push(el.NltM2m);
+        widgets.data.push(el.NltWidget);
         users.data.push(el.NltUser);
         total.data.push(el.Total);
         localConfig.data.labels.push(el.date ? moment(el.date).format(app.config.mask.date.display) : "");
     });
-    localConfig.data.datasets = [bots, M2M, users, total];
-
+    localConfig.data.datasets = [bots, M2M, widgets, users, total];
     var config = $.extend(true, {}, app.config.plugin.chartJs.chart, localConfig);
     new Chart($(selector).find("[name=dates-line-chart-canvas]"), config);
 };

client/entity/build/create/index.dimension.html

@@ -19,7 +19,8 @@
                     <div class="card-header" id="build-create-elimination-map-heading-one">
                         <h2 class="mb-0">
                             <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#build-create-elimination-map-collapse-elimination" aria-expanded="true" aria-controls="build-create-elimination-map-collapse-elimination">
-                                <span label="elimination"></span> <i name="elimination-popover" class="fas fa-info-circle" data-toggle="popover" data-placement="right" tabindex="0" data-trigger="hover"></i>
+                                <span label="elimination"></span>
+                                <i data-toggle="popover" class="fas fa-info-circle fa-lg text-info pl-2" data-placement="top" data-trigger="hover" label-popover="elimination-explanation" style="cursor: help;"></i>
                             </button>
                         </h2>
                     </div>
@@ -46,7 +47,8 @@ <h2 class="mb-0">
                     <div class="card-header" id="build-create-elimination-map-heading-two">
                         <h2 class="mb-0">
                             <button name="map-accordion-button" class="btn btn-link btn-block text-left collapsed" type="button" data-toggle="collapse" data-target="#build-create-elimination-map-collapse-map" aria-expanded="false" aria-controls="build-create-elimination-map-collapse-map">
-                                <span label="map"></span> <i name="map-popover" class="fas fa-info-circle" data-toggle="popover" data-placement="right" tabindex="0" data-trigger="hover"></i>
+                                <span label="map"></span>
+                                <i data-toggle="popover" class="fas fa-info-circle fa-lg text-info pl-2" data-placement="top" data-trigger="hover" label-popover="map-explanation" style="cursor: help;"></i>
                                 <i name="warning-icon" data-toggle="tooltip" class="fas fa-exclamation-triangle text-danger" style="display: none;"></i>
                             </button>
                         </h2>
@@ -179,6 +181,10 @@ <h5 class="mb-0">
                                                 <i class="fas fa-trash-alt"></i>
                                                 <span label="delete-statistics"></span>
                                             </button>
+                                            <button name="download-statistic" class="btn btn-primary text-light">
+                                                <i class="fas fa-file-download"></i>
+                                                <span label="download-csv"></span>
+                                            </button>
                                         </div>
                                         <div class="col-xs-12 col-sm-8 text-right my-2">
                                             <button name="add-statistics" class="btn btn-primary text-light">

client/entity/build/create/js/create.dimension.js

@@ -107,17 +107,6 @@ $(document).ready(function () {
     //Bind the period upload reset button
     $("#build-create-upload-periods").find("[name=upload-reset]").once("click", app.build.create.dimension.resetPeriodUpload);
 
-
-    $("#build-create-matrix-dimensions").find("[name=elimination-popover]").popover({
-        "content": app.label.static["elimination-explanation"],
-        "html": true
-    });
-
-    $("#build-create-matrix-dimensions").find("[name=map-popover]").popover({
-        "content": app.label.static["map-explanation"],
-        "html": true
-    });
-
     $("#build-create-matrix-dimensions").find("[name=warning-icon]").tooltip({
         "title": app.label.static["invalid-geojson-in-px-file"],
     })

client/entity/build/create/js/create.dimension.library.js

@@ -283,6 +283,8 @@ app.build.create.dimension.drawTabs = function () {
             );
         });
 
+        $("#build-create-dimension-accordion-" + value.LngIsoCode).find("[name=download-statistic]").once("click", app.build.create.dimension.downloadStatistic);
+
         $("#build-create-dimension-accordion-" + value.LngIsoCode).find("[name=delete-classifications]").once("click", function () {
             api.modal.confirm(
                 app.library.html.parseDynamicLabel("confirm-delete-classifications", [$("#build-create-matrix-dimensions").find("[name=nav-lng-tab-item].active").attr("lng-iso-name")]),
@@ -1058,6 +1060,31 @@ app.build.create.dimension.deleteAllClassifications = function () {
     app.build.create.dimension.drawClassifications(lngIsoCode);
 };
 
+app.build.create.dimension.downloadStatistic = function () {
+    var statistic = null;
+    var lngIsoCode = $("#build-create-matrix-dimensions").find("[name=nav-lng-tab-item].active").attr("lng-iso-code");
+    $.each(app.build.create.initiate.data.Dimension, function (index, dimension) {
+        if (dimension.LngIsoCode == lngIsoCode) { //find the data based on the LngIsoCode
+            statistic = dimension.Statistic;
+            return;
+        };
+    });
+    var fileData = [];
+
+    if (statistic.length) {
+        $.each(statistic, function (index, value) {
+            fileData.push({ [C_APP_CSV_CODE]: value.SttCode, [C_APP_CSV_VALUE]: value.SttValue, [C_APP_CSV_UNIT]: value.SttUnit, [C_APP_CSV_DECIMAL]: value.SttDecimal });
+        });
+    }
+    else {
+        //create blank template for statistic
+        fileData.push({ [C_APP_CSV_CODE]: "", [C_APP_CSV_VALUE]: "", [C_APP_CSV_UNIT]: "", [C_APP_CSV_DECIMAL]: "" });
+    }
+    // Download the file
+    app.library.utility.download(app.build.create.initiate.data.MtrCode + "_" + C_APP_CSV_STATISTIC + "_" + lngIsoCode, Papa.unparse(fileData), C_APP_EXTENSION_CSV, C_APP_MIMETYPE_CSV);
+
+};
+
 //Add criteria to search for a classification.
 app.build.create.dimension.searchClassifications = function () {
     // Click event search-classifications-modal-search-input

client/entity/build/import/js/import.library.js

@@ -546,7 +546,7 @@ app.build.import.drawCallbackimportHistory = function () {
     //view user info
     $("#build-import-history table").find("[name=user-name]").once("click", function (e) {
         e.preventDefault();
-        app.library.user.modal.read({ CcnUsername: $(this).attr("idn") });
+        app.library.user.modal.ajax.read({ CcnUsername: $(this).attr("idn") });
     });
 
 }

client/entity/build/update/index.html

@@ -119,7 +119,8 @@
                         <div class="card-header" id="build-update-elimination-map-heading-one">
                             <h2 class="mb-0">
                                 <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#build-update-elimination-map-collapse-elimination" aria-expanded="true" aria-controls="build-update-elimination-map-collapse-elimination">
-                                    <span label="elimination"></span> <i name="elimination-popover" class="fas fa-info-circle" data-toggle="popover" data-placement="right" tabindex="0" data-trigger="hover"></i>
+                                    <span label="elimination"></span>
+                                    <i data-toggle="popover" class="fas fa-info-circle fa-lg text-info pl-2" data-placement="top" data-trigger="hover" label-popover="elimination-explanation" style="cursor: help;"></i>
                                 </button>
                             </h2>
                         </div>
@@ -146,7 +147,8 @@ <h2 class="mb-0">
                         <div class="card-header" id="build-update-elimination-map-heading-two">
                             <h2 class="mb-0">
                                 <button name="map-accordion-button" class="btn btn-link btn-block text-left collapsed" type="button" data-toggle="collapse" data-target="#build-update-elimination-map-collapse-map" aria-expanded="false" aria-controls="build-update-elimination-map-collapse-map">
-                                    <span label="map"></span> <i name="map-popover" class="fas fa-info-circle" data-toggle="popover" data-placement="right" tabindex="0" data-trigger="hover"></i>
+                                    <span label="map"></span>
+                                    <i data-toggle="popover" class="fas fa-info-circle fa-lg text-info pl-2" data-placement="top" data-trigger="hover" label-popover="map-explanation" style="cursor: help;"></i>
                                     <i name="warning-icon" data-toggle="tooltip" class="fas fa-exclamation-triangle text-danger" style="display: none;"></i>
                                 </button>
                             </h2>

client/entity/build/update/js/update.js

@@ -142,14 +142,6 @@ $(document).ready(function () {
         offstyle: "warning",
         width: C_APP_TOGGLE_LENGTH
     });
-
-    $("#build-update-matrix-dimensions").find("[name=elimination-popover]").popover({
-        "content": app.label.static["elimination-explanation"],
-        "html": true
-    });
-
-    //
-
     //run bootstrap toggle to show/hide toggle button
     bsBreakpoints.toggle(bsBreakpoints.getCurrentBreakpoint());
     // Translate labels language (Last to run)