ordo
/
surveyor_indonesia_frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'staging' (#175) from staging into general 

Reviewed-on: ordo/adw-frontend#175
pull/2/head
farhantock 1 year ago
parent
dbf77507c5 abd4485c91
commit
e4ccd8fee0
2 changed files with 89 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/views/Dashboard/DashboardProject.js
  2. 98
      src/views/SimproV2/CreatedProyek/ReportAnalysis.js

10
src/views/Dashboard/DashboardProject.js
Unescape View File

@ -325,12 +325,14 @@ const DashboardProject = () => {
);
setPlannedFinish(
SCURVE
? result.data.data.akhir_proyek
? result.data.data.type_proyek_id === 9
? result.data.data.akhir_proyek
: null
? result.data.data.akhir_proyek
: null
: result.data.data.header?.planned_end
? result.data.data.header?.planned_end
: null
: result.data.data.header?.planned_end
? result.data.data.header?.planned_end
: null
);
setActualStart(
result.data.data.header?.start_date

98
src/views/SimproV2/CreatedProyek/ReportAnalysis.js
Unescape View File

@ -59,21 +59,57 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
const columns = [
{title: "Gantt", dataIndex: "name_version", key: "name_version"},
{title: "Start Date", dataIndex: "start_date", key: "start_date",
{title: "Baseline Start", dataIndex: "planned_start", key: "planned_start",
render: (text, record) => (
<>
{moment(record.start_date).format("DD-MM-YYYY")}
{moment(record.planned_start).format("DD-MM-YY")}
</>
),
},
{title: "End Date", dataIndex: "end_date", key: "end_date",
{title: "Baseline Finish", dataIndex: "planned_end", key: "planned_end",
render: (text, record) => (
<>
{moment(record.end_date).format("DD-MM-YYYY")}
{moment(record.planned_end).format("DD-MM-YY")}
</>
),
},
{title: "Assign HR", dataIndex: "user_name", key: "user_name"},
{title: "Early Start", dataIndex: "start_date", key: "start_date",
render: (text, record) => (
<>
{moment(record.start_date).format("DD-MM-YY")}
</>
),
},
{title: "Early Finish", dataIndex: "end_date", key: "end_date",
render: (text, record) => (
<>
{moment(record.end_date).format("DD-MM-YY")}
</>
),
},
{title: "Actual Start", dataIndex: "actual_start", key: "actual_start",
render: (text, record) => (
<>
{record.actual_start ? moment(record.actual_start).format("DD-MM-YY") : ""}
</>
),
},
{title: "Actual Finish", dataIndex: "actual_end", key: "actual_end",
render: (text, record) => (
<>
{record.actual_end ? moment(record.actual_end).format("DD-MM-YY") : ""}
</>
),
},
{title: "Assign HR", dataIndex: "user_name", key: "user_name", width: "8%",
ellipsis:{
showTitle: true
},
render: (text) =>
<Tooltip placement="topLeft" title={text}>
{text}
</Tooltip>
},
{title: "Volume Plan", dataIndex: "qty_planning", key: "qty_planning",
render: (text, record) =>
<>
@ -97,7 +133,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
);
},
},
{title: "Progress Actual (%)", dataIndex: "persentase_progress", key: "persentase_progress"},
{title: "Progress Actual (%)", dataIndex: "persentase_progress", key: "persentase_progress", width: "8%"},
{
title: 'Action',
dataIndex: '',
@ -116,17 +152,45 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
const columnActivityToHr = [
{title: "Activity", dataIndex: "join_second_name", key: "join_second_name"},
{title: "Gantt", dataIndex: "join_fourth_name_version", key: "join_fourth_name_version"},
{title: "Start Date", dataIndex: "start_date", key: "start_date",
{title: "Baseline Start", dataIndex: "join_second_planned_start", key: "join_second_planned_start",
render: (text, record) => (
<>
{moment(record.start_date).format("DD-MM-YYYY")}
{moment(record.join_second_planned_start).format("DD-MM-YY")}
</>
),
},
{title: "End Date", dataIndex: "end_date", key: "end_date",
{title: "Baseline Finish", dataIndex: "join_second_planned_end", key: "join_second_planned_end",
render: (text, record) => (
<>
{moment(record.end_date).format("DD-MM-YYYY")}
{moment(record.join_second_planned_end).format("DD-MM-YY")}
</>
),
},
{title: "Early Start", dataIndex: "join_second_start_date", key: "join_second_start_date",
render: (text, record) => (
<>
{moment(record.join_second_start_date).format("DD-MM-YY")}
</>
),
},
{title: "Early Finish", dataIndex: "join_second_end_date", key: "join_second_end_date",
render: (text, record) => (
<>
{moment(record.join_second_end_date).format("DD-MM-YY")}
</>
),
},
{title: "Actual Start", dataIndex: "join_second_actual_start", key: "join_second_actual_start",
render: (text, record) => (
<>
{record.join_second_actual_start ? moment(record.join_second_actual_start).format("DD-MM-YY") : ""}
</>
),
},
{title: "Actual Finish", dataIndex: "join_second_actual_end", key: "join_second_actual_end",
render: (text, record) => (
<>
{record.join_second_actual_end ? moment(record.join_second_actual_end).format("DD-MM-YY") : ""}
</>
),
},
@ -295,7 +359,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
{
name: "m_activity",
column_join: "activity_id",
column_results: ["name", "persentase_progress", "start_date", "end_date", "duration"]
column_results: ["name", "persentase_progress", "actual_start", "actual_end", "planned_start", "planned_end", "start_date", "end_date", "duration"]
},
{
name1: "m_activity",
@ -458,21 +522,23 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
</Col>
</Row>
</CardHeader>
<CardBody>
<CardBody style={{ width: '100%' }}>
<div style={{ textAlign: 'center' }}>
<h1>
{
search ? `Activity ${search} Plan : ${sumVolPlan ? sumVolPlan.toFixed(0) : 0}, Actual : ${sumVolAct ? sumVolAct.toFixed(0) : 0}` : null
search ? `Activity ${search}, Total Plan = ${sumVolPlan ? sumVolPlan.toFixed(0) : 0} dan Total Actual = ${sumVolAct ? sumVolAct.toFixed(0) : 0}` : null
}
</h1>
</div>
<div style={{ width: '100%', overflowX: 'auto' }}>
<Table
size="small"
columns={columns}
dataSource={dataTable}
pagination={false}
rowKey={"id"}
rowKey="id"
/>
</div>
</CardBody>
</Card>
</TabPane>
@ -491,7 +557,8 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
</Col>
</Row>
</CardHeader>
<CardBody>
<CardBody style={{ width: '100%' }}>
<div style={{ width: '100%', overflowX: 'auto' }}>
<Table
size="small"
columns={columnActivityToHr}
@ -499,6 +566,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
pagination={false}
rowKey={"id"}
/>
</div>
</CardBody>
</Card>
</TabPane>

Write Preview
Loading…
Cancel
Save