Merge pull request 'staging' (#71) from staging into master

Reviewed-on: ordo/adw-frontend#71

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();
+  });
+});

cypress/e2e/tests/gantt-duration-edit.cy.js

@@ -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
-  });
-});

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 {
 			<div className="app">
 				<div className="app-body">
 					{!window.location.href.includes("dashboard-project") || renderSidebar ? (
-					<AppSidebar minimized={true} fixed display="lg">
+						<AppSidebar minimized={this.state.minimized} fixed display="lg">
 							{/* <div class="sidebar-header">
 							<Suspense fallback={this.loading()}>
 								<DefaultHeader history={this.props.history} onLogout={e => this.signOut(e)} />
@@ -261,6 +266,7 @@ class DefaultLayout extends Component {
 								{this.getMenu()}
 							</Suspense>
 							<AppSidebarFooter />
+							{this.state.minimized ? null :
 								<UncontrolledDropdown direction="down">
 									<DropdownToggle nav>
 										<i className="nav-icon fa fa-user-circle"></i>  {localStorage.getItem('user_name')}
@@ -271,8 +277,9 @@ class DefaultLayout extends Component {
 										<DropdownItem href="#/settings"><i className="fa fa-user"></i>Profile</DropdownItem>
 										<DropdownItem onClick={e => this.signOut(e)}><i className="fa fa-sign-out"></i> Logout</DropdownItem>
 									</DropdownMenu>
-						</UncontrolledDropdown>
-						<AppSidebarMinimizer />
+								</UncontrolledDropdown>}
+							<button className='sidebar-minimizer mt-auto' type='button' onClick={this.toggleMinimized}>
+							</button>
 						</AppSidebar>
 					) : null}
 					<main className="main">

src/views/SimproV2/CreatedProyek/ImportActivity/index.js

@@ -197,6 +197,12 @@ const ImportActivity = ({ params }) => {
 								columnData = columnData * 100
 							}
 							
+							if (prop == 'duration') {
+								if (columnData == null) {
+									columnData = 0;
+								}
+							}
+
 							extractedRow[prop] = columnData
 
 						}