Show options just for new project (#462)

varianter · May 6, 2024 · 8a3f1ba · 8a3f1ba
1 parent f2f9713
commit 8a3f1ba
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 30 deletions.
diff --git a/backend/Api/Projects/ProjectController.cs b/backend/Api/Projects/ProjectController.cs
@@ -228,9 +228,7 @@ public ActionResult<ProjectWithCustomerModel> Put([FromRoute] string orgUrlKey,
         var project = _context.Project
             .Include(p => p.Customer)
             .SingleOrDefault(p => p.Customer.Name == body.CustomerName
-                                  && p.IsBillable == body.IsBillable
                                   && p.Name == body.ProjectName
-                                  && p.State == body.BookingType
             );
 
         if (project is null)

diff --git a/backend/Tests/AbsenceTest.cs b/backend/Tests/AbsenceTest.cs
@@ -19,7 +19,10 @@ public class Tests
     [TestCase(0, 0, 0, 37.5, 0)]
     [TestCase(0, 0, 0, 30, 7.5)]
     [TestCase(0, 7.5, 0, 22.5, 7.5)]
-    public void AvailabilityCalculation(int vacationDays, double plannedAbsenceHours, int numberOfHolidays,
+    public void AvailabilityCalculation(
+        int vacationDays, 
+        double plannedAbsenceHours, 
+        int numberOfHolidays,
         double staffedHours,
         double expectedSellableHours)
     {
@@ -51,9 +54,8 @@ public void AvailabilityCalculation(int vacationDays, double plannedAbsenceHours
             Id = 1,
             Name = "Test Variant",
             Email = "[email protected]",
-            Department = department,
             GraduationYear = 2010,
-
+            Department = department
         };
 
         var mondayDateOnly = numberOfHolidays switch
@@ -151,8 +153,8 @@ public void MultiplePlannedAbsences()
             Id = 1,
             Name = "Test Variant",
             Email = "[email protected]",
-            Department = department,
             GraduationYear = 2010,
+            Department = department
         };
 
         var week = new Week(2000, 1);

diff --git a/frontend/src/components/Staffing/AddEngagementForm.tsx b/frontend/src/components/Staffing/AddEngagementForm.tsx
@@ -34,6 +34,7 @@ export function AddEngagementForm({
     useState<SelectOption | null>(null);
 
   const [_, setProject] = useState<ProjectWithCustomerModel | undefined>();
+  const [isNewProject, setIsNewProject] = useState(false);
 
   const customerOptions = customers.map(
     (c) =>
@@ -73,6 +74,11 @@ export function AddEngagementForm({
   }
 
   function handleSelectedEngagementChange(newValue: SelectOption) {
+    console.log(projectOptions);
+    console.log(newValue);
+    if (!projectOptions.map((o) => o.label).includes(newValue.label)) {
+      setIsNewProject(true);
+    }
     setSelectedEngagement(newValue);
   }
 
@@ -172,7 +178,7 @@ export function AddEngagementForm({
             </div>
           </div>
 
-          {!isAbsence && (
+          {isNewProject && (
             <>
               {/* Radio Button Group */}
 

diff --git a/frontend/src/components/Staffing/ConsultantRow.tsx b/frontend/src/components/Staffing/ConsultantRow.tsx
@@ -229,10 +229,12 @@ export default function ConsultantRows({
                 : "border-l-primary/5"
             } `}
           ></td>
-          <AddEngagementForm
-            closeEngagementModal={handleNewEngagement}
-            consultant={currentConsultant}
-          />
+          <td>
+            <AddEngagementForm
+              closeEngagementModal={handleNewEngagement}
+              consultant={currentConsultant}
+            />
+          </td>
         </tr>
       )}
 
@@ -247,27 +249,29 @@ export default function ConsultantRows({
                 : "border-l-primary/5"
             } `}
           ></td>
-          {!addNewRow && (
-            <button
-              onClick={() => {
-                setAddNewRow(true);
-                setIsDisabledHotkeys(true);
-              }}
-              className="flex flex-row items-center min-w-max gap-2 h-[52px]"
-              onMouseEnter={() => setIsAddStaffingHovered(true)}
-              onMouseLeave={() => setIsAddStaffingHovered(false)}
-            >
-              <span
-                className={`w-8 h-8 flex justify-center items-center rounded bg-primary/0 ${
-                  isAddStaffingHovered && "bg-primary/10"
-                }`}
+          <td>
+            {!addNewRow && (
+              <button
+                onClick={() => {
+                  setAddNewRow(true);
+                  setIsDisabledHotkeys(true);
+                }}
+                className="flex flex-row items-center min-w-max gap-2 h-[52px]"
+                onMouseEnter={() => setIsAddStaffingHovered(true)}
+                onMouseLeave={() => setIsAddStaffingHovered(false)}
               >
-                <Plus size={16} className="text-primary" />
-              </span>
+                <span
+                  className={`w-8 h-8 flex justify-center items-center rounded bg-primary/0 ${
+                    isAddStaffingHovered && "bg-primary/10"
+                  }`}
+                >
+                  <Plus size={16} className="text-primary" />
+                </span>
 
-              <p className="small text-primary">Legg til bemanning</p>
-            </button>
-          )}
+                <p className="small text-primary">Legg til bemanning</p>
+              </button>
+            )}
+          </td>
         </tr>
       )}
     </>