Skip to content

T
Tia-dev
Commit 53d5c621 authored by EKSAD's avatar EKSAD
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents a0cb8794 3ceb4cfd
Hide whitespace changes
Inline Side-by-side
Showing with 3862 additions and 5009 deletions
src/container/BudgetTahunan.js
View file @ 53d5c621
...@@ -316,8 +316,7 @@ export default class BudgetTahunan extends Component { ...@@ -316,8 +316,7 @@ export default class BudgetTahunan extends Component {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.getReport() this.getCompanyActive()
this.getSubmission()
this.setState({ loading: false }) this.setState({ loading: false })
} else { } else {
this.setState({ loading: false }) this.setState({ loading: false })
...@@ -653,8 +652,7 @@ export default class BudgetTahunan extends Component { ...@@ -653,8 +652,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID} submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })} onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })}
getReport={this.getReport.bind(this)} getReport={this.getCompanyActive.bind(this)}
getReportAttachment={this.getReportAttachment.bind(this)}
/> />
)} )}
{this.state.visiblePL && ( {this.state.visiblePL && (
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 53d5c621
...@@ -33,7 +33,8 @@ export default class BalanceSheet extends Component { ...@@ -33,7 +33,8 @@ export default class BalanceSheet extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleBalanceSheet: true, visibleBalanceSheet: true,
disabledSave: true disabledSave: true,
editable: false
} }
this.handleValue = this.handleValue.bind(this) this.handleValue = this.handleValue.bind(this)
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
...@@ -68,7 +69,7 @@ export default class BalanceSheet extends Component { ...@@ -68,7 +69,7 @@ export default class BalanceSheet extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "" : item.balance_sheet.total_actual_before,
item.balance_sheet.january, item.balance_sheet.january,
item.balance_sheet.february, item.balance_sheet.february,
item.balance_sheet.march, item.balance_sheet.march,
...@@ -102,7 +103,7 @@ export default class BalanceSheet extends Component { ...@@ -102,7 +103,7 @@ export default class BalanceSheet extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "" : item.balance_sheet.total_actual_before,
item.balance_sheet.january, item.balance_sheet.january,
item.balance_sheet.february, item.balance_sheet.february,
item.balance_sheet.march, item.balance_sheet.march,
...@@ -341,7 +342,6 @@ export default class BalanceSheet extends Component { ...@@ -341,7 +342,6 @@ export default class BalanceSheet extends Component {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.onClickClose() this.props.onClickClose()
this.props.getReport() this.props.getReport()
this.props.getReportAttachment()
} else { } else {
alert(response.data.status) alert(response.data.status)
} }
...@@ -586,16 +586,17 @@ export default class BalanceSheet extends Component { ...@@ -586,16 +586,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -672,16 +673,17 @@ export default class BalanceSheet extends Component { ...@@ -672,16 +673,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -758,16 +760,17 @@ export default class BalanceSheet extends Component { ...@@ -758,16 +760,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -844,16 +847,17 @@ export default class BalanceSheet extends Component { ...@@ -844,16 +847,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -930,16 +934,17 @@ export default class BalanceSheet extends Component { ...@@ -930,16 +934,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1016,16 +1021,17 @@ export default class BalanceSheet extends Component { ...@@ -1016,16 +1021,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1102,16 +1108,17 @@ export default class BalanceSheet extends Component { ...@@ -1102,16 +1108,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1188,16 +1195,17 @@ export default class BalanceSheet extends Component { ...@@ -1188,16 +1195,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1274,16 +1282,17 @@ export default class BalanceSheet extends Component { ...@@ -1274,16 +1282,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1360,16 +1369,17 @@ export default class BalanceSheet extends Component { ...@@ -1360,16 +1369,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1446,16 +1456,17 @@ export default class BalanceSheet extends Component { ...@@ -1446,16 +1456,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1532,16 +1543,17 @@ export default class BalanceSheet extends Component { ...@@ -1532,16 +1543,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1618,16 +1630,17 @@ export default class BalanceSheet extends Component { ...@@ -1618,16 +1630,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1704,16 +1717,17 @@ export default class BalanceSheet extends Component { ...@@ -1704,16 +1717,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1790,16 +1804,17 @@ export default class BalanceSheet extends Component { ...@@ -1790,16 +1804,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1876,16 +1891,17 @@ export default class BalanceSheet extends Component { ...@@ -1876,16 +1891,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1998,7 +2014,7 @@ export default class BalanceSheet extends Component { ...@@ -1998,7 +2014,7 @@ export default class BalanceSheet extends Component {
<div className="col-1"> <div className="col-1">
<button <button
type="button" type="button"
onClick={() => this.backToMasterBudget('draft')} onClick={() => this.state.editable === true ? this.backToMasterBudget('draft') : this.props.onClickClose()}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
...@@ -2058,7 +2074,7 @@ export default class BalanceSheet extends Component { ...@@ -2058,7 +2074,7 @@ export default class BalanceSheet extends Component {
onClick={() => { onClick={() => {
this.setState({ loading: true }, () => { this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.setState({ loading: false, disabledSave: false }) this.setState({ loading: false, disabledSave: false, editable: true })
}, 100); }, 100);
}) })
}} }}
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 53d5c621
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/Otorisasi/User.js
View file @ 53d5c621
...@@ -2,7 +2,7 @@ import React, { Component } from "react"; ...@@ -2,7 +2,7 @@ import React, { Component } from "react";
import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles'; import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
import SearchIcon from '@material-ui/icons/Search'; import SearchIcon from '@material-ui/icons/Search';
import Images from "../../assets/Images"; import Images from "../../assets/Images";
import MUIDataTable from "mui-datatables"; import MUIDataTable, {TableBodyCell} from "mui-datatables";
import AddUser from './User/AddUser'; import AddUser from './User/AddUser';
import EditUser from './User/EditUser' import EditUser from './User/EditUser'
import api from "../../api"; import api from "../../api";
...@@ -17,6 +17,16 @@ import PopUpFailedSave from "../../library/PopUpFailedSave"; ...@@ -17,6 +17,16 @@ import PopUpFailedSave from "../../library/PopUpFailedSave";
import Constant from "../../library/Constant"; import Constant from "../../library/Constant";
import { css } from "@emotion/core"; import { css } from "@emotion/core";
import PropagateLoader from "react-spinners/PropagateLoader" import PropagateLoader from "react-spinners/PropagateLoader"
import Tooltip from '@material-ui/core/Tooltip';
const LightTooltip = withStyles((theme) => ({
tooltip: {
backgroundColor: theme.palette.common.white,
color: 'rgba(0, 0, 0, 0.87)',
boxShadow: theme.shadows[1],
fontSize: 11,
},
}))(Tooltip);
const override = css` const override = css`
display: block; display: block;
...@@ -271,12 +281,12 @@ export default class UserRole extends Component { ...@@ -271,12 +281,12 @@ export default class UserRole extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[6] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[6][check].message} data-for="fullname"> <LightTooltip title={tableMeta.rowData[6][check].message} arrow>
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
</a> : </LightTooltip>
:
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
} }
<ReactTooltip border={true} id="fullname" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -296,12 +306,12 @@ export default class UserRole extends Component { ...@@ -296,12 +306,12 @@ export default class UserRole extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[6] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[6][check].message} data-for="email"> <LightTooltip title={tableMeta.rowData[6][check].message} arrow>
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
</a> : </LightTooltip>
:
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
} }
<ReactTooltip border={true} id="email" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -322,12 +332,12 @@ export default class UserRole extends Component { ...@@ -322,12 +332,12 @@ export default class UserRole extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[6] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[6][check].message} data-for="role"> <LightTooltip title={tableMeta.rowData[6][check].message} arrow>
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
</a> : </LightTooltip>
:
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
} }
<ReactTooltip border={true} id="role" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -348,12 +358,12 @@ export default class UserRole extends Component { ...@@ -348,12 +358,12 @@ export default class UserRole extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[6] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[6][check].message} data-for="startdate"> <LightTooltip title={tableMeta.rowData[6][check].message} arrow>
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
</a> : </LightTooltip>
:
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
} }
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -374,12 +384,12 @@ export default class UserRole extends Component { ...@@ -374,12 +384,12 @@ export default class UserRole extends Component {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[6] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[6][check].message} data-for="enddate"> <LightTooltip title={tableMeta.rowData[6][check].message} arrow>
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
</a> : </LightTooltip>
:
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val == ''? 'Empty' : val}</span>
} }
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div > </div >
); );
} }
...@@ -399,7 +409,7 @@ export default class UserRole extends Component { ...@@ -399,7 +409,7 @@ export default class UserRole extends Component {
rows: dataRow, rows: dataRow,
visibleUpload: false, visibleUpload: false,
visibleUser: false visibleUser: false
}); }, () => console.log(dataRow));
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment