Commit 586128e4 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'rifka' into 'master'

update login dan api index

See merge request !63
parents c13c2581 05fc9b1f
......@@ -62,29 +62,20 @@ export default class CreateApprovalMatrix extends Component {
}
componentDidMount() {
// console.log(this.props.data);
// let datas = this.props.data
// let userData = datas.map((item, index) => {
// return [item.fullname, item.user_id ]
// })
// console.log(userData)
this.getUserData()
}
getUserData() {
api.create().getApprovedByAM().then((response) => {
// console.log("data masuk")
// console.log(response)
if (response.data.status == 'success') {
let data = response.data.data
let userData = data.map((item) => {
// return [item.user_id, item.fullname]
return {
user_id: item.user_id,
fullname: item.fullname
}
})
console.log(userData)
// console.log(userData)
let defaultProps = {
options: userData,
getOptionLabel: (option) => option.fullname,
......@@ -95,6 +86,7 @@ export default class CreateApprovalMatrix extends Component {
}
})
}
handleChange(e, type) {
let data = this.state
......
......@@ -53,26 +53,33 @@ export default class EditApprovalMatrix extends Component {
}
}
render() {
let { type } = this.props
return type === 'edit' ? this.renderEdit() : false
}
componentDidMount() {
console.log(this.props.data);
if (this.props.type === 'edit') {
let data = this.props.data
this.setState({
id: data.business_unit_id,
name: data.business_unit_name,
startDate: data.start_date,
endDate: data.end_date
})
}
}
handleChange(e, type) {
let data = this.state
let isDate = type !== ''? true : false
let isDate = type !== '' ? true : false
if (isDate && type == 'start_date') {
this.setState({...data, startDate : format(e, 'yyyy-MM-dd')})
this.setState({ startDate: format(e, 'yyyy-MM-dd') }, () => {
console.log(this.state.startDate)
})
} else if (isDate && type == 'end_date') {
this.setState({...data, endDate : format(e, 'yyyy-MM-dd')})
this.setState({ endDate: format(e, 'yyyy-MM-dd') }, () => {
console.log(this.state.endDate)
})
} else {
this.setState({...data, [e.target.name] : e.target.value})
// this.setState({...data, tempData: {...this.state.tempData, [e.target.name] : e.target.value}})
}
}
handleDate(item) {
......@@ -80,7 +87,7 @@ export default class EditApprovalMatrix extends Component {
return value
}
renderEdit() {
render() {
return (
<div className="test app-popup-show" style={{ paddingTop: 100 }}>
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
......
......@@ -35,6 +35,9 @@ class Login extends Component {
componentDidMount() {
this.getUser()
// localStorage.clear()
var email = localStorage.getItem(Constant.EMAIL)
console.log(email)
}
handleChange(e) {
......@@ -95,7 +98,9 @@ class Login extends Component {
getUser() {
var email = localStorage.getItem(Constant.EMAIL)
var password = localStorage.getItem(Constant.PASSWORD)
if (email != '' && password != '') {
if (email == null || password == null) {
this.setState({email: '', password: ''})
} else if(email != '' && password != ''){
this.setState({email, password})
}
}
......
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