fixed bug in vacation calendar and fixed right amount of consultants …

…on consultant page
varianter · Mar 1, 2024 · 7f351a3 · 7f351a3
1 parent 15d9c0f
commit 7f351a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/frontend/src/components/VacationCalendar.tsx b/frontend/src/components/VacationCalendar.tsx
@@ -94,7 +94,7 @@ export default function VacationCalendar({
     <div className="flex flex-row">
       <div className="sidebar z-10">
         <div className="bg-primary/5 h-full flex flex-col gap-6 p-4 w-[300px]">
-          <h1 className="">2023</h1>
+          <h1 className="">{new Date().getFullYear()}</h1>
           <div className="flex flex-col gap-2">
             <p className="small text-black">Ferieoversikt</p>
             <InfoBox

diff --git a/frontend/src/components/consultants/FilteredConsultants.tsx b/frontend/src/components/consultants/FilteredConsultants.tsx
@@ -23,7 +23,7 @@ export default function FilteredConsultants() {
             <div className="flex flex-row gap-1 items-center">
               <p className="normal-medium ">Konsulenter</p>
               <p className="text-primary small-medium rounded-full bg-primary/5 px-2 py-1">
-                {filteredConsultants?.length}
+                {filteredConsultants.filter((e) => !e.endDate)?.length}
               </p>
             </div>
           </th>
@@ -129,7 +129,12 @@ export default function FilteredConsultants() {
           ))}
         <tr>
           <td className="py-4 font-bold text-">
-            <p className="normal">Inaktive konsulenter</p>
+            <div className="flex flex-row gap-1 items-center">
+              <p className="normal-medium ">Inaktive konsulenter</p>
+              <p className="text-primary small-medium rounded-full bg-primary/5 px-2 py-1">
+                {filteredConsultants.filter((e) => e.endDate)?.length}
+              </p>
+            </div>
           </td>
         </tr>