Skip to content

T
Tia-dev
Commit d6d7da7e authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 1c81bcd5 387cb89d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 684 additions and 250 deletions
src/container/Home.js
View file @ d6d7da7e
......@@ -483,7 +483,7 @@ export default function MiniDrawer() {
<div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -45, display: 'flex', justifyContent: 'center' }}>
<div className={"sub-color"} style={{ width: 90, height: 90, borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
<div style={{ width: 72, height: 72, backgroundColor: '#838383', borderRadius: 50, alignSelf: 'center' }}>
<img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />
{userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />}
</div>
</div>
......
src/container/Login.js
View file @ d6d7da7e
......@@ -75,25 +75,29 @@ class Login extends Component {
"password": this.state.password
}
api.create().login(payload).then((response) => {
if (response.data.status === 'success') {
console.log(response.data.data)
localStorage.setItem(Constant.TOKEN, response.data.data.token)
localStorage.setItem(Constant.USER, response.data.data.user_id)
if (this.state.rememberMe) {
localStorage.setItem(Constant.EMAIL, this.state.email)
localStorage.setItem(Constant.PASSWORD, this.state.password)
// console.log(this.state.email, this.state.password)
if (response.data) {
if (response.data.status === 'success') {
console.log(response.data.data)
localStorage.setItem(Constant.TOKEN, response.data.data.token)
localStorage.setItem(Constant.USER, response.data.data.user_id)
if (this.state.rememberMe) {
localStorage.setItem(Constant.EMAIL, this.state.email)
localStorage.setItem(Constant.PASSWORD, this.state.password)
// console.log(this.state.email, this.state.password)
} else {
localStorage.setItem(Constant.EMAIL, '')
localStorage.setItem(Constant.PASSWORD, '')
}
this.props.history.push('/home/beranda')
} else {
localStorage.setItem(Constant.EMAIL, '')
localStorage.setItem(Constant.PASSWORD, '')
if (response.data.message == 'Kata sandi tidak sesuai.') {
this.setState({ errorPassword: true, msgPassword: response.data.message })
} else {
this.setState({ errorEmail: true, msgEmail: response.data.message })
}
}
this.props.history.push('/home/beranda')
} else {
if (response.data.message == 'Kata sandi tidak sesuai.') {
this.setState({ errorPassword: true, msgPassword: response.data.message })
} else {
this.setState({ errorEmail: true, msgEmail: response.data.message })
}
alert(response.problem)
}
})
}
......@@ -185,7 +189,7 @@ class Login extends Component {
borderColor: 'transparent',
}}
disabled={this.state.email.trim() == '' && this.state.password.trim() == '' ? true : false}
// onClick={() => this.validateLogin()}
// onClick={() => this.validateLogin()}
>
<Button name="submit" variant="contained" disabled={this.state.email.trim() == '' && this.state.password.trim() == '' ? true : false} style={{ marginTop: 23, width: '100%', height: 35, borderRadius: 4, color: this.state.email.trim() == '' && this.state.password.trim() == '' ? '#4b4b4b' : '#fff', backgroundColor: this.state.email.trim() == '' && this.state.password.trim() == '' ? '#d8d8d8' : '#51c6ea' }}>
<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Login</Typography>
......
src/container/MasterData/Parameter/CreateParameter.js
View file @ d6d7da7e
......@@ -54,18 +54,22 @@ export default class CreateParameter extends Component {
componentDidMount() {
if (this.props.type === 'edit') {
this.setState({
getSettingTypeID: this.props.data.setting_type_id,
getSettingTypeID: this.props.data[0],
})
this.getDetailParameter()
this.getParameterByGroup(this.props.data.setting_group_id)
} else {
let date = format(new Date, 'yyyy-MM-dd')
this.setState({
startDate: date,
endDate: date
})
this.getDataGroup()
this.getDataPerusahaan()
}
}
getDetailParameter() {
api.create().getDetailParameter(this.props.data.setting_id).then((response) => {
api.create().getDetailParameter(this.props.data[0]).then((response) => {
console.log(response);
if (response.data.status === 'success') {
let data = response.data.data
......@@ -74,7 +78,7 @@ export default class CreateParameter extends Component {
getSettingGroupID: data.setting_group_id,
getCompanyID: data.company_id,
settingType: data.setting_type,
}, () => this.getAllGroup(), this.getPerusahaan())
}, () => this.getAllGroup(), this.getPerusahaan(), this.getParameterByGroup(data.setting_group_id))
} else {
alert(response.data.message)
}
......
src/container/MasterData/Parameter/Parameter.js
View file @ d6d7da7e
......@@ -36,10 +36,11 @@ export default class Parameter extends Component {
getAllParameter() {
api.create().getAllParameter().then(response => {
if (response.data.status === "success") {
console.log(response);
let data = response.data.data
let listData = data.map((item, index) => {
return [
index,
item.setting_id,
item.setting_group,
item.setting_type,
item.company_name,
......@@ -58,15 +59,15 @@ export default class Parameter extends Component {
})
}
openPopUp(index, type) {
openPopUp(rowData, type) {
if (type === 'edit') {
this.setState({
selectIndex: index,
rowData: rowData,
visibleEdit: true
})
} else {
this.setState({
data: this.state.data[index],
rowData: rowData,
visibleCreate: true
})
}
......@@ -510,6 +511,7 @@ export default class Parameter extends Component {
const columns = [{
name: "Action",
options: {
sort: false,
customBodyRender: (val, tableMeta) => {
return (
<div style={{ display: 'flex' }}>
......@@ -519,7 +521,8 @@ export default class Parameter extends Component {
cursor: 'pointer',
borderColor: 'transparent'
}}
onClick={() => this.openPopUp(tableMeta.rowIndex, 'edit')}
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
// onClick={()=> console.log(tableMeta)}
>
<img src={Images.editCopy} />
</button>
......@@ -652,7 +655,7 @@ export default class Parameter extends Component {
inputProps={{ 'aria-label': 'naked' }}
/>
</div>
<div style={{ width: '20%', justifyContent: 'space-around', display: 'flex' }}>
<div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
<a data-tip={'Download Template'} data-for="template">
<button
style={{
......@@ -773,7 +776,7 @@ export default class Parameter extends Component {
<CreateParameter
type={"edit"}
onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.data[this.state.selectIndex]}
data={this.state.rowData}
updateParameter={this.updateParameter.bind(this)}
/>
)}
......
src/container/MasterData/UnitBisnis.js
View file @ d6d7da7e
This diff is collapsed.
src/container/MasterData/formReportItems/VisualReportItems.js
View file @ d6d7da7e
......@@ -143,8 +143,10 @@ export default class VisualReportItems extends Component {
}
api.create().getItemReportHierarki(payload).then((response) => {
console.log(response.data)
if (response.data.status == 'success') {
this.setState({ items: response.data.data })
if (response.data) {
if (response.data.status == 'success') {
this.setState({ items: response.data.data })
}
}
})
}
......@@ -219,7 +221,7 @@ export default class VisualReportItems extends Component {
id="report"
onChange={(event, newInputValue) => this.setState({ report: newInputValue }, () => this.getItemHierarki())}
debug
disableClearable
renderInput={(params) => <TextField {...params} label="Jenis Laporan" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.report}
/>
......@@ -230,8 +232,8 @@ export default class VisualReportItems extends Component {
id="company"
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => this.getItemHierarki())}
debug
renderInput={(params) => <TextField {...params} label="Compan" margin="normal" style={{ marginTop: 7 }} />}
disableClearable
renderInput={(params) => <TextField {...params} label="Company" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.company}
/>
</div>
......
src/container/Otorisasi/User.js
View file @ d6d7da7e
This diff is collapsed.
src/container/Otorisasi/User/AddUser.js
View file @ d6d7da7e
This diff is collapsed.
src/container/Otorisasi/User/EditUser.js
View file @ d6d7da7e
This diff is collapsed.
src/container/Otorisasi/UserRole/AddRole.js
View file @ d6d7da7e
......@@ -52,6 +52,16 @@ export default class AddRole extends Component {
componentDidMount() {
this.getMenu()
if (this.props.type === 'edit') {
//
} else {
let date = format(new Date, 'yyyy-MM-dd')
console.log(date);
this.setState({
startDate: date,
endDate: date
})
}
}
handleChange(e, type) {
......@@ -266,6 +276,19 @@ export default class AddRole extends Component {
variant="filled"
value={'-'}
onChange={(e) => null}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
color: '#7e8085',
}
}}
>
{/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}>
......@@ -287,6 +310,19 @@ export default class AddRole extends Component {
error={this.state.errorRoleName}
helperText={this.state.msgErrorRN}
onChange={(e) => this.handleChange(e, '')}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
color: '#7e8085',
}
}}
// defaultValue="Default Value"
// helperText="Some important text"
/>
......@@ -309,6 +345,19 @@ export default class AddRole extends Component {
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/>
......@@ -330,6 +379,19 @@ export default class AddRole extends Component {
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/>
......@@ -348,6 +410,20 @@ export default class AddRole extends Component {
// id="outlined-read-only-input"
variant="filled"
value={'Aktif'}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
>
{/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}>
......
src/container/Otorisasi/UserRole/EditRole.js
View file @ d6d7da7e
......@@ -274,6 +274,19 @@ export default class EditRole extends Component {
variant="filled"
value={this.state.tempData === null ? '' : this.state.tempData.role_id}
onChange={(e) => null}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
>
{/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}>
......@@ -295,6 +308,19 @@ export default class EditRole extends Component {
error={this.state.errorRoleName}
helperText={this.state.msgErrorRN}
onChange={(e) => this.handleChange(e, '')}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
// defaultValue="Default Value"
// helperText="Some important text"
/>
......@@ -317,6 +343,19 @@ export default class EditRole extends Component {
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/>
......@@ -338,6 +377,19 @@ export default class EditRole extends Component {
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/>
......@@ -356,6 +408,19 @@ export default class EditRole extends Component {
// id="outlined-read-only-input"
variant="filled"
value={this.state.tempData === null ? '' : this.state.tempData.status}
inputProps={{
style: {
fontSize: 11,
fontFamily: 'Nunito Sans, sans-serif',
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085',
fontFamily: 'Nunito Sans, sans-serif',
}
}}
>
{/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}>
......
src/library/Upload.js
View file @ d6d7da7e
......@@ -124,7 +124,7 @@ class Upload extends Component {
onClick={this.state.uploadProgress === true ? null : this.onRemove}
className="btn btn-small-circle btn-black"
type="button">
<i className="fa fa-1x fa-times" />
<img src={Images.close} />
</button>
</div>
<div className="width width-full margin-left-10px">
......
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