Skip to content

Commit

Permalink
Merge pull request #1 from LSS-Manager/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@JRH-1997
JRH-1997 committed May 26, 2020
2 parents 5f24d99 + e7e4182 commit 6a25c42
Show file tree
Hide file tree
Showing 66 changed files with 82,926 additions and 57,390 deletions.
11 changes: 7 additions & 4 deletions lss-manager-v3/helperfunctions.js
View file
Expand Up @@ -150,7 +150,7 @@ else if (I18n.locale == "es_ES")
"6": ["Camión BNP", 0],
"7": ["Camión TPP", 0],
"8": ["Coche patrulla", 2],
"9": ["Helicóptero HSR", 1],
"9": ["HEMS", 1],
"10": ["Vehículo aéreo", 0],
"11": ["Vehículo de mando móvil", 0],
"12": ["Vehículo de rescate", 0]
Expand Down Expand Up @@ -640,7 +640,7 @@ else if (I18n.locale == "fi_FI") {
"6": ["Säiliöauto", 0],
"7": ["Kemikaalitorjunta", 0],
"8": ["Partioauto", 2],
"9": ["Lääkärihelikopteri", 1]
"9": ["Lääkärihelikopteri (HEMS)", 1]
};
}
else if (I18n.locale == "nl_NL")
Expand Down Expand Up @@ -748,6 +748,7 @@ else if (I18n.locale == "de_DE")
"Führung": 30,
"Sanitätsdienst": 31,
"Wasserrettung": 32,
"Rettungshundestaffel": 33,
// THW-Erweiterungen (40-49)
"Bergungsgruppe 2": 40,
"Zugtrupp": 41,
Expand Down Expand Up @@ -779,7 +780,8 @@ else if (I18n.locale == "de_DE")
'Polizei-Sondereinheiten',
'Feuerwache (Kleinwache)',
'Polizeiwache (Kleinwache)',
'Rettungswache (Kleinwache)'
'Rettungswache (Kleinwache)',
'Rettungshundestaffel'
];

lssm.carsById = {
Expand Down Expand Up @@ -873,7 +875,8 @@ else if (I18n.locale == "de_DE")
"87": ["TLF 4000", 0],
"88": ["KLF", 0],
"89": ["MLF", 0],
"90": ["HLF 10", 0]
"90": ["HLF 10", 0],
"91": ["Rettungshundefahrzeug", 1]
};
}
lssm.getVehicleNameById = function(vehicleId) {
Expand Down
2 changes: 1 addition & 1 deletion lss-manager-v3/lss-manager-v3.dev.js
View file
Expand Up @@ -29,7 +29,7 @@ let lssm = {
stats_uri: "https://proxy.lss-manager.de/v3/stat.php",
forum_link: "https://forum.leitstellenspiel.de/index.php/Thread/11166-LSS-MANAGER-V3/",
key_link: "/profile/external_secret_key/", // Domain wo alles liegt
version: "3.3.6",
version: "3.3.7",
github: 'https://github.com/LSS-Manager/lss-manager-v3',
prefix: 'lssm',
game: window.location.hostname.toLowerCase().replace("www.",""),
Expand Down
64 changes: 61 additions & 3 deletions modules/lss-AAO-Zaehler/aao-zaehler.js
View file
@@ -1,7 +1,65 @@
/**
* @author Fabian Hassels (https://github.com/eaglefsd)
*/
(function ($) {
(function ($, I18n) {

I18n.translations.de_DE['lssm']['aaozaehler'] = {
reset: "Reset AAO-Zähler"
};
I18n.translations.en_US['lssm']['aaozaehler'] = {
reset: "Reset AAO counter"
};
I18n.translations.cs_CZ['lssm']['aaozaehler'] = {
reset: "Resetujte čítač AAO"
};
I18n.translations.pl_PL['lssm']['aaozaehler'] = {
reset: "Zresetuj licznik AAO"
};
I18n.translations.sv_SE['lssm']['aaozaehler'] = {
reset: "Återställ AAO-räknaren"
};
I18n.translations.da_DK['lssm']['aaozaehler'] = {
reset: "Nulstil AAO-tæller"
};
I18n.translations.nb_NO['lssm']['aaozaehler'] = {
reset: "Tilbakestill AAO-telleren"
};
I18n.translations.it_IT['lssm']['aaozaehler'] = {
reset: "Ripristina contatore AAO"
};
I18n.translations.tr_TR['lssm']['aaozaehler'] = {
reset: "AAO sayacını sıfırla"
};
I18n.translations.fr_FR['lssm']['aaozaehler'] = {
reset: "Réinitialiser le compteur AAO"
};
I18n.translations.ru_RU['lssm']['aaozaehler'] = {
reset: "Сброс счетчика AAO"
};
I18n.translations.uk_UA['lssm']['aaozaehler'] = {
reset: "Скинути лічильник AAO"
};
I18n.translations.es_ES['lssm']['aaozaehler'] = {
reset: "Restablecer contador AAO"
};
I18n.translations.pt_PT['lssm']['aaozaehler'] = {
reset: "Redefinir contador AAO"
};
I18n.translations.ja_JP['lssm']['aaozaehler'] = {
reset: "AAOカウンターをリセット"
};
I18n.translations.ko_KR['lssm']['aaozaehler'] = {
reset: "AAO 카운터 재설정"
};
I18n.translations.ro_RO['lssm']['aaozaehler'] = {
reset: "Resetați contorul AAO"
};
I18n.translations.fi_FI['lssm']['aaozaehler'] = {
reset: "Nollaa AAO-laskuri"
};
I18n.translations.nl_NL['lssm']['aaozaehler'] = { //AUR
reset: "AUR-teller resetten"
};
/**
* Prüft, ob die Einsatzseite geöffnet ist oder nicht.
* @return boolean true, wenn die aktuelle URL der Einsatzseite entspricht, false wenn nicht.
Expand All @@ -21,7 +79,7 @@
});

// Zähler-Reset Button
$('#mission-aao-group').after('<button id="resetAAOZaehler" class="btn btn-default btn-xs" type="button">Reset AAO-Zähler</button>');
$('#mission-aao-group').after('<button id="resetAAOZaehler" class="btn btn-default btn-xs" type="button">' + I18n.t('lssm.aaozaehler.reset') +'</button>');
// Zähler-Reset Funktion
$('#resetAAOZaehler').click(function(){$('.aaoZaehler').replaceWith(' <span class="aaoZaehler">0</span>');});
}
Expand All @@ -46,4 +104,4 @@
$('[vehicle_group_id]').bind('click', function () {
setzeAaoZaehlerHoch(this);
});
})($);
})($, I18n);
10 changes: 6 additions & 4 deletions modules/lss-RenameFZ/renameFZ.user.js
View file
Expand Up @@ -55,7 +55,8 @@
17: "Polizei-Sondereinheiten",
18: "Feuerwache (Kleinwache)",
19: "Polizeiwache (Kleinwache)",
20: "Rettungswache (Kleinwache)"
20: "Rettungswache (Kleinwache)",
21: "Rettungshundestaffel"
},
vehicleTypes: {
0: 'LF 20',
Expand Down Expand Up @@ -148,7 +149,8 @@
87: 'TLF 4000',
88: 'KLF',
89: 'MLF',
90: 'HLF 10'
90: 'HLF 10',
91: 'Rettungshundefahrzeug'
}
}
};
Expand Down Expand Up @@ -1103,7 +1105,7 @@
6: 'Camión BNP',
7: 'Camión TPP',
8: 'Coche patrulla',
9: 'Helicóptero HSR',
9: 'HEMS',
10: 'Vehículo aéreo',
11: 'Vehículo de mando móvil',
12: 'Vehículo de rescate'
Expand Down Expand Up @@ -1494,7 +1496,7 @@
6: 'Säiliöauto',
7: 'Kemikaalitorjunta',
8: 'Partioauto',
9: 'Lääkärihelikopteri'
9: 'Lääkärihelikopteri (HEMS)'
}
}
};
Expand Down
29 changes: 28 additions & 1 deletion modules/lss-TailoredTabs/TailoredTabs.user.js
View file
Expand Up @@ -70,12 +70,28 @@
"parent": SETTINGS + "_nas_toggle",
}
},
"rhs": {
"default": false,
"ui": {
"label": 'RHS',
"type": "toggle",
"description": 'Hundestaffeln in eigenen Tab'
}
},
"seg": {
"default": false,
"ui": {
"label": 'SEG',
"type": "toggle",
"description": 'SEG Einheiten in eigenem Tab'
"description": 'SEG Einheiten in eigenen Tab'
}
},
"rhs1": {
"default": false,
"ui": {
"label": 'RHS hinzufügen',
"type": "checkbox",
"parent": SETTINGS + "_seg_toggle",
}
},
"ktw": {
Expand Down Expand Up @@ -169,8 +185,19 @@
short: 'seg',
vehicles: [58, 59, 60]
};
if (getSetting('rhs1')) {
segSection.vehicles.push(91);
}
sections.push(segSection);
}
if (getSetting('rhs') && !isKtwMode) {
let rhsSection = {
name: 'RHS',
short: 'rhs',
vehicles: [91]
};
sections.push(rhsSection);
}
if (getSetting('heli') && !isKtwMode) {
let heliSection = {
name: 'Helikopter',
Expand Down
2 changes: 1 addition & 1 deletion modules/lss-creditserweiterung/creditserweiterung.user.js
View file
@@ -1,5 +1,5 @@
(($, win, I18n) => {
if (!document.URL.match(/(leitstellenspiel|missionchief|missionchief-australia|centro-de-mando|meldkamerspel|larmcentralen-spelet|operatorratunkowy|operatore112|operateur112|dispetcher112|alarmcentral-spil|nodsentralspillet|operacni-stredisko|112-merkez|operador193|jogo-operador112|dyspetcher101-game|missionchief-japan|missionchief-korea|jocdispecerat112|hatakeskuspeli)(\.de|\.com|\.co\.uk|\.dk|\.cz|\.es|\.mx|\.se|\.pl|\.it|\.fr|\.ru|.pt)\/#?$/)) return;
if (!document.URL.match(/(leitstellenspiel|missionchief|missionchief-australia|centro-de-mando|meldkamerspel|larmcentralen-spelet|operatorratunkowy|operatore112|operateur112|dispetcher112|alarmcentral-spil|nodsentralspillet|operacni-stredisko|112-merkez|operador193|jogo-operador112|dyspetcher101-game|missionchief-japan|missionchief-korea|jocdispecerat112|hatakeskuspeli)(\.de|\.com|\.co\.uk|\.dk|\.cz|\.es|\.mx|\.se|\.pl|\.it|\.fr|\.ru|.gr)\/#?$/)) return;

I18n.translations.de_DE.lssm.creditserweiterung = {
earnedCreditsRegEx: /(.*)([0-9\.]*)? verdiente Credits(.*)/i,
Expand Down
34 changes: 22 additions & 12 deletions modules/lss-dashboard/dashboard.user.js
View file
Expand Up @@ -23,8 +23,8 @@ I18n.translations.de_DE['lssm']['dashboard'] = {
carswp: 'FAHRZEUGE',
patiwp: 'PATIENTEN',
levwp: 'STUFE',
categories: ['Feuerwehr', 'Rettungsdienst', 'Polizei', 'THW', 'Krankenhaus', 'Wasserrettung', 'SEG', 'Bereitschaftspolizei'],
categories_data: ['fw', 'rd', 'pol', 'thw', 'kh', 'wret', 'seg', 'bepo'],
categories: ['Feuerwehr', 'Rettungsdienst', 'Polizei', 'THW', 'Krankenhaus', 'Wasserrettung', 'SEG', 'Bereitschaftspolizei', 'Rettungshundestaffel'],
categories_data: ['fw', 'rd', 'pol', 'thw', 'kh', 'wret', 'seg', 'bepo', 'rhs'],
categories_data_school: ['fw_school', 'rd_school', 'pol_school', 'thw_school'],
nofz: "Keine Fahrzeuge vorhanden",
}
Expand Down Expand Up @@ -277,26 +277,26 @@ I18n.translations.it_IT['lssm']['dashboard'] = {
onsite: "In loco",
request: "Richiesta",
transport: "Trasporto",
fms6: "Stato 6",
fms6: "Non disponibile",
},
total: "Somma",
overview: "Panoramica",
distribution: "Distribuzione",
station_plan: "Pianificazione della stazione",
station_plan: "Postazioni",
loading: "Il cruscotto si sta caricando",
ge: 'Edifici',
school: 'Scuole',
wachen: 'Stazione',
wachen: 'Postazioni',
other: 'Altro',
anz: 'Quantità',
perwp: 'LAVORO',
carswp: 'AUTO',
perwp: 'PERSONALE',
carswp: 'VEICOLI',
patiwp: 'PAZIENTI',
levwp: 'LIVELLO',
categories: ['Fire Stations', 'Rescue Stations', 'Police Stations', 'Hospitals'],
categories: ['Pompieri', 'Ambulanze', 'Polizia', 'Ospedali'],
categories_data: ['fw', 'rd', 'pol', 'kh'],
categories_data_school: ['fw_school', 'rd_school', 'pol_school', 'kh_clinic'],
nofz: "No vehicles found",
nofz: "Nessun veicolo trovato",
}
I18n.translations.fr_FR['lssm']['dashboard'] = {
name: "Tableau de bord",
Expand Down Expand Up @@ -623,7 +623,8 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) {
'kh_clinic': 0,
'wret': 0,
'seg': 0,
'bepo': 0
'bepo': 0,
'rhs': 0
};
$.each(lssm.buildings, function (key, build) {
switch (build.building_type) {
Expand Down Expand Up @@ -672,9 +673,14 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) {
case BUILDING_TYPE_SEG:
building_amount.seg += 1;
break;
//BPol
case BUILDING_TYPE_BEREITSCHAFTSPOLIZEI:
building_amount.bepo += 1;
break;
//RHS
case BUILDING_TYPE_RESCUE_DOG_UNIT:
building_amount.rhs += 1;
break;
}
});
data_station = [];
Expand All @@ -693,7 +699,7 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) {
backgroundColor: 'rgba(0,0,0,0)',
height: '200'
},
colors: ["red", "orange", "green", "blue", "gold", 'black', 'yellow', 'darkgreen'],
colors: ["red", "orange", "green", "blue", "gold", 'black', 'yellow', 'darkgreen', 'purple'],
title: {
text: I18n.t('lssm.dashboard.ge')
},
Expand Down Expand Up @@ -856,6 +862,10 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) {
icon = "fa-ambulance";
maxcars = 9;
break;
case BUILDING_TYPE_RESCUE_DOG_UNIT:
appendto = "rd";
icon = "fa-search";
break;
case BUILDING_TYPE_POLIZEIWACHE:
case BUILDING_TYPE_BEREITSCHAFTSPOLIZEI:
case BUILDING_TYPE_POLIZEISONDEREINHEITEN:
Expand Down Expand Up @@ -1146,4 +1156,4 @@ jQuery.expr[":"].conaintsci = jQuery.expr.createPseudo(function (arg) {
loadDashboard();
});

})(jQuery, I18n)
})(jQuery, I18n)
18 changes: 9 additions & 9 deletions modules/lss-destinationFilter/DestinationFilter.user.js
View file
Expand Up @@ -134,7 +134,7 @@
cellTax: 'owner\'s tax',
settings: {
beds: 'Nascondi ospedali completi',
beds1: 'Blind hospitals under x beds off',
beds1: 'Nascondi ospedal sotto x posti disponibili',
department: 'Nascondi ospedali senza reparto necessario',
distance: 'Nascondi destinazioni oltre la distanza di x km (0 disattiva)',
tax: 'Nascondi destinazioni con una TASSA superiore a x%',
Expand All @@ -157,15 +157,15 @@
};
I18n.translations.fr_FR.lssm.destfilter = {
title: 'Filtre de destination',
freeBeds: 'Free beds',
tax: 'TAX',
cellTax: 'owner\'s tax',
freeBeds: 'Lits libres',
tax: 'TAXE',
cellTax: 'owner\'s TAXE',
settings: {
beds: 'Hide full hospitals',
beds1: 'Blind hospitals under x beds off',
department: 'Hide hospitals without needed department',
distance: 'Hide destinations above x km distance (0 deactivates)',
tax: 'Hide destinations with a TAX higher than x%',
beds: 'Cacher les hôpitaux complets',
beds1: 'Hôpitaux pour aveugles de moins de x lits',
department: 'Cacher les hôpitaux sans service nécessaire',
distance: 'Cacher les destinations situées à plus de x km de distance (0 désactive)',
tax: 'Cacher les destinations dont la TAXE est supérieure à x%',
cells: 'Masquer les cellules pleines'
}
};
Expand Down
6 changes: 3 additions & 3 deletions modules/lss-layout-04/layout-04.user.js
View file
Expand Up @@ -16,7 +16,7 @@
'#missions strong{display:none!important}'+
'#missions .btn-group{margin-left:11px}'+
'#buildings_outer,#chat_outer,#radio_outer{margin-left:5px}'+
'#btn-alliance-new-mission{margin-bottom:0!important}'+
'#btn-alliance-new-event{margin-bottom:0!important}'+
'.alliance_true .btn-group{float:right}'+
'#chat_outer{padding:0}'+
'#radio_outer{width:calc(16.66666667% - 40px)}'+
Expand All @@ -29,15 +29,15 @@
'</style>'
);

$('#btn-alliance-new-mission').parent().detach().insertAfter('#missions .btn-group').addClass('pull-right');
$('#btn-alliance-new-event').parent().detach().insertAfter('#missions .btn-group').addClass('pull-right');

$('#missions_outer, #buildings_outer, #radio_outer, #chat_outer').removeClass('col-sm-4');
$('#missions_outer').addClass('col-md-8');
$('#buildings_outer').addClass('col-sm-3');
$('#chat_outer').addClass('col-sm-3');
$('#radio_outer').addClass('col-md-2');
$('#eventInfo').prependTo('#content');
$('#missions-panel-body > div:nth-child(6)').remove();
$('#missions-panel-body > div:nth-child(6), #missions-panel-body > div:nth-child(7),#missions-panel-body > div:nth-child(8)').remove();
if ("undefined" != typeof mapkit) {
} else
map.invalidateSize(true);
Expand Down
2 changes: 1 addition & 1 deletion modules/lss-managedsettings/ManagedSettings.user.js
View file
Expand Up @@ -358,7 +358,7 @@
import_btn: "Instellingen importeren",
reset_btn: "Reset",
reset_hint: "Weet u zeker dat u de instellingen van deze module wilt resetten naar de standaardwaarden?",
reset_success: "Stel de instellingen succesvol terug. Je moet de pagina opnieuw laden om ze te laten werken.",
reset_success: "De instellingen zijn succesvol gereset. Je moet de pagina opnieuw laden om ze te laten werken.",
export_success: "Instellingen succesvol geëxporteerd",
export_hint: "Houdt er rekening mee dat alleen eerder opgeslagen instellingen van momenteel geactiveerde modules kunnen worden geëxporteerd.",
import_success: "De instellingen zijn succesvol geïmporteerd. Ververs de pagina om ze te gebruiken.",
Expand Down

0 comments on commit 6a25c42

Please sign in to comment.