diff --git a/src/App.js b/src/App.js index 445e1f1..b4515cf 100644 --- a/src/App.js +++ b/src/App.js @@ -19,20 +19,20 @@ class App extends Component { render() { return ( - - - } /> - {/* } /> */} - } /> - } /> - } /> - } /> - } /> - {/* } />*/} - {/* } />*/} - } /> - - + + + } /> + {/* } /> */} + } /> + } /> + } /> + } /> + } /> + {/* } />*/} + {/* } />*/} + } /> + + ); } diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index aab2ea2..9c337f6 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -116,29 +116,29 @@ export let BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; export let BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; switch (APP_MODE) { - case 'KIT': - BASE_OSPRO = "https://kit-api.oslogdev.com" + case 'KIT': + BASE_OSPRO = "https://kit-api.oslogdev.com" - break; - case 'ADW': - BASE_OSPRO = "https://ospro-api.ospro.id" + break; + case 'ADW': + BASE_OSPRO = "https://api-staging-adw.ospro.id" - BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; - BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; - BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; + BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; + BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; + BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; - break; - case 'IU': - BASE_OSPRO = "https://api-iu.ospro.id" + break; + case 'IU': + BASE_OSPRO = "https://api-iu.ospro.id" - BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; - BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; - BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; + BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; + BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; + BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; - break; - default: - BASE_OSPRO = "https://ospro-api.ospro.id" + break; + default: + BASE_OSPRO = "https://ospro-api.ospro.id" } @@ -305,6 +305,12 @@ export const PROJECT_TYPE_EDIT = (id) => { return `${BASE_SIMPRO_LUMEN}/project- export const PROJECT_TYPE_DELETE = (id) => { return `${BASE_SIMPRO_LUMEN}/project-type/delete/${id}` } export const TYPE_PROYEK = `${BASE_SIMPRO_LUMEN}/project-type/list` +export const PROJECT_PHASE_ADD = `${BASE_SIMPRO_LUMEN}/project-phase/add` +export const PROJECT_PHASE_SEARCH = `${BASE_SIMPRO_LUMEN}/project-phase/search` +export const PROJECT_PHASE_EDIT = (id) => { return `${BASE_SIMPRO_LUMEN}/project-phase/update/${id}` } +export const PROJECT_PHASE_DELETE = (id) => { return `${BASE_SIMPRO_LUMEN}/project-phase/delete/${id}` } +export const PHASE_PROYEK = `${BASE_SIMPRO_LUMEN}/project-phase/list` + export const PROJECT_CHARTER_ADD = `${BASE_SIMPRO_LUMEN}/project-charter/add` export const PROJECT_CHARTER_SEARCH = `${BASE_SIMPRO_LUMEN}/project-charter/search` export const PROJECT_CHARTER_EDIT = (id) => { return `${BASE_SIMPRO_LUMEN}/project-charter/update/${id}` } diff --git a/src/containers/DefaultLayout/DefaultHeader.js b/src/containers/DefaultLayout/DefaultHeader.js index 36efce6..b1a846d 100644 --- a/src/containers/DefaultLayout/DefaultHeader.js +++ b/src/containers/DefaultLayout/DefaultHeader.js @@ -126,13 +126,10 @@ class DefaultHeader extends Component { case 'KIT': img = break; - case 'ADW': - img = - break; case 'NAWAKARA': img = break; - case 'IU': + case 'ADW': img =
OSPRO
break; default: diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js index 57d4fdb..860d703 100644 --- a/src/containers/DefaultLayout/DefaultLayout.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -157,10 +157,7 @@ class DefaultLayout extends Component { } setMenu = data => { - - const menu = data.map(res => { - const obj = { name: res.name, url: res.url, @@ -215,7 +212,9 @@ class DefaultLayout extends Component { }); } else { - return + if (!window.location.href.includes("dashboard")){ + return + } } } diff --git a/src/routes.js b/src/routes.js index 2bbe822..0b44ed5 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,102 +1,104 @@ -import React from 'react'; - -const Absensi = React.lazy(() => import('./views/Master/MasterAbsensi')); -const BaseLayers = React.lazy(() => import('./views/BaseLayers')); -const Broadcast = React.lazy(() => import('./views/Master/MasterBroadcast')); -const ChecklistK3 = React.lazy(() => import('./views/SimproV2/ChecklistK3')); -const Closing = React.lazy(() => import('./views/SimproV2/Closing')); -const ConfigAlert = React.lazy(() => import('./views/Master/ConfigAlert')); -const ControlMonitoring = React.lazy(() => import('./views/Report/ControlMonitoring')); -const ControlMonitoringGantt = React.lazy(() => import('./views/ControlMonitoringGantt')); -const CreatedProyek = React.lazy(() => import('./views/SimproV2/CreatedProyek')); -const DashboardSimpro = React.lazy(() => import('./views/DashboardSimpro')); -const DashboardPMO = React.lazy(() => import('./views/DashboardPMO')); -const Divisi = React.lazy(() => import('./views/SimproV2/Divisi')); -const DivisiKaryawan = React.lazy(() => import('./views/Master/MasterTipeKaryawan')); -const Gantt = React.lazy(() => import('./views/SimproV2/Gantt')); -const Izin = React.lazy(() => import('./views/Master/MasterCuti')); -const K3 = React.lazy(() => import('./views/Report/k3')); -const LaporanAlert = React.lazy(() => import('./views/Report/alert')); -const LaporanTugas = React.lazy(() => import('./views/Master/MasterTask')); -const Layer = React.lazy(() => import('./views/Layers/Layer')); -const Layers = React.lazy(() => import('./views/Layers/Layers')); -const Lembur = React.lazy(() => import('./views/Master/MasterLembur')); -const MapConfig = React.lazy(() => import('./views/MapConfig')); -const Menu = React.lazy(() => import('./views/Master/MasterMenu')); -const OfficeHours = React.lazy(() => import('./views/Master/MasterOfficeHours')); -const Organization = React.lazy(() => import('./views/Master/MasterOrganization')); -const PanicButton = React.lazy(() => import('./views/SimproV2/PanicButton')); -const PlanningHarian = React.lazy(() => import('./views/SimproV2/PlanningHarian')); -const Presensi = React.lazy(() => import('./views/SimproV2/Presence')); -const ProjectRole = React.lazy(() => import('./views/Master/RoleProject')); -const ProjectType = React.lazy(() => import('./views/SimproV2/ProjectType')); -const Proyek = React.lazy(() => import('./views/Master/Proyek')); -const RateCost = React.lazy(() => import('./views/SimproV2/RateCost')); -const ResourceMaterial = React.lazy(() => import('./views/SimproV2/ResourceMaterial')); -const ResourceTools = React.lazy(() => import('./views/SimproV2/ResourceTools')); -const ResourceWorker = React.lazy(() => import('./views/SimproV2/ResourceWorker')); -const Roles = React.lazy(() => import('./views/Master/MasterRoles')); -const Satuan = React.lazy(() => import('./views/SimproV2/Satuan')); -const ScheduleShift = React.lazy(() => import('./views/SimproV2/ScheduleShift')); -const Shift = React.lazy(() => import('./views/SimproV2/Shift')); -const TestGantt = React.lazy(() => import('./views/testgantt')); -const UserAdmin = React.lazy(() => import('./views/Master/UserAdmin')); -const UserShift = React.lazy(() => import('./views/SimproV2/UserShift')); -const DashboardProject = React.lazy(() => import('./views/DashboardProject')); -const DashboardPMOV1 = React.lazy(() => import('./views/DashboardPMOV1')); - -const routes = [ - { path: '/', exact: true, name: 'Home' }, - { path: '/dashboardold', name: 'Dashboard', component: DashboardSimpro }, - { path: '/dashboard', name: 'Dashboard', component: DashboardPMOV1 }, - - { path: '/projects', exact: true, name: 'Projects', component: CreatedProyek }, - { path: '/projects/:id/:project/gantt', exact: true, name: 'Gantt', component: Gantt }, - { path: '/human-resource', exact: true, name: 'Human Resource', component: ResourceWorker }, - { path: '/material-resource', exact: true, name: 'Material Resource', component: ResourceMaterial }, - { path: '/tools-resource', exact: true, name: 'Tools Resource', component: ResourceTools }, - - { path: '/control-monitoring', exact: true, name: 'Control Monitoring', component: ControlMonitoring }, - { path: '/control-monitoring-gantt', exact: true, name: 'Control Monitoring Gantt', component: ControlMonitoringGantt }, - { path: '/presensi-resource', exact: true, name: 'Presensi Resource', component: Presensi }, - { path: '/absensi-resource', exact: true, name: 'Absensi Resource', component: Absensi }, - { path: '/laporan-k3', exact: true, name: 'Laporan K3', component: K3 }, - { path: '/broadcast', exact: true, name: 'Broadcast', component: Broadcast }, - { path: '/panic-button', exact: true, name: 'Tombol Darurat', component: PanicButton }, - - { path: '/closing', exact: true, name: 'Closing', component: Closing }, - - { path: '/menu', exact: true, name: 'Menu', component: Menu }, - { path: '/roles', exact: true, name: 'Roles', component: Roles }, - { path: '/project-role', exact: true, name: 'Project Role', component: ProjectRole }, - { path: '/project-type', exact: true, name: 'Project Type', component: ProjectType }, - { path: '/divisi', exact: true, name: 'Divisi', component: Divisi }, - { path: '/satuan', exact: true, name: 'Satuan', component: Satuan }, - { path: '/config-alert', exact: true, name: 'Config Alert', component: ConfigAlert }, - - { path: '/checklist-k3', exact: true, name: 'Checklist K3', component: ChecklistK3 }, - { path: '/absensi', exact: true, name: 'Absensi', component: Absensi }, - { path: '/divisi-karyawan', exact: true, name: 'Divisi Karyawan', component: DivisiKaryawan }, - { path: '/izin', exact: true, name: 'Izin', component: Izin }, - { path: '/laporan-alert', exact: true, name: 'Laporan Alert', component: LaporanAlert }, - { path: '/laporan-tugas-karyawan', exact: true, name: 'Laporan Tugas Karyawan', component: LaporanTugas }, - { path: '/lembur', exact: true, name: 'Lembur', component: Lembur }, - { path: '/map/baselayers', exact: true, name: 'Base Layers', component: BaseLayers }, - { path: '/map/config', exact: true, name: 'Config', component: MapConfig }, - { path: '/map/layers', exact: true, name: 'Layers', component: Layers }, - { path: '/map/layers/:id', exact: true, name: 'Layer Details', component: Layer }, - { path: '/office-hours', exact: true, name: 'Jam Kerja', component: OfficeHours }, - { path: '/organization', exact: true, name: 'Organisasi', component: Organization }, - { path: '/planning-harian', exact: true, name: 'Planning Harian', component: PlanningHarian }, - { path: '/presensi', exact: true, name: 'Presensi', component: Presensi }, - { path: '/proyek', exact: true, name: 'Created Project', component: Proyek }, - { path: '/proyek-gantt', exact: true, name: 'Gantt Chart Proyek', component: TestGantt }, - { path: '/rate-cost', exact: true, name: 'Rate Cost', component: RateCost }, - { path: '/schedule-shift', exact: true, name: 'Schedule Shift', component: ScheduleShift }, - { path: '/user-admin', exact: true, name: 'User Admin', component: UserAdmin }, - { path: '/user-shift', exact: true, name: 'Shift', component: UserShift }, - { path: '/working-hour', exact: true, name: 'Working Hour', component: Shift }, - { path: '/dashboard-project/:ID/:GANTTID', exact: true, name: 'Dashboard Project', component: DashboardProject }, -]; - -export default routes; \ No newline at end of file +import React from 'react'; + +const Absensi = React.lazy(() => import('./views/Master/MasterAbsensi')); +const BaseLayers = React.lazy(() => import('./views/BaseLayers')); +const Broadcast = React.lazy(() => import('./views/Master/MasterBroadcast')); +const ChecklistK3 = React.lazy(() => import('./views/SimproV2/ChecklistK3')); +const Closing = React.lazy(() => import('./views/SimproV2/Closing')); +const ConfigAlert = React.lazy(() => import('./views/Master/ConfigAlert')); +const ControlMonitoring = React.lazy(() => import('./views/Report/ControlMonitoring')); +const ControlMonitoringGantt = React.lazy(() => import('./views/ControlMonitoringGantt')); +const CreatedProyek = React.lazy(() => import('./views/SimproV2/CreatedProyek')); +const DashboardSimpro = React.lazy(() => import('./views/DashboardSimpro')); +const DashboardPMO = React.lazy(() => import('./views/DashboardPMO')); +const Divisi = React.lazy(() => import('./views/SimproV2/Divisi')); +const DivisiKaryawan = React.lazy(() => import('./views/Master/MasterTipeKaryawan')); +const Gantt = React.lazy(() => import('./views/SimproV2/Gantt')); +const Izin = React.lazy(() => import('./views/Master/MasterCuti')); +const K3 = React.lazy(() => import('./views/Report/k3')); +const LaporanAlert = React.lazy(() => import('./views/Report/alert')); +const LaporanTugas = React.lazy(() => import('./views/Master/MasterTask')); +const Layer = React.lazy(() => import('./views/Layers/Layer')); +const Layers = React.lazy(() => import('./views/Layers/Layers')); +const Lembur = React.lazy(() => import('./views/Master/MasterLembur')); +const MapConfig = React.lazy(() => import('./views/MapConfig')); +const Menu = React.lazy(() => import('./views/Master/MasterMenu')); +const OfficeHours = React.lazy(() => import('./views/Master/MasterOfficeHours')); +const Organization = React.lazy(() => import('./views/Master/MasterOrganization')); +const PanicButton = React.lazy(() => import('./views/SimproV2/PanicButton')); +const PlanningHarian = React.lazy(() => import('./views/SimproV2/PlanningHarian')); +const Presensi = React.lazy(() => import('./views/SimproV2/Presence')); +const ProjectRole = React.lazy(() => import('./views/Master/RoleProject')); +const ProjectType = React.lazy(() => import('./views/SimproV2/ProjectType')); +const ProjectPhase = React.lazy(() => import('./views/Master/ProjectPhase')); +const Proyek = React.lazy(() => import('./views/Master/Proyek')); +const RateCost = React.lazy(() => import('./views/SimproV2/RateCost')); +const ResourceMaterial = React.lazy(() => import('./views/SimproV2/ResourceMaterial')); +const ResourceTools = React.lazy(() => import('./views/SimproV2/ResourceTools')); +const ResourceWorker = React.lazy(() => import('./views/SimproV2/ResourceWorker')); +const Roles = React.lazy(() => import('./views/Master/MasterRoles')); +const Satuan = React.lazy(() => import('./views/SimproV2/Satuan')); +const ScheduleShift = React.lazy(() => import('./views/SimproV2/ScheduleShift')); +const Shift = React.lazy(() => import('./views/SimproV2/Shift')); +const TestGantt = React.lazy(() => import('./views/testgantt')); +const UserAdmin = React.lazy(() => import('./views/Master/UserAdmin')); +const UserShift = React.lazy(() => import('./views/SimproV2/UserShift')); +const DashboardProject = React.lazy(() => import('./views/DashboardProject')); +const DashboardPMOV1 = React.lazy(() => import('./views/DashboardPMOV1')); + +const routes = [ + { path: '/', exact: true, name: 'Home' }, + { path: '/dashboardold', name: 'Dashboard', component: DashboardSimpro }, + { path: '/dashboard', name: 'Dashboard', component: DashboardPMOV1 }, + + { path: '/projects', exact: true, name: 'Projects', component: CreatedProyek }, + { path: '/projects/:id/:project/gantt', exact: true, name: 'Gantt', component: Gantt }, + { path: '/human-resource', exact: true, name: 'Human Resource', component: ResourceWorker }, + { path: '/material-resource', exact: true, name: 'Material Resource', component: ResourceMaterial }, + { path: '/tools-resource', exact: true, name: 'Tools Resource', component: ResourceTools }, + + { path: '/control-monitoring', exact: true, name: 'Control Monitoring', component: ControlMonitoring }, + { path: '/control-monitoring-gantt', exact: true, name: 'Control Monitoring Gantt', component: ControlMonitoringGantt }, + { path: '/presensi-resource', exact: true, name: 'Presensi Resource', component: Presensi }, + { path: '/absensi-resource', exact: true, name: 'Absensi Resource', component: Absensi }, + { path: '/laporan-k3', exact: true, name: 'Laporan K3', component: K3 }, + { path: '/broadcast', exact: true, name: 'Broadcast', component: Broadcast }, + { path: '/panic-button', exact: true, name: 'Tombol Darurat', component: PanicButton }, + + { path: '/closing', exact: true, name: 'Closing', component: Closing }, + + { path: '/menu', exact: true, name: 'Menu', component: Menu }, + { path: '/roles', exact: true, name: 'Roles', component: Roles }, + { path: '/project-role', exact: true, name: 'Project Role', component: ProjectRole }, + { path: '/project-type', exact: true, name: 'Project Type', component: ProjectType }, + { path: '/project-phase', exact: true, name: 'Project Phase', component: ProjectPhase }, + { path: '/divisi', exact: true, name: 'Divisi', component: Divisi }, + { path: '/satuan', exact: true, name: 'Satuan', component: Satuan }, + { path: '/config-alert', exact: true, name: 'Config Alert', component: ConfigAlert }, + + { path: '/checklist-k3', exact: true, name: 'Checklist K3', component: ChecklistK3 }, + { path: '/absensi', exact: true, name: 'Absensi', component: Absensi }, + { path: '/divisi-karyawan', exact: true, name: 'Divisi Karyawan', component: DivisiKaryawan }, + { path: '/izin', exact: true, name: 'Izin', component: Izin }, + { path: '/laporan-alert', exact: true, name: 'Laporan Alert', component: LaporanAlert }, + { path: '/laporan-tugas-karyawan', exact: true, name: 'Laporan Tugas Karyawan', component: LaporanTugas }, + { path: '/lembur', exact: true, name: 'Lembur', component: Lembur }, + { path: '/map/baselayers', exact: true, name: 'Base Layers', component: BaseLayers }, + { path: '/map/config', exact: true, name: 'Config', component: MapConfig }, + { path: '/map/layers', exact: true, name: 'Layers', component: Layers }, + { path: '/map/layers/:id', exact: true, name: 'Layer Details', component: Layer }, + { path: '/office-hours', exact: true, name: 'Jam Kerja', component: OfficeHours }, + { path: '/organization', exact: true, name: 'Organisasi', component: Organization }, + { path: '/planning-harian', exact: true, name: 'Planning Harian', component: PlanningHarian }, + { path: '/presensi', exact: true, name: 'Presensi', component: Presensi }, + { path: '/proyek', exact: true, name: 'Created Project', component: Proyek }, + { path: '/proyek-gantt', exact: true, name: 'Gantt Chart Proyek', component: TestGantt }, + { path: '/rate-cost', exact: true, name: 'Rate Cost', component: RateCost }, + { path: '/schedule-shift', exact: true, name: 'Schedule Shift', component: ScheduleShift }, + { path: '/user-admin', exact: true, name: 'User Admin', component: UserAdmin }, + { path: '/user-shift', exact: true, name: 'Shift', component: UserShift }, + { path: '/working-hour', exact: true, name: 'Working Hour', component: Shift }, + { path: '/dashboard-project/:ID/:GANTTID', exact: true, name: 'Dashboard Project', component: DashboardProject }, +]; + +export default routes; diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 9710ea3..d1248cc 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -18,8 +18,7 @@ .box-dashboard-pm { margin-top: 10px; width: 100%; - height: 90px; - padding: 10px; + padding: 5px; border-radius: 2px; box-shadow: 1px 1px 3px 0px rgba(97, 96, 96, 0.5); -webkit-box-shadow: 1px 1px 3px 0px rgba(97, 96, 96, 0.5); @@ -127,4 +126,4 @@ .chat-body { padding: 6px 10px -} \ No newline at end of file +} diff --git a/src/views/DashboardPMO/index.js b/src/views/DashboardPMO/index.js index 822d80c..e69de29 100644 --- a/src/views/DashboardPMO/index.js +++ b/src/views/DashboardPMO/index.js @@ -1,114 +0,0 @@ -import '../../../node_modules/react-grid-layout/css/styles.css'; -import '../../../node_modules/react-resizable/css/styles.css'; -import './Dashboard.css'; -import PieChart from './PieChart'; -import { BASE_OSPRO } from '../../const/ApiConst'; -import ContentLoader from "react-content-loader" -import React, { useEffect, useState } from 'react'; -import axios from 'axios' -import moment from 'moment'; -import numeral from 'numeral'; -import { Table, Tree, Row, Col, Space, Card} from 'antd'; -import { Pie } from '@ant-design/plots'; -import { NotificationContainer, NotificationManager } from 'react-notifications'; -import { formatRibuanDecimal, DATE_TIME_FORMAT } from '../../const/CustomFunc.js'; -import { Badge } from 'reactstrap'; - -const token = localStorage.getItem("token") -const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}`, - "Access-Control-Allow-Origin": "*" - } -} - -const Dashboard = () => { - const token = localStorage.getItem("token") - const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}` - } - } - - const [dataTable, setDataTable] = useState([]) - const getProjects = async () => { - const URL = `${BASE_OSPRO}/api/project/list` - const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Belum ada data proyek!', 'Failed'); - } - console.log("res ", result.data.data) - setDataTable(result.data.data); - } - - const columns = [ - { - title: 'Project', - dataIndex: 'nama', - key: 'nama', - render: (text) => {text}, - }, - { - title: 'Planned Interval', - dataIndex: 'plannedInterval', - key: 'plannedInterval', - }, - { - title: 'Planned Cost', - dataIndex: 'plannedCost', - key: 'plannedCost', - render: (text) => { formatRibuanDecimal(text) }, - }, - { - title: 'Actual Cost', - dataIndex: 'actualCost', - key: 'actualCost', - render: (text) => { formatRibuanDecimal(text) }, - }, - { - title: 'Cost Variance', - dataIndex: 'costVariance', - key: 'costVariance', - render: (text) => { formatRibuanDecimal(text) }, - }, - { - title: 'Cost Health', - dataIndex: 'costHealth', - key: 'costHealth', - render: (text) => { - if(text == "on-budget") { - return On Budget - } else if(text == "warning") { - return Warning - } else { - return Danger - } - } - }, - { - title: 'Progress', - dataIndex: 'progress', - key: 'progress', - }, - ]; - - useEffect(() => { - getProjects(); - }, []) - - - return ( - <> - - - - - - - - ); -} - -export default Dashboard; diff --git a/src/views/DashboardPMOV1/chartDashboard.js b/src/views/DashboardPMOV1/chartDashboard.js index 9d09ff7..a40a34c 100644 --- a/src/views/DashboardPMOV1/chartDashboard.js +++ b/src/views/DashboardPMOV1/chartDashboard.js @@ -1,15 +1,15 @@ import React from 'react'; -import { Doughnut, Bar } from 'react-chartjs-2'; +import { Doughnut } from 'react-chartjs-2'; import { faker } from '@faker-js/faker'; -export const optionsDoughnut = { +const options = { title: { display: true, text: 'PROJECT BY TYPE' }, }; -export const data = { +const data = { labels: ['Pengadaan Barang dan Jasa','Kontruksi', 'FTTH'], datasets: [ { @@ -20,8 +20,6 @@ export const data = { 'rgba(54, 162, 235, 0.2)', 'rgba(255, 206, 86, 0.2)', 'rgba(75, 192, 192, 0.2)', - // 'rgba(153, 102, 255, 0.2)', - // 'rgba(255, 159, 64, 0.2)', ], borderColor: [ 'rgba(255, 99, 132, 1)', @@ -29,78 +27,12 @@ export const data = { 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', - // 'rgba(255, 159, 64, 1)', ], borderWidth: 1, }, ], }; -export const DoughnutChart = () => { - return ; +export const ProjectTypeChart = () => { + return ; } - - -export const options = { - title: { - display: true, - text: 'PROJECT BY GOVERNANCE PHASE' - }, - legend: { - position: 'right', - }, - responsive: true, - scales: { - yAxes: [{ - display: true, - - // position: 'right', - stacked: true, - }], - xAxes: [{ - display: true, - // position: 'right', - stacked: true, - }], - }, -}; - -const labels = ['']; - -export const dataBar = { - labels, - datasets: [ - { - indexAxis: 'y', - label: 'Initiation', - data: labels.map(() => faker.datatype.number({ min: 0, max: 10 })), - backgroundColor: 'rgb(255, 99, 132)', - }, - { - indexAxis: 'y', - label: 'Execution', - data: labels.map(() => faker.datatype.number({ min: 0, max: 10 })), - backgroundColor: 'rgb(75, 192, 192)', - }, - { - indexAxis: 'y', - label: 'Closing', - data: labels.map(() => faker.datatype.number({ min: 0, max: 10 })), - backgroundColor: 'rgb(53, 162, 235)', - }, - // { - // indexAxis: 'y', - // label: 'Excecution', - // data: labels.map(() => faker.datatype.number({ min: 0, max: 10 })), - // backgroundColor: 'rgba(255, 159, 64, 1)', - // }, - ], -}; - -export function BarChart() { - return ; -} - - - - diff --git a/src/views/DashboardPMOV1/index.js b/src/views/DashboardPMOV1/index.js index 2bd1ac7..d6473b0 100644 --- a/src/views/DashboardPMOV1/index.js +++ b/src/views/DashboardPMOV1/index.js @@ -1,199 +1,206 @@ -import React, {useEffect, useState} from 'react'; -import { Row, Col, Select } from 'antd'; -import TableDashboard from './tableDashboard'; +import React, { useEffect, useState } from 'react'; +import { Row, Col, Select, Collapse } from 'antd'; +import { Column } from '@ant-design/plots'; import TableDashboardV1 from './tableDashboardv1'; -import { BarChart, DoughnutChart } from './chartDashboard'; +import { ProjectTypeChart } from './chartDashboard'; +import { ProjectPhaseChart } from './projectPhaseChart'; import axios from 'axios' -import { NotificationContainer, NotificationManager } from 'react-notifications'; import { BASE_OSPRO } from '../../const/ApiConst'; +import { formatRibuanDecimal } from '../../const/CustomFunc.js'; + + +const { Panel } = Collapse; function BoxDashboard({ value, title, secondaryTitle, icon, bgColor }) { return ( -
- -
-
- {icon} -
- - -
-
{value}
-
{title.toUpperCase()}
-
{secondaryTitle && secondaryTitle.toUpperCase()}
-
- - - + <> +
+ +
+
+ {icon} +
+ + +
+
{value}
+
{title.toUpperCase()}
+
{secondaryTitle && secondaryTitle.toUpperCase()}
+
+ + + + + ) +} + +// pardon this, i've no time +function BoxDashboardNoIcon({ value, title, secondaryTitle, bgColor }) { + return ( + <> +
+ +
+
+
{value}
+
{title.toUpperCase()}
+
{secondaryTitle && secondaryTitle.toUpperCase()}
+
+ + + + ) } -const { Option } = Select; -const DashbaoardPM = () => { - const [PROJECTCOUNT, SET_PROJECTCOUNT] = useState([]) - const [PROJECTBUDGETTOTAL, SET_PROJECTBUDGETTOTAL] = useState([]) - const [PROJECTMANPOWER, SET_PROJETMANPOWER] = useState([]) - const [PROJECTACTUALCOSTTOTAL, SET_PROJECTACTUALCOSTTOTAL] = useState([]) +const DashboardPM = () => { + const [PROJECTCOUNT, SET_PROJECTCOUNT] = useState(0) + const [PROJECTBUDGETTOTAL, SET_PROJECTBUDGETTOTAL] = useState(0) + const [PROJECTMANPOWER, SET_PROJETMANPOWER] = useState(0) + const [PROJECTACTUALCOSTTOTAL, SET_PROJECTACTUALCOSTTOTAL] = useState(0) + const [PROJECTCOSTTOTAL, SET_PROJECTCOSTTOTAL] = useState(0) + const [TOTALREVENUE, SET_TOTALREVENUE] = useState(0) const token = localStorage.getItem("token") - const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}` - } - } + const HEADER = { + headers: { + "Content-Type": "application/json", + "Authorization": `Bearer ${token}` + } + } - const getProjects = async () => { + const getProjectInfos = async () => { const URL = `${BASE_OSPRO}/api/project/list` const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Belum ada data proyek!', 'Failed'); - } - console.log("res ", result.data.data) - // setDataTable(result.data.data); + SET_PROJECTCOUNT(result.data.totalRecord) - SET_PROJECTACTUALCOSTTOTAL(result.data.totalActualCost) - SET_PROJECTBUDGETTOTAL(result.data.totalPlannedCost) + result.data.totalActualCost != undefined ? SET_PROJECTCOSTTOTAL(result.data.totalActualCost) : SET_PROJECTCOSTTOTAL(0) + result.data.totalPlannedCost != undefined ? SET_PROJECTBUDGETTOTAL(result.data.totalPlannedCost) : SET_PROJECTBUDGETTOTAL(0) + result.data.totalRevenue != undefined ? SET_TOTALREVENUE(result.data.totalRevenue) : SET_TOTALREVENUE(0) } useEffect(() => { - getProjects(); + getProjectInfos(); }, []) return ( -
- -
PORTOFOLIO DASHBOARD
- {/* - - - - - - - - - - - */} - - -
- -
- } - value={PROJECTCOUNT} - bgColor="teal" - title="Project Count" /> - {/* } - value="19 M" - bgColor="#059669" - title="Project Cost" - secondaryTitle="(dollars)" /> */} + <> +
+ +
} - value={`${PROJECTBUDGETTOTAL} M`} - bgColor="#047857" - title="Budget Project Total" - // secondaryTitle="(dollars)" - /> + icon={} + value={`${formatRibuanDecimal(PROJECTBUDGETTOTAL)}`} + bgColor="#077857" + title="Budget" + /> + + } - value="2000" - bgColor="#0284c7" - title="Project Manpower" + icon={} + value={`${formatRibuanDecimal(PROJECTCOSTTOTAL)}`} + bgColor="#077857" + title="Spent on Projects" /> + + } - value="80" - bgColor="#b30000" - title="Active Car" /> + icon={} + value="-" + bgColor="#0287c7" + title="Manpowers" + /> - -
- -
- - - - - - - -
- -
+ + +
+ + + + + + + + + + + + + + + } + /> + + + + + + + + + + + + + + + + + + + + - + ); } -export default DashbaoardPM; \ No newline at end of file +export default DashboardPM; + diff --git a/src/views/DashboardPMOV1/projectPhaseChart.js b/src/views/DashboardPMOV1/projectPhaseChart.js new file mode 100644 index 0000000..111e748 --- /dev/null +++ b/src/views/DashboardPMOV1/projectPhaseChart.js @@ -0,0 +1,36 @@ +import React from 'react'; +import { Bar } from 'react-chartjs-2'; +import { faker } from '@faker-js/faker'; + +const options = { + indexAxis: 'y', + responsive: true, +}; + +const labels = ['January', 'February', 'March', 'April', 'May', 'June', 'July']; + +export const data = { + labels, + datasets: [ + { + label: 'Dataset 1', + data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })), + borderColor: 'rgb(255, 99, 132)', + backgroundColor: 'rgba(255, 99, 132, 0.5)', + }, + { + label: 'Dataset 2', + data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })), + borderColor: 'rgb(53, 162, 235)', + backgroundColor: 'rgba(53, 162, 235, 0.5)', + }, + ], +}; + +export function ProjectPhaseChart() { + return ; +} + + + + diff --git a/src/views/DashboardPMOV1/tableDashboard.js b/src/views/DashboardPMOV1/tableDashboard.js index 64931d3..62674a5 100644 --- a/src/views/DashboardPMOV1/tableDashboard.js +++ b/src/views/DashboardPMOV1/tableDashboard.js @@ -8,7 +8,7 @@ const columns = [ key: 'project', fixed: 'left', width: 200, - // render: text => {text}, + render: text => {text}, }, { title: 'Project Owner', @@ -127,4 +127,4 @@ const TableDashboard = () => { ); } -export default TableDashboard; \ No newline at end of file +export default TableDashboard; diff --git a/src/views/DashboardPMOV1/tableDashboardv1.js b/src/views/DashboardPMOV1/tableDashboardv1.js index beac1a0..6d3fb23 100644 --- a/src/views/DashboardPMOV1/tableDashboardv1.js +++ b/src/views/DashboardPMOV1/tableDashboardv1.js @@ -1,47 +1,31 @@ import '../../../node_modules/react-grid-layout/css/styles.css'; import '../../../node_modules/react-resizable/css/styles.css'; import './../DashboardPMO/Dashboard.css'; -// import PieChart from './PieChart'; import { BASE_OSPRO } from '../../const/ApiConst'; -import ContentLoader from "react-content-loader" import React, { useEffect, useState } from 'react'; import axios from 'axios' -import moment from 'moment'; -import numeral from 'numeral'; -import { Table, Tree, Row, Col, Space, Card} from 'antd'; -import { Pie } from '@ant-design/plots'; -import { NotificationContainer, NotificationManager } from 'react-notifications'; -import { formatRibuanDecimal, DATE_TIME_FORMAT } from '../../const/CustomFunc.js'; +import { Table, Row, Col } from 'antd'; +import { formatRibuanDecimal } from '../../const/CustomFunc.js'; import { Badge } from 'reactstrap'; import { Link } from "react-router-dom"; -const token = localStorage.getItem("token") -const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}`, - "Access-Control-Allow-Origin": "*" - } -} - const TableDashboardV1 = () => { - const token = localStorage.getItem("token") - const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}` - } - } + const token = localStorage.getItem("token") + const HEADER = { + headers: { + "Content-Type": "application/json", + "Authorization": `Bearer ${token}`, + } + } - const [dataTable, setDataTable] = useState([]) + const [dataTable, setDataTable] = useState([]) const getProjects = async () => { const URL = `${BASE_OSPRO}/api/project/list` const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Belum ada data proyek!', 'Failed'); + console.log("qqq", result) + if (result.data.code == 200) { + setDataTable(result.data.data); } - // console.log("res ", result.data.data) - setDataTable(result.data.data); } const columns = [ @@ -60,38 +44,41 @@ const TableDashboardV1 = () => { title: 'Budget Project', dataIndex: 'plannedCost', key: 'plannedCost', - render: (text) => { formatRibuanDecimal(text) }, + render: (text) => {formatRibuanDecimal(text)}, }, { title: 'Actual Cost', dataIndex: 'actualCost', key: 'actualCost', - render: (text) => { formatRibuanDecimal(text) }, + render: (text) => {formatRibuanDecimal(text)}, }, { title: 'Cost Variance', dataIndex: 'costVariance', key: 'costVariance', - render: (text) => { formatRibuanDecimal(text) }, + render: (text) => {formatRibuanDecimal(text)}, }, { title: 'Cost Health', dataIndex: 'costHealth', key: 'costHealth', render: (text) => { - if(text == "on-budget") { - return On Budget - } else if(text == "warning") { - return Warning - } else { - return Danger - } + if (text == "on-budget") { + return On Budget + } else if (text == "warning") { + return Warning + } else { + return Danger + } } }, { title: 'Progress', dataIndex: 'progress', key: 'progress', + render: (text) => { + return 74 ? 'success' : text > 49 ? 'warning' : 'danger'}>{text}% + } }, ]; @@ -100,16 +87,15 @@ const TableDashboardV1 = () => { }, []) - return ( - <> + return ( + <>
- - - ); + + ); } export default TableDashboardV1; diff --git a/src/views/DashboardProject/index.js b/src/views/DashboardProject/index.js index b5556db..e84047c 100644 --- a/src/views/DashboardProject/index.js +++ b/src/views/DashboardProject/index.js @@ -9,8 +9,8 @@ import axios from 'axios' import { NotificationContainer, NotificationManager } from 'react-notifications'; import { useParams } from 'react-router-dom'; import { BASE_OSPRO } from '../../const/ApiConst'; -import { - formatThousand, +import { + formatThousand, } from "../../const/CustomFunc"; function BoxDashboard({ value, title, secondaryTitle, icon, bgColor }) { @@ -20,7 +20,7 @@ function BoxDashboard({ value, title, secondaryTitle, icon, bgColor }) {
{title}
{icon}
-
Rp. {value}
+
{value}
) } @@ -45,20 +45,20 @@ const DashboardProject = () => { const token = localStorage.getItem("token") - const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}` - } - } + const HEADER = { + headers: { + "Content-Type": "application/json", + "Authorization": `Bearer ${token}` + } + } const getProjectDetail = async () => { const URL = `${BASE_OSPRO}/api/project/dashboard/${ID}` const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) if (result.data.code !== 200) { NotificationManager.error('Belum ada data proyek!', 'Failed'); - } - let resData; + } + let resData; result.data.data.map(datas => resData = datas); SET_BUDGET(resData.rencana_biaya) SET_PROJECTMGR(resData.pm) @@ -75,7 +75,7 @@ const DashboardProject = () => { return ( -
+
@@ -95,7 +95,7 @@ const DashboardProject = () => {
-
Company
+
Customer
{RO}
@@ -225,4 +225,4 @@ const DashboardProject = () => { ); } -export default DashboardProject; \ No newline at end of file +export default DashboardProject; diff --git a/src/views/DashboardSimpro/index.js b/src/views/DashboardSimpro/index.js index 8152c3c..c3be762 100644 --- a/src/views/DashboardSimpro/index.js +++ b/src/views/DashboardSimpro/index.js @@ -2,8 +2,8 @@ import '../../../node_modules/react-grid-layout/css/styles.css'; import '../../../node_modules/react-resizable/css/styles.css'; import '../Map/CustomScroll.css'; import './Dashboard.css'; -import Chart from 'chart.js'; -import ChartDataLabels from 'chartjs-plugin-datalabels'; +import { Chart } from 'chart.js'; +import { ChartDataLabels } from 'chartjs-plugin-datalabels'; import ContentLoader from "react-content-loader" import LineChart from './LineChart'; import PieChart from './PieChart'; @@ -20,18 +20,18 @@ import { Pagination, Tooltip, Tree, List, Checkbox } from 'antd'; import { getChildrenTree, formatRupiah, DATE_TIME_FORMAT } from '../../const/CustomFunc.js'; import { projectTreeConst } from '../../const/LayerTreeConst.js'; import { - Card, Modal, ModalHeader, ModalBody, ModalFooter, Button, - CardBody, CardHeader, Col, Dropdown, DropdownItem, DropdownMenu, DropdownToggle, Row + Card, Modal, ModalHeader, ModalBody, ModalFooter, Button, + CardBody, CardHeader, Col, Dropdown, DropdownItem, DropdownMenu, DropdownToggle, Row } from 'reactstrap'; import { - DONE_COLOR, IZIN_COLOR, NOT_YET_COLOR, - PRESENT_COLOR, TOTAL_COLOR, - RED_COLOR, - ORANGE_COLOR, - GREEN_COLOR, - DARK_GREY_COLOR, - BLUE_COLOR, - PURPLE_COLOR + DONE_COLOR, IZIN_COLOR, NOT_YET_COLOR, + PRESENT_COLOR, TOTAL_COLOR, + RED_COLOR, + ORANGE_COLOR, + GREEN_COLOR, + DARK_GREY_COLOR, + BLUE_COLOR, + PURPLE_COLOR } from '../../const/AppConst.js'; const id_org = window.localStorage.getItem('id_org'); const roleName = window.localStorage.getItem('role_name'); @@ -40,269 +40,269 @@ Chart.plugins.register(ChartDataLabels); const { RangePicker } = DatePicker; let menu = [ - { - "id": 3, - "title": "PANIC BUTTON", - "key": "absent", - "color": IZIN_COLOR - }, - { - "id": 4, - "title": "WASPANG ACTIVE", - "key": "karyawan telat", - "color": GREEN_COLOR - }, - { - "id": 5, - "title": "WASPANG ABSENT", - "key": "karyawan tanpa keterangan", - "color": ORANGE_COLOR - } + { + "id": 3, + "title": "PANIC BUTTON", + "key": "absent", + "color": IZIN_COLOR + }, + { + "id": 4, + "title": "WASPANG ACTIVE", + "key": "karyawan telat", + "color": GREEN_COLOR + }, + { + "id": 5, + "title": "WASPANG ABSENT", + "key": "karyawan tanpa keterangan", + "color": ORANGE_COLOR + } ] const defaultPersentaseProyek = { - labels: [], - datasets: [ - { - label: 'Progress', - data: [], - fill: false, - backgroundColor: 'rgb(54, 162, 235)', - borderColor: 'rgba(54, 162, 235, 0.2)', - yAxisID: 'y-axis-1', - }, - ], + labels: [], + datasets: [ + { + label: 'Progress', + data: [], + fill: false, + backgroundColor: 'rgb(54, 162, 235)', + borderColor: 'rgba(54, 162, 235, 0.2)', + yAxisID: 'y-axis-1', + }, + ], }; const defaultCostProyek = { - labels: [], - datasets: [ - { - label: 'Perencanaan', - data: [], - fill: false, - backgroundColor: 'rgb(255, 99, 132)', - borderColor: 'rgba(255, 99, 132, 0.2)', - yAxisID: 'y-axis-1', - }, - { - label: 'Realisasi', - data: [], - fill: false, - backgroundColor: 'rgb(54, 162, 235)', - borderColor: 'rgba(54, 162, 235, 0.2)', - yAxisID: 'y-axis-1', - }, - ], + labels: [], + datasets: [ + { + label: 'Perencanaan', + data: [], + fill: false, + backgroundColor: 'rgb(255, 99, 132)', + borderColor: 'rgba(255, 99, 132, 0.2)', + yAxisID: 'y-axis-1', + }, + { + label: 'Realisasi', + data: [], + fill: false, + backgroundColor: 'rgb(54, 162, 235)', + borderColor: 'rgba(54, 162, 235, 0.2)', + yAxisID: 'y-axis-1', + }, + ], }; const defaultStatusProyek = { - labels: ['Aman', 'Alert', 'Critical'], - datasets: [ - { - label: '# of Votes', - data: [], - backgroundColor: [ - 'rgba(54, 162, 235, 0.2)', - 'rgba(255, 206, 86, 0.2)', - 'rgba(255, 99, 132, 0.2)', - ], - borderColor: [ - 'rgba(54, 162, 235, 1)', - 'rgba(255, 206, 86, 1)', - 'rgba(255, 99, 132, 1)', - ], - borderWidth: 1, - }, - ], + labels: ['Aman', 'Alert', 'Critical'], + datasets: [ + { + label: '# of Votes', + data: [], + backgroundColor: [ + 'rgba(54, 162, 235, 0.2)', + 'rgba(255, 206, 86, 0.2)', + 'rgba(255, 99, 132, 0.2)', + ], + borderColor: [ + 'rgba(54, 162, 235, 1)', + 'rgba(255, 206, 86, 1)', + 'rgba(255, 99, 132, 1)', + ], + borderWidth: 1, + }, + ], }; const DashboardSimpro = () => { - const token = localStorage.getItem("token") - const HEADER = { - headers: { - "Content-Type": "application/json", - "Authorization": `Bearer ${token}` - } - } - const [openPlanRealisasi, setopenPlanRealisasi] = useState(false); - const [openCostPlanRealisasi, setopenCostPlanRealisasi] = useState(false); - const [dataChart, setDataChart] = useState([]); - const [projectTree, setProjectTree] = useState([]); - const [allProyek, setAllProyek] = useState(true); - const [dataStatusProyek, setDataStatusProyek] = useState(null); - const [dataPersentaseProyek, setDataPersentaseProyek] = useState(null); - const [dataCostProyek, setdataCostProyek] = useState(null); - const [projectTreeVisible, setProjectTreeVisible] = useState(false); - const [checkedKeysProjectTree, setCheckedKeysProjectTree] = useState([]); - const [openModalTable, setOpenModalTable] = useState(false); - const [dataDashboard, setDataDashboard] = useState(null); + const token = localStorage.getItem("token") + const HEADER = { + headers: { + "Content-Type": "application/json", + "Authorization": `Bearer ${token}` + } + } + const [openPlanRealisasi, setopenPlanRealisasi] = useState(false); + const [openCostPlanRealisasi, setopenCostPlanRealisasi] = useState(false); + const [dataChart, setDataChart] = useState([]); + const [projectTree, setProjectTree] = useState([]); + const [allProyek, setAllProyek] = useState(true); + const [dataStatusProyek, setDataStatusProyek] = useState(null); + const [dataPersentaseProyek, setDataPersentaseProyek] = useState(null); + const [dataCostProyek, setdataCostProyek] = useState(null); + const [projectTreeVisible, setProjectTreeVisible] = useState(false); + const [checkedKeysProjectTree, setCheckedKeysProjectTree] = useState([]); + const [openModalTable, setOpenModalTable] = useState(false); + const [dataDashboard, setDataDashboard] = useState(null); - const handleGetDataDashboard = async () => { - const URL = `${BASE_SIMPRO}/dashboard-proyek/search` - const payload = { - "columns": [ - { "name": "created_at", "logic_operator": "range", "value": "2021-11-06 00:00:00", "value1": "2021-11-06 23:59:59", "operator": "AND" } - ], - "paging": { "start": 0, "length": -1 } - } - const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response) + const handleGetDataDashboard = async () => { + const URL = `${BASE_SIMPRO}/dashboard-proyek/search` + const payload = { + "columns": [ + { "name": "created_at", "logic_operator": "range", "value": "2021-11-06 00:00:00", "value1": "2021-11-06 23:59:59", "operator": "AND" } + ], + "paging": { "start": 0, "length": -1 } + } + const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Gaga Menambah Data!!', 'Failed'); - } + if (result.data.code !== 200) { + NotificationManager.error('Gaga Menambah Data!!', 'Failed'); + } - setDataDashboard(result.data.data); - } + setDataDashboard(result.data.data); + } - const handleGetDataDashboardChart = async () => { - const URL = `${BASE_SIMPRO}/dashboard-status/search` - let str = '' + const handleGetDataDashboardChart = async () => { + const URL = `${BASE_SIMPRO}/dashboard-status/search` + let str = '' - checkedKeysProjectTree.map((res, idx) => { - if (idx == 0) str += `${res}` - if (idx != 0) str += `,${res}` - }) + checkedKeysProjectTree.map((res, idx) => { + if (idx == 0) str += `${res}` + if (idx != 0) str += `,${res}` + }) - const payload = { - "columns": [ - { "name": "id", "logic_operator": "in", "value": str ? str : "0", "operator": "AND" } - ], - "orders": { "columns": ["nama"], "ascending": true } - } + const payload = { + "columns": [ + { "name": "id", "logic_operator": "in", "value": str ? str : "0", "operator": "AND" } + ], + "orders": { "columns": ["nama"], "ascending": true } + } - const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response) + const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Gaga Menambah Data!!', 'Failed'); - } + if (result.data.code !== 200) { + NotificationManager.error('Gaga Menambah Data!!', 'Failed'); + } - const { persentase_progress, progress_cost_planning, progress_cost_realisasi, status_proyek } = result.data.data - const labelPersentaseProyek = persentase_progress ? persentase_progress.map(res => res.label) : [] - const valuePersentaseProyek = persentase_progress ? persentase_progress.map(res => res.total) : [] - const persentaseProyek = { - labels: labelPersentaseProyek, - datasets: [ - { - label: 'Progress', - data: valuePersentaseProyek, - fill: false, - backgroundColor: 'rgb(54, 162, 235)', - borderColor: 'rgba(54, 162, 235, 0.2)', - yAxisID: 'y-axis-1', - }, - ], - }; - setDataPersentaseProyek(persentaseProyek) - const labelCostPlaning = progress_cost_planning ? progress_cost_planning.map(res => res.label) : [] - const valueCostPlaning = progress_cost_planning ? progress_cost_planning.map(res => res.total) : [] - const valueCostRealisasi = progress_cost_realisasi ? progress_cost_realisasi.map(res => res.total) : [] + const { persentase_progress, progress_cost_planning, progress_cost_realisasi, status_proyek } = result.data.data + const labelPersentaseProyek = persentase_progress ? persentase_progress.map(res => res.label) : [] + const valuePersentaseProyek = persentase_progress ? persentase_progress.map(res => res.total) : [] + const persentaseProyek = { + labels: labelPersentaseProyek, + datasets: [ + { + label: 'Progress', + data: valuePersentaseProyek, + fill: false, + backgroundColor: 'rgb(54, 162, 235)', + borderColor: 'rgba(54, 162, 235, 0.2)', + yAxisID: 'y-axis-1', + }, + ], + }; + setDataPersentaseProyek(persentaseProyek) + const labelCostPlaning = progress_cost_planning ? progress_cost_planning.map(res => res.label) : [] + const valueCostPlaning = progress_cost_planning ? progress_cost_planning.map(res => res.total) : [] + const valueCostRealisasi = progress_cost_realisasi ? progress_cost_realisasi.map(res => res.total) : [] - const costProyek = { - labels: labelCostPlaning, - datasets: [ - { - label: 'Perencanaan', - data: valueCostPlaning, - fill: false, - backgroundColor: 'rgb(255, 99, 132)', - borderColor: 'rgba(255, 99, 132, 0.2)', - yAxisID: 'y-axis-1', - }, - { - label: 'Realisasi', - data: valueCostRealisasi, - fill: false, - backgroundColor: 'rgb(54, 162, 235)', - borderColor: 'rgba(54, 162, 235, 0.2)', - yAxisID: 'y-axis-1', - }, - ], - }; - setdataCostProyek(costProyek) + const costProyek = { + labels: labelCostPlaning, + datasets: [ + { + label: 'Perencanaan', + data: valueCostPlaning, + fill: false, + backgroundColor: 'rgb(255, 99, 132)', + borderColor: 'rgba(255, 99, 132, 0.2)', + yAxisID: 'y-axis-1', + }, + { + label: 'Realisasi', + data: valueCostRealisasi, + fill: false, + backgroundColor: 'rgb(54, 162, 235)', + borderColor: 'rgba(54, 162, 235, 0.2)', + yAxisID: 'y-axis-1', + }, + ], + }; + setdataCostProyek(costProyek) - const valueStatusProyek = status_proyek ? status_proyek.map(res => res.total) : [] + const valueStatusProyek = status_proyek ? status_proyek.map(res => res.total) : [] - const statusProyek = { - labels: ['Aman', 'Alert', 'Critical'], - datasets: [ - { - label: '# of Votes', - data: valueStatusProyek, - backgroundColor: [ - 'rgba(54, 162, 235, 0.2)', - 'rgba(255, 206, 86, 0.2)', - 'rgba(255, 99, 132, 0.2)', - ], - borderColor: [ - 'rgba(54, 162, 235, 1)', - 'rgba(255, 206, 86, 1)', - 'rgba(255, 99, 132, 1)', - ], - borderWidth: 1, - }, - ], - }; + const statusProyek = { + labels: ['Aman', 'Alert', 'Critical'], + datasets: [ + { + label: '# of Votes', + data: valueStatusProyek, + backgroundColor: [ + 'rgba(54, 162, 235, 0.2)', + 'rgba(255, 206, 86, 0.2)', + 'rgba(255, 99, 132, 0.2)', + ], + borderColor: [ + 'rgba(54, 162, 235, 1)', + 'rgba(255, 206, 86, 1)', + 'rgba(255, 99, 132, 1)', + ], + borderWidth: 1, + }, + ], + }; - setDataStatusProyek(statusProyek) + setDataStatusProyek(statusProyek) - } + } - const getProyek = async () => { - const URL = `${BASE_SIMPRO}/proyek/list?start=0&length=-1&orderby=nama&asc=true` - const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) - if (result.data.code !== 200) { - NotificationManager.error('Gaga Menambah Data!!', 'Failed'); - } - setProjectTree(result.data.data); - const arr = result.data.data.map(res => res.id) - setCheckedKeysProjectTree(arr) - } + const getProyek = async () => { + const URL = `${BASE_SIMPRO}/proyek/list?start=0&length=-1&orderby=nama&asc=true` + const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response) + if (result.data.code !== 200) { + NotificationManager.error('Gaga Menambah Data!!', 'Failed'); + } + setProjectTree(result.data.data); + const arr = result.data.data.map(res => res.id) + setCheckedKeysProjectTree(arr) + } - const renderDailyInfo = () => { - return ( - <> -
-

{dataDashboard ? dataDashboard.panic_button : 0}

-

PANIC BUTTON

-
-
-

{dataDashboard ? dataDashboard.waspang_status.presensi : 0}

-

WASPANG ACTIVE

-
-
-

{dataDashboard ? dataDashboard.waspang_status.absensi : 0}

-

WASPANG ABSENT

-
- - ) - } + const renderDailyInfo = () => { + return ( + <> +
+

{dataDashboard ? dataDashboard.panic_button : 0}

+

PANIC BUTTON

+
+
+

{dataDashboard ? dataDashboard.waspang_status.presensi : 0}

+

WASPANG ACTIVE

+
+
+

{dataDashboard ? dataDashboard.waspang_status.absensi : 0}

+

WASPANG ABSENT

+
+ + ) + } - const handleClickChart = param => { - if (!param.length) return; - const { _datasetIndex, _index } = param[0]; - const data = dataPersentaseProyek.datasets[_datasetIndex].label - setOpenModalTable(true) - } + const handleClickChart = param => { + if (!param.length) return; + const { _datasetIndex, _index } = param[0]; + const data = dataPersentaseProyek.datasets[_datasetIndex].label + setOpenModalTable(true) + } - const handleClickProyek = id => { - const arr = [...checkedKeysProjectTree] - const idx = arr.indexOf(id) - if (idx == -1) { - arr.push(id) - } else { - arr.splice(idx, 1) - } - setCheckedKeysProjectTree(arr) - } + const handleClickProyek = id => { + const arr = [...checkedKeysProjectTree] + const idx = arr.indexOf(id) + if (idx == -1) { + arr.push(id) + } else { + arr.splice(idx, 1) + } + setCheckedKeysProjectTree(arr) + } - return ( - <> - - + return ( + <> + + - ); + ); } export default DashboardSimpro; diff --git a/src/views/Master/ProjectPhase/DialogForm.js b/src/views/Master/ProjectPhase/DialogForm.js new file mode 100644 index 0000000..f2ea800 --- /dev/null +++ b/src/views/Master/ProjectPhase/DialogForm.js @@ -0,0 +1,121 @@ +import React, { useEffect, useState } from 'react' +import { + Modal, ModalHeader, ModalBody, ModalFooter, + Button, Form, FormGroup, Label, Input, Col, Row +} from 'reactstrap'; +import { DatePicker, Tooltip, Select } from 'antd'; +import { formatRupiah, formatNumber } from '../../../const/CustomFunc' +import moment from 'moment'; +import 'antd/dist/antd.css'; +const { Option } = Select + +const DialogForm = ({openDialog, closeDialog, toggleDialog, typeDialog, dataEdit}) => { + const [id, setId] = useState(0) + const [projectType, setProjectType] = useState('') + const [uom, setUom] = useState('') + const [description, setDescription] = useState('') + const [unitPrice, setUnitPrice] = useState() + + + + + useEffect(()=> { + if(typeDialog==="Edit"){ + console.log("cel data Edit", dataEdit) + setId(dataEdit.id) + setDescription(dataEdit.description) + setUnitPrice(dataEdit.unit_price) + setUom(dataEdit.uom) + setProjectType(dataEdit.name) + + }else{ + setId(0) + } + },[dataEdit,openDialog]) + + const handleSave = () => { + let data = ''; + if(typeDialog==="Save"){ + data = { + name: projectType, + description + } + + closeDialog('save', data); + }else{ + data = { + id, + name: projectType, + description + } + closeDialog('edit', data); + } + setId(0) + setDescription('') + + } + + const handleCancel = () => { + closeDialog('cancel', 'none') + setId(0) + + setDescription('') + + } + + + + + + + const renderForm = () => { + return( +
+ +
+ + + setProjectType(e.target.value)} placeholder={`Input material name...`}/> + + + + + + setDescription(e.target.value)} placeholder={`Description ...`} /> + + + + + ) + } + + + return ( + <> + + {typeDialog=="Save" ? `Add` : "Edit"} Resource + + {renderForm()} + + + {' '} + + + + + {/* toggleMapDialog} + dataEdit={dataEdit} + workArea_={workArea} + lat_={lat} + lon_={lon} + radius_={radius} + /> */} + + ) + +} + +export default DialogForm; \ No newline at end of file diff --git a/src/views/Master/ProjectPhase/DialogFormInitial.js b/src/views/Master/ProjectPhase/DialogFormInitial.js new file mode 100644 index 0000000..ff2c506 --- /dev/null +++ b/src/views/Master/ProjectPhase/DialogFormInitial.js @@ -0,0 +1,89 @@ +import React, { useEffect, useState } from 'react' +import { + Modal, ModalHeader, ModalBody, ModalFooter, + Button, Form, FormGroup, Label, Input, Col, Row +} from 'reactstrap'; + +const DialogForm = ({openDialog, closeDialog, toggleDialog, typeDialog, dataEdit, idActivity, projectTypeId}) => { + + const [id, setId] = useState(0) + const [activity, setActivity] = useState('') + + useEffect(()=> { + if(typeDialog==="edit"){ + setId(dataEdit.id) + setActivity(dataEdit.name_activity) + + }else{ + setId(0) + setActivity('') + } + },[dataEdit,openDialog]) + + const handleSave = () => { + let data = ''; + + if(typeDialog==="add"){ + data = { + name_activity: activity, + proyek_type_id:projectTypeId + } + + if(idActivity && idActivity > 0){ + data['parent_id'] = idActivity + } + console.log("cek cek cek") + closeDialog('save', data); + }else{ + data = { + id, + name_activity: activity, + proyek_type_id:projectTypeId + } + + if(idActivity && idActivity > 0){ + data['parent_id'] = idActivity + } + console.log("cek cek cek 2") + closeDialog('edit', data); + } + setId(0) + setActivity('') + } + + const handleCancel = () => { + closeDialog('cancel', 'none') + setId(0) + setActivity('') + } + + const renderForm = () => { + return( +
+ + + setActivity(e.target.value)} placeholder={`Persiapan ...`} /> + + + ) + } + + + return ( + <> + + {typeDialog=="add" ? `Add` : "Edit"} Activity + + {renderForm()} + + + {' '} + + + + + ) + +} + +export default DialogForm; \ No newline at end of file diff --git a/src/views/Master/ProjectPhase/DialogInitialGantt.js b/src/views/Master/ProjectPhase/DialogInitialGantt.js new file mode 100644 index 0000000..c429e23 --- /dev/null +++ b/src/views/Master/ProjectPhase/DialogInitialGantt.js @@ -0,0 +1,217 @@ +import React, { useEffect, useMemo, useState } from 'react' +import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; +import { Button } from 'reactstrap'; +import { Table, Tooltip } from 'antd'; +import { NotificationContainer, NotificationManager } from 'react-notifications'; +import 'antd/dist/antd.css'; +import SweetAlert from 'react-bootstrap-sweetalert'; +import { TEMPLATE_GANTT_ADD, TEMPLATE_GANTT_DELETE, TEMPLATE_GANTT_EDIT, TEMPLATE_GANTT_TREE } from '../../../const/ApiConst'; +import axios from "../../../const/interceptorApi" +import DialogForm from './DialogFormInitial'; + +const DialogInitialGantt = ({ openDialog, closeDialog, toggleDialog, idTypeProject }) => { + const token = window.localStorage.getItem('token'); + const config = { + headers: + { + Authorization: `Bearer ${token}`, + "Content-type": `application/json` + } + }; + + const [dataTable, setDataTable] = useState([]) + const [alertDelete, setAlertDelete] = useState(false) + const [idDelete, setIdDelete] = useState(0) + const [idActivity, setIdActivity] = useState(0) + const [openDialogForm, setOpenDialogForm] = useState(false) + const [typeDialog, setTypeDialog] = useState("add") + const [dataEdit, setDataEdit] = useState([]) + + useEffect(() => { + if (idTypeProject && idTypeProject > 0) { + getDataInitial(); + } + }, [idTypeProject]) + + const getDataInitial = async () => { + const url = TEMPLATE_GANTT_TREE(idTypeProject) + const result = await axios + .get(url, config) + .then(res => res) + .catch((error) => error.response); + if (result && result.data && result.data.code == 200) { + setDataTable(result.data.data); + } else { + NotificationManager.error('Gagal mengambil data, Silahkan coba lagi!!', 'Failed'); + } + } + + const handleDelete = async (id) => { + await setIdDelete(id) + await setAlertDelete(true) + } + + const onConfirmDelete = async () => { + let url = TEMPLATE_GANTT_DELETE(idDelete); + + const result = await axios.delete(url, config) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataInitial() + setIdDelete(0) + setAlertDelete(false) + NotificationManager.success(`Activity berhasil dihapus!`, 'Success!!'); + } else { + setIdDelete(0) + setAlertDelete(false) + NotificationManager.error(`Activity gagal dihapus!}`, 'Failed!!'); + } + } + + const cancelDelete = () => { + setIdDelete(0) + setAlertDelete(false) + } + + const handleAdd = async () => { + setIdActivity(0) + await setTypeDialog("add") + setOpenDialogForm(true) + } + + const handleEdit = async (data) => { + await setDataEdit(data) + if (data.parent_id) { + await setIdActivity(data.parent_id); + } + await setTypeDialog("edit") + setOpenDialogForm(true) + } + + const handleAddWithParent = async (id) => { + setIdActivity(id) + await setTypeDialog("add") + setOpenDialogForm(true) + } + + const closeDialogForm = (type, data) => { + if (type == "save") { + saveActivity(data) + } else if (type == "edit") { + updateActivity(data) + } + setIdActivity(0) + setOpenDialogForm(false) + } + + const toggleDialogForm = () => { + if (openDialogForm) { + setIdActivity(0) + } + setOpenDialogForm(!openDialogForm); + } + + const saveActivity = async (data) => { + const result = await axios.post(TEMPLATE_GANTT_ADD, data, config) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataInitial() + NotificationManager.success(`Data activity berhasil ditambah`, 'Success!!'); + } else { + NotificationManager.error(`${result.data.message}`, 'Failed!!'); + } + } + + const updateActivity = async (data) => { + const url = TEMPLATE_GANTT_EDIT(data.id) + const result = await axios.put(url, data, config) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataInitial() + NotificationManager.success(`Data activity berhasil diedit`, 'Success!!'); + } else { + NotificationManager.error(`${result.data.message}`, 'Failed!!'); + } + } + + const renderTable = useMemo(() => { + const columns = [ + { + title: 'Action', + dataIndex: '', + key: 'id', + className: "nowrap", + render: (text, record) => + <> + + + {" "} + + {" "} + + + + , + }, + { title: 'Nama Activity', dataIndex: 'name_activity', key: 'name_activity' }, + ]; + + return ( +
+ ) + }, [dataTable]) + + + return (<> + + + Delete this data + + + + {/* Initial Gantt */} + +
Template Gantt
+
+ + {renderTable} + + + + +
+ + ) + +} + +export default DialogInitialGantt; \ No newline at end of file diff --git a/src/views/Master/ProjectPhase/index.js b/src/views/Master/ProjectPhase/index.js new file mode 100644 index 0000000..81b4af7 --- /dev/null +++ b/src/views/Master/ProjectPhase/index.js @@ -0,0 +1,325 @@ +import * as XLSX from 'xlsx'; +import DialogForm from './DialogForm'; +import DialogInitialGantt from './DialogInitialGantt'; +import React, { useState, useEffect, useMemo } from 'react'; +import SweetAlert from 'react-bootstrap-sweetalert'; +import axios from "../../../const/interceptorApi" +import moment from 'moment' +import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap'; +import { NotificationContainer, NotificationManager } from 'react-notifications'; +import { PROJECT_PHASE_ADD, PROJECT_PHASE_EDIT, PROJECT_PHASE_DELETE, PROJECT_PHASE_SEARCH } from '../../../const/ApiConst'; +import { Pagination, Button, Tooltip, Table } from 'antd'; + +const token = window.localStorage.getItem('token'); +const config = { + headers: + { + Authorization: `Bearer ${token}`, + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", + "Access-Control-Allow-Origin": `*` + } +}; + +const ProjectPhase = ({ params }) => { + const token = localStorage.getItem("token") + const HEADER = { + headers: { + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", + "Access-Control-Allow-Origin": "*", + "Authorization": `Bearer ${token}` + } + } + const pageName = params.name; + + const [alertDelete, setAlertDelete] = useState(false) + const [allDataMenu, setAllDataMenu] = useState([]) + const [clickOpenModal, setClickOpenModal] = useState(false) + const [currentPage, setCurrentPage] = useState(1) + const [dataEdit, setDataEdit] = useState([]) + const [dataTable, setDatatable] = useState([]) + const [idDelete, setIdDelete] = useState(0) + const [idPhaseProject, setIdPhaseProject] = useState(0) + const [openDialog, setOpenDialog] = useState(false) + const [openDialogIG, setOpenDialogIG] = useState(false) + const [rowsPerPage, setRowsPerPage] = useState(10) + const [search, setSearch] = useState('') + const [totalPage, setTotalPage] = useState(0) + const [typeDialog, setTypeDialog] = useState('Save') + + useEffect(() => { + getDataProjectPhase() + }, [currentPage, rowsPerPage, search]) + + const getDataProjectPhase = async () => { + let start = 0; + if (currentPage !== 1 && currentPage > 1) { + start = (currentPage * rowsPerPage) - rowsPerPage + } + + const payload = { + "columns": [ + { + "name": "name", + "logic_operator": "like", + "value": search, + "operator": "AND" + } + ], + "orders": { + "ascending": true, + "columns": [ + 'id' + ] + }, + "paging": { + "length": rowsPerPage, + "start": start + } + } + + const result = await axios + .post(PROJECT_PHASE_SEARCH, payload, config) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code == 200) { + setDatatable(result.data.data); + setTotalPage(result.data.totalRecord); + } else { + NotificationManager.error('Gagal Mengambil Data!!', 'Failed'); + } + } + + const handleSearch = e => { + const value = e.target.value + setSearch(value); + setCurrentPage(1) + }; + + const handleOpenDialog = (type) => { + setOpenDialog(true) + setTypeDialog(type) + } + + const handleExportExcel = async () => { + let start = 0; + + const payload = { + "paging": { "start": start, "length": -1 }, + "columns": [ + { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" } + ], + "joins": [], + "orders": { "columns": ["id"], "ascending": false } + } + + const result = await axios + .post(PROJECT_PHASE_SEARCH, payload) + .then(res => res) + .catch((error) => error.response); + } + + const handleEdit = (data) => { + setDataEdit(data) + handleOpenDialog('Edit'); + } + + const handleDelete = async (id) => { + await setAlertDelete(true) + await setIdDelete(id) + } + + const handleCloseDialog = (type, data) => { + if (type === "save") { + saveProjectPhase(data); + } else if (type === "edit") { + editMaterialR(data); + } + setDataEdit([]) + setOpenDialog(false) + } + + const saveProjectPhase = async (data) => { + const formData = data + const result = await axios.post(PROJECT_PHASE_ADD, formData, HEADER) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataProjectPhase() + NotificationManager.success(`Data project type berhasil ditambah`, 'Success!!'); + } else { + NotificationManager.error(`${result.data.message}`, 'Failed!!'); + } + } + + const editMaterialR = async (data) => { + let urlEdit = PROJECT_PHASE_EDIT(data.id) + const formData = data + + const result = await axios.put(urlEdit, formData, HEADER) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataProjectPhase(); + NotificationManager.success(`Data project phase berhasil diedit`, 'Success!!'); + } else { + NotificationManager.error(`Data project phase gagal di edit`, `Failed!!`); + } + } + + const toggleAddDialog = () => { + setOpenDialog(!openDialog) + } + + const handleDialogIg = (id) => { + setIdPhaseProject(id) + setOpenDialogIG(true) + } + + const closeDialogIG = () => { + setIdPhaseProject(0) + setOpenDialogIG(false) + } + + const toggleDialogIG = () => { + if (openDialogIG) { + setIdPhaseProject(0) + } + setOpenDialogIG(!openDialogIG); + } + + const onConfirmDelete = async () => { + let url = PROJECT_PHASE_DELETE(idDelete); + + const result = await axios.delete(url, config) + .then(res => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code === 200) { + getDataProjectPhase() + setIdDelete(0) + setAlertDelete(false) + NotificationManager.success(`Data project phase berhasil dihapus!`, 'Success!!'); + } else { + setIdDelete(0) + setAlertDelete(false) + NotificationManager.error(`Data project phase gagal dihapus!}`, 'Failed!!'); + } + } + + const cancelDelete = () => { + setAlertDelete(false) + setIdDelete(0) + } + + const onShowSizeChange = (current, pageSize) => { + setRowsPerPage(pageSize) + } + + const onPagination = (current, pageSize) => { + setCurrentPage(current) + } + + const dataNotAvailable = () => { + if (dataTable.length === 0) { + return ( +
+ + + ) + } + } + + const renderTable = useMemo(() => { + const columns = [ + { + title: 'Action', + dataIndex: '', + key: 'x', + className: 'nowrap', + render: (text, record) => <> + + handleDelete(text.id)}> + + + handleEdit(text)}> + {" "} + , + }, + { title: 'Fase', dataIndex: 'name', key: 'name', className: "nowrap" }, + { title: 'Warna', dataIndex: 'color', key: 'color' }, + ]; + return ( +
Tidak ada data project phase
+ ) + }, [dataTable]) + + return ( +
+ + cancelDelete()} + focusCancelBtn + > + Delete this data + + toggleAddDialog} + typeDialog={typeDialog} + dataEdit={dataEdit} + clickOpenModal={clickOpenModal} + dataParent={allDataMenu} + /> + + + +

{pageName}

+ +
+ + + + + + + + {renderTable} + + + + + ) +} + +export default ProjectPhase; diff --git a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js index e8264d8..011b2d1 100644 --- a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js +++ b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js @@ -28,6 +28,7 @@ const DialogFormProyek = ({ toggleDialog, idTask, dataTypeProyek, + dataPhaseProject, dataPM, }) => { const token = localStorage.getItem("token"); @@ -43,6 +44,7 @@ const DialogFormProyek = ({ const [description, setDescription] = useState(""); const [biaya, setBiaya] = useState(""); const [typeProject, setTypeproject] = useState(null); + const [phaseProject, setPhaseProject] = useState(null); const [sdm, setSdm] = useState(0); const [pic, setPic] = useState(null); const [startDate, setStartDate] = useState(moment()); @@ -68,9 +70,9 @@ const DialogFormProyek = ({ const [approval, setApproval] = useState([]); const [testingEnv, setTestingEnv] = useState(""); - const [lastIdxParticipants, setLastIdxParticipants] = useState(0); - const [lastIdxMilestones, setLastIdxMilestones] = useState(0); - const [lastIdxApproval, setLastIdxApproval] = useState(0); + const [lastIdxParticipants, setLastIdxParticipants] = useState(0); + const [lastIdxMilestones, setLastIdxMilestones] = useState(0); + const [lastIdxApproval, setLastIdxApproval] = useState(0); const handleGetdataIdproyek = async (id) => { // const URL = `${BASE_SIMPRO_LUMEN}/project/edit/${id}` @@ -86,6 +88,7 @@ const DialogFormProyek = ({ setDescription(val.keterangan); setBiaya(val.rencana_biaya ? formatNumber(val.rencana_biaya) : ""); setTypeproject(val.type_proyek_id); + setPhaseProject(val.phase_id); setPic(val.pm_id); setStartDate(moment(val.mulai_proyek)); setEndDate(moment(val.akhir_proyek)); @@ -215,6 +218,7 @@ const DialogFormProyek = ({ setShortName(""); setBiaya(""); setTypeproject(null); + setPhaseProject(null); setPic(null); setStartDate(moment()); setEndDate(moment()); @@ -242,10 +246,10 @@ const DialogFormProyek = ({ setStep(1); }; - useEffect(() => { - if (openDialog) { - handleGetDataCurrency(); - } + useEffect(() => { + if (openDialog) { + handleGetDataCurrency(); + } if (idTask && idTask > 0) { console.log("cel data Edit"); @@ -327,6 +331,11 @@ const DialogFormProyek = ({ setTypeproject(val); }; + const onChangePhaseProject = (val) => { + setPhaseProject(val); + }; + + const onChangePm = (val) => { let data = [...dataPM]; var item = data.find((item) => item.id === val); @@ -404,12 +413,12 @@ const DialogFormProyek = ({ console.log("participants", participants); }; - const handleInputChangeParticipants = (e, index) => { - const { name, value } = e.target; - const newParticipants = [...participants]; - newParticipants[index][name] = value; - setParticipants(newParticipants); - }; + const handleInputChangeParticipants = (e, index) => { + const { name, value } = e.target; + const newParticipants = [...participants]; + newParticipants[index][name] = value; + setParticipants(newParticipants); + }; // remove participant from array const deleteParticipant = (id) => { @@ -440,12 +449,12 @@ const DialogFormProyek = ({ setLastIdxMilestones(lastIdxMilestones + 1); }; - const handleInputChangeMilestones = (e, index) => { - const { name, value } = e.target; - const newMilestones = [...milestones]; - newMilestones[index][name] = value; - setMilestones(newMilestones); - }; + const handleInputChangeMilestones = (e, index) => { + const { name, value } = e.target; + const newMilestones = [...milestones]; + newMilestones[index][name] = value; + setMilestones(newMilestones); + }; const handleInputChangeMilestonesDate = (date, name, index) => { const newMilestones = [...milestones]; @@ -482,12 +491,12 @@ const DialogFormProyek = ({ setLastIdxApproval(lastIdxApproval + 1); }; - const handleInputChangeApproval = (e, index) => { - const { name, value } = e.target; - const newApproval = [...approval]; - newApproval[index][name] = value; - setApproval(newApproval); - }; + const handleInputChangeApproval = (e, index) => { + const { name, value } = e.target; + const newApproval = [...approval]; + newApproval[index][name] = value; + setApproval(newApproval); + }; const handleInputChangeApprovalDate = (date, name, index) => { const newApproval = [...approval]; @@ -682,6 +691,48 @@ const DialogFormProyek = ({ + + + + + + + + + + + + + +
Notes:
@@ -1062,15 +1113,15 @@ const DialogFormProyek = ({ ) : ( - <> - {" "} - - - )} + + + )} diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index d3a177d..ddbfe87 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -50,6 +50,7 @@ import { PROJECT_APPROVAL_SEARCH, CHECKLIST_K3_LIST, VERSION_GANTT_SEARCH, + PHASE_PROYEK, } from "../../../const/ApiConst"; import { formatNumber, @@ -112,6 +113,7 @@ const CreatedProyek = ({ params, ...props }) => { const [materialResource, setMaterialResource] = useState([]); const [toolsResource, setToolsResource] = useState([]); const [dataTypeProyek, setDataTypeProyek] = useState([]); + const [dataPhaseProject, setDataPhaseProject] = useState([]); const [dataPm, setDataPM] = useState([]); const [openDialogDoc, setOpenDialogDoc] = useState(false); const [proyekName, setProyekName] = useState(""); @@ -132,6 +134,7 @@ const CreatedProyek = ({ params, ...props }) => { getDataMaterialResource(); getDataToolsResource(); handleGetTipeProject(); + handleGetPhaseProject(); handleGetDataPm(); getDataK3(); }, []); @@ -170,6 +173,18 @@ const CreatedProyek = ({ params, ...props }) => { } }; + const handleGetPhaseProject = async () => { + const result = await axios + .get(PHASE_PROYEK, HEADER) + .then((res) => res) + .catch((err) => err.response); + console.log("PHASEEEE", result); + if (result && result.data && result.data.code === 200) { + setDataPhaseProject(result.data.data); + } + }; + + const handleGetDataPm = async () => { const result = await axios .get(USER_LIST, HEADER) @@ -1120,6 +1135,7 @@ const CreatedProyek = ({ params, ...props }) => { toggleDialog={() => toggleAddDialog} idTask={idTask} dataTypeProyek={dataTypeProyek} + dataPhaseProject={dataPhaseProject} dataPM={dataPm} /> ), @@ -1134,6 +1150,7 @@ const CreatedProyek = ({ params, ...props }) => { toggleDialog={() => toggleAddDialogProyek} idTask={idTask} dataTypeProyek={dataTypeProyek} + dataPhaseProject={dataPhaseProject} dataPM={dataPm} /> ), @@ -1326,12 +1343,12 @@ const CreatedProyek = ({ params, ...props }) => { } - // visible={visible} - // onVisibleChange={handleVisibleChange} + // visible={visible} + // onVisibleChange={handleVisibleChange} >