Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -295,12 +295,10 @@
                 <select id="section-select" 
                   onchange="
                     document.getElementById('description-section-1-0').style.display = this.value === 'section-1-0' ? 'block' : 'none'; 
-                    document.getElementById('description-section-3-2').style.display = this.value === 'section-3-2' ? 'block' : 'none';
-                    document.getElementById('description-section-3-3').style.display = this.value === 'section-3-3' ? 'block' : 'none';">
+                    document.getElementById('description-section-3-2').style.display = this.value === 'section-3-2' ? 'block' : 'none';">
                   <option value="">--Select Section--</option>
                   <option value="section-1-0">Section 1.0</option>
                   <option value="section-3-2">Section 3.2</option>
-                  <option value="section-3-3">Section 3.3</option>
                 </select>
                 <div id="description-section-1-0" class="description">
                   <label style="font-style: italic;">* Notes for section 1.0 measurement:</label>
@@ -343,41 +341,6 @@
                     </ol>
                   </div>
                 </div>
-                <div id="description-section-3-3" class="description">
-                  <label style="font-style: italic;">* Notes for section 3.3 measurement:</label>
-                  <p>The algorithm is designed to measure the Ceiling finishes for Ceiling plans by detecting each shape individually and measuring its area and perimeter.</p>
-                  <label style="font-weight: 200;">Steps to use:</label>
-                  <div style="margin-left: 20px;">
-                    <ol>
-                      <li>Select Section 3.3 from the drop-down list.</li>
-                      <li>Choose the PDF you wish to measure. A pdf will be downloaded for the next step.</li>
-                      <li>A pop window will appear in which it contains the pdf drawn on it a big blue shape. Measure its perimeter and input the value in the corresponding cell in the console. Be sure to adjust the unit (e.g., m, cm).</li>
-                      <li>Open AutoCAD and import the PDF.</li>
-                      <li>When a pop-up window appears in AutoCAD, ensure the following options are selected:
-                         <ol class="sub-item">
-                          <li>PDF Data to Import:
-                            <ol class="nested-item">
-                              <li>Vector geometry (Solid Fills)</li>
-                              <li>TrueType text</li>
-                            </ol>
-                          </li>
-                          <li>Layers:
-                            <ol class="nested-item">
-                              <li>Use PDF Layers</li>
-                            </ol>
-                          </li>
-                          <li>Import Options:
-                            <ol class="nested-item">
-                              <li>Convert solid fills to hatches</li>
-                              <li>Apply line weight properties</li>
-                            </ol>
-                          </li>
-                        </ol>
-                      </li>
-                      <li>Upload the generated DXF file to the console, input the measured perimeter, and click the green button.</li>
-                    </ol>
-                  </div>
-                </div>
               </body>
               <br>
               <i id="secondpage" class="fa fa-arrow-right" aria-hidden="true"></i>
@@ -439,11 +402,9 @@
                 <label for="section-select" style="font-style: italic;">Further Output Notes:</label>
                 <select id="section-select" 
                   onchange="
-                    document.getElementById('Output-section-3-2').style.display = this.value === 'section-3-2' ? 'block' : 'none';
-                    document.getElementById('Output-section-3-3').style.display = this.value === 'section-3-3' ? 'block' : 'none';">
+                    document.getElementById('Output-section-3-2').style.display = this.value === 'section-3-2' ? 'block' : 'none';">
                   <option value="">--Select Section--</option>
                   <option value="section-3-2">Section 3.2</option>
-                  <option value="section-3-3">Section 3.3</option>
                 </select>
                 <div id="Output-section-3-2" class="description">
                   <label style="font-style: italic;">* Output Notes for section 3.2 measurement:</label>
@@ -457,31 +418,6 @@
                       <li>After setting the scale, all annotations will appear and dynamically update in the measurement column, along with their corresponding labels.</li>
                       <li>This section works correctly only if the PDF was originally created in AutoCAD.</li>
                       <li>Double check the required items in the pop up window in AutoCAD while importing the pdf, if something is missing in it, the markups might appear as X shapes.</li>
-                      <li>If the perimeter is not an accurate number, the markups may shift.</li>
-                      <li>Some tiny shapes might be missed during processing.</li>
-                      <li>The annotation shapes are primarily based on the DXF file's shape.</li>
-                      <li>The annotations might appear duplicated in a very small percentage of the pdfs</li>
-                      <li>Thoroughly review the generated markups, as they may include elements outside your measurement scope. For example,  parts of the title block may appear as markups. </li>
-                    </ol>
-                  </div>
-                </div>
-                <div id="Output-section-3-3" class="description">
-                  <label style="font-style: italic;">* Output Notes for section 3.3 measurement:</label>
-                  <p>Image will appear contains the pdf and its annotations.Below this image, will be the same output buttons as all other sections.If the user wants to download the PDF file and open it in Bluebeam, </p>
-                  <label style="font-weight: 200;">They need to follow these steps:</label>
-                  <div style="margin-left: 20px;">
-                    <ol>
-                      <li>Download the output PDF file.</li>
-                      <li>Open the file in Bluebeam.</li>
-                      <li>Set the scale of the PDF in Bluebeam by navigating to Tools → Measure → Set Scale.</li>
-                      <li>After setting the scale, all annotations will appear and dynamically update in the measurement column, along with their corresponding labels.</li>
-                      <li>This section works correctly only if the PDF was originally created in AutoCAD.</li>
-                      <li>Double check the required items in the pop up window in AutoCAD while importing the pdf, if something is missing in it, the markups might appear as X shapes.</li>
-                      <li>If the perimeter is not an accurate number, the markups may shift.</li>
-                      <li>Some tiny shapes might be missed during processing.</li>
-                      <li>The annotation shapes are primarily based on the DXF file's shape.</li>
-                      <li>The annotations might appear duplicated in a very small percentage of the pdfs</li>
-                      <li>Thoroughly review the generated markups, as they may include elements outside your measurement scope. For example,  parts of the title block may appear as markups. </li>
                     </ol>
                   </div>
                 </div>
@@ -681,7 +617,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.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.2')))
           {
             opt.style.color='#bdbcbc';
             opt.style.cursor='not-allowed';
@@ -807,7 +743,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[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.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -1033,7 +969,7 @@ console.log('ayhaga', clone.children[5])
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('id', 'repeatforloop'+addciconval+'0');
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('name', 'repeatforloopname'+addciconval+'0');
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('class', 'repeatforloopclass'+addciconval+'0');
-      if (thirddropdown.value.startsWith('3.2') || thirddropdown.value.startsWith('3.3') ||  thirddropdown.value.startsWith('2.8'))
+      if (thirddropdown.value.startsWith('3.2') || thirddropdown.value.startsWith('3.3'))
              { 
 
               clone.children[5].children[1].setAttribute('disabled','True')
@@ -1151,7 +1087,25 @@ console.log('ayhaga', clone.children[5])
           inputs1.add(optn1);
 
           }
-          
+          if (section.value.startsWith('2.1'))
+          { 
+          var opt = document.createElement("OPTION");
+          opt.text= 'Select';
+          opt.value= "";
+          opt.hidden=true;
+          inputs1.add(opt);
+
+          var optn = document.createElement("OPTION");
+          optn.text= 'Column';
+          optn.value= "Column";
+          inputs1.add(optn);
+
+          var optn1 = document.createElement("OPTION");
+          optn1.text= 'Wall';
+          optn1.value= "Wall";
+          inputs1.add(optn1);
+
+          }
         }
 
 
@@ -1333,10 +1287,13 @@ 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') || projsec.value.startsWith('2.8')) {
+                  if (projsec.value.startsWith('3.2') || projsec.value.startsWith('3.3') ) {
                       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.");
                   }
+                  else{
+                    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.");
+                  }
                   canvasimg='';
                   ry=[[]];
                   levelcheckbox.checked=false;
@@ -1389,11 +1346,11 @@ 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') ){ 
+                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3') || projsec.value.startsWith('2.1') ){ 
                       areaRatio.setAttribute('disabled',true)
                       document.getElementById('selectunitA').setAttribute('disabled',true)
                     }
-                    else{
+                    else{ // section 1.0
                       areaRatio.removeAttribute('disabled')
                       document.getElementById('selectunitA').removeAttribute('disabled')
                     }
@@ -1487,11 +1444,11 @@ function getSelectValues(select) {
           ShowPopUp();
      });
      if (document.getElementById('arealvlinput')){
-        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.1') ){
             document.getElementById('arealvlinput').setAttribute('disabled',true)
             document.getElementById('selectunitA').setAttribute('disabled',true)
           }
-          else{
+          else{ // section 1.0
             document.getElementById('arealvlinput').removeAttribute('disabled')
             document.getElementById('selectunitA').removeAttribute('disabled')
           }
@@ -1733,7 +1690,7 @@ function getData(form) {
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
     console.log('ratioss',ratio1,ratio2)
   }
-  else if (formvalues['selectprojs'].startsWith('2.8') ){
+  else if (formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('2.1') ){
     ratio1=1;
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
     console.log('ratioss',ratio1,ratio2)
@@ -1764,7 +1721,7 @@ function getData(form) {
         answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
         formData.append('answers',JSON.stringify(answers)) 
        } 
-    else if (formvalues['selectprojs'].startsWith('2.8'))
+    else if (formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('2.1'))
     {
       answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
       formData.append('answers',JSON.stringify(answers)) 
@@ -1772,7 +1729,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') )
+  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') 
   {  
     // console.log(formData)
     $.ajax({
@@ -1929,7 +1886,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('3.3')) {
+if (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') ||  formvalues['selectprojs'].startsWith('3.3')) {
     const interval = 6000; // Interval in milliseconds
     let delrows1 = ''; // Initial data storage
     let delrows2 = ''; // Updated data storage
@@ -2041,71 +1998,72 @@ if (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].sta
   });
 }
 // trial for 2.1 - tameem's code--- delete and deploy in the above if statement
-  else{
-  $.ajax({
-            type: "POST",
-            url: "/2.1Trial/",
-
-            // 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}),
-
-            // expect JSON data in return (e.g. Flask jsonify)
-            dataType: "json",
-
-            // handle response
-            success: function(response) {
-                console.log(response);
-            },
-            error: function(err) {
-              PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
-              ShowPopUp();
-            }
-          }).done(function(data){
-            spreadsheetURL=data[0];
-            var backimg=document.getElementById('backgroundimg');
-            var rightside=document.getElementById('rightside');
-            document.getElementById("loading").hidden = true;
-            document.getElementById('duplicater').removeAttribute('hidden');
-            document.getElementById('doneebackground').removeAttribute('hidden');
-            document.getElementById('summarytoXML').removeAttribute('hidden');
-            document.getElementById('measureADRbutton').removeAttribute('disabled');
-            document.getElementById('measureADRbutton').style.cursor='pointer';
-            document.getElementById('measureADRbutton').style.color = 'white';
-            document.getElementById('measureADRbutton').style.backgroundColor="#16c72e";
-
-            document.getElementById('measureADRbutton').addEventListener('mouseover',function(){
-              document.getElementById('measureADRbutton').style.color='black';
-              document.getElementById('measureADRbutton').style.boxShadow=' 0 0 8px 2px #16c72e';
-            })
-
-            document.getElementById('measureADRbutton').addEventListener('mouseout',function(){
-              document.getElementById('measureADRbutton').style.color='white';
-              document.getElementById('measureADRbutton').style.boxShadow='none';
-            });
-
-            var legendbutton= document.createElement("button");
-            legendbutton.className='measureADRbutton2';
-            legendbutton.innerText='Legend and Data created';
-            legendbutton.style.backgroundColor='rgb(5, 43, 235)';
-            legendbutton.addEventListener('mouseover',function(){
-              legendbutton.style.boxShadow='0 0 8px 2px rgb(5, 43, 235)';
-            })
-            legendbutton.addEventListener('mouseout',function(){
-              legendbutton.style.boxShadow='none';
-            })
+//   else{
+//   $.ajax({
+//             type: "POST",
+//             url: "/2.1Trial/",
+
+//             // 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}),
+
+//             // expect JSON data in return (e.g. Flask jsonify)
+//             dataType: "json",
+
+//             // handle response
+//             success: function(response) {
+//                 console.log(response);
+//             },
+//             error: function(err) {
+//               PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+//               ShowPopUp();
+//             }
+//           }).done(function(data){
+//             spreadsheetURL=data[0];
+//             var backimg=document.getElementById('backgroundimg');
+//             var rightside=document.getElementById('rightside');
+//             document.getElementById("loading").hidden = true;
+//             document.getElementById('duplicater').removeAttribute('hidden');
+//             document.getElementById('doneebackground').removeAttribute('hidden');
+//             document.getElementById('summarytoXML').removeAttribute('hidden');
+//             document.getElementById('measureADRbutton').removeAttribute('disabled');
+//             document.getElementById('measureADRbutton').style.cursor='pointer';
+//             document.getElementById('measureADRbutton').style.color = 'white';
+//             document.getElementById('measureADRbutton').style.backgroundColor="#16c72e";
+
+//             document.getElementById('measureADRbutton').addEventListener('mouseover',function(){
+//               document.getElementById('measureADRbutton').style.color='black';
+//               document.getElementById('measureADRbutton').style.boxShadow=' 0 0 8px 2px #16c72e';
+//             })
+
+//             document.getElementById('measureADRbutton').addEventListener('mouseout',function(){
+//               document.getElementById('measureADRbutton').style.color='white';
+//               document.getElementById('measureADRbutton').style.boxShadow='none';
+//             });
 
-            legendbutton.addEventListener('click',function(){
-              window.open( spreadsheetURL);
+//             var legendbutton= document.createElement("button");
+//             legendbutton.className='measureADRbutton2';
+//             legendbutton.innerText='Legend and Data created';
+//             legendbutton.style.backgroundColor='rgb(5, 43, 235)';
+//             legendbutton.addEventListener('mouseover',function(){
+//               legendbutton.style.boxShadow='0 0 8px 2px rgb(5, 43, 235)';
+//             })
+//             legendbutton.addEventListener('mouseout',function(){
+//               legendbutton.style.boxShadow='none';
+//             })
+
+//             legendbutton.addEventListener('click',function(){
+//               window.open( spreadsheetURL);
           
-            })
-            underimg.append(legendbutton);
+//             })
+//             underimg.append(legendbutton);
 
-          })
+//           })
+
+// }
 
-}
 }
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
@@ -2136,6 +2094,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=='Wall' ) || (inputs1.value=='Column' ) ) & (!selections1.value))//& (selections.value.startsWith('Pile') || !selections.value )) || (inputs.children[0].value=='pile caps'  & (selections.value.startsWith('Ground') || !selections.value )))
+        {  //1.0
+        selections1.innerHTML='';
+
+
             for (let m=0;m<MCTNames.length;m++)
             {
               var opt0 = document.createElement("OPTION") ;
@@ -2276,6 +2250,20 @@ function get3rddropdown(){
         selections.add(opt0);
       }
 
+   }
+   if(( (inputs.value=='Wall' ) || (inputs.value=='Column' ) ) & (!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);
+      }
+
    }
    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 )))
    {
@@ -2961,7 +2949,22 @@ function chooseFirstdrpdwn()
     optn1.value= "Double Door";
     inputs.add(optn1);
     }
-
+    if (section.value.startsWith('2.1'))
+    {
+    var opt = document.createElement("OPTION");
+    opt.text= 'Select';
+    opt.value= "";
+    opt.hidden=true;
+    inputs.add(opt);
+    var optn = document.createElement("OPTION");
+    optn.text= 'Column';
+    optn.value= "Column";
+    inputs.add(optn);
+    var optn1 = document.createElement("OPTION");
+    optn1.text= 'Wall';
+    optn1.value= "Wall";
+    inputs.add(optn1);
+    }
 
 $(inputs).select2({
   
@@ -3203,7 +3206,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.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.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';