ref #794 fixed

convertigo · Dec 3, 2024 · cef2c0e · cef2c0e
1 parent aa63f8c
commit cef2c0e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/DisplayObjects/mobile/assets/i18n/en.json b/DisplayObjects/mobile/assets/i18n/en.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.0.0-beta184",
+    "version_c8o": "2.0.0-beta185",
     "offline_notice": "However, since you are offline, the response will be sent to the server the next time you have a network connection and are connected to the application.",
     "reset_to_default_values": "Reset to default values",
     "general_settings": "General settings",

diff --git a/DisplayObjects/mobile/assets/i18n/es.json b/DisplayObjects/mobile/assets/i18n/es.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.0.0-beta184",
+    "version_c8o": "2.0.0-beta185",
     "offline_notice": "Sin embargo, dado que estás sin conexión, la respuesta se enviará al servidor la próxima vez que tengas conexión a la red y estés conectado a la aplicación.",
     "reset_to_default_values": "Restablecer los valores predeterminados",
     "general_settings": "Configuración general",

diff --git a/DisplayObjects/mobile/assets/i18n/fr.json b/DisplayObjects/mobile/assets/i18n/fr.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.0.0-beta184",
+    "version_c8o": "2.0.0-beta185",
     "offline_notice": "Cependant, étant donné que vous êtes hors-ligne, la réponse sera transmise au serveur la prochaine fois que vous aurez du réseau et que vous serez connecté à l'application.",
     "reset_to_default_values": "Réinitialiser les valeurs par défaut",
     "general_settings": "Paramètres généraux",

diff --git a/DisplayObjects/mobile/assets/i18n/it.json b/DisplayObjects/mobile/assets/i18n/it.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.0.0-beta184",
+    "version_c8o": "2.0.0-beta185",
     "offline_notice": "Tuttavia, poiché sei offline, la risposta verrà inviata al server la prossima volta che avrai una connessione di rete e sarai connesso all'applicazione.",
     "reset_to_default_values": "Reimposta i valori predefiniti",
     "general_settings": "Impostazioni generali",

diff --git a/_c8oProject/mobilePages/dataPage.yaml b/_c8oProject/mobilePages/dataPage.yaml
@@ -15,7 +15,7 @@ scriptContent:
         			this.local.spinner = true;
         			this.local.formId = this.navParams.get(''formId'');
         		    this.local.offset = new Date().getTimezoneOffset() * 60000 * -1;
-        			let responses = (await this.c8o.callJsonObject("C8Oforms.APIV2_getResponses", {formId: this.local.formId, version: version, summary: summary ? "true": "false", indexStart, indexEnd}).async()).res;
+        			let responses = (await this.c8o.callJsonObject("C8Oforms.APIV2_getResponses", {csv: "false", formId: this.local.formId, version: version, summary: summary ? "true": "false", indexStart, indexEnd}).async()).res;
         			if(this.local.currentIndex == null){
         				if(version == null){
         					this.local.currentIndex = responses?.versions?.length - 1;

diff --git a/_c8oProject/sequences/APIV2_getResponses.yaml b/_c8oProject/sequences/APIV2_getResponses.yaml
@@ -103,7 +103,12 @@ accessibility: Hidden
     					response.value = JSON.stringify(response["value"]["bounding_box"]);
     				}
     				else if (response["value"]["addr"] != undefined && response["value"]["addr"]["FormattedAddress"] != undefined && response["value"]["addr"]["FormattedAddress"] != "") {
-    					response.value = response["value"]["addr"]["FormattedAddress"];
+    					if(csv){
+    						response.value = response["value"]["addr"]["FormattedAddress"];
+    					}
+    					else{
+    						response.value = {text : response["value"]["addr"]["FormattedAddress"], gps: response["value"]["gps"]};
+    					}
     				}
     				else {
     					response.value = { text: "Latitude : " + response["value"]["gps"]["latitude"] + ", Longitude : " + response["value"]["gps"]["longitude"] + ", précision : " + ("" + response["value"]["gps"]["accuracy"]).split(".")[0] + " métres", gps: response["value"]["gps"] };

diff --git a/c8oProject.yaml b/c8oProject.yaml
@@ -4,7 +4,7 @@
   contextTimeout: ${C8Oforms.context.timeout=60}
   corsOrigin: =Origin
   httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
-  version: 2.0.0-beta184
+  version: 2.0.0-beta185
   ↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
   ↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
   ↓HTTP_connector [connectors.HttpConnector]: 🗏 connectors/HTTP_connector.yaml

diff --git a/ngswForPWA/ngsw-config-sub-pwa.json b/ngswForPWA/ngsw-config-sub-pwa.json
@@ -4,7 +4,7 @@
     "appData": {
         "name": "Convertigo Forms Builder",
         "description": "A simple and intuitive \"no code\" tool to create your personalized apps in a few clicks!",
-        "version": "2.0.0-beta184"
+        "version": "2.0.0-beta185"
     },
     "assetGroups": [
         {