Feiertage Implementiert
Feiertage werden nun ausgegraut ^^
This commit is contained in:
@@ -6,6 +6,7 @@ import WeekSelector from "@/components/WeekSelector";
|
||||
import {baseURL} from "@/components/Constants";
|
||||
import {ErrorType} from "@/components/ErrorType";
|
||||
import BasicDateCalendar from "@/components/CalendarSideBar";
|
||||
import feiertagejs from "feiertagejs";
|
||||
|
||||
let cellHeight = 20;
|
||||
|
||||
@@ -54,10 +55,6 @@ export default function CalenderView(p) {
|
||||
let maxLunchBreak = 0
|
||||
let daySum = 0
|
||||
for (let j = 0; j < en[i].length; j++) {
|
||||
if (en[i][j] != null){
|
||||
console.log(currentsid + " " + en[i][j].semesterid)
|
||||
|
||||
}
|
||||
if (en[i][j] != null && currentsid == (en[i][j]).semesterid) {
|
||||
let elem = en[i][j]
|
||||
|
||||
@@ -143,6 +140,7 @@ export default function CalenderView(p) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
let j = 0;
|
||||
@@ -151,6 +149,10 @@ export default function CalenderView(p) {
|
||||
grayedOut[j] = i % Math.round(((new Date(currentYear, 11, 31) - new Date(currentYear, 0, 0)) / (1000 * 60 * 60 * 24))) < semesterStart && semesterEnd && new Date(currentYear, 0, currentWeekStartDay + j).getFullYear() == semesterStartYear || i % Math.round(((new Date(currentYear, 11, 31) - new Date(currentYear, 0, 0)) / (1000 * 60 * 60 * 24))) > semesterEnd && new Date(currentYear, 0, currentWeekStartDay + j).getFullYear() == semesterEndYear
|
||||
j++
|
||||
}
|
||||
for (let i = 0; i < 6; i++) {
|
||||
let date = new Date(currentYear, 0, currentWeekStartDay+i)
|
||||
grayedOut[i] = holiday(currentYear, date.getMonth(), date.getDate())
|
||||
}
|
||||
|
||||
setEntries(en)
|
||||
})
|
||||
@@ -187,6 +189,12 @@ export default function CalenderView(p) {
|
||||
}).then(r => readEntries())
|
||||
}
|
||||
|
||||
function holiday(year, month, day){
|
||||
var feiertagejs = require('feiertagejs');
|
||||
let today = new Date(year, month, day)
|
||||
return feiertagejs.isHoliday(today, 'BW')
|
||||
}
|
||||
|
||||
function checkForElementAtRow(row, column) {
|
||||
let currentList = entries[column];
|
||||
for (let i = 0; i < currentList.length; i++) {
|
||||
|
||||
@@ -33,7 +33,7 @@ export default function SemesteroverviewLecturer(p) {
|
||||
fetch(semesterURL).then(r => r.json()).then(sem => {
|
||||
sem.map(e => {
|
||||
let progessURL = baseURL + "/entries/planned?sessionid=" + localStorage.getItem("sessionid") + "&semesterid=" + e.id;
|
||||
fetch(progessURL).then(r => r.json()).then(en => console.log(en))
|
||||
fetch(progessURL).then(r => r.json()).then(en => console.log(en)) // TODO: Progressbar
|
||||
temp.push(e.name)
|
||||
})
|
||||
}).then(() => setSemesterNames(temp))
|
||||
|
||||
Reference in New Issue
Block a user