diff --git a/src/views/Dashboard/DashboardCustomer.js b/src/views/Dashboard/DashboardCustomer.js
index 1673264..9b5e55f 100644
--- a/src/views/Dashboard/DashboardCustomer.js
+++ b/src/views/Dashboard/DashboardCustomer.js
@@ -1,12 +1,15 @@
import React, { useEffect, useMemo, useRef, useState } from 'react';
import axios from 'axios'
-import { Row, Col } from 'antd';
+import { Row, Col, Button, Input } from 'antd';
import { CardDashboard, CardExpenditure, CardScheduleHealthPerDivision } from '../../components/CardDashboard/CardDashboard';
import L from 'leaflet';
import { useParams } from 'react-router-dom';
import '../../assets/css/customscroll.css'
import moment from 'moment';
import { BASE_OSPRO } from '../../const/ApiConst';
+import { SendOutlined } from '@ant-design/icons';
+import { NotificationContainer, NotificationManager } from 'react-notifications';
+const { TextArea } = Input;
const styles = {
cardContainer: { backgroundColor: '#F8F8F8', margin: 2, paddingLeft: 20, paddingRight: 20, paddingTop: 10 },
@@ -26,12 +29,13 @@ const DashboardCustomer = () => {
const HEADER = {
headers: {
"Content-Type": "application/json",
- "Authorization": `Bearer ${token}`
+ Authorization: `Bearer ${token}`
}
}
const { PROJECT_ID, GANTT_ID } = useParams();
// const URL_GANTT = `http://103.73.125.81:8446/index.html?base_url=http://103.73.125.81:8444/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
const URL_GANTT = `https://adw-gantt.ospro.id/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
+ // const URL_GANTT = '';
const mapRef = useRef()
const [projectName, setProjectName] = useState("Project Tower ABC");
const [customerName, setCustomerName] = useState("Jaya Gedung Group");
@@ -45,11 +49,16 @@ const DashboardCustomer = () => {
const [activeTabCommentIdx, setActiveTabCommentIdx] = useState(0);
const [planningProgress, setPlanningProgress] = useState(79);
const [actualProgress, setActualProgress] = useState(50);
+ const [comment, setComment] = useState('');
+ const [comments, setComments] = useState([]);
+ const [isReadyComments, setIsReadyComments] = useState(false);
+ const [isSendingComment, setIsSendingComment] = useState(false);
+ const [behindTasks, setBehindTasks] = useState([]);
-
-
useEffect(() => {
- console.log('URL_GANTT', URL_GANTT);
+ // console.log('URL_GANTT', URL_GANTT);
+ getComments();
+ getBehindTasks();
return () => {
console.log('unmount RenderMap');
}
@@ -61,6 +70,105 @@ const DashboardCustomer = () => {
}
}, [activeTabIdx]);
+ const getComments = async () => {
+ setIsReadyComments(false);
+ const URL = `${BASE_OSPRO}/api/project-comment/search`;
+ const payload = {
+ columns: [
+ {
+ name: "project_id",
+ logic_operator: "=",
+ value: PROJECT_ID.toString(),
+ operator: "AND",
+ },
+ ],
+ joins: [
+ {
+ name: "m_users",
+ column_join: "sender_id",
+ column_results: ["name", "username"],
+ }
+ ],
+ orders: { columns: ["created_at"], ascending: false },
+ paging: { start: 0, length: -1 },
+ };
+
+ const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response)
+ console.log('getComments', result);
+ if (!result) {
+ NotificationManager.error(`Could not connect to internet.`, "Failed");
+ setIsReadyComments(true);
+ return;
+ }
+
+ if (result.status !== 200) {
+ NotificationManager.error(`Post comment failed, ${result.data.message}`, "Failed");
+ setIsReadyComments(true);
+ return;
+ }
+ else if (result.status == 200 && result.data.data) {
+ console.log(result.data.data);
+ setComments(result.data.data);
+ setIsReadyComments(true);
+ }
+ }
+
+ const handleSendComment = async () => {
+ console.log('handleSendComment', comment);
+ setIsSendingComment(true);
+ if (comment === '') {
+ NotificationManager.error("Please leave a comment before you send it.", "Failed");
+ setIsSendingComment(false);
+ return;
+ }
+ const URL = `${BASE_OSPRO}/api/project-comment/add`;
+ const payload = {
+ "sender_id": localStorage.getItem('user_id'),
+ "project_id": PROJECT_ID,
+ "comment": comment
+ }
+ const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response)
+
+ if (!result) {
+ NotificationManager.error(`Could not connect to internet.`, "Failed");
+ setIsSendingComment(false);
+ return;
+ }
+
+ if (result.status !== 200) {
+ NotificationManager.error(`Post comment failed, ${result.data.message}`, "Failed");
+ setIsSendingComment(false);
+ return;
+ }
+ else if (result.status === 200) {
+ NotificationManager.success(`Post comment success`, "Success");
+ resetInputComment();
+ getComments();
+ }
+ }
+
+ const resetInputComment = () => {
+ setComment('');
+ setIsSendingComment(false);
+ }
+
+ const getBehindTasks = () => {
+ setBehindTasks([
+ {
+ id: 1,
+ name: "Tom",
+ message: "Overdue by 5 days",
+ division: "IT"
+ },
+ {
+ id: 1,
+ name: "Jerry",
+ message: "Overdue by 3 days",
+ division: "Finance"
+ }
+ ])
+ }
+
const initMap = () => {
let mymap = L.map('map-area', {
center: center,
@@ -86,16 +194,56 @@ const DashboardCustomer = () => {
>
), [activeTabIdx])
- const Comment = ({name, division, message}) => (
+ const Comment = ({name, comment, created_at}) => (
{name}
-
{division}
-
{message}
+
{created_at ? moment(created_at).format('D MMMM YYYY HH:mm:ss') : '-'}
+
{comment}
)
+ const BehindTaskItem = ({name, message, division}) => (
+
+
{name}
+
{message}
+
{division}
+
+