From a7849f5b3dd32f52a8bd13e23eca52fee636df49 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Sun, 23 Jul 2023 20:04:06 +0700 Subject: [PATCH 01/28] Add cypress e2e --- cypress.config.js | 9 ++++++ cypress/e2e/tests/gantt-duration-edit.cy.js | 9 ++++++ cypress/fixtures/example.json | 5 ++++ cypress/support/commands.js | 33 +++++++++++++++++++++ cypress/support/e2e.js | 20 +++++++++++++ package.json | 1 + 6 files changed, 77 insertions(+) create mode 100644 cypress.config.js create mode 100644 cypress/e2e/tests/gantt-duration-edit.cy.js create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/e2e.js diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 index 0000000..97f47c4 --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,9 @@ +const { defineConfig } = require("cypress"); + +module.exports = defineConfig({ + e2e: { + setupNodeEvents(on, config) { + // implement node event listeners here + }, + }, +}); diff --git a/cypress/e2e/tests/gantt-duration-edit.cy.js b/cypress/e2e/tests/gantt-duration-edit.cy.js new file mode 100644 index 0000000..ec199ab --- /dev/null +++ b/cypress/e2e/tests/gantt-duration-edit.cy.js @@ -0,0 +1,9 @@ +describe("Test a page", () => { + beforeEach(() => { + cy.visit("http://localhost:3000/#/login"); + }); + + it("should visit the authenticated page", () => { + // Continue with your assertions or other test steps + }); +}); diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 0000000..02e4254 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 0000000..2b0aa47 --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,33 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add('login', (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This will overwrite an existing command -- +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) +Cypress.Commands.add("login", (username, password) => { + // Implement your login logic here + // For example: + cy.visit("http://localhost:3000/#/login"); // Assuming your login page is at "/login" + cy.get("#exampleName").type(username); + cy.get("#examplePassword").type(password); + cy.get(".px-4").click(); +}); \ No newline at end of file diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js new file mode 100644 index 0000000..0e7290a --- /dev/null +++ b/cypress/support/e2e.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/e2e.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') \ No newline at end of file diff --git a/package.json b/package.json index 3e8583b..f6e19ba 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,7 @@ "@babel/core": "^7.14.5", "babel-plugin-module-resolver": "^4.1.0", "clean-webpack-plugin": "^3.0.0", + "cypress": "^12.17.2", "react-scripts": "^3.0.1", "webpack-sources": "1.0.1" }, From abb3c39a7d7bbd92632c553444e64c99b463db68 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 25 Jul 2023 08:53:29 +0700 Subject: [PATCH 02/28] Fix unnecessary request on project menu --- src/views/SimproV2/CreatedProyek/AsignHrProject.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/AsignHrProject.js b/src/views/SimproV2/CreatedProyek/AsignHrProject.js index e2ca043..fb392f1 100644 --- a/src/views/SimproV2/CreatedProyek/AsignHrProject.js +++ b/src/views/SimproV2/CreatedProyek/AsignHrProject.js @@ -34,9 +34,11 @@ const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, toolsR }, [openDialog]); useEffect(() => { - getDataUser(); - getDataProjectRole(); - }, []) + if (dataUserToProject.length > 0) { + getDataUser(); + getDataProjectRole(); + } + }, [dataUserToProject]) const getDataAssignHr = async () => { const payload = { From 2ab7277223644685d63fbeddfd8fc32cc0dd9fe9 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 25 Jul 2023 09:25:05 +0700 Subject: [PATCH 03/28] Quick Fix --- src/views/SimproV2/CreatedProyek/AsignHrProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/SimproV2/CreatedProyek/AsignHrProject.js b/src/views/SimproV2/CreatedProyek/AsignHrProject.js index fb392f1..e3b4152 100644 --- a/src/views/SimproV2/CreatedProyek/AsignHrProject.js +++ b/src/views/SimproV2/CreatedProyek/AsignHrProject.js @@ -34,7 +34,7 @@ const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, toolsR }, [openDialog]); useEffect(() => { - if (dataUserToProject.length > 0) { + if (dataUserToProject.length > 0 && openDialog) { getDataUser(); getDataProjectRole(); } From 623615043cd1530c81ce741d2082c1b0c3f5313b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 31 Jul 2023 08:11:53 +0700 Subject: [PATCH 04/28] Test example add project --- cypress/e2e/addProject.cy.js | 57 +++++++++++++++++++++ cypress/e2e/tests/gantt-duration-edit.cy.js | 9 ---- 2 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 cypress/e2e/addProject.cy.js delete mode 100644 cypress/e2e/tests/gantt-duration-edit.cy.js diff --git a/cypress/e2e/addProject.cy.js b/cypress/e2e/addProject.cy.js new file mode 100644 index 0000000..9580b08 --- /dev/null +++ b/cypress/e2e/addProject.cy.js @@ -0,0 +1,57 @@ +describe("Test a page", () => { + beforeEach(() => { + cy.login("admin", "1nt3gr4s14"); + cy.url({ timeout: 20000 }).should("include", "/dashboard"); + cy.visit("http://localhost:3000/#/projects"); + }); + + it("Add project normal case", () => { + cy.intercept('GET', 'http://localhost/adw-backend/api/currency/list').as('getCurrency'); + cy.intercept('GET', 'http://localhost/adw-backend/api/project-type/list').as('getType'); + cy.intercept('GET', 'http://localhost/adw-backend/api/divisi/list').as('getDivisi'); + cy.intercept('GET', 'http://localhost/adw-backend/api/project-phase/list').as('getPhase'); + cy.intercept('GET', 'http://localhost/adw-backend/api/human-resource/list').as('getHr'); + + cy.get('[style="background: rgb(76, 175, 80); color: rgb(255, 255, 255);"]').click(); + + cy.get(':nth-child(2) > :nth-child(1) > .form-group > .form-control').type('Automated Test'); + cy.get(':nth-child(2) > :nth-child(2) > .form-group > .form-control').type('AT'); + + cy.wait("@getType").then((xhr) => { + cy.get('#rc_select_1').type('template detail{enter}'); + }); + + cy.wait("@getHr").then((xhr) => { + cy.get('#rc_select_2').type('admin adw{enter}'); + }); + + cy.get(':nth-child(2) > .form-group > .ant-picker > .ant-picker-input > input').click(); + cy.contains('td[title="2023-08-04"].ant-picker-cell', '4').click(); + + cy.get(':nth-child(5) > :nth-child(1) > .form-group > .form-control').type('Indramayu'); + cy.get(':nth-child(5) > :nth-child(2) > .form-group > .form-control').type('Integrasia Utama'); + + cy.wait("@getCurrency").then((xhr) => { + cy.get('.col-md-4 > .ant-select > .ant-select-selector').click(); + cy.get('[title="USD"] > .ant-select-item-option-content').click(); + cy.get('.col-md-8 > .form-control').type(20000); + }); + + cy.get(':nth-child(6) > :nth-child(2) > .form-group > .form-control').type('Implement Automated Testing For Development'); + + cy.wait("@getDivisi").then((xhr) => { + cy.get('#rc_select_4').click(); + cy.get('[title=" Construction"] > .ant-select-item-option-content').click(); + }); + + cy.wait("@getPhase").then((xhr) => { + cy.get('#rc_select_5').click(); + cy.get('.ant-select-item-option-content').contains('Inisiasi').click(); + }); + + cy.get('#rc_select_6').click(); + cy.get('.ant-select-item-option-content').contains('On budget').click(); + + cy.get('.btn-primary').click(); + }); +}); diff --git a/cypress/e2e/tests/gantt-duration-edit.cy.js b/cypress/e2e/tests/gantt-duration-edit.cy.js deleted file mode 100644 index ec199ab..0000000 --- a/cypress/e2e/tests/gantt-duration-edit.cy.js +++ /dev/null @@ -1,9 +0,0 @@ -describe("Test a page", () => { - beforeEach(() => { - cy.visit("http://localhost:3000/#/login"); - }); - - it("should visit the authenticated page", () => { - // Continue with your assertions or other test steps - }); -}); From 6266f27e771c3eddd0baff8356e1f29a74e8996f Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 31 Jul 2023 14:49:22 +0700 Subject: [PATCH 05/28] Fix minimizer ui --- src/containers/DefaultLayout/DefaultLayout.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js index 0ef378c..9fc5088 100644 --- a/src/containers/DefaultLayout/DefaultLayout.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -17,6 +17,7 @@ import { AppBreadcrumb2 as AppBreadcrumb, AppSidebarNav2 as AppSidebarNav, } from '@coreui/react'; +import LayoutHelper from '../../../node_modules/@coreui/react/lib/Shared/layout/layout'; import navigation from '../../_nav'; import routes from '../../routes'; import { emptyConstants } from '../../const/MapConst.js'; @@ -44,6 +45,7 @@ class DefaultLayout extends Component { routes2: routes, finalRoutes: [], breadrCrumbReady: false, + minimized: true } } @@ -70,7 +72,10 @@ class DefaultLayout extends Component { } } - + toggleMinimized = () => { + this.setState((prevState) => ({ minimized: !prevState.minimized })); + LayoutHelper.sidebarToggle(!this.state.minimized); + }; setFinalRoutes = () => { const { routes2 } = this.state; @@ -248,7 +253,7 @@ class DefaultLayout extends Component {
{!window.location.href.includes("dashboard-project") || renderSidebar ? ( - + {/*
this.signOut(e)} /> @@ -261,18 +266,20 @@ class DefaultLayout extends Component { {this.getMenu()} + {this.state.minimized ? null : {localStorage.getItem('user_name')} handleChangeLng("id")}>ID - handleChangeLng("en")}>EN + handleChangeLng("en")}>EN Profile this.signOut(e)}> Logout - - + } + ) : null }
From 61ccc73e196e9984ce322365410cb65c0773251f Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 31 Jul 2023 14:50:27 +0700 Subject: [PATCH 06/28] add formatting --- src/containers/DefaultLayout/DefaultLayout.js | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js index 9fc5088..2d53f98 100644 --- a/src/containers/DefaultLayout/DefaultLayout.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -234,54 +234,54 @@ class DefaultLayout extends Component { } render() { - const { location } = this.props; - const { pathname } = location; - let renderSidebar = false + const { location } = this.props; + const { pathname } = location; + let renderSidebar = false - if (pathname.includes("/dashboard-project")) { - // Remove the base URL and hash - const path = pathname.replace("/dashboard-project/", ""); + if (pathname.includes("/dashboard-project")) { + // Remove the base URL and hash + const path = pathname.replace("/dashboard-project/", ""); - // Split the remaining path by "/" - const parts = path.split("/"); - if (parts[2] == "1") { - renderSidebar = true - } - } + // Split the remaining path by "/" + const parts = path.split("/"); + if (parts[2] == "1") { + renderSidebar = true + } + } return (
- {!window.location.href.includes("dashboard-project") || renderSidebar ? ( - - {/*
+ {!window.location.href.includes("dashboard-project") || renderSidebar ? ( + + {/*
this.signOut(e)} />
*/} -
- - - - {this.getMenu()} - - - {this.state.minimized ? null : - - - {localStorage.getItem('user_name')} - - - handleChangeLng("id")}>ID - handleChangeLng("en")}>EN - Profile - this.signOut(e)}> Logout - - } - - - ) : null } +
+ + + + {this.getMenu()} + + + {this.state.minimized ? null : + + + {localStorage.getItem('user_name')} + + + handleChangeLng("id")}>ID + handleChangeLng("en")}>EN + Profile + this.signOut(e)}> Logout + + } + + + ) : null}
{this.state.breadrCrumbReady ? this.getAppBreadcrumb() : null} From 81515753079dfa583d2816c552b8f08403facb55 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 1 Aug 2023 09:58:54 +0700 Subject: [PATCH 07/28] Add formatting --- .../CreatedProyek/ImportActivity/index.js | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js index 794ce06..5b978b6 100644 --- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js +++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js @@ -2,9 +2,9 @@ import React, { useState, useEffect, useMemo } from 'react'; import axios from "../../../../const/interceptorApi" import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap'; import { NotificationContainer, NotificationManager } from 'react-notifications'; -import { Button, Table, Form, Upload, Tooltip, Alert, Spin } from 'antd'; +import { Button, Table, Form, Upload, Tooltip, Alert, Spin } from 'antd'; import { InboxOutlined, UploadOutlined } from '@ant-design/icons'; -import {OutTable, ExcelRenderer} from 'react-excel-renderer'; +import { OutTable, ExcelRenderer } from 'react-excel-renderer'; import './table.css'; import { BASE_OSPRO, ASSIGN_HR_PROJECT_SEARCH } from '../../../../const/ApiConst'; import { Prompt } from 'react-router-dom'; @@ -89,60 +89,60 @@ const ImportActivity = ({ params }) => { const pageName = params.name; const [dataTable, setDatatable] = useState([]) - const [dataUserToProject, setdataUserToProject] = useState([]) + const [dataUserToProject, setdataUserToProject] = useState([]) // const [isMovePage, setIsMovePage] = useState(false); const [isPreview, setIsPreview] = useState(false); - useEffect(() => { + useEffect(() => { getDataAssignHr(); }, []) - const getDataAssignHr = async () => { + const getDataAssignHr = async () => { let url = window.location.href; let urlSplitted = url.split('/') - const payload = { - "paging": { - "start": 0, - "length": -1 - }, - "columns": [ - { "name": "name", "logic_operator": "ilike", "value": "", "table_name": "m_users" }, - { "name": "proyek_id", "logic_operator": "=", "value": urlSplitted[6] } - ], - "joins": [ - { "name": "m_users", "column_join": "user_id", "column_results": ["name", "ktp_number"] }, - { "name": "m_role_proyek", "column_join": "project_role", "column_results": ["name"] }, - ], - "orders": { - "columns": [ - "id" - ], - "ascending": false - } - } - const URL = ASSIGN_HR_PROJECT_SEARCH - const result = await axios - .post(URL, payload, HEADER) - .then(res => res) - .catch((error) => error.response); - - if (result && result.data && result.data.code == 200) { - let dataRes = result.data.data || [] - setdataUserToProject(dataRes); - } else { - NotificationManager.error('Gagal Mengambil Data!!', 'Failed'); - } - } + const payload = { + "paging": { + "start": 0, + "length": -1 + }, + "columns": [ + { "name": "name", "logic_operator": "ilike", "value": "", "table_name": "m_users" }, + { "name": "proyek_id", "logic_operator": "=", "value": urlSplitted[6] } + ], + "joins": [ + { "name": "m_users", "column_join": "user_id", "column_results": ["name", "ktp_number"] }, + { "name": "m_role_proyek", "column_join": "project_role", "column_results": ["name"] }, + ], + "orders": { + "columns": [ + "id" + ], + "ascending": false + } + } + const URL = ASSIGN_HR_PROJECT_SEARCH + const result = await axios + .post(URL, payload, HEADER) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code == 200) { + let dataRes = result.data.data || [] + setdataUserToProject(dataRes); + } else { + NotificationManager.error('Gagal Mengambil Data!!', 'Failed'); + } + } const fileHandler = (file) => { setIsMovePage(true); - if(file.name.slice(file.name.lastIndexOf('.')+1) === "xlsx"){ + if (file.name.slice(file.name.lastIndexOf('.') + 1) === "xlsx") { // NotificationManager.info('Loading...',' '); - setTimeout(() => { + setTimeout(() => { previewHandler(file); setIsMovePage(false); - }, 5000); + }, 5000); } else { NotificationManager.error('file harus dalam format .xlsx', 'Failed'); } @@ -156,7 +156,7 @@ const ImportActivity = ({ params }) => { let dataMapped = [] ExcelRenderer(fileObj, (err, resp) => { - if(err){ + if (err) { console.log(err) errorHandler() } else { @@ -167,7 +167,7 @@ const ImportActivity = ({ params }) => { return el.length > 0; }); - for(let i = 5; i < rows.length; i++){ + for (let i = 5; i < rows.length; i++) { let extractedRow = {} for (var prop in columnToIndexs) { @@ -175,25 +175,25 @@ const ImportActivity = ({ params }) => { let columnData = rows[i][columnToIndexs[prop]] // remove leading whitespace - if(typeof(columnData) == 'string') { + if (typeof (columnData) == 'string') { columnData = columnData.trim().replace(/ /g, '').replace(/<[^\/>][^>]*><\/[^>]+>/g, "") } - if(["nik"].includes(prop)){ - if(columnData){ - let index = dataUserToProject.findIndex((x) => columnData == x.join_first_ktp_number); - if(index >= 0) { - columnData = dataUserToProject[index].join_first_ktp_number; - } else { - columnData = ''; - } - } - } - - if(prop == 'weight'){ - if (columnData == null) { - columnData = 0; - } + if (["nik"].includes(prop)) { + if (columnData) { + let index = dataUserToProject.findIndex((x) => columnData == x.join_first_ktp_number); + if (index >= 0) { + columnData = dataUserToProject[index].join_first_ktp_number; + } else { + columnData = ''; + } + } + } + + if (prop == 'weight') { + if (columnData == null) { + columnData = 0; + } columnData = columnData * 100 } @@ -232,13 +232,13 @@ const ImportActivity = ({ params }) => { console.log(result) if (result.data.code == 200) { - const timestamp = Date.now(); - const newTimestamp = timestamp + 60000; + const timestamp = Date.now(); + const newTimestamp = timestamp + 60000; window.location = urlSplitted[0] + '//' + urlSplitted[2] + `/#/projects/` + ganttId + '/' + result.data.projectId + '/' + newTimestamp + '/gantt' } setIsMovePage(true); - setIsPreview(true); + setIsPreview(true); } const columns = [ @@ -268,7 +268,7 @@ const ImportActivity = ({ params }) => { key: 'name', render: (text, record) => { let prepend = "" - for(let i = 1; i < record.level; i++) { + for (let i = 1; i < record.level; i++) { prepend = prepend + "--" } @@ -329,7 +329,7 @@ const ImportActivity = ({ params }) => { listType="text" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" maxCount={1} - beforeUpload={(file)=> fileHandler(file)} + beforeUpload={(file) => fileHandler(file)} showUploadList={false} > @@ -338,11 +338,11 @@ const ImportActivity = ({ params }) => { - + @@ -356,7 +356,7 @@ const ImportActivity = ({ params }) => { index % 2 == 0 ? 'table-row-light' : 'table-row-dark'} + rowClassName={(record, index) => index % 2 == 0 ? 'table-row-light' : 'table-row-dark'} dataSource={dataTable} columns={columns} pagination={false} @@ -397,7 +397,7 @@ const ImportActivity = ({ params }) => { listType="text" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" maxCount={1} - beforeUpload={(file)=> fileHandler(file)} + beforeUpload={(file) => fileHandler(file)} showUploadList={false} > @@ -406,11 +406,11 @@ const ImportActivity = ({ params }) => { - + @@ -423,7 +423,7 @@ const ImportActivity = ({ params }) => {
index % 2 == 0 ? 'table-row-light' : 'table-row-dark'} + rowClassName={(record, index) => index % 2 == 0 ? 'table-row-light' : 'table-row-dark'} dataSource={dataTable} columns={columns} pagination={false} From a2506a9fc934ec0d7fe1a030291ac566fb1d452a Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 1 Aug 2023 10:11:58 +0700 Subject: [PATCH 08/28] Add default duration --- src/views/SimproV2/CreatedProyek/ImportActivity/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js index 5b978b6..2307554 100644 --- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js +++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js @@ -196,6 +196,12 @@ const ImportActivity = ({ params }) => { } columnData = columnData * 100 } + + if (prop == 'duration') { + if (columnData == null) { + columnData = 0; + } + } extractedRow[prop] = columnData From 62ac39ef6e131f01473272931d6eff2ad481446b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 1 Aug 2023 15:30:12 +0700 Subject: [PATCH 09/28] Fix handling default value --- .../SimproV2/CreatedProyek/ImportActivity/index.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js index 2307554..4e20276 100644 --- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js +++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js @@ -203,6 +203,17 @@ const ImportActivity = ({ params }) => { } } + if (prop == 'level') { + if (columnData == null) { + columnData = 1; + } + } + + if (prop == 'name') { + if (columnData == null) { + columnData = "New Activity"; + } + } extractedRow[prop] = columnData } From cacc6cc7c5c2ed7fbb3537b3f3a9e869288bac0f Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Thu, 3 Aug 2023 08:34:44 +0700 Subject: [PATCH 10/28] Fix planning progress bar range --- src/views/Dashboard/DashboardProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index 24b6428..d59f04d 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -289,7 +289,7 @@ const DashboardProject = () => { } let now = new Date().toISOString().slice(0, 10); let dates = result.data.data[0].data?.date; - let n = dates.findIndex(element => new Date(now) < new Date(element[0])) - 1; + let n = dates.findIndex(element => new Date(now) < new Date(element[0])); if (n < 0) { n = dates.length - 1; } From 1490c9014c512de64b06943ac68229227e4d48bf Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 7 Aug 2023 13:50:12 +0700 Subject: [PATCH 11/28] Remove unnecessary request --- src/views/SimproV2/CreatedProyek/DialogGantt.js | 7 ++----- src/views/SimproV2/CreatedProyek/DialogHierarchy.js | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index 7fb98d7..3fc9550 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -13,7 +13,7 @@ import DialogUserGantt from './DialogUserGantt'; import { Link } from 'react-router-dom'; -const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, hierarchyId, hierarchyName }) => { +const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, hierarchyId, hierarchyName, openDialogHierarchy }) => { const token = localStorage.getItem("token") const HEADER = { headers: { @@ -31,10 +31,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName const [humanResource, setHumanResource] = useState([]) useEffect(() => { - if (idTask > 0) { - getdataGantt(); - } - if (hierarchyId > 0) { + if (hierarchyId > 0 || idTask > 0 && !openDialogHierarchy) { getdataGantt(); } }, [hierarchyId, idTask, openDialog]) diff --git a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js index d62ce53..7c1f99a 100644 --- a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js +++ b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js @@ -311,6 +311,7 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek hierarchyId={parentId} hierarchyName={parentName} idTask={idTask} + openDialogHierarchy={openDialog} /> Date: Tue, 8 Aug 2023 16:55:33 +0700 Subject: [PATCH 12/28] Extracting gantt iframe --- src/views/SimproV2/Gantt/GanttFrame.js | 23 +++++++++++++++++++++++ src/views/SimproV2/Gantt/index.js | 25 ++++++++++--------------- 2 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 src/views/SimproV2/Gantt/GanttFrame.js diff --git a/src/views/SimproV2/Gantt/GanttFrame.js b/src/views/SimproV2/Gantt/GanttFrame.js new file mode 100644 index 0000000..0ddb2b9 --- /dev/null +++ b/src/views/SimproV2/Gantt/GanttFrame.js @@ -0,0 +1,23 @@ +import React from 'react'; +import { BASE_SIMPRO_LUMEN } from '../../../const/ApiConst'; + +const GanttFrame = React.memo((props) => { + const { versionGanttId, idProject, token, ro, timestamp } = props; + const iframeSrc = `https://adw-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}`; + + return ( + + ); +}); + +export default GanttFrame; diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js index 466bb6d..c491af4 100644 --- a/src/views/SimproV2/Gantt/index.js +++ b/src/views/SimproV2/Gantt/index.js @@ -6,7 +6,7 @@ import axios from "../../../const/interceptorApi" import { Fab, Action } from 'react-tiny-fab'; import 'react-tiny-fab/dist/styles.css'; import { useHistory } from "react-router-dom"; - +import GanttFrame from './GanttFrame'; const token = localStorage.getItem("token") const userId = parseInt(localStorage.getItem("user_id")); const HEADER = { @@ -82,24 +82,19 @@ const Gantt = (props) => { } roCount = roCount + 1; } - const RenderGantt = () => ( - - ) return ( <>
- {ready && } + {ready && ( + + )}
); From 63797ecf83e16a4b9e5123b306359f0a4a4017d7 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 9 Aug 2023 15:05:34 +0700 Subject: [PATCH 13/28] Prevent moving page --- src/views/SimproV2/Gantt/GanttFrame.js | 28 +++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/views/SimproV2/Gantt/GanttFrame.js b/src/views/SimproV2/Gantt/GanttFrame.js index 0ddb2b9..f175154 100644 --- a/src/views/SimproV2/Gantt/GanttFrame.js +++ b/src/views/SimproV2/Gantt/GanttFrame.js @@ -1,10 +1,36 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; +import { useHistory } from 'react-router-dom'; import { BASE_SIMPRO_LUMEN } from '../../../const/ApiConst'; const GanttFrame = React.memo((props) => { + const history = useHistory(); const { versionGanttId, idProject, token, ro, timestamp } = props; const iframeSrc = `https://adw-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}`; + + + const [batchEntityData, setBatchEntityData] = useState(null); + + useEffect(() => { + const handleMessage = (event) => { + if (event.data && event.data.batchEntity) { + setBatchEntityData(event.data.batchEntity); + } + }; + + window.addEventListener('message', handleMessage); + }, []); + + useEffect(()=>{ + const handleNavigation = (event) => { + if (batchEntityData && batchEntityData !== '') { + const message = 'You have unsaved changes. Are you sure you want to leave this page?'; + return message; + } + }; + history.block(handleNavigation); + }, [batchEntityData]) + return (