diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css index 1b0a4dc39..7cb105b85 100755 --- a/public/css/components/calendar.css +++ b/public/css/components/calendar.css @@ -55,8 +55,6 @@ grid-template-columns: 3em repeat(7, 1fr); margin-left: -3em; /*min-height: 266.6666666667%;*/ - background-image: linear-gradient(#f8f9fa calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 + .55px), #f8f9fa calc(100% / 18 + .55px), #f8f9fa calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 + .55px), #f8f9fa calc(200% / 18 + .55px), #f8f9fa calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 + .55px), #f8f9fa calc(300% / 18 + .55px), #f8f9fa calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 + .55px), #f8f9fa calc(400% / 18 + .55px), #f8f9fa calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 + .55px), #f8f9fa calc(500% / 18 + .55px), #f8f9fa calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 + .55px), #f8f9fa calc(600% / 18 + .55px), #f8f9fa calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 + .55px), #f8f9fa calc(700% / 18 + .55px), #f8f9fa calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 + .55px), #fff calc(800% / 18 + .55px), #fff calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 + .55px), #fff calc(900% / 18 + .55px), #fff calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 + .55px), #fff calc(1000% / 18 + .55px), #fff calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 + .55px), #fff calc(1100% / 18 + .55px), #fff calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 + .55px), #fff calc(1200% / 18 + .55px), #fff calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 + .55px), #fff calc(1300% / 18 + .55px), #fff calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 + .55px), #fff calc(1400% / 18 + .55px), #fff calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 + .55px), #fff calc(1500% / 18 + .55px), #fff calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 + .55px), #fff calc(1600% / 18 + .55px), #fff calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 + .55px), #f8f9fa calc(1700% / 18 + .55px), #f8f9fa calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 + .55px), #f8f9fa calc(1800% / 18 + .55px), #f8f9fa calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 + .55px), #f8f9fa calc(1900% / 18 + .55px), #f8f9fa calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 + .55px), #f8f9fa calc(2000% / 18 + .55px), #f8f9fa calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 + .55px), #f8f9fa calc(2100% / 18 + .55px), #f8f9fa calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 + .55px), #f8f9fa calc(2200% / 18 + .55px), #f8f9fa calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 + .55px), #f8f9fa calc(2300% / 18 + .55px)); - } .fhc-calendar-week-page .events .day { gap: 1px; diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js index 1eca1e8a6..d56e9a330 100755 --- a/public/js/components/Calendar/Week/Page.js +++ b/public/js/components/Calendar/Week/Page.js @@ -73,11 +73,14 @@ export default { return res; }, smallestTimeFrame() { - return 10;//[30,15,10,5][this.size]; + return [30,15,10,5][this.size]; } }, methods: { - + getAbsolutePositionForHour(hour){ + // used for the absolute positioning of the gutters of hours + return (100 / this.hours.length) * (hour - (24-this.hours.length)) + '%'; + }, changeToMonth(day) { if (!this.noMonthView) { this.date.set(day); @@ -86,32 +89,30 @@ export default { } }, dateToMinutesOfDay(day) { - //console.log((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame,"this are the hours"); - //console.log(Math.floor((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1,"this is the result of the calculation"); return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1; } }, mounted() { - console.log(this.hours,"this are the hours"); setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0); }, template: `
-
+ -
+
+
{{hour}}:00
-
+

this is a placeholder which means that no template was passed to the Calendar Page slot