Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -86,7 +86,7 @@
     </div> -->
     <input type="button" id="refreshAPIbutton" title="Refresh data retrieved from MC" value="Refresh data retrieved from MC ">
       <div id ="">
-          <select name="selectproj" class="selectionsProj" id="selectionsProjid" onchange=getproj() required  >     </select>
+          <select name="selectproj" class="selectionsProj" id="selectionsProjid"  required  >     </select>
       </div>
   
       <div id ="projectpart">
@@ -94,7 +94,7 @@
       </div>
   
       <div id ="projectsection">
-          <select name="selectprojs" class="selectionsProjs" onchange=getALLMCTNAMES() required>   </select>
+          <select name="selectprojs" class="selectionsProjs" onchange=getproj() required>   </select>
       </div>
 
   
@@ -679,6 +679,7 @@ function getALLMCTNAMES(){
   document.getElementById("all").style.display = "block";
 $.get( '/RetrieveMCTNames/')
   .success (function(data){
+    // document.getElementById("all").style.display = "none";
     console.log(data)
     MCTNames=data;
     sectionNumber=thirddropdown.value
@@ -939,7 +940,7 @@ var ratioPunit=1;
 //___________________________________________________________________________________________________________
   //Retrieves list of projects  
   function getproj(){
-    // getALLMCTNAMES();
+    getALLMCTNAMES();
     
     var proj = document.getElementsByClassName("selectionsProj")[0];
     var projectVal=proj.value.toString() //selected project
@@ -952,6 +953,7 @@ var ratioPunit=1;
      
     $.get( '/getmethod/'+JSON.stringify(projectVal))
     .success (function(data){
+
     document.getElementById("all").style.display = "none";
 
       console.log(data[0],data[1])
@@ -1412,63 +1414,97 @@ interval= setInterval( function() {
  
   const delay = ms => new Promise(res => setTimeout(res, ms));
       delay(3000)
-      $.getJSON('/_submission', {
-            
-            // dict: JSON.stringify(SimilarAreaDictionary),
-            dict1: JSON.stringify(list1),
-            spreadsheetId:spreadsheetId,
-            pdfpathpath:JSON.stringify(pdfpath),
-            path:Object.fromEntries(formData)['measureselectname'],
-      
-        },function(data1){
- 
-          if(data1.length >0){
-          delrows1=data1[0];
-          console.log(data1, delrows1,delrows2)
-          console.log(typeof delrows1)
-          console.log(typeof delrows2)
-          if (JSON.stringify(delrows1)=== JSON.stringify(delrows2))
-          {
-           console.log('same')
-          }
-          else{
-            // if (data1[0]==1){
-              // return data1[0];
-             flag=1
-              if (confirm("Changes have been made in the markups. Would you like to save and view them in the legend?")) {
-        
-              
-              $.getJSON('/deletemarkupsroute', {
-                  dict: JSON.stringify(SimilarAreaDictionary),
-                  deletedrows: JSON.stringify(delrows1),
-                  path:Object.fromEntries(formData)['measureselectname'],
-                  spreadsheetId:spreadsheetId,
-                  areaPermArr:  JSON.stringify(data[7]),
-                  section: Object.fromEntries(formData)['selectprojs'],
-                  pdfpathpath:JSON.stringify(pdfpath),
-                  
-                  
-          
-                  }, function(data2){
-                      console.log(data2)
-                  })
-              }
-           }
-        }
-        });
-      
+
+      $.ajax({
+            type: "POST",
+            url: "/_submission",
+            // set content type header to use Flask response.get_json()
+            contentType: "application/json",
+            // convert data/object to JSON to send
+            data: JSON.stringify({dict1: JSON.stringify(list1),
+                                  spreadsheetId:spreadsheetId,
+                                  pdfpathpath:JSON.stringify(pdfpath),
+                                  path:Object.fromEntries(formData)['measureselectname']}),
+            // expect JSON data in return (e.g. Flask jsonify)
+            dataType: "json",
+            // handle response
+            success: function(data1){
+                    
+                    if(data1.length >0){
+                    delrows1=data1[0];
+                    console.log(data1, delrows1,delrows2)
+                    console.log(typeof delrows1)
+                    console.log(typeof delrows2)
+                    if (JSON.stringify(delrows1)=== JSON.stringify(delrows2))
+                    {
+                      console.log('same')
+                    }
+                    else{
+                      // if (data1[0]==1){
+                        // return data1[0];
+                        flag=1
+                        if (confirm("Changes have been made in the markups. Would you like to save and view them in the legend?")) {
+
+                          $.ajax({
+                                type: "POST",
+                                url: "/deletemarkupsroute",
+                                // set content type header to use Flask response.get_json()
+                                contentType: "application/json",
+                                // convert data/object to JSON to send
+                                data: JSON.stringify({ dict: JSON.stringify(SimilarAreaDictionary),
+                                                        deletedrows: JSON.stringify(delrows1),
+                                                        path:Object.fromEntries(formData)['measureselectname'],
+                                                        spreadsheetId:spreadsheetId,
+                                                        areaPermArr:  JSON.stringify(data[7]),
+                                                        section: Object.fromEntries(formData)['selectprojs'],
+                                                        pdfpathpath:JSON.stringify(pdfpath),}),
+                                // expect JSON data in return (e.g. Flask jsonify)
+                                dataType: "json",
+                                // handle response
+                                success: function(response) {
+                                  console.log(data2)
+                                },
+                                error: function(err) {
+                                  PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+                                  ShowPopUp();
+                                }
+                              })
+
+                        }
+                      }
+                    }
+                    },
+            error: function(err) {
+              PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+              ShowPopUp();
+            }
+          })
+     
         delay(6000);
-        $.getJSON('/_submission', {
-            // dict: JSON.stringify(SimilarAreaDictionary),
-            dict1: JSON.stringify(list1),
-            spreadsheetId:spreadsheetId,
-            pdfpathpath:JSON.stringify(pdfpath),
-            path:Object.fromEntries(formData)['measureselectname'],
-
-        },function(data11){
-          delrows2=data11[0];
-          
-        })
+
+
+        $.ajax({
+            type: "POST",
+            url: "/_submission",
+            // set content type header to use Flask response.get_json()
+            contentType: "application/json",
+            // convert data/object to JSON to send
+            data: JSON.stringify({dict1: JSON.stringify(list1),
+                                  spreadsheetId:spreadsheetId,
+                                  pdfpathpath:JSON.stringify(pdfpath),
+                                  path:Object.fromEntries(formData)['measureselectname']}),
+            // expect JSON data in return (e.g. Flask jsonify)
+            dataType: "json",
+            // handle response
+            success: function(data11) {
+              delrows2=data11[0];
+             },
+            error: function(err) {
+              PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+              ShowPopUp();
+            }
+          })
+
 },10000)