Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -1228,6 +1228,8 @@ var ratioPunit=1;
               value=document.getElementById('selectunitP').value
               if (value=='mm'){
                 ratioPunit=1000;
+                // if (projsec.value.startsWith('3.2'))
+                //   ratioPunit=100;
               }
               else
                 ratioPunit=1;
@@ -1437,6 +1439,8 @@ function getData(form) {
                 spreadsheetId=data[3];
                 spreadsheetURL=data[4];
                 list1= data[5]
+
+                
             }
             if (formvalues['selectprojs'].startsWith('2.2'))
               {
@@ -1535,199 +1539,114 @@ function getData(form) {
             pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs'])
             var rightsideids=[];
           
-if (formvalues['selectprojs'].startsWith('1.0') )// || formvalues['selectprojs'].startsWith('3.2')  )
-{
-  // Set the interval in milliseconds
-const interval = 10000;
+if (formvalues['selectprojs'].startsWith('1.0')  || formvalues['selectprojs'].startsWith('3.2')  )
+{// Set the interval in milliseconds
+const interval = 30000;
+const initialDelay = 0;
+console.log('Starting first AJAX request...');
+let delrows1=0; // Define delrows1 in a broader scope
+let delrows2=0; // Define delrows1 in a broader scope
+
+
+        // First AJAX request
+        $.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']
+            }),
+            dataType: "json",
+            // handle response
+            success: function(data1) {
+              delrows1 = data1[0];
+              console.log('First AJAX response received:', JSON.stringify(delrows1));
+
+            },
+            error: function(err) {
+              PopupElement.textContent='Error occured. Refresh and try again. If the error continues, please contact the ADR team to fix it. ';
+              ShowPopUp();
+            }
+          })
 
+        
 // Function to handle the delay
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 // Function to perform AJAX requests and compare data
-function fetchAndCompareData() {
-    // First AJAX request
-    $.ajax({
-        type: "POST",
-        url: "/_submission",
-        contentType: "application/json",
-        data: JSON.stringify({
-            dict1: JSON.stringify(list1),
-            spreadsheetId: spreadsheetId,
-            pdfpathpath: JSON.stringify(pdfpath),
-            path: Object.fromEntries(formData)['measureselectname']
-        }),
-        dataType: "json",
-        success:  function(data1) {
-            // if (data1.length > 0) {
-                const delrows1 = data1[0];
-                if(data1.length >0)
-                {
-                // Wait for the delay
-                delay(10000);
+async function fetchAndCompareData() {
+    try {
+
+        // Second AJAX request
+        let data11 = await $.ajax({
+            type: "POST",
+            url: "/_submission",
+            contentType: "application/json",
+            data: JSON.stringify({
+                dict1: JSON.stringify(list1),
+                spreadsheetId: spreadsheetId,
+                pdfpathpath: JSON.stringify(pdfpath),
+                path: Object.fromEntries(formData)['measureselectname']
+            }),
+            dataType: "json"
+        });
 
-                // Second AJAX request
-                $.ajax({
+        delrows2 = data11[0];
+        console.log('Second AJAX response received:', JSON.stringify(delrows2));
+
+        // Compare the data
+        if (JSON.stringify(delrows1) === JSON.stringify(delrows2)) 
+          console.log('same')
+        else{
+            console.log('Differences found:', delrows1, delrows2);
+            if (confirm("Changes have been made in the markups. Would you like to save and view them in the legend?")) {
+                delrows1=delrows2
+                await $.ajax({
                     type: "POST",
-                    url: "/_submission",
+                    url: "/deletemarkupsroute",
                     contentType: "application/json",
                     data: JSON.stringify({
-                        dict1: JSON.stringify(list1),
+                        dict: JSON.stringify(SimilarAreaDictionary),
+                        deletedrows: delrows2,
+                        path: Object.fromEntries(formData)['measureselectname'],
                         spreadsheetId: spreadsheetId,
-                        pdfpathpath: JSON.stringify(pdfpath),
-                        path: Object.fromEntries(formData)['measureselectname']
+                        areaPermArr: JSON.stringify(data[7]),
+                        section: Object.fromEntries(formData)['selectprojs'],
+                        pdfpathpath: JSON.stringify(pdfpath)
                     }),
                     dataType: "json",
-                    success: function(data11) {
-                    
-                        const delrows2 = data11[0];
-                        console.log('rowssssss',delrows1,delrows2)
-                        if (JSON.stringify(delrows1) === JSON.stringify(delrows2)) {
-                            console.log('same');
-                        } else {
-                            console.log('differences found', delrows1);
-                            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",
-                                    contentType: "application/json",
-                                    data: JSON.stringify({
-                                        dict: JSON.stringify(SimilarAreaDictionary),
-                                        deletedrows: delrows1,
-                                        path: Object.fromEntries(formData)['measureselectname'],
-                                        spreadsheetId: spreadsheetId,
-                                        areaPermArr: JSON.stringify(data[7]),
-                                        section: Object.fromEntries(formData)['selectprojs'],
-                                        pdfpathpath: JSON.stringify(pdfpath)
-                                    }),
-                                    dataType: "json",
-                                    success: function(response) {
-                                        console.log('Markups updated');
-                                        delay(5000)
-                                    },
-                                    error: function(err) {
-                                        PopupElement.textContent = 'Error occurred. Refresh and try again. If the error continues, please contact the ADR team to fix it.';
-                                        ShowPopUp();
-                                    }
-                                });
-                            }
-                        }
-                    },
-                    error: function(err) {
-                        PopupElement.textContent = 'Error occurred. Refresh and try again. If the error continues, please contact the ADR team to fix it.';
-                        ShowPopUp();
-                    }
                 });
+
+                console.log('Markups updated');
+               
             }
-        },
-        error: function(err) {
-            PopupElement.textContent = 'Error occurred. Refresh and try again. If the error continues, please contact the ADR team to fix it.';
-            ShowPopUp();
-        }
-    });
+        } 
+        
+        // Wait for the delay
+        console.log(`Waiting for ${interval} ms...`);
+        await delay(interval);
+        console.log('Delay complete. Starting second AJAX request...');
+
+    } catch (err) {
+        console.error('Error occurred:', err);
+        PopupElement.textContent = 'Error occurred. Refresh and try again. If the error continues, please contact the ADR team to fix it.';
+        ShowPopUp();
+    } finally {
+        // Ensure the function is called again after the interval, whether an error occurred or not
+        setTimeout(fetchAndCompareData, interval);
+    }
 }
 
-// Set the interval to call the function
-setInterval(fetchAndCompareData, interval);
+// Initial call to the function after the initial delay
+setTimeout(fetchAndCompareData, initialDelay);
 
-} 
+}  
 
-// interval= setInterval( function() {
- 
-//   const delay = ms => new Promise(res => setTimeout(res, ms));
-//       delay(3000)
-
-//       $.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
-//                         console.log('jjjj')
-//                         if (confirm("Changes have been made in the markups. Would you like to save and view them in the legend?")) {
-// console.log('kkkkk')
-//                           $.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(4000);
-
-
-//         $.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();
-//             }
-//           })
-
-// },7000)