Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -513,7 +513,7 @@ function displayprojsections(projectid,Partid){
       opt.text=data[i];
       thirddropdown.append(opt);
 
-      if(!(data[i].startsWith('1.0')  ) && !(data[i].startsWith('3.2'))) // ||data[i].startsWith('2.2')))
+      if(!(data[i].startsWith('1.0')  ) && !(data[i].startsWith('3.2')) && !(data[i].startsWith('2.8'))) // ||data[i].startsWith('2.2')))
         {
           opt.style.color='#bdbcbc';
           opt.style.cursor='not-allowed';
@@ -637,7 +637,7 @@ worker.onmessage= function(event){
                 opt=document.createElement("option");
                 opt.textContent=data[2][d];
                 opt.text=data[2][d];
-                if(!(data[2][d].startsWith('1.0')  )  && !(data[2][d].startsWith('3.2')  )) //||data[i].startsWith('2.2')))
+                if(!(data[2][d].startsWith('1.0')  )  && !(data[2][d].startsWith('3.2')  ) && !(data[2][d].startsWith('2.8')  )) //||data[i].startsWith('2.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -827,15 +827,11 @@ function downloadPdf(pdfname) {
         .then(response => response.blob())
         .then(blob => {
             const url = URL.createObjectURL(blob);
-            const a = document.createElement('a');
-            a.href = url;
-            a.download = 'downloaded_file.pdf';  // Default filename
-            document.body.appendChild(a);
-            a.click();
-            a.remove();
-
-            console.log('adddxffilehere')
-        })
+            var link = document.createElement('a');
+            link.href = url;
+            link.download = 'file.pdf';
+            link.dispatchEvent(new MouseEvent('click'));
+                    })
         .catch(error => console.error('Error fetching PDF:', error));
 }
 
@@ -949,6 +945,25 @@ function downloadPdf(pdfname) {
           optn2.text= 'Internal Doors';
           optn2.value= "Internal Doors";
           inputs1.add(optn2);
+          }
+        if (section.value.startsWith('2.8'))
+          {
+          var opt = document.createElement("OPTION");
+          opt.text= 'Select';
+          opt.value= "";
+          opt.hidden=true;
+          inputs1.add(opt);
+
+          var optn = document.createElement("OPTION");
+          optn.text= 'Single Door';
+          optn.value= "Single Door";
+          inputs1.add(optn);
+
+          var optn1 = document.createElement("OPTION");
+          optn1.text= 'Double Door';
+          optn1.value= "Double Door";
+          inputs1.add(optn1);
+
           }
         }
 
@@ -992,9 +1007,30 @@ projsec.addEventListener('input',function(){
 
 var ratioAunit=1;
 var ratioPunit=1;
+var pdfnames='';
+//___________________________________________________________________________________________________________
+//___________________________________________________________________________________________________________
+function getSelectValues(select) {
+  var result = [];
+  var options = select && select.options;
+  var opt;
+
+  for (var i=0, iLen=options.length; i<iLen; i++) {
+    opt = options[i];
+    
+
+    if (opt.selected) {
+      result.push(opt.value || opt.text);
+    }
+  }
+  console.log('selectedddddd',result)
+  return result;
+}
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
+
   //Retrieves list of projects  
+  
   function getproj(){
     getALLMCTNAMES();
     
@@ -1106,138 +1142,145 @@ var ratioPunit=1;
 
     measids.forEach(function(elem) {
             elem.addEventListener("change", function() {
+              if (!(projsec.value.startsWith('2.8')))
+                  {
+                  canvasimg='';
+                  ry=[[]];
+                  levelcheckbox.checked=false;
+                  pdfname=elem.value;
+                  measSelect.style.boxShadow='none';
 
-            canvasimg='';
-            ry=[[]];
-            levelcheckbox.checked=false;
-            pdfname=elem.value;
-            measSelect.style.boxShadow='none';
-
-            
-            document.getElementById("all").style.display = "block";
-
-            pixelArr=[projname.value, projpart.value,projsec.value, pdfname]
-            if (projsec.value.startsWith('3.2'))
-              downloadPdf(pdfname)
-            
-            $.get( '/pixelimg/'+JSON.stringify(pixelArr)) 
-            .success( function(data) {
-              // downloadpdf(pdfname, data1)
-            document.getElementById("all").style.display = "none";
-              if(window.confirm("Measure the purple shape drawn on the pdf using Foxit Reader, Blueabeam, or any other external tool, then enter its area and perimeter in your desired scale. \n")){
-                window.open(data[2]);
-              }
-              document.getElementById("all").style.display = "none";
-            
-              document.getElementById('measureADRbutton').onclick= function()
-              {
-                if (!areaRatio.value){
-                  if (!(projsec.value.startsWith('3.2')))
-                      areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
-                }
-                if (!prmRatio.value)
-                prmRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
-
-              }
-              document.getElementById('radiosColors').removeAttribute('hidden');
-              var scalelbl= document.createElement("label");
-              scalelbl.innerText='Scale Document';
-              scalelbl.id='measureLabel';
-              var br1=  document.createElement("br");
-              var areadiv=document.createElement("div");
-              areadiv.id='areadiv'
-              var areaRatiolbl= document.createElement("label");
-              areaRatiolbl.innerText='Area:'
-              areaRatiolbl.id='radiolbl';
- 
-              var areaRatio= document.createElement("input");
-              areaRatio.type='number';
-              areaRatio.id='arealvlinput';
-              areaRatio.className='lvlinput';
-              areaRatio.name='areaRatio';
-              areaRatio.style.marginLeft='78px';
-              areaRatio.style.textAlign='right';
-              areaRatio.step=".0000001";
-              
-              if( projsec.value.startsWith('3.2')){ 
-                areaRatio.setAttribute('disabled',true)
-                document.getElementById('selectunitA').setAttribute('disabled',true)
-              }
-              else{
-                areaRatio.removeAttribute('disabled')
-                document.getElementById('selectunitA').removeAttribute('disabled')
-              }
-              areaRatio.addEventListener('change',function(){
-                areaRatio.value=(Number(areaRatio.value)).toFixed(7)
-                areaRatio.style.boxShadow='none';
-              })
-              areaRatio.required=true;
-              selectunitA=document.getElementById('selectunitA')
-              selectunitA.removeAttribute('hidden')
-              
-              areadiv.append(areaRatiolbl,areaRatio,selectunitA)
-              var br2=  document.createElement("br");
-              var br3=  document.createElement("br");
-              var prmdiv=document.createElement("div");
-              prmdiv.id='prmdiv'
-              var prmRatiolbl= document.createElement("label");
-              prmRatiolbl.innerText='Perimeter:'
-              prmRatiolbl.id='radiolbl';
-
-              var prmRatio= document.createElement("input");
-              prmRatio.type='number';
-              prmRatio.id='perimlvlinput';
-              prmRatio.className='lvlinput';
-              prmRatio.name='prmRatio';
-              prmRatio.style.textAlign='right';
-              // prmRatio.onchange=setNumberDecimal();
-              prmRatio.style.marginLeft='49px';
-              prmRatio.step=".0000001";
-              prmRatio.addEventListener('change',function(){
-                prmRatio.value=(Number(prmRatio.value)).toFixed(7)
-                prmRatio.style.boxShadow='none';
-              })
-              prmRatio.required=true;
-              selectunitP=document.getElementById('selectunitP')
-              selectunitP.removeAttribute('hidden')
-
-              prmdiv.append(prmRatiolbl, prmRatio,selectunitP)
-              var ratiosdiv= document.getElementById("ratios");
-              ratiosdiv.innerHTML='';
-              ratiosdiv.append(scalelbl);
-              ratiosdiv.append(br1);
-              ratiosdiv.append(areadiv)
-              ratiosdiv.append(prmdiv)
-              areainpixels=data[0];
-              prminpixels=data[1];    
+                  
+                  document.getElementById("all").style.display = "block";
 
+                  pixelArr=[projname.value, projpart.value,projsec.value, pdfname]
+                  if (projsec.value.startsWith('3.2'))
+                    downloadPdf(pdfname)
+                  
+                  $.get( '/pixelimg/'+JSON.stringify(pixelArr)) 
+                  .success( function(data) {
+                    // downloadpdf(pdfname, data1)
+                  document.getElementById("all").style.display = "none";
+                    if(window.confirm("Measure the purple shape drawn on the pdf using Foxit Reader, Blueabeam, or any other external tool, then enter its area and perimeter in your desired scale. \n")){
+                      window.open(data[2]);
+                    }
+                    document.getElementById("all").style.display = "none";
+                  
+                    document.getElementById('measureADRbutton').onclick= function()
+                    {
+                      if (!areaRatio.value){
+                        if (!(projsec.value.startsWith('3.2')))
+                            areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
+                      }
+                      if (!prmRatio.value)
+                      prmRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
 
-            })
-            .error(function(jqXHR, textStatus, errorThrown) { 
-                PopupElement.textContent='Error occured while uploading the pdf to the Dropbox. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
-                ShowPopUp();
-              });
-            selectunitA.addEventListener('change',function(){
-              value=document.getElementById('selectunitA').value
-              if (value=='mm2')
-                ratioAunit=1000000;
-              else
-                ratioAunit=1;
-            })
-            selectunitP.addEventListener('change',function(){
-              value=document.getElementById('selectunitP').value
-              if (value=='mm'){
-                ratioPunit=1000;
-                // if (projsec.value.startsWith('3.2'))
-                //   ratioPunit=100;
-              }
-              else
-                ratioPunit=1;
+                    }
+                    document.getElementById('radiosColors').removeAttribute('hidden');
+                    var scalelbl= document.createElement("label");
+                    scalelbl.innerText='Scale Document';
+                    scalelbl.id='measureLabel';
+                    var br1=  document.createElement("br");
+                    var areadiv=document.createElement("div");
+                    areadiv.id='areadiv'
+                    var areaRatiolbl= document.createElement("label");
+                    areaRatiolbl.innerText='Area:'
+                    areaRatiolbl.id='radiolbl';
+      
+                    var areaRatio= document.createElement("input");
+                    areaRatio.type='number';
+                    areaRatio.id='arealvlinput';
+                    areaRatio.className='lvlinput';
+                    areaRatio.name='areaRatio';
+                    areaRatio.style.marginLeft='78px';
+                    areaRatio.style.textAlign='right';
+                    areaRatio.step=".0000001";
+                    
+                    if( projsec.value.startsWith('3.2')){ 
+                      areaRatio.setAttribute('disabled',true)
+                      document.getElementById('selectunitA').setAttribute('disabled',true)
+                    }
+                    else{
+                      areaRatio.removeAttribute('disabled')
+                      document.getElementById('selectunitA').removeAttribute('disabled')
+                    }
+                    areaRatio.addEventListener('change',function(){
+                      areaRatio.value=(Number(areaRatio.value)).toFixed(7)
+                      areaRatio.style.boxShadow='none';
+                    })
+                    areaRatio.required=true;
+                    selectunitA=document.getElementById('selectunitA')
+                    selectunitA.removeAttribute('hidden')
+                    
+                    areadiv.append(areaRatiolbl,areaRatio,selectunitA)
+                    var br2=  document.createElement("br");
+                    var br3=  document.createElement("br");
+                    var prmdiv=document.createElement("div");
+                    prmdiv.id='prmdiv'
+                    var prmRatiolbl= document.createElement("label");
+                    prmRatiolbl.innerText='Perimeter:'
+                    prmRatiolbl.id='radiolbl';
+
+                    var prmRatio= document.createElement("input");
+                    prmRatio.type='number';
+                    prmRatio.id='perimlvlinput';
+                    prmRatio.className='lvlinput';
+                    prmRatio.name='prmRatio';
+                    prmRatio.style.textAlign='right';
+                    // prmRatio.onchange=setNumberDecimal();
+                    prmRatio.style.marginLeft='49px';
+                    prmRatio.step=".0000001";
+                    prmRatio.addEventListener('change',function(){
+                      prmRatio.value=(Number(prmRatio.value)).toFixed(7)
+                      prmRatio.style.boxShadow='none';
+                    })
+                    prmRatio.required=true;
+                    selectunitP=document.getElementById('selectunitP')
+                    selectunitP.removeAttribute('hidden')
+
+                    prmdiv.append(prmRatiolbl, prmRatio,selectunitP)
+                    var ratiosdiv= document.getElementById("ratios");
+                    ratiosdiv.innerHTML='';
+                    ratiosdiv.append(scalelbl);
+                    ratiosdiv.append(br1);
+                    ratiosdiv.append(areadiv)
+                    ratiosdiv.append(prmdiv)
+                    areainpixels=data[0];
+                    prminpixels=data[1];    
+
+
+                  })
+                  .error(function(jqXHR, textStatus, errorThrown) { 
+                      PopupElement.textContent='Error occured while uploading the pdf to the Dropbox. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+                      ShowPopUp();
+                    });
+                  selectunitA.addEventListener('change',function(){
+                    value=document.getElementById('selectunitA').value
+                    if (value=='mm2')
+                      ratioAunit=1000000;
+                    else
+                      ratioAunit=1;
+                  })
+                  selectunitP.addEventListener('change',function(){
+                    value=document.getElementById('selectunitP').value
+                    if (value=='mm'){
+                      ratioPunit=1000;
+                      // if (projsec.value.startsWith('3.2'))
+                      //   ratioPunit=100;
+                    }
+                    else
+                      ratioPunit=1;
 
-            })     
+                  })     
+                }
+                else{
+                  pdfnames=getSelectValues(elem)
+                }
     });
           
     });
+    
+    
     document.getElementById('measureADRbutton').onclick= function()
     {
       if (!measSelect.value)
@@ -1341,7 +1384,7 @@ function getData(form) {
     console.log(ratio2, prminpixels,formvalues['prmRatio'],ratioPunit)
     
   }
-  else{
+  else if (formvalues['selectprojs'].startsWith('1.0')){
     ratio1=(formvalues['areaRatio']/ratioAunit)/areainpixels;
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
   }
@@ -1362,16 +1405,22 @@ function getData(form) {
         formData.append('file',dxffile) 
         formData.append('answers',JSON.stringify(answers)) 
       }
-      else
+    else if (formvalues['selectprojs'].startsWith('1.0'))
         {
           console.log('why heree')
           file=''
         answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
         formData.append('answers',JSON.stringify(answers)) 
        } 
+    else if (formvalues['selectprojs'].startsWith('2.8'))
+    {
+      answers.push(pdfnames, 0,[] , ratio1, ratio2 ,pdfpath);
+      formData.append('answers',JSON.stringify(answers)) 
+    }
+
   }
  
-  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'))
   {  
     // console.log(formData)
     $.ajax({
@@ -1433,12 +1482,25 @@ function getData(form) {
 
             if (formvalues['selectprojs'].startsWith('3.2'))
             { //
-            // /* data[0]--> img , data[1]-->dataframe (goes to legend lsa ) , data [2] -->pdf dropbox shareable link ,data[3]-> spreadsheetId, data[4],spreadsheeturl */   
+            // /* data[0]--> img , SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
                 SimilarAreaDictionary=data[1];
-                dropboxLink=data[2];
+                spreadsheetURL=data[2];
                 spreadsheetId=data[3];
-                spreadsheetURL=data[4];
-                list1= data[5]
+                // spreadsheetURL=data[4];
+                list1= data[5];
+                dropboxLink=data[6];
+
+                
+            }
+            if (formvalues['selectprojs'].startsWith('2.8'))
+            { //
+            // /* 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];
+                console.log('link here')
+                dropboxLink=data[1];
+                // spreadsheetId=data[3];
+                // spreadsheetURL=data[4];
+                // list1= data[5]
 
                 
             }
@@ -1462,8 +1524,9 @@ function getData(form) {
                 spreadsheetURL=data[0]
 
             }
-            else{ 
-              // section 1.0
+            if (formvalues['selectprojs'].startsWith('1.0'))
+              {// section 1.0
+              console.log('?')
               SimilarAreaDictionary=data[1];
               spreadsheetURL= data[2];
               spreadsheetId=  data[3];
@@ -2494,6 +2557,22 @@ function chooseFirstdrpdwn()
     optn1.value= "Wall";
     inputs.add(optn1);
     }
+    if (section.value.startsWith('2.8'))
+    {
+    var opt = document.createElement("OPTION");
+    opt.text= 'Select';
+    opt.value= "";
+    opt.hidden=true;
+    inputs.add(opt);
+    var optn = document.createElement("OPTION");
+    optn.text= 'Single Door';
+    optn.value= "Single Door";
+    inputs.add(optn);
+    var optn1 = document.createElement("OPTION");
+    optn1.text= 'Double Door';
+    optn1.value= "Double Door";
+    inputs.add(optn1);
+    }
 
 
 $(inputs).select2({
@@ -2678,7 +2757,7 @@ function getlegendstoDirectory(){
                     newlabelsec.textContent=prjSectionsforLgnd[cc];
                     newlabelsec.id='prjsec';
                     newlabelsec.className='prjsecclass';
-                    if (!(newlabelsec.textContent.toString().startsWith('1.0') ) && !(newlabelsec.textContent.toString().startsWith('3.2') ) )//|| newlabelsec.textContent.startsWith('2.2')  || newlabelsec.textContent.startsWith('2.1')))
+                    if (!(newlabelsec.textContent.toString().startsWith('1.0') ) && !(newlabelsec.textContent.toString().startsWith('3.2') ) && !(newlabelsec.textContent.toString().startsWith('2.8') ) )//|| newlabelsec.textContent.startsWith('2.2')  || newlabelsec.textContent.startsWith('2.1')))
                     { 
                     newlabelsec.style.color='lightgray';
                     i.style.color='lightgray'
@@ -3032,7 +3111,7 @@ function refreshAPIbuutton(dataa){
                               opt=document.createElement("option");
                               opt.textContent=dataa[2][d];
                               opt.text=dataa[2][d];
-                              if(!(dataa[2][d].startsWith('1.0')  ) || (data[i].startsWith('3.2') ))//||data[i].startsWith('2.2')))
+                              if(!(dataa[2][d].startsWith('1.0')  ) || (data[i].startsWith('3.2') ) || (data[i].startsWith('2.8') ))//||data[i].startsWith('2.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';