fix: merge conflicts resolved
This commit is contained in:
commit
473dfc7a5b
41 changed files with 317 additions and 219 deletions
|
|
@ -7,6 +7,7 @@ import { ModuleGanttBlock } from "components/modules";
|
|||
import { useModule, useProject } from "hooks/store";
|
||||
// types
|
||||
import { IModule } from "@plane/types";
|
||||
import { getDate } from "helpers/date-time.helper";
|
||||
|
||||
export const ModulesListGanttChartView: React.FC = observer(() => {
|
||||
// router
|
||||
|
|
@ -34,8 +35,8 @@ export const ModulesListGanttChartView: React.FC = observer(() => {
|
|||
data: block,
|
||||
id: block.id,
|
||||
sort_order: block.sort_order,
|
||||
start_date: block.start_date ? new Date(block.start_date) : null,
|
||||
target_date: block.target_date ? new Date(block.target_date) : null,
|
||||
start_date: getDate(block.start_date),
|
||||
target_date: getDate(block.target_date),
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue