From 6496ca133740f45a166c816e615f3ca588d35a9b Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Tue, 29 Aug 2023 15:51:39 +0200 Subject: [PATCH] bugfixing / frontend --- .idea/.gitignore | 8 + .idea/DdevIntegration.xml | 6 + .idea/php.xml | 149 ++++++++++++++++++ .idea/vcs.xml | 6 + .idea/watcherTasks.xml | 25 +++ httpdocs/public/assets/js/my-bim-score.js | 5 + .../public/assets/scss/components/_basic.scss | 66 ++++++++ httpdocs/public/assets/scss/styles.css | 84 +++++++++- httpdocs/public/assets/scss/styles.css.map | 2 +- .../pages-admin/admin_create_user.html.twig | 2 +- httpdocs/templates/pages/index.html.twig | 28 +--- .../templates/pages/risk_analysis.html.twig | 4 +- httpdocs/templates/pages/start.html.twig | 4 +- httpdocs/templates/pages/worksheet.html.twig | 2 +- httpdocs/templates/security/login.html.twig | 28 +--- .../snippets/worksheet-result.html.twig | 8 +- 16 files changed, 374 insertions(+), 53 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/DdevIntegration.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/watcherTasks.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/DdevIntegration.xml b/.idea/DdevIntegration.xml new file mode 100644 index 0000000..713613d --- /dev/null +++ b/.idea/DdevIntegration.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..eddccfd --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..72ef692 --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/httpdocs/public/assets/js/my-bim-score.js b/httpdocs/public/assets/js/my-bim-score.js index 7032b4b..3faa7c4 100644 --- a/httpdocs/public/assets/js/my-bim-score.js +++ b/httpdocs/public/assets/js/my-bim-score.js @@ -8,6 +8,11 @@ $(document).ready(function() { loadDinAssetData(); $("#asset").on("change", function(e) { loadDinAssetData(); + $("#result-box").removeClass("result-existing"); + }); + $("#form-risk").on("submit", function(e) { + e.preventDefault(); + $("#calculate").trigger("click"); }); } }); diff --git a/httpdocs/public/assets/scss/components/_basic.scss b/httpdocs/public/assets/scss/components/_basic.scss index 2f9c196..dc1f622 100644 --- a/httpdocs/public/assets/scss/components/_basic.scss +++ b/httpdocs/public/assets/scss/components/_basic.scss @@ -39,6 +39,12 @@ textarea:-ms-input-placeholder { max-width: 1280px; padding: 3rem 0; min-height: calc(100vh - 68px - 104px); + @media (max-width: 1600px) { + width: 90vw; + } + @media (max-width: 1423px) { + width: 90vw; + } } h1 { @@ -473,16 +479,46 @@ textarea:-ms-input-placeholder { display: flex; justify-content: space-between; flex-wrap: wrap; + align-items: end; + &-up { + align-items: flex-start; + } .col-box { width: 60%; + @media (max-width: 1024px) { + width: 50%; + } + @media (max-width: 850px) { + width: 40%; + } + @media (max-width: 650px) { + width: 100%; + } &:nth-child(2) { width: 30%; + @media (max-width: 1024px) { + width: 40%; + } + @media (max-width: 850px) { + width: 50%; + } + @media (max-width: 650px) { + width: 100%; + } } .col-box { width: 48%; + @media (max-width: 850px) { + width: 100%; + } + } + } + .row-box { + @media (max-width: 850px) { + } } } @@ -503,6 +539,8 @@ textarea:-ms-input-placeholder { label { display: block; font-size: 16px; + line-height: 1.5rem; + padding-bottom: 10px; } input, select { @@ -512,6 +550,24 @@ textarea:-ms-input-placeholder { background: #fff; border: 1px solid #000; padding: 10px 10px; + border-radius: 0; + @media (max-width: 650px) { + max-width: none; + } + &#asset { + max-width: 550px; + @media (max-width: 1350px) { + max-width: none; + } + } + } + + select { + box-shadow:none; + outline:none; + -webkit-appearance: none; + -moz-appearance: none; + background: #fff url(data:image/svg+xml;base64,PHN2ZyBmaWxsPSdibGFjaycgaGVpZ2h0PScyNCcgdmlld0JveD0nMCAwIDI0IDI0JyB3aWR0aD0nMjQnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zyc+PHBhdGggZD0nTTcgMTBsNSA1IDUtNXonLz48cGF0aCBkPSdNMCAwaDI0djI0SDB6JyBmaWxsPSdub25lJy8+PC9zdmc+) no-repeat calc(100% - 6px) 3px; } } @@ -640,6 +696,13 @@ ol.worksheets { border-collapse: collapse; } + .ins { + border-right: 1px solid rgba(118, 127, 134, .3); + } + .ins-2 { + background: rgb(230, 230, 230); + } + th { padding: 0 0 20px 0; background: #d5d8da; @@ -690,6 +753,9 @@ ol.worksheets { &:nth-child(3) { text-align: left; } + img { + margin: 0 8px; + } } } } diff --git a/httpdocs/public/assets/scss/styles.css b/httpdocs/public/assets/scss/styles.css index 66041d5..8ea747a 100644 --- a/httpdocs/public/assets/scss/styles.css +++ b/httpdocs/public/assets/scss/styles.css @@ -229,7 +229,17 @@ textarea:-ms-input-placeholder { width: 80vw; max-width: 1280px; padding: 3rem 0; - min-height: 600px; + min-height: calc(100vh - 68px - 104px); +} +@media (max-width: 1600px) { + #main .inside { + width: 90vw; + } +} +@media (max-width: 1423px) { + #main .inside { + width: 90vw; + } } #main h1 { font-size: 2rem; @@ -621,17 +631,55 @@ textarea:-ms-input-placeholder { display: flex; justify-content: space-between; flex-wrap: wrap; + align-items: end; +} +.row-box-up { + align-items: flex-start; } .row-box .col-box { width: 60%; } +@media (max-width: 1024px) { + .row-box .col-box { + width: 50%; + } +} +@media (max-width: 850px) { + .row-box .col-box { + width: 40%; + } +} +@media (max-width: 650px) { + .row-box .col-box { + width: 100%; + } +} .row-box .col-box:nth-child(2) { width: 30%; } +@media (max-width: 1024px) { + .row-box .col-box:nth-child(2) { + width: 40%; + } +} +@media (max-width: 850px) { + .row-box .col-box:nth-child(2) { + width: 50%; + } +} +@media (max-width: 650px) { + .row-box .col-box:nth-child(2) { + width: 100%; + } +} .row-box .col-box .col-box { width: 48%; } - +@media (max-width: 850px) { + .row-box .col-box .col-box { + width: 100%; + } +} #main .form--catalogue { padding-top: 20px; } @@ -645,6 +693,8 @@ textarea:-ms-input-placeholder { .form-fields label { display: block; font-size: 16px; + line-height: 1.5rem; + padding-bottom: 10px; } .form-fields input, .form-fields select { display: block; @@ -653,6 +703,27 @@ textarea:-ms-input-placeholder { background: #fff; border: 1px solid #000; padding: 10px 10px; + border-radius: 0; +} +@media (max-width: 650px) { + .form-fields input, .form-fields select { + max-width: none; + } +} +.form-fields input#asset, .form-fields select#asset { + max-width: 550px; +} +@media (max-width: 1350px) { + .form-fields input#asset, .form-fields select#asset { + max-width: none; + } +} +.form-fields select { + box-shadow: none; + outline: none; + -webkit-appearance: none; + -moz-appearance: none; + background: #fff url(data:image/svg+xml;base64,PHN2ZyBmaWxsPSdibGFjaycgaGVpZ2h0PScyNCcgdmlld0JveD0nMCAwIDI0IDI0JyB3aWR0aD0nMjQnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zyc+PHBhdGggZD0nTTcgMTBsNSA1IDUtNXonLz48cGF0aCBkPSdNMCAwaDI0djI0SDB6JyBmaWxsPSdub25lJy8+PC9zdmc+) no-repeat calc(100% - 6px) 3px; } .result-box { @@ -759,6 +830,12 @@ ol.worksheets a:hover { margin: 0 0 4rem 0; border-collapse: collapse; } +#main .worksheet-table .ins { + border-right: 1px solid rgba(118, 127, 134, 0.3); +} +#main .worksheet-table .ins-2 { + background: rgb(230, 230, 230); +} #main .worksheet-table th { padding: 0 0 20px 0; background: #d5d8da; @@ -798,6 +875,9 @@ ol.worksheets a:hover { #main .worksheet-table td:last-child, #main .worksheet-table td:nth-child(2), #main .worksheet-table td:nth-child(3) { text-align: left; } +#main .worksheet-table td img { + margin: 0 8px; +} header { box-shadow: 0 1px 10px -6px rgba(0, 0, 0, 0.42), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 4px 5px -2px rgba(0, 0, 0, 0.1); diff --git a/httpdocs/public/assets/scss/styles.css.map b/httpdocs/public/assets/scss/styles.css.map index 898582e..bc06426 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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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,ODrcY;ECscZ;;AAEA;EACE;;AAGF;EACE,YDzcY;;AC4cd;EACE;;;AAIJ;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAGF;EACE;;;AAMJ;EACE;;AAEA;EACE;;;AAKN;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;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;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;;;AElrBR;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;;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;;;AEpvBR;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/templates/pages-admin/admin_create_user.html.twig b/httpdocs/templates/pages-admin/admin_create_user.html.twig index 0f3e751..17f0508 100644 --- a/httpdocs/templates/pages-admin/admin_create_user.html.twig +++ b/httpdocs/templates/pages-admin/admin_create_user.html.twig @@ -4,7 +4,7 @@ {% block body %}
- Zurück zur Übersicht + Zurück zur Instandhaltungsplanung

Admin - Neuen Benutzer anlegen

diff --git a/httpdocs/templates/pages/index.html.twig b/httpdocs/templates/pages/index.html.twig index 187cb53..c44803c 100644 --- a/httpdocs/templates/pages/index.html.twig +++ b/httpdocs/templates/pages/index.html.twig @@ -14,25 +14,13 @@ {% endif %} {% else %}

Willkommen beim MPP-Tool (index.html.twig)

-

Headline

-

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Real FMLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Hinweise

- -

Anmerkung:

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

+

Vorwort

+

Das MPP-Tool unterstützt den Anwender der MPP-Methode bei der Instandhaltungsplanung.

+

Des Weiteren besteht die Möglichkeit über das Planungstool eine erste Kostenindikation für die Wartungs- Und Inspektionsleistungen der technischen Anlagen abzuschätzen. Hierbei greift der MPP auf Daten des Arbeitskreises „Benchmarking der RealFM“ zurück und stellt entsprechende Kennzahlen der Kosten zur Verfügung.

+

Sofern IST-Kosten oder Wartungszyklen verarbeitet werden, kann eine erste grobe Abschätzung der Kosteneinsparung oder Kostenerhöhung je Anlage erfolgen.

+

Achtung: Die Kostenkennwerte sind grobe Anhaltswerte und müssen immer im Detail am konkreten Gebäude bzw. an der konkreten Anlage überprüft und individuell bewertet werden.

+

Die Arbeitskarte zeigt dem Anwendenden auf, welche Tätigkeiten in welchem Intervall durchgeführt werden können. Die Tätigkeiten und die Intervallzyklen sind die Empfehlung des Arbeitskreises. Diese müssen jedoch immer auf das konkrete Gebäude und auf die konkrete technische Anlage angewendet werden.

+

Die Anwendung der Methode MPP sollte somit nach ausdrücklicher Empfehlung der RealFM nur durch Fachexperten in der TGA bzw. in der Baukonstruktion angewandt und umgesetzt werden. Der MPP ist eine Weiterentwicklung des MPC (Maintenance Performance Check) aus dem Leitfaden 2017 und soll den Anwender bei der anlagenbezogenen Zyklusfindung für Wartungs- und Inspektionstätigkeiten sowie deren Kostenauswirkung auf das Budget unterstützen.

+

Zusätzlich kann der Anwender des MPP eine Standard-Arbeitskarte für die geplanten technischen Anlagen finden und für seine Instandhaltungsstrategie nutzbar machen.

{% endif %} {% endblock %} diff --git a/httpdocs/templates/pages/risk_analysis.html.twig b/httpdocs/templates/pages/risk_analysis.html.twig index 59939af..f934db2 100644 --- a/httpdocs/templates/pages/risk_analysis.html.twig +++ b/httpdocs/templates/pages/risk_analysis.html.twig @@ -4,12 +4,12 @@ {% block body %}
- Zurück zur Übersicht + Zurück zur Instandhaltungsplanung

MPP-Tool

Bitte füllen sie alle Felder aus, um eine Risikoanalyse zu erstellen.

-
+
diff --git a/httpdocs/templates/pages/start.html.twig b/httpdocs/templates/pages/start.html.twig index bcc3e4d..c72d968 100644 --- a/httpdocs/templates/pages/start.html.twig +++ b/httpdocs/templates/pages/start.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}Übersicht{% endblock %} +{% block title %}Instandhaltungsplanung{% endblock %} {% block body %} -

Übersicht

+

Instandhaltungsplanung

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore.

diff --git a/httpdocs/templates/pages/worksheet.html.twig b/httpdocs/templates/pages/worksheet.html.twig index 902be8f..f997679 100644 --- a/httpdocs/templates/pages/worksheet.html.twig +++ b/httpdocs/templates/pages/worksheet.html.twig @@ -4,7 +4,7 @@ {% block body %}
- Zurück zur Übersicht + Zurück zur Instandhaltungsplanung

Arbeitsblatt (erstellt am: {{ worksheet.creationDate|date("d.m.Y H:i") }})

{% include 'snippets/worksheet-result.html.twig' with { diff --git a/httpdocs/templates/security/login.html.twig b/httpdocs/templates/security/login.html.twig index b166380..1985835 100644 --- a/httpdocs/templates/security/login.html.twig +++ b/httpdocs/templates/security/login.html.twig @@ -14,25 +14,13 @@ {% endif %} {% else %}

Willkommen beim MPP-Tool

-

Headline

-

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Real FMLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

-

Hinweise

-
    -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
  • Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
    • -
-

Anmerkung:

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

+

Vorwort

+

Das MPP-Tool unterstützt den Anwender der MPP-Methode bei der Instandhaltungsplanung.

+

Des Weiteren besteht die Möglichkeit über das Planungstool eine erste Kostenindikation für die Wartungs- Und Inspektionsleistungen der technischen Anlagen abzuschätzen. Hierbei greift der MPP auf Daten des Arbeitskreises „Benchmarking der RealFM“ zurück und stellt entsprechende Kennzahlen der Kosten zur Verfügung.

+

Sofern IST-Kosten oder Wartungszyklen verarbeitet werden, kann eine erste grobe Abschätzung der Kosteneinsparung oder Kostenerhöhung je Anlage erfolgen.

+

Achtung: Die Kostenkennwerte sind grobe Anhaltswerte und müssen immer im Detail am konkreten Gebäude bzw. an der konkreten Anlage überprüft und individuell bewertet werden.

+

Die Arbeitskarte zeigt dem Anwendenden auf, welche Tätigkeiten in welchem Intervall durchgeführt werden können. Die Tätigkeiten und die Intervallzyklen sind die Empfehlung des Arbeitskreises. Diese müssen jedoch immer auf das konkrete Gebäude und auf die konkrete technische Anlage angewendet werden.

+

Die Anwendung der Methode MPP sollte somit nach ausdrücklicher Empfehlung der RealFM nur durch Fachexperten in der TGA bzw. in der Baukonstruktion angewandt und umgesetzt werden. Der MPP ist eine Weiterentwicklung des MPC (Maintenance Performance Check) aus dem Leitfaden 2017 und soll den Anwender bei der anlagenbezogenen Zyklusfindung für Wartungs- und Inspektionstätigkeiten sowie deren Kostenauswirkung auf das Budget unterstützen.

+

Zusätzlich kann der Anwender des MPP eine Standard-Arbeitskarte für die geplanten technischen Anlagen finden und für seine Instandhaltungsstrategie nutzbar machen.

{% endif %} {% endblock %} diff --git a/httpdocs/templates/snippets/worksheet-result.html.twig b/httpdocs/templates/snippets/worksheet-result.html.twig index 2f10c02..24024cd 100644 --- a/httpdocs/templates/snippets/worksheet-result.html.twig +++ b/httpdocs/templates/snippets/worksheet-result.html.twig @@ -65,9 +65,9 @@ Aufgabe Abgrenzung - Inspektion - Wartung - Instandsetzung + Inspektion + Wartung + Instandsetzung Sachverständiger Sachkundige Fachkraft @@ -94,7 +94,7 @@ {% endif %} - + {% if task.service == 1 %} {% else %}