From e7a29dc21a69fa597684b946f4501fba51a8dab9 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 7 Aug 2024 11:56:00 +0200 Subject: [PATCH] Identation --- public/js/components/DashboardWidget/Ampel.js | 173 +++++++++++------- 1 file changed, 105 insertions(+), 68 deletions(-) diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js index a3a36eb94..8f8281276 100755 --- a/public/js/components/DashboardWidget/Ampel.js +++ b/public/js/components/DashboardWidget/Ampel.js @@ -15,16 +15,12 @@ export default { AbstractWidget ], computed: { - - ampelnComputed(){ - - switch(this.source) - { + ampelnComputed() { + switch(this.source) { case 'offen': return this.applyFilter(this.activeAmpeln); case 'alle': return this.applyFilter(this.allAmpeln); default: return this.applyFilter(this.activeAmpeln); } - }, ampelnOverview () { return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX); // show only newest 4 active ampeln @@ -39,23 +35,20 @@ export default { ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length, alle: datasource?.length } - } }, methods: { - applyFilter(data){ - switch(this.filter) - { - case 'verpflichtend': return data?.filter(item => item.verpflichtend); - case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt); - default: return data; - } + applyFilter(data) { + switch(this.filter) { + case 'verpflichtend': return data?.filter(item => item.verpflichtend); + case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt); + default: return data; + } }, - toggleFilter(value){ + toggleFilter(value) { this.filter === value ? this.filter = '' : this.filter = value; }, - closeOffcanvasAmpeln() - { + closeOffcanvasAmpeln() { for (let i = 0; i < this.ampelnComputed.length; i++) { let ampelId = this.ampelnComputed[i].ampel_id; @@ -64,29 +57,29 @@ export default { } } }, - openOffcanvasAmpel(ampelId){ + openOffcanvasAmpel(ampelId) { // Close earlier opened Ampeln this.closeOffcanvasAmpeln(); // Show given Ampel this.$refs['ampelCollapse_' + ampelId][0].classList.add('show'); }, - closeOffcanvas(){ + closeOffcanvas() { this.closeOffcanvasAmpeln(); this.filter = ''; // maybe we also want to reset the source (open/alle) of the displayed ampeln }, - async fetchNonConfirmedActiveAmpeln(){ - await this.$fhcApi.factory.ampeln.open().then(res=>{ + async fetchNonConfirmedActiveAmpeln() { + await this.$fhcApi.factory.ampeln.open().then(res => { this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline)); }); }, - async fetchAllActiveAmpeln(){ - await this.$fhcApi.factory.ampeln.all().then(res=>{ + async fetchAllActiveAmpeln() { + await this.$fhcApi.factory.ampeln.all().then(res => { this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline)); }); }, - async confirm(ampelId){ + async confirm(ampelId) { this.$fhcApi.factory.ampeln.confirm(ampelId) .then(() => { this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt')); @@ -97,11 +90,10 @@ export default { this.fetchNonConfirmedActiveAmpeln(); this.fetchAllActiveAmpeln(); }, - validateBtnTxt(buttontext){ + validateBtnTxt(buttontext) { + if (buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen'); - if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen'); - - if(!buttontext) return this.$p.t('ui','bestaetigen'); + if (!buttontext) return this.$p.t('ui', 'bestaetigen'); return buttontext; } @@ -117,11 +109,19 @@ export default {
-
{{$p.t('ampeln','newestAmpeln')}}
- +
{{$p.t('ampeln', 'newestAmpeln')}}
+
@@ -139,28 +139,25 @@ export default {
-
+
{{$p.t('ampeln','super')}}
{{$p.t('ampeln','noOpenAmpeln')}}
-
{{$p.t('ampeln','newestAmpeln')}}
+
{{$p.t('ampeln', 'newestAmpeln')}}
-
-
@@ -169,38 +166,78 @@ export default {