#1005 LWPA small CSS inconsistencies

#1008 Set network in LWPA from URL #1011 Wrong message about camera in LPWA
PharmaLedger-IMI · Nov 3, 2022 · 17b19ef · 17b19ef
1 parent 6675510
commit 17b19ef
Show file tree

Hide file tree

Showing 16 changed files with 298 additions and 196 deletions.
diff --git a/apihub-root/lightweight-pwa/css/main.css b/apihub-root/lightweight-pwa/css/main.css
diff --git a/apihub-root/lightweight-pwa/error.html b/apihub-root/lightweight-pwa/error.html
@@ -6,10 +6,15 @@
 
 <body>
 <div class="page-container error-page">
-    <div class="page-header">
-        <span class="header-title" translate="error_title"></span>
-        <span class="header-subtitle" translate="error_subtitle"></span>
+
+    <div class="page-header modal-header left-aligned-header">
+        <div class="icon-title-container">
+            <div class="modal-title header-title" translate="error_title"></div>
+            <div class="modal-icon"></div>
+        </div>
+        <div class="modal-subtitle header-subtitle" translate="error_subtitle"></div>
     </div>
+
     <div class="page-content">
         <div class="error-text" translate="error_text">
         </div>

diff --git a/apihub-root/lightweight-pwa/fonts/DMSans-Bold.ttf b/apihub-root/lightweight-pwa/fonts/DMSans-Bold.ttf
diff --git a/apihub-root/lightweight-pwa/fonts/DMSans-Medium.ttf b/apihub-root/lightweight-pwa/fonts/DMSans-Medium.ttf
diff --git a/apihub-root/lightweight-pwa/fonts/DMSans-Regular.ttf b/apihub-root/lightweight-pwa/fonts/DMSans-Regular.ttf
diff --git a/apihub-root/lightweight-pwa/images/close-modal-white.svg b/apihub-root/lightweight-pwa/images/close-modal-white.svg
diff --git a/apihub-root/lightweight-pwa/images/modal-error-icon.svg b/apihub-root/lightweight-pwa/images/modal-error-icon.svg
diff --git a/apihub-root/lightweight-pwa/images/modal-info-icon.svg b/apihub-root/lightweight-pwa/images/modal-info-icon.svg
diff --git a/apihub-root/lightweight-pwa/images/modal-warning-icon.svg b/apihub-root/lightweight-pwa/images/modal-warning-icon.svg
diff --git a/apihub-root/lightweight-pwa/index.html b/apihub-root/lightweight-pwa/index.html
@@ -24,7 +24,8 @@
                 <div class="label" translate="fwd_help"></div>
                 <div class="fwd-icon"></div>
             </div>
-            <div class="more-options-link" ><span translate="app_version"></span> <span id="app_version_number"></span></div>
+            <div class="more-options-link"><span translate="app_version"></span> <span id="app_version_number"></span>
+            </div>
         </div>
     </div>
     <div class="welcome-container">
@@ -47,14 +48,19 @@
 </div>
 <div id="settings-modal" class="modal-container info-modal">
     <div class="modal-body">
-        <div class="modal-header">
-            <div class="modal-icon"></div>
-            <div class="modal-title"></div>
+        <div class="modal-header left-aligned-header">
+            <div class="icon-title-container">
+                <div class="modal-title"></div>
+                <div class="modal-icon"></div>
+            </div>
             <div class="modal-subtitle"></div>
             <div class="close-modal" onclick="mainController.closeModal()"></div>
         </div>
-        <div class="modal-content"></div>
+        <div class="modal-content">
+            <div class="generated-content-container"></div>
+        </div>
     </div>
+    <div class="scan-button" onclick="mainController.goHome()" translate="go_home"></div>
 </div>
 </body>
 <script type="module">

diff --git a/apihub-root/lightweight-pwa/js/controllers/MainController.js b/apihub-root/lightweight-pwa/js/controllers/MainController.js
@@ -68,6 +68,10 @@ function MainController() {
     goToPage("scan.html")
   }
 
+  this.goHome = function () {
+    goToPage("index.html")
+  }
+
   this.closeModal = function () {
     document.querySelector("#settings-modal").setAttribute('style', 'display:none !important');
   }
@@ -94,7 +98,10 @@ function MainController() {
 }
 
 const mainController = new MainController();
-let lsEpiDomain = localStorage.setItem("_epiDomain_", environment.epiDomain);
+const queryString = window.location.search;
+const urlParams = new URLSearchParams(queryString);
+let epiDomain = urlParams.get("setdomain") || environment.epiDomain;
+let lsEpiDomain = localStorage.setItem("_epiDomain_", epiDomain);
 mainController.checkOnboarding();
 
 window.mainController = mainController;
diff --git a/apihub-root/lightweight-pwa/js/controllers/ScanController.js b/apihub-root/lightweight-pwa/js/controllers/ScanController.js
@@ -1,6 +1,7 @@
 import {convertFromISOtoYYYY_HM, goToPage} from "../utils/utils.js";
 import interpretGS1scan from "../utils/interpretGS1scan/interpretGS1scan.js";
 import ScanService, {switchFacingMode} from "../services/ScanService.js";
+import {getTranslation} from "../translations.js";
 
 function ScanController() {
   this.init = async function (facingMode) {
@@ -20,7 +21,12 @@ function ScanController() {
 
   this.redirectToError = function (err) {
     console.log("Error on scanService ", err);
-    document.querySelector("#scan-error").setAttribute('style', 'display:flex !important');
+    let modal = document.querySelector("#scan-error")
+    if (err.scanResult) {
+      modal.querySelector(".modal-title").innerHTML = getTranslation("scan_parse_error");
+      modal.querySelector(".modal-content").innerHTML = `<div>${getTranslation("scan_parse_error_message")}  ${err.scanResult}</div>`;
+    }
+    modal.setAttribute('style', 'display:flex !important');
     //  goToPage("error.html")
   }
 
@@ -29,6 +35,7 @@ function ScanController() {
   }
 
   this.startScanning = async function () {
+    let scanResult = null;
     this.scanInterval = setInterval(() => {
       this.scanService.scan().then(result => {
         if (!result) {
@@ -37,9 +44,11 @@ function ScanController() {
         console.log("Scan result:", result);
         this.scanService.stop();
         clearInterval(this.scanInterval);
-
+        scanResult = result.text;
         this.processGS1Fields(this.parseGS1Code(result.text));
       }).catch(err => {
+        err.scanResult = scanResult;
+        this.redirectToError(err);
         console.log("Caught", err);
       });
     }, 100);
@@ -50,7 +59,7 @@ function ScanController() {
     try {
       gs1FormatFields = interpretGS1scan.interpretScan(scannedBarcode);
     } catch (e) {
-      this.redirectToError(e);
+      throw e;
       return;
     }
 
@@ -84,7 +93,6 @@ function ScanController() {
   }
 
   this.processGS1Fields = function (gs1Fields) {
-    let domainName = "epi";
     goToPage(`leaflet.html?gtin=${gs1Fields.gtin}&batch=${gs1Fields.batchNumber}&expiry=${gs1Fields.expiry}`)
   }