Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -118,9 +118,9 @@
             <label id="measureLabel">Document To Measure</label>  
               <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>            
-          
+              <i hidden 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. Please note that it will refresh the files related to the project you chose only.</span> </i>            
+  
           </div>
           <div id="measureCheckbox">
             <select style="margin-left: -1%;" hidden name="measureselectname"  id="measureselectid"  multiple size="5"></select>
@@ -145,6 +145,7 @@
         <br>
         <div id ="relvdiv">
           <select style="margin-left: -1%;" hidden name="relvselectname"  id="relvselectid"  multiple size="5">   </select>
+          <iframe id="pdfFrame" hidden></iframe>
         </div>
       </div>
    
@@ -152,13 +153,27 @@
    
       <div id="radiosColors" hidden="until-found">
 
+        <div id="checkboxLine">
+          <input type="checkbox" id="levelcheckbox">
+          <label id="nLevels" name="levelsnamelabel">Leveled Plan</label>
+          <i class="fa fa-info-circle" id="infotool">
+            <span class="tooltiptext">
+              Choose whether this project contains levels or not. Leave the checkbox unchecked if you want to measure the entirety of the plan.
+              <br> Please check the box on this line if you want to measure certain areas of the plan or have the plan divided into levels. Once the checkbox is ticked, a window will appear that will allow you to draw on the PDF. Click the save button at the bottom of the page when you are done.
+            </span>
+          </i>
+        </div>
+        
+        <div class="button-container">
+          <input type="button" id="popupforextratext" title="Add Key Information" value="Add Key Information">
+        </div>
+        <!-- <br>
         <input type="checkbox" id="levelcheckbox" >
         <label id=nLevels name="levelsnamelabel"  >Leveled Plan </label>
-        <i  class="fa fa-info-circle" id="infotool" > <span class="tooltiptext">Choose whether this project contains levels or not. Leave the checkbox unchecked if you want to measure the entirety of the plan. <br> Please check the box on this line if you want to measure certain areas of the plan or have the plan divided into levels. Once the checkbox is ticked, a window will apear that will allow you to draw on the PDF. Click the save button at the bottom of the page when you are done. </span> </i>
-
+        <i  class="fa fa-info-circle" id="infotool" > <span class="tooltiptext">Choose whether this project contains levels or not. Leave the checkbox unchecked if you want to measure the entirety of the plan. <br> Please check the box on this line if you want to measure certain areas of the plan or have the plan divided into levels. Once the checkbox is ticked, a window will apear that will allow you to draw on the PDF. Click the save button at the bottom of the page when you are done. </span> </i> -->
+        
       </div>
-      <br> 
-      
+
      <div id ="saveOPdiv">
       <button id="measureADRbutton">Measure using ADR</button> 
       <script src="https://cdn.lordicon.com/bhenfmcm.js"></script>
@@ -363,14 +378,14 @@
                       <p style="font-weight: bold;">Double Door:</p>
                       <div style="margin-left: 20px;">
                           <p>• Can correctly detect some double doors.</p>
-                          <p>• Identify the opening of the door properly and draw a line between the two end points.</p>
-                          <p>• Calculate the width of the opening</p>
+                          <p>• Calculate the width of the opening.</p>
+                          <p>• Draw a rectangle around the detected door.</p>
                       </div>
                   </div>
               
                   <p style="font-weight: bold;">What to Expect in the Next Version?</p>
                   <div style="margin-left: 20px;">
-                      <p>• Detect more single and double doors. </p>
+                      <p>• Identify the opening of the double door properly and draw a line between the two end points.</p>
                       <p>• Get the labels beside doors to generate their name.</p>
                       <p>• Detect more symbols, e.g., "Leaf door".</p>
                   </div>
@@ -486,16 +501,90 @@
 </div>
 
 
+
+
 <div id="dialog-container" class="overlay">
   <!-- Modal content -->
   <div class="modal-content">
       <div class="modal-header">
          <button type="button" class="closeModal" >&times;</button>
-          <h2 id="TopTextModal">Warning!</h2>
+          <h2 id="TopTextModalWarning">Warning!</h2>
       </div>
-      <div class="modal-body">
-        <p id="modal-bodyTextp">Are you sure you want to retrieve information from dropbox. Please note that this process may exceed 30 minutes, depending on the amount of data found in the dropbox and the internet connection. 
-        </p>
+
+        <div class="modal-body">
+          <p id="modal-bodyTextp">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. Please note that it will refresh the files related to the project you chose only. 
+          </p>
+          <div id="duplicaterExtra" hidden="until-found">
+                <div id="repeatforloopExtra" class="repeatforloopclassExtra0" name="repeatforloopExtraname " > 
+                  <label id="modalColIndex">Index</label>
+                  <i class="fa fa-info-circle smallFaIcon" id="infotoolModal">
+                    <span class="tooltiptext" id="modaltooltips">
+                       Index of column. (Optional)
+                    </span>
+                  </i>
+                  <label id="modalColumn">Type</label> <label id="modalGray">(from drawing)</label>
+                  <i class="fa fa-info-circle smallFaIcon" id="infotoolModal">
+                    <span class="tooltiptext" id="modaltooltips">
+                      Enter the title for the column as it will be shown in Bluebeam columns. This helps organize and categorize extracted information.
+                    </span>
+                  </i>
+                  <label id="modalKeyword">Specification</label> <label  id="modalGray">(from drawing)</label>
+                  <i class="fa fa-info-circle smallFaIcon" id="infotoolModal">
+                    <span class="tooltiptext" id="modaltooltips">
+                      Provide a word or phrase from the data you want to help detect relevant information in the drawing. 
+                    </span>
+                  </i>
+                  <label id="modalCharacter">Count</label>
+                  <i class="fa fa-info-circle smallFaIcon" id="infotoolModal">
+                    <span class="tooltiptext" id="modaltooltips">
+                      Set the number of characters that is expected to be captured. This helps refine the extraction by limiting or expanding the detected text. 
+                    </span>
+                  </i>
+                  <br>
+                  <input type="number" id="textextra" name="text0name" placeholder="Eg: 1" >
+                  <input type="text" id="text0extra" name="text1name" placeholder="Eg: Wall Type" > 
+                  <input type="text" id="text1extra" name="text2name"  placeholder="Eg:NBS K10/" >
+                  <input type="number" id="text2extra" name="text3name" placeholder="Eg: 3" >
+                  
+                  <script src="https://cdn.lordicon.com/bhenfmcm.js" ></script>
+                  <lord-icon
+                      onclick="addmctnameiconPopup()"
+                      src="https://cdn.lordicon.com/mecwbjnp.json"
+                      trigger="hover"
+                      class="addmctnameclassExtra"
+                      id="addmctnameidExtra"
+                      colors="primary:black,secondary:black">
+                  </lord-icon>
+                </div> 
+            </div>
+            <div hidden="until-found" id="duplicaterExtraHidden" >
+                <div id="repeatforloopExtrahidden" class="repeatforloopclassExtrahidden" name="repeatforloopnameExtrahidden " >    <!-- onchange="getmctName()" -->
+                  <input type="number" id="textextra" name="text0name" placeholder="Eg: 1" >
+                  <input type="text" id="text0extra" name="text1name" placeholder="Eg:Specification" > 
+                  <input type="text" id="text1extra" name="text2name"  placeholder="Eg:NBS K10/" >
+                  <input type="number" id="text2extra" name="text3name" placeholder="Eg: 3" >
+                  <script src="https://cdn.lordicon.com/bhenfmcm.js" ></script>
+                  <lord-icon
+                      onclick="addmctnameiconPopup()"
+                      src="https://cdn.lordicon.com/mecwbjnp.json"
+                      trigger="hover"
+                      class="addmctnameclassExtra"
+                      id="addmctnameidExtra"
+                      colors="primary:black,secondary:black">
+                  </lord-icon>
+                  <script src="https://cdn.lordicon.com/bhenfmcm.js"></script>
+                  <lord-icon
+                      onclick="deletemctnameiconPopup()"
+                      src="https://cdn.lordicon.com/rivoakkk.json"
+                      trigger="hover"
+                      class="deletemctnameclassExtra"
+                      id="deletemctnameidExtra"
+                      colors="primary:black,secondary:black">
+                  </lord-icon>
+            </div>   
+    
+          </div>
+
         <br>
         <div class="text-right">
           <button class="dialog-btn btn-primary" id="confirm">Ok</button>
@@ -513,15 +602,23 @@
 
 ///////////////////////////////////////////////BEGIN JS CODE//////////////////////////////////////////////////
 // Function to send the Dropbox link and keyword to the server
+function getURLParams() {
+    const urlParams = new URLSearchParams(window.location.search);
+    return {
+        pdfLink: urlParams.get('pdfLink'),
+        keyword: JSON.parse(decodeURIComponent(urlParams.get('keyword') || "[]")),  // Decode and parse
+        pageNumber: parseInt(urlParams.get('page')) || 1,
+        zoomRect: urlParams.get('zoom')  // Expecting format: "x,y,width,height"
+    };
+}
 function processPdf() {
-    const pdfLink = 'https://www.dropbox.com/scl/fi/fjykwhhn9gu9t3kqrflxd/LA002-NOR-ZZ-ZZ-T-A-2403_Architectural-Specification-F10-Brick-and-Block-Walling_A4-_C01.pdf?rlkey=ek9i66i79m0hwp8z5yjs6rp5p&e=1&st=mh7rurkc&dl=1'; // Dropbox link
-    const keyword = 'Page 1 of 5' ;  // Example keyword
-
+    // const pdfLink = 'https://www.dropbox.com/scl/fi/hnp4mqigb51a5kp89kgfa/00801-ARC-20-ZZ-S-A-0002.pdf?rlkey=45abeoebzqw4qwnslnei6dkd6&st=m4yrcjm2&dl=1'; // Dropbox link
+    // const keyword = ['115 INTEGRATED MRI ROOM LININGS','710 TRANSPORTATION'] ;  // Example keyword
+    const { pdfLink, keyword, pageNumber, zoomRect } = getURLParams();
     // Create a new FormData object to send the data as form data
     const formData = new FormData();
     formData.append('pdf_link', pdfLink);
-    formData.append('keyword', keyword);
-
+    formData.append('keyword', JSON.stringify(keyword)); 
     // Send the data to the Flask server
     fetch('/api/process-data', {
         method: 'POST',
@@ -529,11 +626,9 @@ function processPdf() {
     })
     .then(response => response.json())
     .then(data => {
-        // Handle the server's response
         if (data.download_link) {
-            // Redirect the user to the page where the annotation is located
-            // The download_link includes both the page number and the rect (coordinates)
-            window.location.href = data.download_link; // This will use the rect info from Flask
+            //window.location.href = data.download_link; // This will use the rect info from Flask
+            console.log('Done!')
         } else {
             alert('Error: ' + data.error);
         }
@@ -542,11 +637,8 @@ function processPdf() {
         console.error('Error:', error);
     });
 }
-
 // Call the function to process the PDF
-// processPdf();
-
-
+// processPdf();  
 ////////////////////////////////////////////////////////////////////
 
 PopupElement=document.getElementById('modal-bodyText');
@@ -596,6 +688,8 @@ displayprjnames()
 function displayprjnames(){
 $.get('/getprojectnames/')
      .success(function(data) {
+    
+     
       document.getElementById("all").style.display = "none";
       prjids=data[1];
       var op0 = document.createElement("OPTION") ;
@@ -696,7 +790,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.8')) && !(data[i].startsWith('3.3')) && !(data[i].startsWith('2.1')) ) // ||data[i].startsWith('2.2')))
+        if(!(data[i].startsWith('1.0')  ) && !(data[i].startsWith('3.2')) && !(data[i].startsWith('2.8')) && !(data[i].startsWith('3.3')) && !(data[i].startsWith('2.1')) && !(data[i].startsWith('2.7')) ) // ||data[i].startsWith('2.2')))
           {
             opt.style.color='#bdbcbc';
             opt.style.cursor='not-allowed';
@@ -822,7 +916,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[2][d].startsWith('2.8')) && !(data[2][d].startsWith('3.3'))  && !(data[2][d].startsWith('2.1')) ) //||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[2][d].startsWith('3.3'))  && !(data[2][d].startsWith('2.1')) && !(data[i].startsWith('2.7'))) //||data[i].startsWith('2.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -1012,11 +1106,18 @@ function downloadPdf(pdfname) {
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 /*Add icon to duplicate 'duplicater' div (big section that includes 3 dropdowns,3 textboxes, 2 buttons(add,delete)*/
+  var dupliateiExtra = 0; // i 
+  var clonedDivIdExtra=0;
+  var originalExtra = document.getElementById('duplicaterhidden');
+  var addciconvalExtra=0; //div duplicate
+  var jjExtra=0;
+
   var dupliatei = 0; // i 
   var clonedDivId=0;
   var original = document.getElementById('duplicaterhidden');
   var addciconval=0; //div duplicate
   var jj=0;
+
   const vals = [];
   var canvasimg;
   var ry = [[]];
@@ -1133,7 +1234,8 @@ console.log('ayhaga', clone.children[5])
           optn2.value= "Internal Doors";
           inputs1.add(optn2);
           }
-          if (section.value.startsWith('3.3'))
+          
+        if (section.value.startsWith('2.7'))
           {
           var opt = document.createElement("OPTION");
           opt.text= 'Select';
@@ -1142,8 +1244,8 @@ console.log('ayhaga', clone.children[5])
           inputs1.add(opt);
 
           var optn = document.createElement("OPTION");
-          optn.text= 'Ceiling';
-          optn.value= "Ceiling";
+          optn.text= 'Internal Walls';
+          optn.value= "Internal Walls";
           inputs1.add(optn);
 
           }
@@ -1250,7 +1352,7 @@ function getSelectValues(select) {
 //___________________________________________________________________________________________________________
 
   //Retrieves list of projects  
-  
+
   function getproj(){
     getALLMCTNAMES();
     
@@ -1265,17 +1367,16 @@ function getSelectValues(select) {
      
     $.get( '/getmethod/'+JSON.stringify(projectVal))
     .success (function(data){
-
+      document.getElementById('refreshDropboxButtonID').style.display = "block";
     document.getElementById("all").style.display = "none";
-    if (sections.value.startsWith('3.2') || sections.value.startsWith('3.3') ){
+    if (sections.value.startsWith('3.2') || sections.value.startsWith('3.3') || sections.value.startsWith('2.7') ){
       document.getElementById('dxfdiv').removeAttribute('hidden'); 
       document.getElementById('pdftodxfFile').setAttribute('required',true)
     }
     else{
       document.getElementById('dxfdiv').setAttribute('hidden',true)
     }
-
-      console.log(data[0],data[1])
+    extracted_path=data[2]
       var docsToMeasure=data[0]; //
       var relvDocs=data[1]
       var projname = document.getElementsByClassName("selectionsProj")[0];
@@ -1320,44 +1421,64 @@ function getSelectValues(select) {
           optn1.setAttribute('disabled',true);
       }
     }
+    const nameSet = new Set(); // To track unique names
 
     for (i = 0; i < docsToMeasure.length; i++) {
   //to measure documents
         var optn2 = document.createElement("OPTION");
-
+        let name = docsToMeasure[i][0]; // Extract name
         optn2.text= docsToMeasure[i][0];
         optn2.value= docsToMeasure[i][0]  ;
         optn2.id=docsToMeasure[i][1] ;
         measSelect.add(optn2);
         measoptns.push(optn2);
+
+            // Check for duplicates
+      if (nameSet.has(name)) {
+          optn2.style.color = "red"; // Highlight duplicate (optional)
+          PopupElement.textContent = 'Duplicate project names were detected while retrieving the project PDFs. Please visit Dropbox and rename the files to ensure each project has a unique name. Once the renaming is complete, return to the console and click on the Dropbox icon to retrieve the updated project names.';
+          ShowPopUp();
+      } else {
+          nameSet.add(name); // Add unique name to the set
+      }
+
         if (data=='No projects found'){
           optn2.style.color='#bdbcbc';
           optn2.style.cursor='not-allowed';
           optn2.setAttribute('disabled',true);
       }
       }
-
+    console.log(nameSet)
     relvids.push(relvSelect) ;
     measids.push(measSelect);
 //to open pdf in a new tab (relevant documents)
 
 
-    relvids.forEach(function(elem){
-      elem.addEventListener("change", function() {
-        // console.log(elem.value)
-        document.getElementById("all").style.display = "block";
-      // var pdfpatharr=[]
-      // pdfpatharr.push(projname.value, projpart.value,projsec.value, elem.value)
-      $.get( '/getdropboxurl/'+JSON.stringify(elem.value))
-      .success (function(data){
-        document.getElementById("all").style.display = "none";
-        window.open( data)
-      })
-      .error(function(jqXHR, textStatus, errorThrown) { 
-          PopupElement.textContent='Error occured while retrieving the dropbox URL. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
-          ShowPopUp();
-      });
-      });
+relvids.forEach(function(elem) {
+  elem.addEventListener("change", function() {
+    // Show loading indicator
+    document.getElementById("all").style.display = "block";
+    fetch('/getdropboxurl/'+ JSON.stringify(elem.value), {
+
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ filename: "your_pdf_filename_here.pdf" })
+        })
+        .then(response => response.blob())
+        .then(blob => {
+          document.getElementById("all").style.display = "none";
+          const url = URL.createObjectURL(blob);
+              // Set the URL to the iframe's src to load the content inside the page
+          const iframe = document.getElementById("pdfFrame");
+          iframe.src = url;
+          iframe.style.display = "block"; // Show the iframe
+        })
+        .catch(function(jqXHR, textStatus, errorThrown) {
+              // Handle error
+              PopupElement.textContent = 'Error occurred while retrieving the dropbox URL. Refresh and try again. If the error continues, please contact the ADR team to fix it.';
+              ShowPopUp();
+            });
+    });
     });
 
     measids.forEach(function(elem) {
@@ -1366,7 +1487,7 @@ function getSelectValues(select) {
               // if (!(projsec.value.startsWith('2.8')))
                   // {
                           // Show alert immediately to prompt the user
-                  if (projsec.value.startsWith('3.2') || projsec.value.startsWith('3.3') ) {
+                  if (projsec.value.startsWith('3.2') || projsec.value.startsWith('3.3') || projsec.value.startsWith('2.7')) {
                       downloadPdf(elem.value);
                       window.alert("Measure the purple shape drawn on the PDF using Foxit Reader, Bluebeam, or any other external tool, then enter its area and perimeter in your desired scale.");
                   }
@@ -1398,7 +1519,7 @@ function getSelectValues(select) {
                     document.getElementById('measureADRbutton').onclick= function()
                     {
                       if (!areaRatio.value){
-                        if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')) & !(projsec.value.startsWith('3.3')) )
+                        if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')) & !(projsec.value.startsWith('3.3')) & !(projsec.value.startsWith('2.7')) )
                             areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
                       }
                       if (!prmRatio.value)
@@ -1425,7 +1546,7 @@ function getSelectValues(select) {
                     areaRatio.style.textAlign='right';
                     areaRatio.step=".0000001";
                     
-                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3') || projsec.value.startsWith('2.1') ){ 
+                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3') || projsec.value.startsWith('2.1') || projsec.value.startsWith('2.7')){ 
                       areaRatio.setAttribute('disabled',true)
                       document.getElementById('selectunitA').setAttribute('disabled',true)
                     }
@@ -1510,7 +1631,13 @@ function getSelectValues(select) {
           
     });
     
-    
+document.addEventListener("click", function(event) {
+  const iframe = document.getElementById("pdfFrame");
+  if (!iframe.contains(event.target)) {
+    const iframe = document.getElementById("pdfFrame");
+    iframe.style.display = "none";
+  }
+});
     document.getElementById('measureADRbutton').onclick= function()
     {
       if (!measSelect.value)
@@ -1523,7 +1650,7 @@ function getSelectValues(select) {
           ShowPopUp();
      });
      if (document.getElementById('arealvlinput')){
-        if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3')  || projsec.value.startsWith('2.1') ){
+        if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3')  || projsec.value.startsWith('2.1')  || projsec.value.startsWith('2.7')){
             document.getElementById('arealvlinput').setAttribute('disabled',true)
             document.getElementById('selectunitA').setAttribute('disabled',true)
           }
@@ -1759,7 +1886,7 @@ function getData(form) {
   tomeasureproj=formvalues['measureselectname']; //proj name
 
 
-  if( formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') ){
+  if( formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') || formvalues['selectprojs'].startsWith('2.7') ){
     ratio1=1
     ratio2=prminpixels/(formvalues['prmRatio']/ratioPunit);
     console.log(ratio2, prminpixels,formvalues['prmRatio'],ratioPunit)
@@ -1792,7 +1919,17 @@ function getData(form) {
         answers.push(tomeasureproj, 0,[], ratio1, ratio2 ,pdfpath); 
         formData.append('file',dxffile) 
         formData.append('answers',JSON.stringify(answers)) 
+      }
+
+    else if ( formvalues['selectprojs'].startsWith('2.7'))
+      {
+        console.log('elseif')
+        console.log(groupedValues)
+        answers.push(tomeasureproj, 0,[], ratio1, ratio2 ,pdfpath,groupedValues); 
+        formData.append('file',dxffile) 
+        formData.append('answers',JSON.stringify(answers)) 
       } 
+
     else if (formvalues['selectprojs'].startsWith('1.0'))
         {
           console.log('whyyyy hereeee')
@@ -1808,7 +1945,7 @@ function getData(form) {
 
   }
  
-  if  (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('3.3') ||formvalues['selectprojs'].startsWith('2.1')  ) //
+  if  (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('3.3') || formvalues['selectprojs'].startsWith('2.7') ) //formvalues['selectprojs'].startsWith('2.1') 
   {  
     // console.log(formData)
     $.ajax({
@@ -1879,7 +2016,7 @@ function getData(form) {
               document.getElementById('measureADRbutton').style.boxShadow='none';
             });
 
-            if (formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') )
+            if (formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') || formvalues['selectprojs'].startsWith('2.7') )
             { //
             // /* data[0]--> img , SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
 
@@ -1921,10 +2058,11 @@ function getData(form) {
             if (formvalues['selectprojs'].startsWith('2.1'))
               {
                 //ignore data[0] --> img passed directly
-                dropboxLink=data[1];
-                spreadsheetURL=data[2];
-                list1= data[3] // list of pdf markups 
-                SimilarAreaDictionary=data[4];
+                //dropboxLink=data[1]
+              
+                //spreadsheetId=data[2]
+                //spreadsheetURL=data[3]
+                spreadsheetURL=data[0]
 
             }
             if (formvalues['selectprojs'].startsWith('1.0'))
@@ -1964,7 +2102,7 @@ function getData(form) {
             var flag=0;
             pdfpath=[];
             pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs'])
-if (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') ||  formvalues['selectprojs'].startsWith('3.3')) {
+if (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') ||  formvalues['selectprojs'].startsWith('3.3')||  formvalues['selectprojs'].startsWith('2.7')) {
     const interval = 6000; // Interval in milliseconds
     let delrows1 = ''; // Initial data storage
     let delrows2 = ''; // Updated data storage
@@ -2230,7 +2368,23 @@ function get3rddropdown(){
             }
             console.log(section.value.toString())
             
-      } 
+      }
+      else if(( (inputs1.value=='Internal Walls' ) ) & (!selections1.value))//& (selections.value.startsWith('Pile') || !selections.value )) || (inputs.children[0].value=='pile caps'  & (selections.value.startsWith('Ground') || !selections.value )))
+        {   //3.3
+        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())
+            
+      }  
 
       // if (inputs1.value.startsWith('Floor') & (selections1.value.startsWith('Wall') || !selections1.value )){
       //   selections1.innerHTML='';
@@ -2445,6 +2599,7 @@ console.log(selections.value)
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 var repeatforloopI=0;
+var repeatforloopIextra=0;
 function getmctName(){
   
   var listofnames=[];
@@ -2729,6 +2884,81 @@ function deletemctnameicon(){
     }
   }
 }
+
+function addmctnameiconPopup(){
+  // guessednamesDropdown()
+  repeatforloopIextra+=1
+  var dupDivExtra;
+  if (clonedDivIdExtra==0){
+  var dupDivExtra=document.getElementById('duplicaterExtra'); //pass kol div hna 
+  }
+  else{
+  var dupDivExtra=document.getElementById(clonedDivIdExtra); //pass kol div hna  //akher div et3mlt
+  }
+
+  var divExtra=document.getElementById('repeatforloopExtrahidden')
+  var cloneExtra = divExtra.cloneNode(true); // "deep" clone
+  jjExtra++;
+
+  // if (clonedDivIdExtra==0)
+  //   clone.style.marginLeft='5px';
+  // else
+  //   clone.style.marginLeft='5px';
+
+window.onclick = elem => {
+  if (elem.target.tagName.startsWith('LORD-ICON') && elem.target.id.startsWith('addmctnameidExtra')){
+    // console.log('repeatforloopExtraaa', elem.target.parentElement.parentElement.childNodes[1].value )
+    cloneExtra.id = 'repeatforloopExtra'+ jjExtra;
+    cloneExtra.setAttribute('class','repeatforloopclassExtra'+jjExtra);
+    cloneExtra.setAttribute('name','repeatforloopnameExtra'+jjExtra);
+    cloneExtra.childNodes[11].id='addmctnameidExtra'+jjExtra;
+    cloneExtra.childNodes[15].id='deletemctnameidExtra'+jjExtra;
+
+    if (elem.target.parentElement.nextElementSibling)
+    {
+      $("#"+elem.target.parentElement.parentElement.id).append(cloneExtra);
+    }
+    else
+    {
+      $("#"+elem.target.parentElement.parentElement.id).append(cloneExtra);
+      $("#"+elem.target.parentElement.id).insertBefore(cloneExtra,document.getElementById('doneebackground')); 
+    }
+    
+  }
+}
+console.log()
+if (sectionNumber.startsWith('2.7'))
+{
+    textextra= cloneExtra.children[0]
+    textextra.style.backgroundColor = "#7c7c7c;";
+    textextra.style.cursor='not-allowed';
+    textextra.disabled="disabled";
+
+} 
+if (sectionNumber.startsWith('2.8'))
+{
+  text2extra= cloneExtra.children[3]
+  text2extra.style.backgroundColor = "#7c7c7c;";
+  text2extra.style.cursor='not-allowed';
+  text2extra.disabled="disabled";
+}
+}
+
+function deletemctnameiconPopup(){
+  window.onclick = elem => {
+
+    if (elem.target.tagName.startsWith('LORD-ICON') && elem.target.id.startsWith('deletemctnameidExtra'))
+    {
+      var numb = elem.target.parentElement.id.match(/\d/g);
+      if (numb==null)
+        numb='';
+      else
+        numb = numb.join("");
+      var deletethisdivExtra= document.getElementById('repeatforloopExtra'+ numb);
+      deletethisdivExtra.parentNode.removeChild(deletethisdivExtra);
+    }
+  }
+}
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 function colors(){
@@ -3011,6 +3241,18 @@ function chooseFirstdrpdwn()
     optn.value= "Ceiling";
     inputs.add(optn);
     }
+    if (section.value.startsWith('2.7'))
+    {
+    var opt = document.createElement("OPTION");
+    opt.text= 'Select';
+    opt.value= "";
+    opt.hidden=true;
+    inputs.add(opt);
+    var optn = document.createElement("OPTION");
+    optn.text= 'Internal Walls';
+    optn.value= "Internal Walls";
+    inputs.add(optn);
+    }
     if (section.value.startsWith('2.8'))
     {
     var opt = document.createElement("OPTION");
@@ -3149,6 +3391,8 @@ function filterFunction(id) {
 
 
 // Call function when show dialog btn is clicked
+var duplicaterExtra = document.getElementById("duplicaterExtra");
+var overlaymeText = document.getElementById("modal-bodyTextp");
 var overlayme = document.getElementById("dialog-container");
 document.getElementById("refreshDropboxButtonID").disabled=false;
 
@@ -3157,41 +3401,108 @@ document.getElementById("refreshDropboxButtonID").disabled=false;
 
   document.getElementById("refreshDropboxButtonID").onclick = function()
   {
+    TopTextModal.textContent='Warning!';
     if (document.getElementById("refreshDropboxButtonID").disabled==false)
     overlayme.style.display = "block";
+    overlaymeText.textContent='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. Please note that it will refresh the files related to the project you chose only.'; 
+    duplicaterExtra.setAttribute('hidden',true)
   };
-// }
 
 
-//   document.getElementById("confirm").onclick = function(){confirmDialog()};
-// function confirmDialog() {
-//  /* code executed if confirm is clicked */
-//   console.log('bvhj')   
-//     overlayme.style.display = "none";
-//     callrefreshDropbox();
+// Call function when show dialog btn is clicked
+var TopTextModal = document.getElementById("TopTextModalWarning");
+
+document.getElementById("refreshAPIbutton").disabled=false;
+document.getElementById("refreshAPIbutton").onclick = function()
+  {
+    TopTextModal.textContent='Warning!';
+    if (document.getElementById("refreshAPIbutton").disabled==false)
+    {
+      console.log(overlaymeText.textContent)
+    overlaymeText.textContent='This is not a mandatory button. The system already runs at half-hour intervals to update the dropdowns and MC-Templates from the MC. Using this would manually refresh the data retrieved, disregarding the 30-minute interval.';
+    overlayme.style.display = "block";
+    duplicaterExtra.setAttribute('hidden',true)
+  }
+  };
+
+
+
+document.getElementById("popupforextratext").disabled=false;
+document.getElementById("popupforextratext").onclick = function(){
+if (sectionNumber.startsWith('2.7'))
+{
+    textextra= document.getElementById("textextra")
+    textextra.style.backgroundColor = "#7c7c7c;";
+    textextra.style.cursor='not-allowed';
+    textextra.disabled="disabled";
+
+}
+if (sectionNumber.startsWith('2.8'))
+{
+  text2extra= document.getElementById("text2extra")
+  text2extra.style.backgroundColor = "#7c7c7c;";
+  text2extra.style.cursor='not-allowed';
+  text2extra.disabled="disabled";
+}
+  duplicaterExtra.removeAttribute('hidden'); 
+  TopTextModal.textContent='Define Information to Extract from Drawing'
+    if (document.getElementById("popupforextratext").disabled==false)
+    {    
+      overlaymeText.textContent='';
+      overlayme.style.display = "block";
+  }
+  };
 // }
 
+
+document.getElementById("confirm").onclick = function(){confirmDialogR()};
+function confirmDialogR() {
+ /* code executed if confirm is clicked */ 
+    overlayme.style.display = "none";
+   console.log(document.getElementById("confirm").parentElement.parentElement.children[0].textContent)
+    if (document.getElementById("confirm").parentElement.parentElement.children[0].textContent.startsWith('Are'))
+    {
+      console.log('hereeeeeeeee')
+      callrefreshDropbox();
+    }
+    else if(document.getElementById("confirm").parentElement.parentElement.children[0].textContent.startsWith('This')){
+
+      callrefreshAPI();
+    }
+    else{
+      getpopuptext();
+    }
+
+}
+
 // If cancel btn is clicked , the function cancel() is executed
 document.getElementById("cancel").onclick = function(){cancelDialog()};
 function cancelDialog() {
     overlayme.style.display = "none";
 }
 
+var extracted_path;
 function callrefreshDropbox(){
-  console.log('ldropboxx')
+  console.log('ldropboxx' , extracted_path)
   document.getElementById("refreshDropboxButtonID").style.backgroundColor = "gray";
   document.getElementById("refreshDropboxButtonID").style.cursor='not-allowed';
   document.getElementById("refreshDropboxButtonID").disabled="disabled";
   
-
-  $.get('/postdropboxprojects')
+  TopTextModal=document.getElementById("TopTextModal");
+  $.get('/postdropboxprojects/' + encodeURIComponent(JSON.stringify(extracted_path)))
       
      .success(function(stringReturned) {
+      if (stringReturned.startsWith('Updated'))
+      {
       console.log('DONEEEE')
-      TopTextModal=document.getElementById("TopTextModal");
+      
       TopTextModal.textContent= "Success!";
       TopTextModal.style.color='green';
       PopupElement.textContent=stringReturned;
+     }
+     else{
+      PopupElement.textContent=stringReturned;
+     }
       ShowPopUp();
       document.getElementById("refreshDropboxButtonID").style.cursor='pointer';
       document.getElementById("refreshDropboxButtonID").style.backgroundColor = "#1680c7";
@@ -3205,40 +3516,6 @@ function callrefreshDropbox(){
 }
 
 
-// Call function when show dialog btn is clicked
-var overlaymeText = document.getElementById("modal-bodyTextp");
-document.getElementById("refreshAPIbutton").disabled=false;
-document.getElementById("refreshAPIbutton").onclick = function()
-  {
-    if (document.getElementById("refreshAPIbutton").disabled==false)
-    {
-      console.log(overlaymeText.textContent)
-    overlaymeText.textContent='This is not a mandatory button. The system already runs at half-hour intervals to update the dropdowns and MC-Templates from the MC. Using this would manually refresh the data retrieved, disregarding the 30-minute interval.';
-    overlayme.style.display = "block";
-  }
-  };
-// }
-
-
-  document.getElementById("confirm").onclick = function(){confirmDialogR()};
-function confirmDialogR() {
- /* code executed if confirm is clicked */ 
-    overlayme.style.display = "none";
-   console.log(document.getElementById("confirm").parentElement.parentElement.children[0].textContent)
-    if (document.getElementById("confirm").parentElement.parentElement.children[0].textContent.startsWith('Are'))
-    {
-      console.log('hereeeeeeeee')
-      callrefreshDropbox();
-    }
-    else
-      callrefreshAPI();
-}
-
-// // If cancel btn is clicked , the function cancel() is executed
-// document.getElementById("cancel").onclick = function(){cancelDialog()};
-// function cancelDialog() {
-//     overlayme.style.display = "none";
-// }
 function refreshAPIbuutton(dataa){  
                 $.get('/refreshAPIAppendNewTables')
                 .success(function(successData){
@@ -3284,7 +3561,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.8')) || (data[i].startsWith('3.3')) || (data[i].startsWith('2.1')) )//||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('3.3')) || (data[i].startsWith('2.1')) || (data[i].startsWith('2.7')) )//||data[i].startsWith('2.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';
@@ -3295,9 +3572,7 @@ function refreshAPIbuutton(dataa){
                             }
                           }
                       }
-      
-                  console.log('DONEEEE')
-                  TopTextModal=document.getElementById("TopTextModal");
+                  TopTextModal=document.getElementById("TopTextModalWarning");
                   TopTextModal.textContent= "Success!";
                   TopTextModal.style.color='green';
                   PopupElement.textContent='Console is up to date!';
@@ -3362,5 +3637,32 @@ function callrefreshAPI(){
         }
 
 }
+
+var groupedValues = [];
+
+function getpopuptext(){
+  // Select all text input fields inside the modal
+  const inputs = document.querySelectorAll('.modal-body input[type="text"], .modal-body input[type="number"]');
+  const values = [];
+  
+  // Loop through the inputs and add their values to the array
+  inputs.forEach(input => {
+    values.push(input.value);
+  });
+  
+  console.log("Collected input values:", values);
+
+  // Group the values into subarrays of 4
+  // const groupedValues = [];
+  for (let i = 0; i < values.length; i += 4) {
+    groupedValues.push(values.slice(i, i + 4));
+  }
+  
+  console.log("Grouped input values:", groupedValues);
+  
+  return groupedValues;
+
+}
+
 </script>