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

ap0v

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 20:40:35 +01:00
parent fbee0fb7bc
commit 6df1a30681
3 changed files with 62 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+31 -33
View File
@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 20:31:15 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 20:40:34 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();
@@ -5423,39 +5423,39 @@ ADisDB.on("ready", () => {
} }
function AD_StartAlarmProcess() { function AD_StartAlarmProcess() {
console.log(" Automatic Dispose: Starte Alarmierungsprozess");
setTimeout(function () { setTimeout(function () {
Promise.resolve().then(async () => { Promise.resolve().then(async () => {
return await ADis_PrepareVehicleNeedList(); return await ADis_PrepareVehicleNeedList();
}).then(async () => { }).then(async () => {
return await ADis_CollectInvolvedVehicles(); return await ADis_CollectInvolvedVehicles();
}).then(async () => { }).then(async () => {
return await ADis_CollectPatients(); return await ADis_CollectPatients();
})
.then(async () => {
return await Promise.all([
ADis_ProcessEmergencyMedicalService(),
ADis_ProcessFireDepartment(),
ADis_ProcessPoliceDepartment(),
ADis_ProcessTechnicalEmergencyService(),
ADis_ProcessWaterRescue(),
]).then((result) => {
var updateData = {
last_check: CurrentTime,
next_check: CurrentTime + 60
};
tellParent(`
console.log('ok:${window.name}:${MissionID}');
ADis_MissionUpdateDone('${window.name}', '${MissionID}');
`);
if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) {
setTimeout(() => {
$('#mission_alarm_btn').click();
}, 250);
}
}) })
.then(async () => { });
return await Promise.all([
ADis_ProcessEmergencyMedicalService(),
ADis_ProcessFireDepartment(),
ADis_ProcessPoliceDepartment(),
ADis_ProcessTechnicalEmergencyService(),
ADis_ProcessWaterRescue(),
]).then((result) => {
var updateData = {
last_check: CurrentTime,
next_check: CurrentTime + 60
};
tellParent("console.log('ok:"+window.name+" "+ MissionID+"');ADis_MissionUpdateDone('"+window.name+"', '"+MissionID+"');");
if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) {
setTimeout(() => {
$('#mission_alarm_btn').click();
}, 250);
}
})
});
}, 500); }, 500);
} }
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -5788,7 +5788,6 @@ ADisDB.on("ready", () => {
if (typeof MissionConfig.fire_department == "object") // Wenn der FD-Block in der Config definiert ist if (typeof MissionConfig.fire_department == "object") // Wenn der FD-Block in der Config definiert ist
{ {
console.log(ADis_VehiclesNeed);
ADis_VehiclesNeed["0"] += parseInt(MissionConfig.fire_department.num_LF); ADis_VehiclesNeed["0"] += parseInt(MissionConfig.fire_department.num_LF);
ADis_VehiclesNeed["3"] += parseInt(MissionConfig.fire_department.num_ELW_1); ADis_VehiclesNeed["3"] += parseInt(MissionConfig.fire_department.num_ELW_1);
@@ -6230,7 +6229,6 @@ ADisDB.on("ready", () => {
for (VehicleTypeID = 0; VehicleTypeID <= MaxVehicleID; VehicleTypeID++) { for (VehicleTypeID = 0; VehicleTypeID <= MaxVehicleID; VehicleTypeID++) {
ADis_CountInvolvedVehiclesOfType(VehicleTypeID); ADis_CountInvolvedVehiclesOfType(VehicleTypeID);
} }
console.log("ADis_PrepareVehicleNeedList: ok");
return true; return true;
} }
dist/standalone.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 20:31:15 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 20:40:34 GMT+0100 (CET)*/
function includesString(string1, string2) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }
script/mission/handler.js
+30 -32
View File
@@ -146,39 +146,39 @@ function AD_GetMissionConfiguration(MissionType) {
} }
function AD_StartAlarmProcess() { function AD_StartAlarmProcess() {
console.log(" Automatic Dispose: Starte Alarmierungsprozess");
setTimeout(function () { setTimeout(function () {
Promise.resolve().then(async () => { Promise.resolve().then(async () => {
return await ADis_PrepareVehicleNeedList(); return await ADis_PrepareVehicleNeedList();
}).then(async () => { }).then(async () => {
return await ADis_CollectInvolvedVehicles(); return await ADis_CollectInvolvedVehicles();
}).then(async () => { }).then(async () => {
return await ADis_CollectPatients(); return await ADis_CollectPatients();
})
.then(async () => {
return await Promise.all([
ADis_ProcessEmergencyMedicalService(),
ADis_ProcessFireDepartment(),
ADis_ProcessPoliceDepartment(),
ADis_ProcessTechnicalEmergencyService(),
ADis_ProcessWaterRescue(),
]).then((result) => {
var updateData = {
last_check: CurrentTime,
next_check: CurrentTime + 60
};
tellParent(`
console.log('ok:${window.name}:${MissionID}');
ADis_MissionUpdateDone('${window.name}', '${MissionID}');
`);
if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) {
setTimeout(() => {
$('#mission_alarm_btn').click();
}, 250);
}
}) })
.then(async () => { });
return await Promise.all([
ADis_ProcessEmergencyMedicalService(),
ADis_ProcessFireDepartment(),
ADis_ProcessPoliceDepartment(),
ADis_ProcessTechnicalEmergencyService(),
ADis_ProcessWaterRescue(),
]).then((result) => {
var updateData = {
last_check: CurrentTime,
next_check: CurrentTime + 60
};
tellParent("console.log('ok:"+window.name+" "+ MissionID+"');ADis_MissionUpdateDone('"+window.name+"', '"+MissionID+"');");
if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) {
setTimeout(() => {
$('#mission_alarm_btn').click();
}, 250);
}
})
});
}, 500); }, 500);
} }
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -511,7 +511,6 @@ function ADis_ProcessFireDepartment() {
if (typeof MissionConfig.fire_department == "object") // Wenn der FD-Block in der Config definiert ist if (typeof MissionConfig.fire_department == "object") // Wenn der FD-Block in der Config definiert ist
{ {
console.log(ADis_VehiclesNeed);
ADis_VehiclesNeed["0"] += parseInt(MissionConfig.fire_department.num_LF); ADis_VehiclesNeed["0"] += parseInt(MissionConfig.fire_department.num_LF);
ADis_VehiclesNeed["3"] += parseInt(MissionConfig.fire_department.num_ELW_1); ADis_VehiclesNeed["3"] += parseInt(MissionConfig.fire_department.num_ELW_1);
@@ -953,7 +952,6 @@ function ADis_PrepareVehicleNeedList() {
for (VehicleTypeID = 0; VehicleTypeID <= MaxVehicleID; VehicleTypeID++) { for (VehicleTypeID = 0; VehicleTypeID <= MaxVehicleID; VehicleTypeID++) {
ADis_CountInvolvedVehiclesOfType(VehicleTypeID); ADis_CountInvolvedVehiclesOfType(VehicleTypeID);
} }
console.log("ADis_PrepareVehicleNeedList: ok");
return true; return true;
} }