diff --git a/lss-manager-v3/helperfunctions.js b/lss-manager-v3/helperfunctions.js index 1cc3de9ca..3ef2c1452 100755 --- a/lss-manager-v3/helperfunctions.js +++ b/lss-manager-v3/helperfunctions.js @@ -1,80 +1,128 @@ /** * Created by Northdegree on 25.05.2017. */ -lssm.carsById = { - "0": ["LF 20", 0], - "1": ["LF 10", 0], - "2": ["DLK 23", 0], - "3": ["ELW 1", 0], - "4": ["RW", 0], - "5": ["GW-A", 0], - "6": ["LF 8/6", 0], - "7": ["LF 20/16", 0], - "8": ["LF 10/6", 0], - "9": ["LF 16-TS", 0], - "10": ["GW-Öl", 0], - "11": ["GW-L2-Wasser", 0], - "12": ["GW-Messtechnik", 0], - "13": ["SW 1000", 0], - "14": ["SW 2000", 0], - "15": ["SW 2000-Tr", 0], - "16": ["SW Kats", 0], - "17": ["TLF 2000", 0], - "18": ["TLF 3000", 0], - "19": ["TLF 8/18", 0], - "20": ["TLF 8/18", 0], - "21": ["TLF 16/24-Tr", 0], - "22": ["TLF 16/25", 0], - "23": ["TLF 16/45", 0], - "24": ["TLF 20/40", 0], - "25": ["TLF 20/40-SL", 0], - "26": ["TLF 16", 0], - "27": ["GW-Gefahrgut", 0], - "28": ["RTW", 1], - "29": ["NEF", 1], - "30": ["HLF 20", 0], - "31": ["RTH", 1], - "32": ["FuStW", 2], - "33": ["GW-Höhenrettung", 0], - "34": ["ELW 2", 0], - "35": ["leBefKw", 2], - "36": ["MTW", 0], - "37": ["TSF-W", 0], - "38": ["KTW", 1], - "39": ["GKW", 3], - "40": ["MTW-TZ", 3], - "41": ["MzKW", 3], - "42": ["LKW K 9", 3], - "43": ["BRmG R", 3], - "44": ["Anh DLE", 3], - "45": ["MLW 5", 3], - "46": ["WLF", 0], - "47": ["AB-Rüst", 0], - "48": ["AB-Atemschutz", 0], - "49": ["AB-Öl", 0], - "50": ["GruKw", 2], - "51": ["FüKw", 2], - "52": ["GefKw", 2], - "53": ["Dekon-P", 0], - "54": ["AB-Dekon-P", 0], - "55": ["KdoW-LNA", 1], - "56": ["KdoW-Orgl", 1], - "57": ["FwK", 0], - "58": ["KTW Typ B", 1], - "59": ["ELW 1 (SEG)", 1], - "60": ["GW-San", 1], - "61": ["Polizeihubschrauber", 2], - "62": ["AB-Schlauch", 0], - "63": ["GW-Taucher", 4], - "64": ["GW-Wasserrettung", 4], - "65": ["LKW 7 Lkr 19 tm", 4], - "66": ["Anh MzB", 4], - "67": ["Anh SchlB", 4], - "68": ["Anh MzAB", 4], - "69": ["Tauchkraftwagen", 4], - "70": ["MZB", 4], - "71": ["AB-MZB", 4], -}; +// 0 = Feuerwehr +// 1 = Rettungsdienst +// 2 = Polizei +// 3 = THW +// 4 = Wasserrettung +if(I18n.locale == "nl") + lssm.carsById = { + "0": ["SIV | Snel Interventie Voertuig", 0], + "1": ["TS 8/9 | Tankautospuit (8/9 personen)", 0], + "2": ["AL | Autoladder", 0], + "3": ["DA-OVD-B | Officier van Dienst Brandweer", 0], + "4": ["HV-G | Hulpverleningsvoertuig Groot", 0], + "5": ["AB | Adembeschermingsvoertuig", 0], + "6": ["TST 8/9 | Tankautospuit Terreinvaardig (8/9 personen)", 0], + "7": ["TST 6/7 | Tankautospuit Terreinvaardig (6/7 personen)", 0], + "8": ["TST 4 | Tankautospuit Terreinvaardig (4 personen)", 0], + "9": ["TS 4 | Tankautospuit (4 personen)", 0], + "10": ["SL | Slangenwagen", 0], + "11": ["WvD | Waarschuwings- en Verkenningsdienst", 0], + "12": ["TST-NBB 8/9 | Tankautospuit Natuurbrandbestrijding (8/9 personen)", 0], + "13": ["TS8 (4x4)", 0], + "14": ["TST-NBB 6/7 | Tankautospuit Natuurbrandbestrijding (6/7 personen)", 0], + "15": ["TST-NBB 4 | Tankautospuit Natuurbrandbestrijding (4 personen)", 0], + "16": ["Ambulance", 1], + "17": ["TS 6/7 | Tankautospuit (6/7 personen)", 0], + "18": ["HW | Hoogwerker", 0], + "19": ["DA-HOvD-B | Hoofd Officier van Dienst", 0], + "20": ["DA | Dienstauto (4 personen)", 0], + "21": ["DB | Dienstbus (9 personen)", 0], + "22": ["DA NOODHULP | Dienstauto Noodhulp", 2], + "23": ["Lifeliner", 1], + "24": ["AGS | Adviseur Gevaarlijke Stoffen", 0], + "25": ["DB Noodhulp | Dienstbus Noodhulp", 2], + "26": ["HA | Haakarmvoertuig", 0], + "27": ["ABH | Adembeschermingshaakarmbak", 0], + "28": ["Politiehelikopter", 2], + "29": ["WTH | Watertransporthaakarmbak", 0], + "30": ["Zorgambulance | B-ambulance", 1], + "31": ["CO | Commandovoertuig", 0], + "32": ["COH | Commandohaakarmbak", 0], + "33": ["WO | Waterongevallenvoertuig", 0], + "34": ["TW | Tankwagen", 0], + "35": ["OVD-P | Officier van Dienst - Politie", 2], + "36": ["WOA | Waterongevallenaanhanger", 0], + "37": ["MMT-Auto", 1] + } +else + lssm.carsById = { + "0": ["LF 20", 0], + "1": ["LF 10", 0], + "2": ["DLK 23", 0], + "3": ["ELW 1", 0], + "4": ["RW", 0], + "5": ["GW-A", 0], + "6": ["LF 8/6", 0], + "7": ["LF 20/16", 0], + "8": ["LF 10/6", 0], + "9": ["LF 16-TS", 0], + "10": ["GW-Öl", 0], + "11": ["GW-L2-Wasser", 0], + "12": ["GW-Messtechnik", 0], + "13": ["SW 1000", 0], + "14": ["SW 2000", 0], + "15": ["SW 2000-Tr", 0], + "16": ["SW Kats", 0], + "17": ["TLF 2000", 0], + "18": ["TLF 3000", 0], + "19": ["TLF 8/18", 0], + "20": ["TLF 8/18", 0], + "21": ["TLF 16/24-Tr", 0], + "22": ["TLF 16/25", 0], + "23": ["TLF 16/45", 0], + "24": ["TLF 20/40", 0], + "25": ["TLF 20/40-SL", 0], + "26": ["TLF 16", 0], + "27": ["GW-Gefahrgut", 0], + "28": ["RTW", 1], + "29": ["NEF", 1], + "30": ["HLF 20", 0], + "31": ["RTH", 1], + "32": ["FuStW", 2], + "33": ["GW-Höhenrettung", 0], + "34": ["ELW 2", 0], + "35": ["leBefKw", 2], + "36": ["MTW", 0], + "37": ["TSF-W", 0], + "38": ["KTW", 1], + "39": ["GKW", 3], + "40": ["MTW-TZ", 3], + "41": ["MzKW", 3], + "42": ["LKW K 9", 3], + "43": ["BRmG R", 3], + "44": ["Anh DLE", 3], + "45": ["MLW 5", 3], + "46": ["WLF", 0], + "47": ["AB-Rüst", 0], + "48": ["AB-Atemschutz", 0], + "49": ["AB-Öl", 0], + "50": ["GruKw", 2], + "51": ["FüKw", 2], + "52": ["GefKw", 2], + "53": ["Dekon-P", 0], + "54": ["AB-Dekon-P", 0], + "55": ["KdoW-LNA", 1], + "56": ["KdoW-Orgl", 1], + "57": ["FwK", 0], + "58": ["KTW Typ B", 1], + "59": ["ELW 1 (SEG)", 1], + "60": ["GW-San", 1], + "61": ["Polizeihubschrauber", 2], + "62": ["AB-Schlauch", 0], + "63": ["GW-Taucher", 4], + "64": ["GW-Wasserrettung", 4], + "65": ["LKW 7 Lkr 19 tm", 4], + "66": ["Anh MzB", 4], + "67": ["Anh SchlB", 4], + "68": ["Anh MzAB", 4], + "69": ["Tauchkraftwagen", 4], + "70": ["MZB", 4], + "71": ["AB-MZB", 4], + }; + lssm.car_list = function(building) { // liefert die Fahrzeuge einer Wache zurück var data = []; diff --git a/lss-manager-v3/lss-manager-v3.dev.js b/lss-manager-v3/lss-manager-v3.dev.js index 62829f472..fd3fc1243 100755 --- a/lss-manager-v3/lss-manager-v3.dev.js +++ b/lss-manager-v3/lss-manager-v3.dev.js @@ -5,7 +5,7 @@ //███████╗███████║███████║....██║.╚═╝.██║██║..██║██║.╚████║██║..██║╚██████╔╝███████╗██║..██║ //╚══════╝╚══════╝╚══════╝....╚═╝.....╚═╝╚═╝..╚═╝╚═╝..╚═══╝╚═╝..╚═╝.╚═════╝.╚══════╝╚═╝..╚═╝ - +I18n.locale = "nl"; /** * Tell jQuery to allow caching beforehand! */ diff --git a/modules/lss-dashboard/dashboard.html b/modules/lss-dashboard/dashboard.html index d8cd2478f..89b52c456 100755 --- a/modules/lss-dashboard/dashboard.html +++ b/modules/lss-dashboard/dashboard.html @@ -1,15 +1,7 @@
-
- Feuerwehr - Rettungswache - Polizei - THW - Schulen - Sonstiges - -
+
diff --git a/modules/lss-dashboard/dashboard.user.js b/modules/lss-dashboard/dashboard.user.js index 938fdbebe..9c3ccddfa 100755 --- a/modules/lss-dashboard/dashboard.user.js +++ b/modules/lss-dashboard/dashboard.user.js @@ -16,6 +16,7 @@ I18n.translations.de['lssm']['dashboard'] = { ge: 'Gebäude', school: 'Schulen', wachen: 'Wachen', + other: 'Sonstige', anz: 'Anzahl', categories: ['Feuerwehr', 'Rettungsdienst', 'Polizei', 'THW', 'Krankenhaus', 'Wasserrettung', 'SEG', 'Bereitschaftspolizei'], categories_data: ['fw', 'rd', 'pol', 'thw', 'kh', 'wret', 'seg','bepo'], @@ -40,6 +41,7 @@ I18n.translations.en['lssm']['dashboard'] = { ge: 'Buildings', school: 'Schools', wachen: 'Station', + other: 'Other', anz: 'Amount', categories: ['Firefighter', 'Rescue', 'Police', 'Hospital'], categories_data: ['fw', 'rd', 'pol', 'kh'], @@ -151,12 +153,16 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) { {'data': [], 'total': 0}]; // Go through all cars and put them where they belong $.each(lssm.car_list_all(), function (key, veh) { - var c = lssm.carsById[veh.type][1]; - cars[c].total += 1; - if (typeof (cars[c].data[veh.type]) !== 'undefined') { - cars[c].data[veh.type].y += 1; - } else { - cars[c].data[veh.type] = {name: lssm.carsById[veh.type][0], y: 1}; + var c = ["Undefined", 0]; + if (veh.type in lssm.carsById) + c = lssm.carsById[veh.type][1]; + if (c in cars) { + cars[c].total += 1; + if (typeof (cars[c].data[veh.type]) !== 'undefined') { + cars[c].data[veh.type].y += 1; + } else { + cars[c].data[veh.type] = {name: c[0], y: 1}; + } } }); // Remove unused keys @@ -318,7 +324,9 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) { var cars = {}; var total = {'free': 0, 'miss': 0, 'fms5': 0, 'fms6': 0, 'sum': 0}; $.each(lssm.car_list_all(), function (key, veh) { - var type = lssm.carsById[veh.type][0]; + var type = 0 + if (veh.type in lssm.carsById) + type = lssm.carsById[veh.type][0]; if (typeof cars[type] == 'undefined') { cars[type] = {'free': 0, 'miss': 0, 'fms5': 0, 'fms6': 0, 'sum': 0}; } @@ -448,6 +456,16 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) { $('#dashboard_buttons').append('' + I18n.t('lssm.dashboard.name') + '') .append('' + I18n.t('lssm.dashboard.vehicles.name') + '') .append('' + I18n.t('lssm.dashboard.station_plan') + ''); + + $('#wp_sub').append(''+I18n.t('lssm.dashboard.categories')[0]+'') + .append(''+I18n.t('lssm.dashboard.categories')[1]+'') + .append(''+I18n.t('lssm.dashboard.categories')[2]+''); + if(I18n.locale == "de") + $('#wp_sub').append('THW') + + $("#wp_sub").append(''+I18n.t('lssm.dashboard.school')+'') + .append(''+I18n.t('lssm.dashboard.other')+''); + bind_db_buttons(); curtab_db = "#db_main_outer"; curtab_wp = "#wp_fw";