Merge branch 'feature-WG-374' into 'feature-WG-363'

WebGde/WebContent/WebGde-Widgets/BPO/getElement.js

@@ -78,6 +78,7 @@ export class BPO {
         //processing all assigned workload first
 if(elements){
 
+<<<<<<< WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
         for (const element of elements) {
             console.log("Checking element : " + element.elementId);
             console.log("Element status : " + element.status);
@@ -99,16 +100,16 @@ if(elements){
                             console.log("lastImage " + lastImage);
         
                             let dir = await lst.data;
-                            if(lastImage){
-                                const index = dir.indexOf(lastImage);
-                                console.log(index);
-                                if (index > -1) { // only splice array when item is found
-                                    dir.splice(0, index +1); // 2nd parameter means remove one item only
-                                }
-                                if(dir.length === 0){
-                                    continue;
-                                }
-                            }
+                            // if(lastImage){
+                            //     const index = dir.indexOf(lastImage);
+                            //     console.log(index);
+                            //     if (index > -1) { // only splice array when item is found
+                            //         dir.splice(0, index +1); // 2nd parameter means remove one item only
+                            //     }
+                            //     if(dir.length === 0){
+                            //         continue;
+                            //     }
+                            // }
                             sessionStorage.setItem("dir_files", JSON.stringify(dir));
         
                             sessionStorage.setItem("element_id", retElement.element.elementId);
@@ -118,6 +119,33 @@ if(elements){
                             console.log("XML does not exist");
                             await this.returnElement(retElement.element.elementId);
                         }
+=======
+                if (lst.isExisting) {
+                    const xml = await this.isXMLExisting(retElement.element);
+
+                    if (xml.isExisting) {
+                        const xmlString = await xml.data.join('').replace('\t', '');
+                        const lastImage = this.getXmlLastImage(xmlString);
+                        //console.log("lastImage " + lastImage);
+
+                        let dir = await lst.data;
+                        // if(lastImage){
+                        //     const index = dir.indexOf(lastImage);
+                        //     console.log(index);
+                        //     if (index > -1) { // only splice array when item is found
+                        //         dir.splice(0, index +1); // 2nd parameter means remove one item only
+                        //     }
+                        //     if(dir.length === 0){
+                        //         continue;
+                        //     }
+                        // }
+                        
+                        sessionStorage.setItem("dir_files", JSON.stringify(dir));
+
+                        sessionStorage.setItem("element_id", retElement.element.elementId);
+                        sessionStorage.setItem("element_file_loc", retElement.element.fileLocation);
+                        return true;
+>>>>>>> WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
                     } else {
                             // await this.returnElement(retElement.element.elementId);
                         await this.transferElement(element.elementId);

WebGde/WebContent/WebGde-Widgets/ImageViewerWidget/modules/imageViewer/imageViewer.js

@@ -216,6 +216,14 @@ export class ImageViewer {
             }
             document.getElementById(this.currentImageID).setAttribute("id", this.previousImageID);
             document.getElementById(this.previousImageID).style.display = "none";
+
+            let previousDiv =  document.getElementById(this.previousImageID);
+            if(previousDiv.getAttribute("file-type") == "tiff" || previousDiv.getAttribute("file-type") == "tif"){
+                let filename = document.getElementById("imageFileName").textContent;
+                let filenameWithoutExt = filename.split(".")[0];
+                document.getElementById(filenameWithoutExt + sessionStorage.getItem("current_page")).style.display = "none";
+            }
+            
         }
         //this.previousImageObject.id = this.previousImageID;
     }
@@ -234,6 +242,13 @@ export class ImageViewer {
             }
             document.getElementById(this.currentImageID).setAttribute("id", this.nextImageID);
             document.getElementById(this.nextImageID).style.display = "none";
+
+            let nextDiv =  document.getElementById(this.nextImageID);
+            if(nextDiv.getAttribute("file-type") == "tiff" || nextDiv.getAttribute("file-type") == "tif"){
+                let filename = document.getElementById("imageFileName").textContent;
+                let filenameWithoutExt = filename.split(".")[0];
+                document.getElementById(filenameWithoutExt + sessionStorage.getItem("current_page")).style.display = "none";
+            }
         }
         this.nextImageObject.id = this.nextImageID;
     }