diff --git a/httpdocs/import/mpp_import_benchmark.xlsx b/httpdocs/import/mpp_import_benchmark.xlsx index 5db6c8d..f7898f1 100644 Binary files a/httpdocs/import/mpp_import_benchmark.xlsx and b/httpdocs/import/mpp_import_benchmark.xlsx differ diff --git a/httpdocs/import/mpp_import_benchmark_works.xlsx b/httpdocs/import/mpp_import_benchmark_works.xlsx new file mode 100644 index 0000000..5db6c8d Binary files /dev/null and b/httpdocs/import/mpp_import_benchmark_works.xlsx differ diff --git a/httpdocs/import/mpp_import_din.xlsx b/httpdocs/import/mpp_import_din.xlsx index 6a4cc5b..6f26a21 100644 Binary files a/httpdocs/import/mpp_import_din.xlsx and b/httpdocs/import/mpp_import_din.xlsx differ diff --git a/httpdocs/public/assets/js/mpp-tool.js b/httpdocs/public/assets/js/mpp-tool.js index 1d7391a..69bbbf0 100644 --- a/httpdocs/public/assets/js/mpp-tool.js +++ b/httpdocs/public/assets/js/mpp-tool.js @@ -132,10 +132,6 @@ function loadDinAssetData() { method: "get", data: { assetId: $("#asset").val() }, success: function (data) { - $("#cycle").attr({ - "min" : data.cycleMin, - "max" : data.cycleMax - }).val(''); $('#benchmark') .find('option') @@ -148,18 +144,12 @@ function loadDinAssetData() { $('#benchmark').append(''); } - if (Object.keys(data.benchmarkValues).length < 1) { + if (Object.keys(data.benchmarkValues).length <= 0) { $('#no-benchmark-data').show(); - $('#benchmark-data').hide(); - $('#no-calculation').css('display', 'block'); - $('#calculate-first').hide(); - $('#worksheet-no-calculation').show(); + $('#benchmark').prop( "disabled", true ); } else { $('#no-benchmark-data').hide(); - $('#benchmark-data').show(); - $('#calculate-first').css('display', 'block'); - $('#no-calculation').hide(); - $('#worksheet-no-calculation').hide(); + $('#benchmark').prop( "disabled", false ); } }, error: function (xhr, msg, three) { @@ -180,10 +170,20 @@ function onCalculate() { success: function (data) { $('#resInspection').text(data['recCycleInspection']); $('#resMaintenance').text(data['recCycleMaintenance']); - $('#resPercentage').text((parseFloat(data['costDiffCurRecPercentage']) * 100) + " %"); - let costDiff = data['costDiffCurCycleRecCycle']; - let roundedCostDiff = parseFloat(costDiff).toFixed(2); - $('#resEuro').text(roundedCostDiff.replace(/\./g, ",") + " €"); + + let percentage = "-"; + if (data['costDiffCurRecPercentage'] !== null) { + percentage = (parseFloat(data['costDiffCurRecPercentage']) * 100) + " %"; + } + $('#resPercentage').text(percentage); + + let costDiff = "-"; + if (data['costDiffCurCycleRecCycle'] !== null) { + costDiff = parseFloat(data['costDiffCurCycleRecCycle']).toFixed(2); + costDiff = costDiff.replace(/\./g, ",") + " €"; + } + $('#resEuro').text(costDiff); + $("#result-box").addClass("result-existing"); $('html, body').animate({ scrollTop: $('#result-box').offset().top - 200 @@ -221,7 +221,7 @@ function onCreateWorksheet() { } }); - $("#worksheet-no-calculation").on("click", function (e) { + $("#create-worksheet").on("click", function (e) { e.preventDefault(); let result = window.confirm("Sie nutzen hiermit einen Ihrer Durchgänge."); if (result) { diff --git a/httpdocs/public/assets/scss/components/_basic.scss b/httpdocs/public/assets/scss/components/_basic.scss index 8f170b8..6a7c705 100644 --- a/httpdocs/public/assets/scss/components/_basic.scss +++ b/httpdocs/public/assets/scss/components/_basic.scss @@ -613,6 +613,9 @@ textarea:-ms-input-placeholder { .result-existing { display: none; + p { + padding: 1.25rem; + } } .result-not-existing { @@ -631,12 +634,11 @@ textarea:-ms-input-placeholder { } ol.worksheets { - padding-left: 26px; - li { padding-bottom: 10px; - list-style: decimal-leading-zero; - + strong { + padding-right: 10px; + } } a { @@ -759,7 +761,6 @@ ol.worksheets { } } } -#no-calculation, #calculate-first { width: 100%; padding-bottom: 20px; @@ -767,8 +768,10 @@ ol.worksheets { #no-benchmark-data, #benchmark-data, -#no-calculation, -#calculate-first, -#worksheet-no-calculation { +#calculate-first { + display: block; +} + +#create-worksheet { display: none; } diff --git a/httpdocs/public/assets/scss/styles.css b/httpdocs/public/assets/scss/styles.css index a1469ce..2e13801 100644 --- a/httpdocs/public/assets/scss/styles.css +++ b/httpdocs/public/assets/scss/styles.css @@ -762,6 +762,9 @@ textarea:-ms-input-placeholder { .result-box .result-existing { display: none; } +.result-box .result-existing p { + padding: 1.25rem; +} .result-box .result-not-existing { display: block; } @@ -772,12 +775,11 @@ textarea:-ms-input-placeholder { display: none; } -ol.worksheets { - padding-left: 26px; -} ol.worksheets li { padding-bottom: 10px; - list-style: decimal-leading-zero; +} +ol.worksheets li strong { + padding-right: 10px; } ol.worksheets a { text-decoration: none; @@ -879,7 +881,6 @@ ol.worksheets a:hover { margin: 0 8px; } -#no-calculation, #calculate-first { width: 100%; padding-bottom: 20px; @@ -887,9 +888,11 @@ ol.worksheets a:hover { #no-benchmark-data, #benchmark-data, -#no-calculation, -#calculate-first, -#worksheet-no-calculation { +#calculate-first { + display: block; +} + +#create-worksheet { display: none; } diff --git a/httpdocs/public/assets/scss/styles.css.map b/httpdocs/public/assets/scss/styles.css.map index 5d1e03f..8ebca00 100644 --- a/httpdocs/public/assets/scss/styles.css.map +++ b/httpdocs/public/assets/scss/styles.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["components/_reset.scss","_variables.scss","components/_basic.scss","_mixins.scss","components/_header.scss","components/_footer.scss","components/_listing.scss"],"names":[],"mappings":"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F;EACE;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;;AACA;EAHF;IAII;IACA;;;AAKF;EACE;;AAEA;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAOV;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OD3cY;EC4cZ;;AAEA;EACE;;AAGF;EACE,YD/cY;;ACkdd;EACE;;;AAIJ;AAEA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAGF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;AAEF;EARF;IASI;;;AAGF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;AAEF;EARF;IASI;;;AAIJ;EACE;;AACA;EAFF;IAGI;;;AAYN;EACE;;AAEA;EACE;;;AAKN;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EARF;IASI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAKN;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIA;EACE;;AAGF;EACE;;;AAKN;EACE;;AAEA;EACE;EACA;;AAIF;EACE;;AAEA;EACE;EACA;;;AAMJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAEF;EAPF;IAQI;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAKF;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAMA;EACE;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EAGE;;AAEF;EACE;;;AAKR;AAAA;EAEE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;EAKE;;;AEpwBF;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YHPY;;AGQZ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAEF;EATF;IAUI;IACA;;;AAEF;EAbF;IAcI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EANF;IAOI;IACA;;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAKJ;EADF;IAEI;;;AAIN;EACE;;AACA;EAFF;IAGI;;;AAGJ;EACE;;AClEJ;EACE;EACA,OJFY;;AIGZ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;;;AChBN;EACE;;;AAOA;EACE,YLIW;EKHX;EACA;;AACA;EACE,YLDS;;AKGX;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EAFF;IAGI;IACA;IACA;;;AAGJ;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACE;;AAKF;EACE","file":"styles.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["components/_reset.scss","_variables.scss","components/_basic.scss","_mixins.scss","components/_header.scss","components/_footer.scss","components/_listing.scss"],"names":[],"mappings":"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F;EACE;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;;AACA;EAHF;IAII;IACA;;;AAKF;EACE;;AAEA;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAOV;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OD3cY;EC4cZ;;AAEA;EACE;;AAGF;EACE,YD/cY;;ACkdd;EACE;;;AAIJ;AAEA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAGF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;AAEF;EARF;IASI;;;AAGF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;AAEF;EARF;IASI;;;AAIJ;EACE;;AACA;EAFF;IAGI;;;AAYN;EACE;;AAEA;EACE;;;AAKN;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EARF;IASI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAKN;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;AAGF;EACE;;AACA;EACE;;AAIJ;EACE;;AAIA;EACE;;AAGF;EACE;;;AAMJ;EACE;;AACA;EACE;;AAIJ;EACE;;AAEA;EACE;EACA;;;AAMJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAEF;EAPF;IAQI;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAKF;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAMA;EACE;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EAGE;;AAEF;EACE;;;AAKR;EACE;EACA;;;AAGF;AAAA;AAAA;EAGE;;;AAGF;EACE;;;AEvwBF;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YHPY;;AGQZ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAEF;EATF;IAUI;IACA;;;AAEF;EAbF;IAcI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EANF;IAOI;IACA;;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAKJ;EADF;IAEI;;;AAIN;EACE;;AACA;EAFF;IAGI;;;AAGJ;EACE;;AClEJ;EACE;EACA,OJFY;;AIGZ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;;;AChBN;EACE;;;AAOA;EACE,YLIW;EKHX;EACA;;AACA;EACE,YLDS;;AKGX;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EAFF;IAGI;IACA;IACA;;;AAGJ;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACE;;AAKF;EACE","file":"styles.css"} \ No newline at end of file diff --git a/httpdocs/src/Controller/UserController.php b/httpdocs/src/Controller/UserController.php index 6a1105e..f584d18 100644 --- a/httpdocs/src/Controller/UserController.php +++ b/httpdocs/src/Controller/UserController.php @@ -101,8 +101,6 @@ class UserController extends AbstractController } $res = []; - $res['cycleMin'] = $dinAsset->getCycleMonthsMin(); - $res['cycleMax'] = $dinAsset->getCycleMonthsMax(); $res['benchmarkValues'] = $dinAsset->getBenchMarkSelectValues(); return $this->json($res); } @@ -113,8 +111,12 @@ class UserController extends AbstractController public function calculateRisk(Request $request, CalculatorService $calculatorService) { $params = $request->request->all(); - $benchMark = $this->getDoctrine()->getRepository(DinAssetBenchmark::class)->find($params['benchmark']); - $res = $calculatorService->calculateRisk($benchMark, $params); + $asset = $this->getDoctrine()->getRepository(DinAsset::class)->find($params['asset']); + $benchMark = null; + if (array_key_exists('benchmark', $params)) { + $benchMark = $this->getDoctrine()->getRepository(DinAssetBenchmark::class)->find($params['benchmark']); + } + $res = $calculatorService->calculateRisk($params, $asset, $benchMark); return $this->json($res); } @@ -139,30 +141,23 @@ class UserController extends AbstractController } $assetTasks = $asset->getTasks(); - $failureProbability = null; - $failureDamage = null; - $maintenanceAdvantage = null; - $inspectionAdvantage = null; - $cycle = null; + $asset = $this->getDoctrine()->getRepository(DinAsset::class)->find($params['asset']); + $benchMark = null; $bandwidth = null; - $recCycleMaintenance = null; - $recCycleInspection = null; - $costDiffCurRecPercentage = null; - $costDiffCurCycleRecCycle = null; if (array_key_exists('benchmark', $params)) { - $benchMark = $em->getRepository(DinAssetBenchmark::class)->find($params['benchmark']); - $calculation = $calculatorService->calculateRisk($benchMark, $params); - $failureProbability = Utils::$riskFailure[$params['failure']][0]; - $failureDamage = Utils::$riskCosts[$params['costs']][0]; - $maintenanceAdvantage = $params['maintenance']; - $inspectionAdvantage = $params['inspection']; - $cycle = $params['cycle']; + $benchMark = $this->getDoctrine()->getRepository(DinAssetBenchmark::class)->find($params['benchmark']); $bandwidth = $benchMark->getBandwidth(); - $recCycleMaintenance = $calculation['recCycleMaintenance']; - $recCycleInspection = $calculation['recCycleInspection']; - $costDiffCurRecPercentage = $calculation['costDiffCurRecPercentage']; - $costDiffCurCycleRecCycle = $calculation['costDiffCurCycleRecCycle']; } + $calculation = $calculatorService->calculateRisk($params, $asset, $benchMark); + $failureProbability = Utils::$riskFailure[$params['failure']][0]; + $failureDamage = Utils::$riskCosts[$params['costs']][0]; + $maintenanceAdvantage = $params['maintenance']; + $inspectionAdvantage = $params['inspection']; + $cycle = $params['cycle']; + $recCycleMaintenance = $calculation['recCycleMaintenance']; + $recCycleInspection = $calculation['recCycleInspection']; + $costDiffCurRecPercentage = $calculation['costDiffCurRecPercentage']; + $costDiffCurCycleRecCycle = $calculation['costDiffCurCycleRecCycle']; $em->getConnection()->beginTransaction(); try { diff --git a/httpdocs/src/Service/CalculatorService.php b/httpdocs/src/Service/CalculatorService.php index 8ae2e99..66f9184 100644 --- a/httpdocs/src/Service/CalculatorService.php +++ b/httpdocs/src/Service/CalculatorService.php @@ -15,10 +15,8 @@ class CalculatorService const KEY_COST_DIFF_CUR_REC_CYCLE = 'costDiffCurCycleRecCycle'; const KEY_COST_DIFF_CUR_REC_PERCENTAGE = 'costDiffCurRecPercentage'; - public function calculateRisk(DinAssetBenchmark $benchmark, $params) + public function calculateRisk($params, DinAsset $asset, DinAssetBenchmark $benchmark = null) { - /** @var DinAsset $asset */ - $asset = $benchmark->getDinAsset(); $userCycle = $params['cycle']; $pointsFailure = Utils::$riskFailure[$params['failure']][1]; @@ -36,8 +34,6 @@ class CalculatorService $recCycleMaintenance = $asset->getCycleMonthsMin(); } } - $costsCurrentPerYear = (12 / $userCycle) * $benchmark->getAverageCosts(); - $costsRecPerYear = (12 / $recCycleMaintenance) * $benchmark->getAverageCosts(); $recCycleInspection = $asset->getCycleMonthsMax(); if ( ((int)$params['inspection']) === 1 ) { @@ -46,13 +42,20 @@ class CalculatorService $recCycleInspection = $asset->getCycleMonthsMin(); } } - $costDiffCurCycleRecCycle = $costsCurrentPerYear - $costsRecPerYear; - $costDiffCurRecPercentage = 1 - ($userCycle / $recCycleMaintenance); + + $costDiffCurCycleRecCycle = null; + $costDiffCurRecPercentage = null; + if ($benchmark !== null) { + $costsCurrentPerYear = (12 / $userCycle) * $benchmark->getAverageCosts(); + $costsRecPerYear = (12 / $recCycleMaintenance) * $benchmark->getAverageCosts(); + $costDiffCurRecPercentage = round(1 - ($userCycle / $recCycleMaintenance), 2); + $costDiffCurCycleRecCycle = $this->customRounding($costsCurrentPerYear - $costsRecPerYear); + } $res[self::KEY_REC_CYCLE_MAINTENANCE] = $recCycleMaintenance; $res[self::KEY_REC_CYCLE_INSPECTION] = $recCycleInspection; - $res[self::KEY_COST_DIFF_CUR_REC_PERCENTAGE] = round($costDiffCurRecPercentage, 2); - $res[self::KEY_COST_DIFF_CUR_REC_CYCLE] = $this->customRounding($costDiffCurCycleRecCycle); + $res[self::KEY_COST_DIFF_CUR_REC_PERCENTAGE] = $costDiffCurRecPercentage; + $res[self::KEY_COST_DIFF_CUR_REC_CYCLE] = $costDiffCurCycleRecCycle; return $res; } diff --git a/httpdocs/templates/pages/catalogue.html.twig b/httpdocs/templates/pages/catalogue.html.twig deleted file mode 100644 index 6e3709f..0000000 --- a/httpdocs/templates/pages/catalogue.html.twig +++ /dev/null @@ -1,49 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Fragenkatalog{% endblock %} - -{% block body %} -

Fragenkatalog

-

Bitte entscheiden Sie sich für eine Antwort und speichern Sie diese. Andernfalls gilt die Frage als nicht beantwortet. Sie können jederzeit von einer Frage zu einer anderen Frage und wieder zurück navigieren. Auch bereits gespeicherte Antworten können Sie später bei Bedarf noch einmal bearbeiten und erneut speichern, solange die Bearbeitung des Fragenkataloges noch nicht abgeschlossen wurde. Das Abschließen des Fragebogens ist nur möglich, wenn alle Fragen beantwortet wurden.

-
-
-

Frage: {{ catalogueDetail.orderNo }}/{{ catalogue.numDetails }}

-
-
-
-
-
-

Handlungsfeld: {{ questionType.type }}

-

{{ question.questionText }}

-
-
-
- - - - - -
-
- - -
-
-
- - Letzte offene Frage - Vorherige Frage - -
- Antwort speichern -
- - Nächste Frage - Nächste offene Frage - -
-
- -
-
-{% endblock %} diff --git a/httpdocs/templates/pages/catalogue_finished.html.twig b/httpdocs/templates/pages/catalogue_finished.html.twig deleted file mode 100644 index 950f208..0000000 --- a/httpdocs/templates/pages/catalogue_finished.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Fragenkatalog{% endblock %} - -{% block body %} -

Abschluss Fragenkatalog

-

- Herzlichen Glückwunsch, Sie haben soeben die Bearbeitung Ihres Fragenkatalogs zu MPPTool abgeschlossen. Die Auswertung Ihrer Antworten liegt als PDF-Download für Sie bereit. -

-

"Ihr BIMScore"

-

Hier erhalten Sie eine Zusammenfassung Ihrer Antworten zu den Fragen aus MPPTool und das Ergebnis der Auswertung als PDF-Dokument.

- Ergebnis -

-

Sie können die Bearbeitung des Fragenkataloges noch {{ remainingCatalogues }}-mal durchführen. Dazu haben Sie noch {{ remainingDays }} Tage Zeit.

- Zum Fragenkatalog -{% endblock %} diff --git a/httpdocs/templates/pages/risk_analysis.html.twig b/httpdocs/templates/pages/risk_analysis.html.twig index 161e305..05c0ec3 100644 --- a/httpdocs/templates/pages/risk_analysis.html.twig +++ b/httpdocs/templates/pages/risk_analysis.html.twig @@ -73,11 +73,7 @@
- {% if initialDinAsset is not null %} - - {% else %} - - {% endif %} +
@@ -98,9 +94,8 @@

Ergebnis

- Kein Potenzial ermittelbar! Bitte erst Potenzial ermitteln! - Arbeitskarte erstellen + Arbeitskarte erstellen

@@ -116,10 +111,10 @@
Arbeitskarte erstellen +

* Vergleichskosten sind nach BKI indiziert (März 2023)

-

* Vergleichskosten sind nach BKI indiziert (März 2023)

{% endblock %} diff --git a/httpdocs/templates/pages/start.html.twig b/httpdocs/templates/pages/start.html.twig index 56ace4e..ff9ccea 100644 --- a/httpdocs/templates/pages/start.html.twig +++ b/httpdocs/templates/pages/start.html.twig @@ -25,9 +25,9 @@ {% if (worksheets | length > 0) %}

Ihre bisher abgeschlossenen Arbeitskarten:

    - {% for worksheet in worksheets %} + {% for index, worksheet in worksheets %}
  1. - {{ worksheet.creationDate|date("d.m.Y H:i") }} | {{ worksheet.dinNumber }} - {{ worksheet.dinAssetName }} + {{ "%02d"|format(index + 1) }}. {{ worksheet.creationDate|date("d.m.Y H:i") }} | {{ worksheet.dinNumber }} - {{ worksheet.dinAssetName }}
    2. {% endfor %}