Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v2 autoremove finisched alerts

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-18 00:38:26 +01:00
parent 31116a7cae
commit e4ccac9966
3 changed files with 84 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Tue Dec 18 2018 00:29:40 GMT+0100 (CET)*/ /*Generated on:Tue Dec 18 2018 00:38:26 GMT+0100 (CET)*/
var AutomaticDispose_Branch = "master"; var AutomaticDispose_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
dist/autoloaderV2.js
Vendored
+30 -7
View File
@@ -1,4 +1,4 @@
/*Generated on:Tue Dec 18 2018 00:29:40 GMT+0100 (CET)*/ /*Generated on:Tue Dec 18 2018 00:38:26 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18125,7 +18125,29 @@ class AutomaticDispose {
ReadAndAddMissions(MissionID, Runner) { ReadAndAddMissions(MissionID, Runner) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
self.ADSettings().then(() => {
return self.ADisDB.ADisMissions.toCollection()
}).then((Missions) => {
if (typeof Missions !== "undefined") {
return Missions.count((count) => {
if (count > 0) {
return Missions.each((MyMission) => {
var MissionElement = $("#mission_" + MyMission.missionID);
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
// remove
console.log("Remove :", MyMission)
self.RemoveMissionsFromQueue(MyMission.missionID)
}
});
}
});
}
}).then(() => {
if (typeof MissionID != 'undefined') { if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner); return self.AddMission(MissionID, Runner);
} else { } else {
@@ -18137,6 +18159,7 @@ class AutomaticDispose {
}) })
} }
}); });
});
} }
AddMission(ID, Runner) { AddMission(ID, Runner) {
@@ -18584,37 +18607,37 @@ class AutomaticDispose {
}).then(async () => { }).then(async () => {
return await self.CollectInvolvedVehicles(); return await self.CollectInvolvedVehicles();
}).then(async () => { }).then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.CollectPatients(); return await self.CollectPatients();
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessEmergencyMedicalService() return await self.ProcessEmergencyMedicalService()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessFireDepartment() return await self.ProcessFireDepartment()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessPoliceDepartment() return await self.ProcessPoliceDepartment()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessTechnicalEmergencyService() return await self.ProcessTechnicalEmergencyService()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessWaterRescue() return await self.ProcessWaterRescue()
src/autoloaderV2.js
+29 -6
View File
@@ -884,7 +884,29 @@ class AutomaticDispose {
ReadAndAddMissions(MissionID, Runner) { ReadAndAddMissions(MissionID, Runner) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
self.ADSettings().then(() => {
return self.ADisDB.ADisMissions.toCollection()
}).then((Missions) => {
if (typeof Missions !== "undefined") {
return Missions.count((count) => {
if (count > 0) {
return Missions.each((MyMission) => {
var MissionElement = $("#mission_" + MyMission.missionID);
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
// remove
console.log("Remove :", MyMission)
self.RemoveMissionsFromQueue(MyMission.missionID)
}
});
}
});
}
}).then(() => {
if (typeof MissionID != 'undefined') { if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner); return self.AddMission(MissionID, Runner);
} else { } else {
@@ -896,6 +918,7 @@ class AutomaticDispose {
}) })
} }
}); });
});
} }
AddMission(ID, Runner) { AddMission(ID, Runner) {
@@ -1343,37 +1366,37 @@ class AutomaticDispose {
}).then(async () => { }).then(async () => {
return await self.CollectInvolvedVehicles(); return await self.CollectInvolvedVehicles();
}).then(async () => { }).then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.CollectPatients(); return await self.CollectPatients();
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessEmergencyMedicalService() return await self.ProcessEmergencyMedicalService()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessFireDepartment() return await self.ProcessFireDepartment()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessPoliceDepartment() return await self.ProcessPoliceDepartment()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessTechnicalEmergencyService() return await self.ProcessTechnicalEmergencyService()
}) })
.then(async () => { .then(async () => {
if (self.MyRunner == 'os' && self.Vehicles.length > 0){ if (self.MyRunner == 'os' && self.Vehicles.length > 0) {
return return
} }
return await self.ProcessWaterRescue() return await self.ProcessWaterRescue()