Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -764,23 +764,9 @@ document.getElementById('measureADRbutton').addEventListener('click',function(){
     document.getElementsByClassName('selectionsProjs')[0].style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
-
-/*Clear output everytime the user clicks on measureADR button*/
-  var rightside=document.getElementById('rightside');
-  
-  document.getElementById("imgs").innerHTML='';
-  document.getElementById("underimgbuttons").innerHTML='';
-  var rightchidren= rightside.children;
-  // for (let ch=0;ch<rightchidren.length; ch++)
-  // { 
-  //   if (rightchidren[ch].id == 'imgcanvas')
-  //   {
-  //     rightside.removeChild(rightchidren[ch])
-  //     // document.getElementById('imgcanvas').innerHTML=''
-  //     clearInterval()
-  //     clearTimeout()
-  //   }
-  // }
+if (document.getElementById('imgContainer')) {
+    document.getElementById('imgContainer').innerHTML = '';
+}
 });
 
 //___________________________________________________________________________________________________________
@@ -1152,8 +1138,8 @@ function getSelectValues(select) {
 
     measids.forEach(function(elem) {
             elem.addEventListener("change", function() {
-              if (!(projsec.value.startsWith('2.8')))
-                  {
+              // if (!(projsec.value.startsWith('2.8')))
+                  // {
                   canvasimg='';
                   ry=[[]];
                   levelcheckbox.checked=false;
@@ -1179,7 +1165,7 @@ function getSelectValues(select) {
                     document.getElementById('measureADRbutton').onclick= function()
                     {
                       if (!areaRatio.value){
-                        if (!(projsec.value.startsWith('3.2')))
+                        if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')))
                             areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
                       }
                       if (!prmRatio.value)
@@ -1206,7 +1192,7 @@ function getSelectValues(select) {
                     areaRatio.style.textAlign='right';
                     areaRatio.step=".0000001";
                     
-                    if( projsec.value.startsWith('3.2')){ 
+                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') ){ 
                       areaRatio.setAttribute('disabled',true)
                       document.getElementById('selectunitA').setAttribute('disabled',true)
                     }
@@ -1282,10 +1268,11 @@ function getSelectValues(select) {
                       ratioPunit=1;
 
                   })     
-                }
-                else{
-                  pdfnames=getSelectValues(elem)
-                }
+                // }
+                // for 2.8 multiple pdfs
+                // else{
+                //   pdfnames=getSelectValues(elem)
+                // }
     });
           
     });
@@ -1422,7 +1409,7 @@ function ImgSide(imgdata, spreadsheetLink, pdfLink) {
 }
 
 function getData(form) {
-    
+
   document.getElementById("loading").hidden = false;
 
   document.getElementById('measureADRbutton').setAttribute('disabled',true);
@@ -1431,6 +1418,7 @@ function getData(form) {
   document.getElementById('measureADRbutton').style.color = 'white';
   document.getElementById('measureADRbutton').style.backgroundColor="rgb(154,152,152)";
 
+
   var formData = new FormData(form);
   
   clearInterval(interval)
@@ -1454,9 +1442,15 @@ function getData(form) {
     console.log(ratio2, prminpixels,formvalues['prmRatio'],ratioPunit)
     
   }
-  else if (formvalues['selectprojs'].startsWith('1.0')){
+  else if (formvalues['selectprojs'].startsWith('1.0') ){
     ratio1=(formvalues['areaRatio']/ratioAunit)/areainpixels;
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
+    console.log('ratioss',ratio1,ratio2)
+  }
+  else if (formvalues['selectprojs'].startsWith('2.8') ){
+    ratio1=1;
+    ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
+    console.log('ratioss',ratio1,ratio2)
   }
   pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs']) //project name - part - section
 
@@ -1484,7 +1478,7 @@ function getData(form) {
        } 
     else if (formvalues['selectprojs'].startsWith('2.8'))
     {
-      answers.push(pdfnames, 0,[] , ratio1, ratio2 ,pdfpath);
+      answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
       formData.append('answers',JSON.stringify(answers)) 
     }
 
@@ -1567,11 +1561,10 @@ function getData(form) {
             { //
             // /* data[0]--> img , data[1]-->dataframe (goes to legend lsa ) , data [2] -->pdf dropbox shareable link ,data[3]-> spreadsheetId, data[4],spreadsheeturl */   
                 // SimilarAreaDictionary=data[1];
-                listofimages=data[0];
-                dropboxLinks=data[1];
-                // spreadsheetId=data[2];
-                spreadsheetURLs=data[2];
-                // list1= data[5]
+                // listofimages=data[0];
+                dropboxLink=data[1];
+                spreadsheetURL=data[2];
+                list1= data[3] // list of pdf markups 
 
                 
             }
@@ -1607,18 +1600,18 @@ function getData(form) {
               namepathArr=data[8];
             }
             
-            if (!(formvalues['selectprojs'].startsWith('2.8')))
-            {
+            // if (!(formvalues['selectprojs'].startsWith('2.8')))
+            // {
               ImgSide(data[0],spreadsheetURL,dropboxLink)
-            }
+            // }
               
-            else{
-              console.log(listofimages.length)
-              for(var p=0;p<listofimages.length;p++)
-              {
-                ImgSide(listofimages[p],spreadsheetURLs[p],dropboxLinks[p])
-              }
-            }
+            // else{
+            //   console.log(listofimages.length)
+            //   for(var p=0;p<listofimages.length;p++)
+            //   {
+            //     ImgSide(listofimages[p],spreadsheetURLs[p],dropboxLinks[p])
+            //   }
+            // }
             getlegendstoDirectory()
 //////////////////////////////////////////////////////////////////////////////////////////
             let delrows2 = {
@@ -1633,7 +1626,7 @@ function getData(form) {
             pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs'])
             var rightsideids=[];
           
-if (formvalues['selectprojs'].startsWith('1.0')  || formvalues['selectprojs'].startsWith('3.2')  )
+if (formvalues['selectprojs'].startsWith('1.0')  || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') )
 {// Set the interval in milliseconds
 const interval = 20000;
 const initialDelay = 0;