Skip to content

Commit c3e6d60

Browse files
committed
Gantt fix and admin user migration order
1 parent b8eabda commit c3e6d60

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/backend/src/prisma/migrations/20250626021534_finance_redesign/migration.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ ALTER TABLE "Reimbursement_Product_Reason" ADD COLUMN "otherReasonId" TEXT;
1010
-- AlterTable
1111
ALTER TABLE "Reimbursement_Request" ADD COLUMN "indexCodeId" TEXT;
1212

13+
-- CreateAdminUser
14+
INSERT INTO "User" ("userId", "firstName", "lastName", "googleAuthId", "email") VALUES ('0', 'Admin', 'User', 'admin', 'admin@gmail.com');
15+
1316
-- AlterTable
14-
ALTER TABLE "Vendor" ADD COLUMN "addedByUserId" TEXT NOT NULL,
17+
ALTER TABLE "Vendor" ADD COLUMN "addedByUserId" TEXT NOT NULL DEFAULT '0',
1518
ADD COLUMN "discountCode" TEXT,
1619
ADD COLUMN "notes" TEXT,
1720
ADD COLUMN "password" TEXT,
@@ -117,9 +120,6 @@ CREATE TABLE "_Account_CodeToReimbursement_Product_Other_Reason" (
117120
CONSTRAINT "_Account_CodeToReimbursement_Product_Other_Reason_AB_pkey" PRIMARY KEY ("A","B")
118121
);
119122

120-
-- CreateAdminUser
121-
INSERT INTO "User" ("userId", "firstName", "lastName", "googleAuthId", "email") VALUES ('0', 'Admin', 'User', 'admin', 'admin@gmail.com');
122-
123123
-- Ensure every organization gets its own CASH and BUDGET index codes
124124
WITH orgs AS (
125125
SELECT "organizationId" FROM "Organization"

src/frontend/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBarDisplay.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const GanttTaskBarDisplay = <T,>({
7575
cursor: 'pointer',
7676
position: 'sticky',
7777
left: 0,
78-
width: hasChildren ? 'fit-content' : '100%'
78+
width: hasOverlays ? 'fit-content' : '100%'
7979
};
8080

8181
const ganttTaskBarChildOverlayStyles = (child: GanttTask<T>): CSSProperties => {
@@ -174,7 +174,7 @@ const GanttTaskBarDisplay = <T,>({
174174
onMouseLeave={handleOnMouseLeave}
175175
onClick={task.onClick}
176176
>
177-
{hasChildren && (
177+
{hasOverlays && (
178178
<IconButton
179179
onClick={(e) => {
180180
e.stopPropagation();
@@ -193,7 +193,7 @@ const GanttTaskBarDisplay = <T,>({
193193
{task.name}
194194
</Typography>
195195
</div>
196-
{hasChildren &&
196+
{hasOverlays &&
197197
task.children.map((childTask) => {
198198
return (
199199
<div

0 commit comments

Comments
 (0)