Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -77,7 +77,7 @@
     </div>
 
 
-    <form method="post"  id="myForm" >
+    <form method="post"  id="myForm" enctype="multipart/form-data">
 
       <!-- <div class="projnamedp">
         <input type="text" placeholder="Project" name="selectproj" class="selectionsProj" id="selectionsProjid"  oninput="filterFunction(this,event)" >
@@ -104,11 +104,15 @@
               <input type="search" onkeyup=filterFunction(this.id) id="tomeasureSearchInput">
               <!-- <button id="refreshDropboxButtonID"></button>  -->
               <i class="fa fa-dropbox fa-lg" id="refreshDropboxButtonID" > 
-                <span class="dropboxtip">The console updates projects retrieved from Dropbox automatically at 9:00 am and 9:00 p.m. If you need to access any projects in between, just click on this button.</span> </i>
-             
+                <span class="dropboxtip">The console updates projects retrieved from Dropbox automatically at 9:00 am and 9:00 p.m. If you need to access any projects in between, just click on this button.</span> </i>            
+          
           </div>
           <div id="measureCheckbox">
             <select style="margin-left: -1%;" hidden name="measureselectname"  id="measureselectid"  multiple size="5"></select>
+            <div id="dxfdiv" hidden="until-found">
+                <input type="button" id="pdftodxfFileButton" onclick="document.getElementById('pdftodxfFile').click();" value="Choose DXF File" >
+                <input type="file" id="pdftodxfFile" name="pdftodxfFilename" > 
+            </div>
             <select id='selectunitA' hidden>
               <option id="m2" value="m2" >m&#xb2; </option>
               <option id="mm2" value="mm2" >mm&#xb2;  </option>
@@ -498,7 +502,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.2')))
         {
           opt.style.color='#bdbcbc';
           opt.style.cursor='not-allowed';
@@ -622,7 +626,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[i].startsWith('3.2') ||data[i].startsWith('2.2')))
+                if(!(data[2][d].startsWith('1.0')  )  && !(data[2][d].startsWith('3.2')  )) //||data[i].startsWith('2.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -701,7 +705,7 @@ document.getElementById('duplicater').childNodes[1].value=[0,0]
 //___________________________________________________________________________________________________________
 /*Tab View of User Guide*/
 document.getElementById('secondpage').addEventListener('click',function(){
-  document.getElementById('textsecondpage').removeAttribute('hidden');
+  document.getElementById('textsecondpage').removeAttribute('hidden'); 
   document.getElementById('textfirstpage').setAttribute('hidden',true)
 
 });
@@ -791,6 +795,40 @@ function openTab(evt, tabname) {
 // Start with the first page (Home)
 document.getElementById("pagetitle").click();
 
+
+/// download file (made for 3.2 only)
+// function downloadpdf(filename, pdfdata) {
+//   console.log('hereeee')
+//     var element = document.createElement('a');
+//     element.setAttribute('href', 'data:application/pdf;base64,[base64_encoded_pdf_data],' + encodeURIComponent(pdfdata));
+//     element.setAttribute('download', filename);
+
+//     element.style.display = 'none';
+//     document.body.appendChild(element);
+
+//     element.click();
+
+//     document.body.removeChild(element);
+// }
+
+function downloadPdf(pdfname) {
+    fetch('/get-pdf/'+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')
+        })
+        .catch(error => console.error('Error fetching PDF:', error));
+}
+
+
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 /*Add icon to duplicate 'duplicater' div (big section that includes 3 dropdowns,3 textboxes, 2 buttons(add,delete)*/
@@ -885,14 +923,21 @@ document.getElementById("pagetitle").click();
           opt.value= "";
           opt.hidden=true;
           inputs1.add(opt);
+
           var optn = document.createElement("OPTION");
           optn.text= 'Floor';
           optn.value= "Floor";
           inputs1.add(optn);
+
           var optn1 = document.createElement("OPTION");
           optn1.text= 'Wall';
           optn1.value= "Wall";
           inputs1.add(optn1);
+
+          var optn2 = document.createElement("OPTION");
+          optn2.text= 'Internal Doors';
+          optn2.value= "Internal Doors";
+          inputs1.add(optn2);
           }
         }
 
@@ -955,6 +1000,13 @@ var ratioPunit=1;
     .success (function(data){
 
     document.getElementById("all").style.display = "none";
+    if (sections.value.startsWith(3.2)){
+      document.getElementById('dxfdiv').removeAttribute('hidden'); 
+      document.getElementById('pdftodxfFile').setAttribute('required',true)
+    }
+    else{
+      document.getElementById('dxfdiv').setAttribute('hidden',true)
+    }
 
       console.log(data[0],data[1])
       var docsToMeasure=data[0]; //
@@ -986,8 +1038,6 @@ var ratioPunit=1;
     
       measSelect.add(optn2);
       document.getElementById("hidden").required = true;
-      // measSelect.required=true;
-    // console.log(measSelect)
    
     relvSelect.innerHTML='';
     for (i = 0; i < relvDocs.length; i++) {
@@ -1052,21 +1102,28 @@ var ratioPunit=1;
             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 or any other external tool, then enter its area and perimeter in your desired scale. \n")){
+              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)
-                areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
+                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)';
 
@@ -1084,11 +1141,21 @@ var ratioPunit=1;
  
               var areaRatio= document.createElement("input");
               areaRatio.type='number';
-              areaRatio.id='lvlinput';
+              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';
@@ -1108,7 +1175,8 @@ var ratioPunit=1;
 
               var prmRatio= document.createElement("input");
               prmRatio.type='number';
-              prmRatio.id='lvlinput';
+              prmRatio.id='perimlvlinput';
+              prmRatio.className='lvlinput';
               prmRatio.name='prmRatio';
               prmRatio.style.textAlign='right';
               // prmRatio.onchange=setNumberDecimal();
@@ -1167,7 +1235,17 @@ var ratioPunit=1;
           PopupElement.textContent='Error occured while retrieving the Project Names. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
           ShowPopUp();
      });
-}
+     if (document.getElementById('arealvlinput')){
+        if(projsec.value.startsWith('3.2')){
+            document.getElementById('arealvlinput').setAttribute('disabled',true)
+            document.getElementById('selectunitA').setAttribute('disabled',true)
+          }
+          else{
+            document.getElementById('arealvlinput').removeAttribute('disabled')
+            document.getElementById('selectunitA').removeAttribute('disabled')
+          }
+      }
+}  
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 
@@ -1207,9 +1285,15 @@ var allcolors=['#2FFFFF'];
 // Main Function - form submit 
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
+document.getElementById('pdftodxfFile').addEventListener('input',function(){
+  console.log('hghjk')
+  const files = document.getElementById("pdftodxfFile");
+   dxffile=files.files[0];
+  console.log(dxffile)
+});
+
 function getData(form) {
- 
-  
+    
   document.getElementById("loading").hidden = false;
 
   document.getElementById('measureADRbutton').setAttribute('disabled',true);
@@ -1221,6 +1305,7 @@ function getData(form) {
   var underimg=document.getElementById('underimgbuttons');
   var rightside=document.getElementById('rightside');
   var formData = new FormData(form);
+  
   clearInterval(interval)
   val=0;
   answers=[];
@@ -1230,37 +1315,66 @@ function getData(form) {
   pdfpath=[];
   formvalues=Object.fromEntries(formData);
 
- 
+ console.log(formData,formvalues)
 // iterate through entries...
 
   tomeasureproj=formvalues['measureselectname']; //proj name
-  ratio1=(formvalues['areaRatio']/ratioAunit)/areainpixels;
-  ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
 
+
+  if( formvalues['selectprojs'].startsWith('3.2')){
+    ratio1=1
+    ratio2=prminpixels/(formvalues['prmRatio']/ratioPunit);
+    console.log(ratio2, prminpixels,formvalues['prmRatio'],ratioPunit)
+  }
+  else{
+    ratio1=(formvalues['areaRatio']/ratioAunit)/areainpixels;
+    ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
+  }
   pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs']) //project name - part - section
 
   if (canvasimg){
     buf=canvasimg.split("data:image/png;base64,")
     answers.push(tomeasureproj, 220,allcolors , ratio1, ratio2 ,pdfpath,buf[1]); 
  } 
+
   else{
-      answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);  
+    console.log('else')
+    
+    if (formvalues['selectprojs'].startsWith('3.2'))
+      {
+        console.log('elseif')
+        answers.push(tomeasureproj, 0,[], ratio1, ratio2 ,pdfpath); 
+        formData.append('file',dxffile) 
+        formData.append('answers',JSON.stringify(answers)) 
+      }
+      else
+        {
+          console.log('why heree')
+          file=''
+        answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
+        formData.append('answers',JSON.stringify(answers)) 
+       } 
   }
  
-  if  (!formvalues['selectprojs'].startsWith('2.1'))
+  if  (formvalues['selectprojs'].startsWith('1.0')||formvalues['selectprojs'].startsWith('3.2'))
   {  
+    // console.log(formData)
     $.ajax({
             type: "POST",
+            
             url: "/savebase64Img/",
 
             // set content type header to use Flask response.get_json()
             contentType: "application/json",
 
             // convert data/object to JSON to send
-            data: JSON.stringify({allvalues:answers}),
+            data: formData,
+            processData: false, // Prevent jQuery from automatically processing the data
+            contentType: false,
+            // files:formvalues['pdftodxfFilename'],
 
             // expect JSON data in return (e.g. Flask jsonify)
-            dataType: "json",
+            // dataType: "json",
 
             // handle response
             success: function(response) {
@@ -1303,7 +1417,7 @@ 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 */   
                 SimilarAreaDictionary=data[1];
                 dropboxLink=data[2];
@@ -1408,7 +1522,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')  ) 
 
 interval= setInterval( function() {
  
@@ -1608,6 +1722,22 @@ function get3rddropdown(){
         selections1.innerHTML='';
 
 
+            for (let m=0;m<MCTNames.length;m++)
+            {
+              var opt0 = document.createElement("OPTION") ;
+              opt0.text= MCTNames[m][0];
+              opt0.textContent= MCTNames[m][0];
+              opt0.value= MCTNames[m][0];
+              selections1.add(opt0);
+            }
+            console.log(section.value.toString())
+            
+      }
+      else if(( (inputs1.value=='Floor' ) || (inputs1.value=='Wall' ) ) & (!selections1.value))//& (selections.value.startsWith('Pile') || !selections.value )) || (inputs.children[0].value=='pile caps'  & (selections.value.startsWith('Ground') || !selections.value )))
+        {  
+        selections1.innerHTML='';
+
+
             for (let m=0;m<MCTNames.length;m++)
             {
               var opt0 = document.createElement("OPTION") ;
@@ -1717,6 +1847,20 @@ function get3rddropdown(){
       }
 
    }
+   else if(( (inputs.value=='Floor' ) || (inputs.value=='Wall' ) ) & (!selections.value))//& (selections.value.startsWith('Pile') || !selections.value )) || (inputs.children[0].value=='pile caps'  & (selections.value.startsWith('Ground') || !selections.value )))
+   {
+    selections.innerHTML='';
+ 
+      for (let m=0;m<MCTNames.length;m++)
+      { 
+        var opt0 = document.createElement("OPTION") ;
+        opt0.text= MCTNames[m][0];
+        opt0.textContent= MCTNames[m][0];
+        opt0.value= MCTNames[m][0];
+        selections.add(opt0);
+      }
+
+   }
 
   //  if (inputs.value=='Floor' & (selections.value.startsWith('Wall') || !selections.value )){
   //   selections.innerHTML='';
@@ -2186,6 +2330,8 @@ NewShapeButtonId=document.getElementById('NewShapeButtonId');
 var savecanvas=document.getElementById('savecanvas');
 
 levelsin.addEventListener('click',function(){
+  if (projsec.value.startsWith('1.0'))
+  {  
   document.getElementById("all").style.display = "block";
   if( document.getElementById('levelcheckbox').checked)
     {
@@ -2262,6 +2408,12 @@ levelsin.addEventListener('click',function(){
         canvasimg=image.src;
       })    
     }
+  }
+  else{
+    PopupElement.textContent='Levels are not supported in this Section. ';
+    ShowPopUp();
+    document.getElementById('levelcheckbox').checked=false;
+  }
 })
 //___________________________________________________________________________________________________________
 function getSecondData(){
@@ -2499,7 +2651,7 @@ function getlegendstoDirectory(){
                     newlabelsec.textContent=prjSectionsforLgnd[cc];
                     newlabelsec.id='prjsec';
                     newlabelsec.className='prjsecclass';
-                    if (!(newlabelsec.textContent.toString().startsWith('1.0') ))//|| newlabelsec.textContent.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.startsWith('2.2')  || newlabelsec.textContent.startsWith('2.1')))
                     { 
                     newlabelsec.style.color='lightgray';
                     i.style.color='lightgray'
@@ -2853,7 +3005,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.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';