-
diff --git a/src/Application/exportService.js b/src/Application/exportService.js
index 03902f7..f4d22b1 100644
--- a/src/Application/exportService.js
+++ b/src/Application/exportService.js
@@ -4,7 +4,7 @@
x.push('');
for (var [nr, data] of Object.entries(fd.scores)) {
var fNrs = (fd.photos[nr] || []).map(function (_, i) { return fd.orderNr + '_loc' + nr + '_foto' + (i + 1); }).join('; ');
- if (type === D.TYPE_WISSEL) {
+ if (D.usesDwlBal(type)) {
x.push('' + nr + '' + I.esc(data.dwl || '') + '' + I.esc(data.bal || '') + '' + I.esc(fNrs) + '' + I.esc(data.opm || '') + '');
} else if (type === D.TYPE_OVERWEG) {
x.push('' + I.esc(data.locatie || '') + '' + I.esc(data.score || '') + '');
@@ -25,7 +25,8 @@
x.push('' + I.esc(document.getElementById('inp_techjaar').value) + '');
x.push('' + I.esc(document.getElementById('inp_inspjaar').value) + '');
x.push('' + I.esc(document.getElementById('inp_opmerkingen').value) + '');
- if (fd.type === D.TYPE_WISSEL) {
+ var hasOvPhotos = Object.values(fd.overviewPhotos).some(function (p) { return p.length > 0; });
+ if (hasOvPhotos) {
x.push('');
for (var [pos, photos] of Object.entries(fd.overviewPhotos)) {
photos.forEach(function (_, i) {
diff --git a/src/Application/inspectionForm.js b/src/Application/inspectionForm.js
index 441edb8..57d881d 100644
--- a/src/Application/inspectionForm.js
+++ b/src/Application/inspectionForm.js
@@ -11,25 +11,30 @@
A.applyFormType = function (type) {
A.state.formData.type = type;
var body = document.body;
- body.classList.remove('type-wissel', 'type-overweg', 'type-spoor');
+ body.classList.remove('type-wissel', 'type-overweg', 'type-spoor', 'type-engelsman', 'type-kruising');
body.classList.add('type-' + type);
var thead = document.getElementById('assessmentHead');
- if (type === D.TYPE_WISSEL) {
- thead.innerHTML = '| Nr | Locatie in wissel | DWL Score | BAL Score | Foto\'s | Opmerkingen |
|---|
';
- document.getElementById('formTitle').textContent = 'Duimstokformulier Gewoon of Symmetrisch wissel';
+ var titles = {};
+ titles[D.TYPE_WISSEL] = 'Duimstokformulier Gewoon of Symmetrisch wissel';
+ titles[D.TYPE_ENGELSMAN] = 'Duimstokformulier Half of Heel Engelsman';
+ titles[D.TYPE_KRUISING] = 'Duimstokformulier Kruising';
+ titles[D.TYPE_OVERWEG] = 'Duimstokformulier Overwegbevloering';
+ titles[D.TYPE_SPOOR] = 'Duimstokformulier Spoor';
+
+ if (D.usesDwlBal(type)) {
+ thead.innerHTML = '| Nr | Locatie | DWL Score | BAL Score | Foto\'s | Opmerkingen |
|---|
';
} else if (type === D.TYPE_OVERWEG) {
thead.innerHTML = '| Locatie | Score | Foto\'s | Opmerkingen |
|---|
';
- document.getElementById('formTitle').textContent = 'Duimstokformulier Overwegbevloering';
} else if (type === D.TYPE_SPOOR) {
thead.innerHTML = '| Nr | KM van | KM tot | Lengte | Score | Foto\'s | Opmerkingen |
|---|
';
- document.getElementById('formTitle').textContent = 'Duimstokformulier Spoor';
}
+ document.getElementById('formTitle').textContent = titles[type] || 'Duimstokformulier';
};
A.resetForm = function () {
A.state.formData = A.emptyFormData();
- document.body.classList.remove('type-wissel', 'type-overweg', 'type-spoor');
+ document.body.classList.remove('type-wissel', 'type-overweg', 'type-spoor', 'type-engelsman', 'type-kruising');
document.querySelectorAll('.header-grid .value').forEach(el => el.textContent = '');
document.querySelectorAll('#hdr_taakomschrijving, #hdr_aanleiding').forEach(el => el.textContent = '');
document.getElementById('inp_inspecteur').value = '';
@@ -83,16 +88,17 @@
btn.addEventListener('click', () => A.openPhotoModal(+btn.dataset.nr, btn.dataset.loc)));
}
- A.buildWisselAssessment = function (scoreElements) {
+ A.buildWisselAssessment = function (scoreElements, type) {
var tbody = document.getElementById('assessmentBody');
tbody.innerHTML = '';
var currentSection = '';
+ var assessType = type || A.state.formData.type;
scoreElements.forEach(el => {
var nr = parseInt(el.querySelector('NR').textContent.trim());
var locatie = el.querySelector('LOCATIE').textContent.trim();
var dwlScore = el.querySelector('DWL_SCORE').textContent.trim();
var balScore = el.querySelector('BAL_SCORE').textContent.trim();
- var section = D.getSectionForNr(nr);
+ var section = D.getSectionForNr(nr, assessType);
if (section && section !== currentSection) {
currentSection = section;
var sr = document.createElement('tr');
@@ -174,7 +180,7 @@
};
A.buildAssessmentForType = function (type, scoreElements) {
- if (type === D.TYPE_WISSEL) A.buildWisselAssessment(scoreElements);
+ if (D.usesDwlBal(type)) A.buildWisselAssessment(scoreElements, type);
else if (type === D.TYPE_OVERWEG) A.buildOverwegAssessment(scoreElements);
else if (type === D.TYPE_SPOOR) A.buildSpoorAssessment(scoreElements);
};
@@ -208,7 +214,7 @@
A.updateTotaalscore = function () {
var type = A.state.formData.type;
var worst;
- if (type === D.TYPE_WISSEL) {
+ if (D.usesDwlBal(type)) {
worst = D.computeWorstScore(A.state.formData.scores);
} else {
var order = ['', ...D.SCORE_VALUES];
diff --git a/src/Application/xmlImport.js b/src/Application/xmlImport.js
index 6a0106f..e9d4613 100644
--- a/src/Application/xmlImport.js
+++ b/src/Application/xmlImport.js
@@ -11,6 +11,9 @@
var eqart = getText('EQART');
var type = D.typeFromEqart(eqart);
+ if (type === D.TYPE_WISSEL) {
+ type = D.typeFromWisselSoort(getText('SOORT'));
+ }
A.applyFormType(type);
var orderNr = getText('AUFNR_VORNR');
@@ -31,7 +34,7 @@
setIfExists('hdr_taakomschrijving', getText('LTXA1'));
setIfExists('hdr_aanleiding', getText('KURZTEXT'));
- if (type === D.TYPE_WISSEL) {
+ if (D.usesDwlBal(type)) {
setIfExists('hdr_wisselnr', getText('WISSELNR') || getText('EQFNR_EQUI'));
setIfExists('hdr_soort', getText('SOORT'));
setIfExists('hdr_hoekverhouding', getText('HOEKVERHOUDING'));
@@ -67,7 +70,7 @@
if (getText('INSP_JAAR')) document.getElementById('inp_inspjaar').value = getText('INSP_JAAR');
if (getText('OPMERKING')) document.getElementById('inp_opmerkingen').value = getText('OPMERKING');
- if (type === D.TYPE_WISSEL) A.buildWisselAssessment(xml.querySelectorAll('WISSEL_SCORE'));
+ if (D.usesDwlBal(type)) A.buildWisselAssessment(xml.querySelectorAll('WISSEL_SCORE'), type);
else if (type === D.TYPE_OVERWEG) A.buildOverwegAssessment(xml.querySelectorAll('OVERWEG_SCORE'));
else if (type === D.TYPE_SPOOR) A.buildSpoorAssessment(xml.querySelectorAll('SPOOR_STUK'));
diff --git a/src/Domain/inspectionTypes.js b/src/Domain/inspectionTypes.js
index 6d6bfe7..b8b6b8b 100644
--- a/src/Domain/inspectionTypes.js
+++ b/src/Domain/inspectionTypes.js
@@ -2,17 +2,26 @@
D.TYPE_WISSEL = 'wissel';
D.TYPE_OVERWEG = 'overweg';
D.TYPE_SPOOR = 'spoor';
+ D.TYPE_ENGELSMAN = 'engelsman';
+ D.TYPE_KRUISING = 'kruising';
D.EQART_TO_TYPE = {
'WISSEL': D.TYPE_WISSEL,
'OVERWBEVL': D.TYPE_OVERWEG,
- 'SPOORDWL': D.TYPE_SPOOR
+ 'SPOORDWL': D.TYPE_SPOOR,
+ 'ENGELSMAN': D.TYPE_ENGELSMAN,
+ 'KRUISING': D.TYPE_KRUISING
};
D.OBJECTSOORT_TO_TYPE = {
'Wissel': D.TYPE_WISSEL,
'Overwegbevloering': D.TYPE_OVERWEG,
- 'Spoor': D.TYPE_SPOOR
+ 'Spoor': D.TYPE_SPOOR,
+ 'Engelsman': D.TYPE_ENGELSMAN,
+ 'Half Engelsman': D.TYPE_ENGELSMAN,
+ 'Heel Engelsman': D.TYPE_ENGELSMAN,
+ 'Kruising': D.TYPE_KRUISING,
+ 'Ingesloten kruising': D.TYPE_KRUISING
};
D.typeFromEqart = function (eqart) {
@@ -23,10 +32,21 @@
return D.OBJECTSOORT_TO_TYPE[objectsoort] || D.TYPE_WISSEL;
};
+ D.typeFromWisselSoort = function (soort) {
+ soort = (soort || '').toLowerCase();
+ if (soort.indexOf('engelsman') >= 0) return D.TYPE_ENGELSMAN;
+ if (soort.indexOf('kruising') >= 0) return D.TYPE_KRUISING;
+ return D.TYPE_WISSEL;
+ };
+
D.OVERWEG_LOCATIONS = [
'Ligging spoor',
'Ligging bevloering',
'Constructieve kwaliteit',
'Wegverharding'
];
+
+ D.usesDwlBal = function (type) {
+ return type === D.TYPE_WISSEL || type === D.TYPE_ENGELSMAN || type === D.TYPE_KRUISING;
+ };
})(window.App.Domain);
diff --git a/src/Domain/sectionMap.js b/src/Domain/sectionMap.js
index c456675..a8a5fd4 100644
--- a/src/Domain/sectionMap.js
+++ b/src/Domain/sectionMap.js
@@ -1,12 +1,34 @@
(function (D) {
- D.sectionMap = {
+ D.wisselSectionMap = {
'Sectie 1: Tongbeweging': [1, 2, 3, 4],
'Sectie 2: Middengedeelte': [5, 6, 7, 8, 9, 10],
'Sectie 3: Puntstuk gedeelte': [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
};
- D.getSectionForNr = function (nr) {
- for (const [section, nrs] of Object.entries(D.sectionMap)) {
+ D.engelsmanSectionMap = {
+ 'Sectie 1: Puntstuk gedeelte (boven)': [1, 2, 3, 4, 5],
+ 'Sectie 2: Kruisstuk gedeelte': [6, 7, 8, 9, 10],
+ 'Sectie 3: Middengedeelte': [11, 12, 13, 14, 15, 16],
+ 'Sectie 4: Tongbeweging': [17, 18, 19, 20, 21, 22],
+ 'Sectie 5: Puntstuk gedeelte (onder)': [23, 24, 25, 26, 27, 28, 29, 30]
+ };
+
+ D.kruisingSectionMap = {
+ 'Sectie 1: Puntstuk gedeelte (boven)': [1, 2, 3, 4, 5, 6],
+ 'Sectie 2: Kruisstuk gedeelte': [7, 8, 9, 10, 11, 12],
+ 'Sectie 3: Middengedeelte': [13, 14, 15, 16, 17, 18],
+ 'Sectie 4: Puntstuk gedeelte (onder)': [19, 20, 21, 22, 23, 24]
+ };
+
+ D.sectionMapForType = function (type) {
+ if (type === 'engelsman') return D.engelsmanSectionMap;
+ if (type === 'kruising') return D.kruisingSectionMap;
+ return D.wisselSectionMap;
+ };
+
+ D.getSectionForNr = function (nr, type) {
+ var map = D.sectionMapForType(type);
+ for (const [section, nrs] of Object.entries(map)) {
if (nrs.includes(nr)) return section;
}
return null;
@@ -18,9 +40,26 @@
foto_s3_l: 'Foto Puntstuk L', foto_s3_r: 'Foto Puntstuk R',
foto_s2_l: 'Foto Midden L', foto_s2_r: 'Foto Midden R',
foto_s1_l: 'Foto Tong L', foto_s1_r: 'Foto Tong R',
- ovz_ow_1: 'Overzichtsfoto 1', ovz_ow_2: 'Overzichtsfoto 2',
- foto_ligging_spoor: 'Ligging spoor', foto_ligging_bevl: 'Ligging bevloering',
- foto_constr_kwal: 'Constructieve kwaliteit', foto_wegverharding: 'Wegverharding',
- ovz_sp_1: 'Overzichtsfoto begin', ovz_sp_2: 'Overzichtsfoto einde'
+ foto_ow_sticker: 'Sticker overwegpaal', foto_ow_spoorbord: 'Spoornaambordje',
+ foto_ow_lk_1: 'Lage km foto 1', foto_ow_lk_2: 'Lage km foto 2',
+ foto_ow_lk_3: 'Lage km foto 3', foto_ow_lk_4: 'Lage km foto 4',
+ foto_ow_lk_5: 'Lage km foto 5', foto_ow_lk_6: 'Lage km foto 6',
+ foto_ow_hk_1: 'Hoge km foto 1', foto_ow_hk_2: 'Hoge km foto 2',
+ foto_ow_hk_3: 'Hoge km foto 3', foto_ow_hk_4: 'Hoge km foto 4',
+ foto_ow_hk_5: 'Hoge km foto 5', foto_ow_hk_6: 'Hoge km foto 6',
+ ovz_sp_1: 'Overzichtsfoto begin', ovz_sp_2: 'Overzichtsfoto einde',
+ ovz_eng_tl: 'Overzichtsfoto LB', ovz_eng_tr: 'Overzichtsfoto RB',
+ ovz_eng_bl: 'Overzichtsfoto LO', ovz_eng_br: 'Overzichtsfoto RO',
+ foto_eng_s5_l: 'Foto Puntstuk boven L', foto_eng_s5_r: 'Foto Puntstuk boven R',
+ foto_eng_s4_l: 'Foto Kruisstuk L', foto_eng_s4_r: 'Foto Kruisstuk R',
+ foto_eng_s3_l: 'Foto Midden L', foto_eng_s3_r: 'Foto Midden R',
+ foto_eng_s2_l: 'Foto Tong L', foto_eng_s2_r: 'Foto Tong R',
+ foto_eng_s1_l: 'Foto Puntstuk onder L', foto_eng_s1_r: 'Foto Puntstuk onder R',
+ ovz_kr_tl: 'Overzichtsfoto LB', ovz_kr_tr: 'Overzichtsfoto RB',
+ ovz_kr_bl: 'Overzichtsfoto LO', ovz_kr_br: 'Overzichtsfoto RO',
+ foto_kr_s4_l: 'Foto Puntstuk boven L', foto_kr_s4_r: 'Foto Puntstuk boven R',
+ foto_kr_s3_l: 'Foto Kruisstuk L', foto_kr_s3_r: 'Foto Kruisstuk R',
+ foto_kr_s2_l: 'Foto Midden L', foto_kr_s2_r: 'Foto Midden R',
+ foto_kr_s1_l: 'Foto Puntstuk onder L', foto_kr_s1_r: 'Foto Puntstuk onder R'
};
})(window.App.Domain);