From c1f8766571294eef77085f9b57be380c4bacc263 Mon Sep 17 00:00:00 2001 From: gurusainath Date: Sat, 20 May 2023 23:10:04 +0530 Subject: [PATCH] styles: UI changes in the gantt blocks --- .../components/cycles/cycles-list-gantt-chart.tsx | 6 +++--- apps/app/components/cycles/gantt-chart.tsx | 6 +++--- apps/app/components/gantt-chart/blocks/index.tsx | 12 +++++------- apps/app/components/gantt-chart/chart/index.tsx | 2 +- apps/app/components/gantt-chart/views/month-view.ts | 2 +- apps/app/components/issues/gantt-chart.tsx | 6 +++--- apps/app/components/modules/gantt-chart.tsx | 6 +++--- .../components/modules/modules-list-gantt-chart.tsx | 6 +++--- apps/app/components/views/gantt-chart.tsx | 6 +++--- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/apps/app/components/cycles/cycles-list-gantt-chart.tsx b/apps/app/components/cycles/cycles-list-gantt-chart.tsx index 2b783f4e2..ad298e79d 100644 --- a/apps/app/components/cycles/cycles-list-gantt-chart.tsx +++ b/apps/app/components/cycles/cycles-list-gantt-chart.tsx @@ -23,9 +23,9 @@ export const CyclesListGanttChartView: FC = ({ cycles }) => { // rendering issues on gantt card const GanttBlockView = ({ data }: { data: ICycle }) => ( -
-
-
+
+
+
{data?.name}
diff --git a/apps/app/components/cycles/gantt-chart.tsx b/apps/app/components/cycles/gantt-chart.tsx index d38ad727b..04de7afb7 100644 --- a/apps/app/components/cycles/gantt-chart.tsx +++ b/apps/app/components/cycles/gantt-chart.tsx @@ -32,12 +32,12 @@ export const CycleIssuesGanttChartView: FC = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
diff --git a/apps/app/components/gantt-chart/blocks/index.tsx b/apps/app/components/gantt-chart/blocks/index.tsx index 24ee4d39e..113ca8964 100644 --- a/apps/app/components/gantt-chart/blocks/index.tsx +++ b/apps/app/components/gantt-chart/blocks/index.tsx @@ -21,14 +21,14 @@ export const GanttChartBlocks: FC<{ className="relative z-10 mt-[58px] h-full w-[4000px] divide-x divide-gray-300 overflow-hidden overflow-y-auto bg-[#999] bg-opacity-5" style={{ width: `${itemsContainerWidth}px` }} > -
+
{blocks && blocks.length > 0 && blocks.map((block: any, _idx: number) => ( <> {block.start_date && block.target_date && (
-
- {blockRender({ ...block?.data })} -
+ {blockRender({ ...block?.data })}
@@ -71,7 +69,7 @@ export const GanttChartBlocks: FC<{ {blocks && blocks.length > 0 && blocks.map((block: any, _idx: number) => ( -
+
{sidebarBlockRender(block?.data)}
))} diff --git a/apps/app/components/gantt-chart/chart/index.tsx b/apps/app/components/gantt-chart/chart/index.tsx index a1b80ef84..6724c3552 100644 --- a/apps/app/components/gantt-chart/chart/index.tsx +++ b/apps/app/components/gantt-chart/chart/index.tsx @@ -214,7 +214,7 @@ export const ChartViewRoot: FC = ({
{/* chart title */}
diff --git a/apps/app/components/gantt-chart/views/month-view.ts b/apps/app/components/gantt-chart/views/month-view.ts index df537ba5e..7211a45eb 100644 --- a/apps/app/components/gantt-chart/views/month-view.ts +++ b/apps/app/components/gantt-chart/views/month-view.ts @@ -184,7 +184,7 @@ export const getMonthChartItemPositionWidthInMonth = (chartData: ChartDataType, diffMonths -= startDate.getMonth(); diffMonths += itemStartDate.getMonth(); - scrollPosition = scrollPosition + diffMonths - 1; + scrollPosition = scrollPosition + diffMonths; // position code ends // width code starts diff --git a/apps/app/components/issues/gantt-chart.tsx b/apps/app/components/issues/gantt-chart.tsx index 5e79822c5..b35d4a749 100644 --- a/apps/app/components/issues/gantt-chart.tsx +++ b/apps/app/components/issues/gantt-chart.tsx @@ -32,12 +32,12 @@ export const IssueGanttChartView: FC = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
diff --git a/apps/app/components/modules/gantt-chart.tsx b/apps/app/components/modules/gantt-chart.tsx index edc24cfc9..0d11da2c0 100644 --- a/apps/app/components/modules/gantt-chart.tsx +++ b/apps/app/components/modules/gantt-chart.tsx @@ -32,12 +32,12 @@ export const ModuleIssuesGanttChartView: FC = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
diff --git a/apps/app/components/modules/modules-list-gantt-chart.tsx b/apps/app/components/modules/modules-list-gantt-chart.tsx index c6fbf329f..edff17a95 100644 --- a/apps/app/components/modules/modules-list-gantt-chart.tsx +++ b/apps/app/components/modules/modules-list-gantt-chart.tsx @@ -27,12 +27,12 @@ export const ModulesListGanttChartView: FC = ({ modules }) => { // rendering issues on gantt card const GanttBlockView = ({ data }: { data: IModule }) => ( -
+
s.value === data.status)?.color }} /> -
+
{data?.name}
diff --git a/apps/app/components/views/gantt-chart.tsx b/apps/app/components/views/gantt-chart.tsx index dbe71fae0..461f46835 100644 --- a/apps/app/components/views/gantt-chart.tsx +++ b/apps/app/components/views/gantt-chart.tsx @@ -32,12 +32,12 @@ export const ViewIssuesGanttChartView: FC = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}