diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 9b7a9274..142f619f 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -3,7 +3,7 @@ import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom"; import { Login } from "./pages/Login"; import { Report } from "./pages/Report"; import { Help } from "./pages/Help"; -import { VacationPlanner } from "./pages/VacationPlanner"; +import { AbsencePlanner } from "./pages/AbsencePlanner"; import { AuthProvider } from "./components/AuthProvider"; import { ProtectedRoute } from "./components/ProtectedRoute"; import { getISOWeek } from "date-fns"; @@ -50,10 +50,10 @@ export const App = () => { } /> - + } /> diff --git a/frontend/src/components/HeaderUser.tsx b/frontend/src/components/HeaderUser.tsx index 9188be9b..3cfc3910 100644 --- a/frontend/src/components/HeaderUser.tsx +++ b/frontend/src/components/HeaderUser.tsx @@ -20,8 +20,8 @@ export const HeaderUser = ({ username }: { username: string }) => { Report time - - Vacation + + Absence -

Reported vacation

+ {tableData.length > 0 ? ( +
+ + {/*The empty heading tags make the top border go all the way out*/} + + + + + + + {tableData.map((element, index) => { + return ( + + + + + + + ); + })} +
Start dateEnd date
{formatDate(element.startDate, dateFormat)}{formatDate(element.endDate, dateFormat)} + pencil to edit + + +
+
+ ) : ( + <> + )} +

Reported absence

Filter by group:
- {vacationRows.length > 1 ? ( + {absenceRows.length > 1 ? ( ) : ( -

No time entries were found

+

No absence entries were found

)}
{toastList.length > 0 && (