Browse Source

Merge pull request 'update condition' (#149) from dev-wahyun into staging

Reviewed-on: ordo/adw-frontend#149
pull/1/head
farhantock 1 year ago
parent
commit
c68434f27b
  1. 8
      src/views/Dashboard/DashboardProject.js

8
src/views/Dashboard/DashboardProject.js

@ -126,8 +126,6 @@ const DashboardProject = () => {
const [calculationStatus, setCalculationStatus] = useState(false); const [calculationStatus, setCalculationStatus] = useState(false);
const [isHierarchy, setIsHierarchy] = useState(false); const [isHierarchy, setIsHierarchy] = useState(false);
let history = useHistory(); let history = useHistory();
let location = useLocation();
const isDashboardProject = location.pathname.includes('dashboard-project');
useEffect(() => { useEffect(() => {
getProjectDetail(); getProjectDetail();
@ -1019,7 +1017,7 @@ const DashboardProject = () => {
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span={isDashboardProject ? 8 : 10}> <Col span={SCURVE ? 8 : 10}>
<div <div
style={{ style={{
border: "solid", border: "solid",
@ -1144,7 +1142,7 @@ const DashboardProject = () => {
</div> </div>
</div> </div>
</Col> </Col>
{isDashboardProject ? ( {SCURVE ? (
<Col span={16}> <Col span={16}>
<div <div
style={{ style={{
@ -1557,7 +1555,7 @@ const DashboardProject = () => {
</Col> </Col>
</Row> </Row>
<Row> <Row>
{isDashboardProject ? ( {SCURVE ? (
<Col span={24}> <Col span={24}>
<div <div
style={{ style={{

Loading…
Cancel
Save