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

merge conflict

pull/2/head
ardhi 2 years ago
parent
59297ffed9 4a18187c89
commit
4fcdb5dc3f
3 changed files with 8 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/containers/DefaultLayout/DefaultLayout.js
  2. 15
      src/views/Dashboard/DashboardCustomer.js
  3. 3
      src/views/Pages/Login/Login.js

2
src/containers/DefaultLayout/DefaultLayout.js
Unescape View File

@ -269,7 +269,7 @@ class DefaultLayout extends Component {
)} /> )} />
) : (null); ) : (null);
})} })}
<Redirect from="/" to="/dashboard" /> <Redirect from="/" to="/dashboard" />
</Switch> </Switch>
</Suspense> </Suspense>
</Container> </Container>

15
src/views/Dashboard/DashboardCustomer.js
Unescape View File

@ -34,10 +34,7 @@ const DashboardCustomer = () => {
} }
} }
const { PROJECT_ID, GANTT_ID } = useParams(); 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/view-mode/index.html?base_url=${BASE_OSPRO}/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 URL_GANTT = `http://192.168.1.104:8446/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
const mapRef = useRef() const mapRef = useRef()
const [projectName, setProjectName] = useState(""); const [projectName, setProjectName] = useState("");
const [projectManagerName, setProjectManagerName] = useState(''); const [projectManagerName, setProjectManagerName] = useState('');
@ -64,7 +61,7 @@ const DashboardCustomer = () => {
const [healthBySchedule, setHealthBySchedule] = useState('-'); const [healthBySchedule, setHealthBySchedule] = useState('-');
const [healthByBudget, setHealthByBudget] = useState('-'); const [healthByBudget, setHealthByBudget] = useState('-');
const [reportDistribution, setReportDistribution] = useState([]); const [reportDistribution, setReportDistribution] = useState([]);
useEffect(() => { useEffect(() => {
getProjectDetail(); getProjectDetail();
getSCurve() getSCurve()
@ -316,7 +313,7 @@ const DashboardCustomer = () => {
if (reportDistribution.length > 0) { if (reportDistribution.length > 0) {
reportDistribution.map((item, idx) => { reportDistribution.map((item, idx) => {
L.marker([item.lat, item.lon]).addTo(mymap).bindPopup(PopupContent(item)) L.marker([item.lat, item.lon]).addTo(mymap).bindPopup(PopupContent(item))
}); });
} }
} }
}, [mymap, reportDistribution]) }, [mymap, reportDistribution])
@ -347,7 +344,7 @@ const DashboardCustomer = () => {
<div> <div>
{!isReadyComments && <ListLoader />} {!isReadyComments && <ListLoader />}
{isReadyComments && comments && comments.length < 1 && <div style={{flex: 1, textAlign: 'center', color: '#E80053', marginTop: 50, marginBottom: 50}}>No comments found.</div>} {isReadyComments && comments && comments.length < 1 && <div style={{flex: 1, textAlign: 'center', color: '#E80053', marginTop: 50, marginBottom: 50}}>No comments found.</div>}
{comments && comments.length > 0 && comments.map((item, idx) => {comments && comments.length > 0 && comments.map((item, idx) =>
<Comment key={idx} name={item.join_first_name} comment={item.comment} created_at={item.created_at} /> <Comment key={idx} name={item.join_first_name} comment={item.comment} created_at={item.created_at} />
)} )}
</div> </div>
@ -497,13 +494,13 @@ const DashboardCustomer = () => {
{isReadySCurve ? {isReadySCurve ?
<ProgressPlanningBar progress={planningProgress} /> <ProgressPlanningBar progress={planningProgress} />
: :
<SingleTextLoader width={"100%"} height={30} /> <SingleTextLoader width={"100%"} height={30} />
} }
<div style={{marginTop: 10, marginBottom: 10}}></div> <div style={{marginTop: 10, marginBottom: 10}}></div>
{isReadySCurve ? {isReadySCurve ?
<ProgressActualBar progress={actualProgress} /> <ProgressActualBar progress={actualProgress} />
: :
<SingleTextLoader width={"100%"} height={30} /> <SingleTextLoader width={"100%"} height={30} />
} }
</div> </div>
</Col> </Col>

3
src/views/Pages/Login/Login.js
Unescape View File

@ -110,12 +110,11 @@ class Login extends Component {
this.setState({ loader: false }) this.setState({ loader: false })
// custom redirect home after login // custom redirect home after login
if (role_id == 28) { if (role_id == 28) {
this.props.history.push(`/dashboard-customer/37/48`); this.props.history.push("/dashboard-customer/48/50");
} }
else { else {
this.props.history.push("/dashboard"); this.props.history.push("/dashboard");
} }
} else { } else {
NotificationManager.error('Login Failed', 'Failed'); NotificationManager.error('Login Failed', 'Failed');
this.setState({ loader: false }) this.setState({ loader: false })

Write Preview
Loading…
Cancel
Save