Remove Approached Missions

dist/autoloader.js

@@ -1,4 +1,4 @@
-/*Generated on:Fri Jan 11 2019 03:10:43 GMT+0100 (CET)*/
+/*Generated on:Fri Jan 11 2019 03:35:35 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();

dist/autoloaderV2.js

@@ -1,4 +1,4 @@
-/*Generated on:Fri Jan 11 2019 03:10:43 GMT+0100 (CET)*/
+/*Generated on:Fri Jan 11 2019 03:35:35 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -17249,10 +17249,10 @@ class AutomaticDispose {
                 self.GetAvailableMissions()
                 self.IndexPage()
                 setInterval(self.CollectRescueSprechwuensche.bind(self), 3500);
-                setInterval(self.OpenNextRescueSprechwunsch.bind(self), 1000);
+                setInterval(self.OpenNextRescueSprechwunsch.bind(self), 2000);
                 self.CollectRescueSprechwuensche();
                 setInterval(self.CollectPoliceSprechwuensche.bind(self), 3500);
-                setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 1000);
+                setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 2000);
                 self.CollectPoliceSprechwuensche();
 
                 setTimeout(() => {
@@ -17376,7 +17376,7 @@ class AutomaticDispose {
                                     $("#adis-sprechwunsch-rescue-frame").attr("src", "");
                                     $("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", "empty");
                                 });
-                            }, 1500);
+                            }, 2500);
                         }
                     });
                 });
@@ -17566,7 +17566,7 @@ class AutomaticDispose {
                                     $("#adis-sprechwunsch-police-frame").attr("src", "");
                                     $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
                                 });
-                            }, 1500, MissionID);
+                            }, 2500, MissionID);
                         }
                     });
                 });
@@ -17590,11 +17590,12 @@ class AutomaticDispose {
 
 
     Check_Call_Police_Active() {
+        let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
         if ($('#h2_prisoners').length > 0) {
+            console.log('Check_Call_Police_Active', MissionID);
             this.Collect_Jails();
         } else {
-            let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
-            // console.log('Check_Call_Police_Active', MissionID)
+            console.log('REMOVE: Check_Call_Police_Active', MissionID);
             this.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
                 $("#adis-sprechwunsch-police-frame").attr("src", "");
                 $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
@@ -17748,6 +17749,7 @@ class AutomaticDispose {
         });
 
         self.Jails.reverse();
+        console.log(self.Jails)
         if (self.Jails.length > 0) {
             self.Send_Vehicle_To_Jail()
         } else {
@@ -17784,6 +17786,7 @@ class AutomaticDispose {
 
     // Gefängnis einlieferung
     Send_Vehicle_To_Jail() {
+        console.log("Send_Vehicle_To_Jail")
         var JailHref = this.Jails[0].href
         document.location.href = document.location.origin + JailHref;
     }
@@ -18250,7 +18253,7 @@ class AutomaticDispose {
                         if (count > 0) {
                             return Missions.each((MyMission) => {
                                 var MissionElement = $("#mission_" + MyMission.missionID);
-                                if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
+                                if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) {
                                     // remove
                                     //console.log("Remove :", MyMission)
                                     self.RemoveMissionsFromQueue(MyMission.missionID)
@@ -18484,10 +18487,8 @@ class AutomaticDispose {
                                     //     $('#' + runnerIframe).attr("mission_id", 'empty');
                                     //     setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
                                     // })
-                                } else {
-                                    // only while
-                                    // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
-                                }
+                                } 
+                                return;
                             });
                         } else {
                             return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
@@ -18513,7 +18514,7 @@ class AutomaticDispose {
         const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
         self.MyRunner = self.ADisSettings.runner[runnerID];
         self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
-        setTimeout(function () {
+        //setTimeout(function () {
             self.MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
             var help_el = $('a#mission_help');
             if (help_el.length > 0) {
@@ -18572,7 +18573,7 @@ class AutomaticDispose {
                 })
             })
             // }
-        }, 500);
+        //}, 500);
     }
 
 

src/autoloaderV2.js

@@ -129,10 +129,10 @@ class AutomaticDispose {
                 self.GetAvailableMissions()
                 self.IndexPage()
                 setInterval(self.CollectRescueSprechwuensche.bind(self), 3500);
-                setInterval(self.OpenNextRescueSprechwunsch.bind(self), 1000);
+                setInterval(self.OpenNextRescueSprechwunsch.bind(self), 2000);
                 self.CollectRescueSprechwuensche();
                 setInterval(self.CollectPoliceSprechwuensche.bind(self), 3500);
-                setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 1000);
+                setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 2000);
                 self.CollectPoliceSprechwuensche();
 
                 setTimeout(() => {
@@ -256,7 +256,7 @@ class AutomaticDispose {
                                     $("#adis-sprechwunsch-rescue-frame").attr("src", "");
                                     $("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", "empty");
                                 });
-                            }, 1500);
+                            }, 2500);
                         }
                     });
                 });
@@ -446,7 +446,7 @@ class AutomaticDispose {
                                     $("#adis-sprechwunsch-police-frame").attr("src", "");
                                     $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
                                 });
-                            }, 1500, MissionID);
+                            }, 2500, MissionID);
                         }
                     });
                 });
@@ -470,11 +470,12 @@ class AutomaticDispose {
 
 
     Check_Call_Police_Active() {
+        let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
         if ($('#h2_prisoners').length > 0) {
+            console.log('Check_Call_Police_Active', MissionID);
             this.Collect_Jails();
         } else {
-            let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
-            // console.log('Check_Call_Police_Active', MissionID)
+            console.log('REMOVE: Check_Call_Police_Active', MissionID);
             this.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
                 $("#adis-sprechwunsch-police-frame").attr("src", "");
                 $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
@@ -628,6 +629,7 @@ class AutomaticDispose {
         });
 
         self.Jails.reverse();
+        console.log(self.Jails)
         if (self.Jails.length > 0) {
             self.Send_Vehicle_To_Jail()
         } else {
@@ -664,6 +666,7 @@ class AutomaticDispose {
 
     // Gefängnis einlieferung
     Send_Vehicle_To_Jail() {
+        console.log("Send_Vehicle_To_Jail")
         var JailHref = this.Jails[0].href
         document.location.href = document.location.origin + JailHref;
     }
@@ -896,7 +899,7 @@ class AutomaticDispose {
                         if (count > 0) {
                             return Missions.each((MyMission) => {
                                 var MissionElement = $("#mission_" + MyMission.missionID);
-                                if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
+                                if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) {
                                     // remove
                                     //console.log("Remove :", MyMission)
                                     self.RemoveMissionsFromQueue(MyMission.missionID)
@@ -1130,10 +1133,8 @@ class AutomaticDispose {
                                     //     $('#' + runnerIframe).attr("mission_id", 'empty');
                                     //     setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
                                     // })
-                                } else {
-                                    // only while
-                                    // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
-                                }
+                                } 
+                                return;
                             });
                         } else {
                             return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
@@ -1159,7 +1160,7 @@ class AutomaticDispose {
         const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
         self.MyRunner = self.ADisSettings.runner[runnerID];
         self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
-        setTimeout(function () {
+        //setTimeout(function () {
             self.MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
             var help_el = $('a#mission_help');
             if (help_el.length > 0) {
@@ -1218,7 +1219,7 @@ class AutomaticDispose {
                 })
             })
             // }
-        }, 500);
+        //}, 500);
     }