Highlight Added
Bugs
This commit is contained in:
@@ -11,6 +11,17 @@ const weekdays = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"]
|
|||||||
|
|
||||||
export default function BasicDateCalendar(p) {
|
export default function BasicDateCalendar(p) {
|
||||||
|
|
||||||
|
function getBackMonthColor(monthIndex)
|
||||||
|
{
|
||||||
|
let date = new Date(parseInt(startParts[2]), parseInt(startParts[1]) + monthIndex, 1)
|
||||||
|
console.log(p.highlightYear + " " + date.getFullYear())
|
||||||
|
if (date.getFullYear() === p.highlightYear && date.getMonth() === p.highlightMonth + 1)
|
||||||
|
{
|
||||||
|
return true
|
||||||
|
}else
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
startParts = []
|
startParts = []
|
||||||
endParts = []
|
endParts = []
|
||||||
@@ -36,7 +47,10 @@ export default function BasicDateCalendar(p) {
|
|||||||
textAlign : "center",
|
textAlign : "center",
|
||||||
marginBottom : 10,
|
marginBottom : 10,
|
||||||
fontSize: 19,
|
fontSize: 19,
|
||||||
pointerEvents: "none"
|
pointerEvents: "none",
|
||||||
|
backgroundColor: getBackMonthColor(index) ? "#346991":"rgba(0,0,0,0)",
|
||||||
|
color : getBackMonthColor(index) ? "white":"black",
|
||||||
|
borderRadius : 10
|
||||||
}}>{getMonthName(index)}</p>
|
}}>{getMonthName(index)}</p>
|
||||||
<div className={"Days"} style={{
|
<div className={"Days"} style={{
|
||||||
pointerEvents: "none"
|
pointerEvents: "none"
|
||||||
@@ -60,6 +74,8 @@ export default function BasicDateCalendar(p) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function getMonthName(monthIndex) {
|
function getMonthName(monthIndex) {
|
||||||
if (startParts[1] - 1 + monthIndex < 12) {
|
if (startParts[1] - 1 + monthIndex < 12) {
|
||||||
return months[startParts[1] - 1 + monthIndex][0];
|
return months[startParts[1] - 1 + monthIndex][0];
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ export default function CalenderView(p) {
|
|||||||
const[startYearCalenderSideBar, setStartYearCalenderSideBar] = useState(2000)
|
const[startYearCalenderSideBar, setStartYearCalenderSideBar] = useState(2000)
|
||||||
const[endDayCalenderSideBar, setEndDayCalenderSideBar] = useState(0)
|
const[endDayCalenderSideBar, setEndDayCalenderSideBar] = useState(0)
|
||||||
const[endYearCalenderSideBar, setEndYearCalenderSideBar] = useState(2000)
|
const[endYearCalenderSideBar, setEndYearCalenderSideBar] = useState(2000)
|
||||||
|
const [highlightMonth, setHighlightMonth] = useState(0)
|
||||||
|
const [highlightYear, setHighlightYear] = useState(2000)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function readEntries() {
|
function readEntries() {
|
||||||
let url = baseURL + "/entries?semesterid=" + localStorage.getItem("currentsid") +
|
let url = baseURL + "/entries?semesterid=" + localStorage.getItem("currentsid") +
|
||||||
@@ -266,11 +270,15 @@ export default function CalenderView(p) {
|
|||||||
|
|
||||||
function onWeekLeft() {
|
function onWeekLeft() {
|
||||||
currentWeekStartDay -= 7;
|
currentWeekStartDay -= 7;
|
||||||
|
setHighlightMonth(new Date(currentYear, 0, currentWeekStartDay + 5).getMonth())
|
||||||
|
setHighlightYear(currentYear)
|
||||||
readEntries()
|
readEntries()
|
||||||
}
|
}
|
||||||
|
|
||||||
function onWeekRight() {
|
function onWeekRight() {
|
||||||
currentWeekStartDay += 7;
|
currentWeekStartDay += 7;
|
||||||
|
setHighlightMonth(new Date(currentYear, 0, currentWeekStartDay + 5).getMonth())
|
||||||
|
setHighlightYear(currentYear)
|
||||||
readEntries()
|
readEntries()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,6 +326,9 @@ export default function CalenderView(p) {
|
|||||||
currentYear = s.startyear;
|
currentYear = s.startyear;
|
||||||
setStartYearCalenderSideBar(currentYear)
|
setStartYearCalenderSideBar(currentYear)
|
||||||
setEndYearCalenderSideBar(s.endyear)
|
setEndYearCalenderSideBar(s.endyear)
|
||||||
|
//console.log(new Date(s.startyear, 0, s.startday).getMonth())
|
||||||
|
setHighlightMonth(new Date(s.startyear, 0, s.startday).getMonth())
|
||||||
|
setHighlightYear(currentYear)
|
||||||
|
|
||||||
semesterStart = s.startday;
|
semesterStart = s.startday;
|
||||||
setStartDayCalenderSideBar(semesterStart)
|
setStartDayCalenderSideBar(semesterStart)
|
||||||
@@ -374,6 +385,8 @@ export default function CalenderView(p) {
|
|||||||
currentWeekStartDay = Math.round((date - start) / (1000 * 60 * 60 * 24))
|
currentWeekStartDay = Math.round((date - start) / (1000 * 60 * 60 * 24))
|
||||||
currentWeekStartDay = currentWeekStartDay - new Date(date.getFullYear(), 0, currentWeekStartDay).getUTCDay()
|
currentWeekStartDay = currentWeekStartDay - new Date(date.getFullYear(), 0, currentWeekStartDay).getUTCDay()
|
||||||
currentYear = date.getFullYear()
|
currentYear = date.getFullYear()
|
||||||
|
setHighlightMonth(date.getMonth())
|
||||||
|
setHighlightYear(currentYear)
|
||||||
readEntries()
|
readEntries()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -386,7 +399,7 @@ export default function CalenderView(p) {
|
|||||||
alignItems: "center"
|
alignItems: "center"
|
||||||
}}>
|
}}>
|
||||||
<div>
|
<div>
|
||||||
<BasicDateCalendar startyear={startYearCalenderSideBar} startday={startDayCalenderSideBar} endyear={endYearCalenderSideBar} endday={endDayCalenderSideBar} onMonthClick={onMonthClick}/>
|
<BasicDateCalendar startyear={startYearCalenderSideBar} startday={startDayCalenderSideBar} endyear={endYearCalenderSideBar} endday={endDayCalenderSideBar} highlightYear={highlightYear} highlightMonth={highlightMonth} onMonthClick={onMonthClick}/>
|
||||||
</div>
|
</div>
|
||||||
<div style={{
|
<div style={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
|
|||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user