Skip to content

T
Tia-dev
Commit ebbc1a8e authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'syadziy' into 'master' 

update validasi user

See merge request !121
parents bc0608d6 7b32144a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 525 additions and 125 deletions
src/container/MasterData/formReportItems/VisualReportItems.js
View file @ ebbc1a8e
...@@ -143,9 +143,11 @@ export default class VisualReportItems extends Component { ...@@ -143,9 +143,11 @@ export default class VisualReportItems extends Component {
} }
api.create().getItemReportHierarki(payload).then((response) => { api.create().getItemReportHierarki(payload).then((response) => {
console.log(response.data) console.log(response.data)
if (response.data) {
if (response.data.status == 'success') { if (response.data.status == 'success') {
this.setState({ items: response.data.data }) this.setState({ items: response.data.data })
} }
}
}) })
} }
......
src/container/Otorisasi/User.js
View file @ ebbc1a8e
...@@ -102,6 +102,7 @@ export default class UserRole extends Component { ...@@ -102,6 +102,7 @@ export default class UserRole extends Component {
this.setState({ payload: body }) this.setState({ payload: body })
api.create().checkUploadUser(body).then(response => { api.create().checkUploadUser(body).then(response => {
console.log(response); console.log(response);
if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
let dataRow = response.data.data.map((item, index) => { let dataRow = response.data.data.map((item, index) => {
return [ return [
...@@ -233,6 +234,7 @@ export default class UserRole extends Component { ...@@ -233,6 +234,7 @@ export default class UserRole extends Component {
rows: dataRow rows: dataRow
}); });
} }
}
}) })
} }
}); });
...@@ -261,7 +263,7 @@ export default class UserRole extends Component { ...@@ -261,7 +263,7 @@ export default class UserRole extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Data User.xlsx'; a.download = 'User.xlsx';
a.click(); a.click();
} }
} }
......
src/container/Otorisasi/User/AddUser.js
View file @ ebbc1a8e
This diff is collapsed.
src/container/Otorisasi/User/EditUser.js
View file @ ebbc1a8e
This diff is collapsed.
src/container/Otorisasi/UserRole/AddRole.js
View file @ ebbc1a8e
...@@ -266,6 +266,19 @@ export default class AddRole extends Component { ...@@ -266,6 +266,19 @@ export default class AddRole extends Component {
variant="filled" variant="filled"
value={'-'} value={'-'}
onChange={(e) => null} 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) => ( {/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}> <MenuItem key={option.value} value={option.value}>
...@@ -287,6 +300,19 @@ export default class AddRole extends Component { ...@@ -287,6 +300,19 @@ export default class AddRole extends Component {
error={this.state.errorRoleName} error={this.state.errorRoleName}
helperText={this.state.msgErrorRN} helperText={this.state.msgErrorRN}
onChange={(e) => this.handleChange(e, '')} 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" // defaultValue="Default Value"
// helperText="Some important text" // helperText="Some important text"
/> />
...@@ -309,6 +335,19 @@ export default class AddRole extends Component { ...@@ -309,6 +335,19 @@ export default class AddRole extends Component {
KeyboardButtonProps={{ KeyboardButtonProps={{
'aria-label': 'change date', '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%' }} style={{ padding: 0, margin: 0, width: '100%' }}
/> />
...@@ -330,6 +369,19 @@ export default class AddRole extends Component { ...@@ -330,6 +369,19 @@ export default class AddRole extends Component {
KeyboardButtonProps={{ KeyboardButtonProps={{
'aria-label': 'change date', '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%' }} style={{ padding: 0, margin: 0, width: '100%' }}
/> />
...@@ -348,6 +400,20 @@ export default class AddRole extends Component { ...@@ -348,6 +400,20 @@ export default class AddRole extends Component {
// id="outlined-read-only-input" // id="outlined-read-only-input"
variant="filled" variant="filled"
value={'Aktif'} 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) => ( {/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}> <MenuItem key={option.value} value={option.value}>
......
src/container/Otorisasi/UserRole/EditRole.js
View file @ ebbc1a8e
...@@ -274,6 +274,19 @@ export default class EditRole extends Component { ...@@ -274,6 +274,19 @@ export default class EditRole extends Component {
variant="filled" variant="filled"
value={this.state.tempData === null ? '' : this.state.tempData.role_id} value={this.state.tempData === null ? '' : this.state.tempData.role_id}
onChange={(e) => null} 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) => ( {/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}> <MenuItem key={option.value} value={option.value}>
...@@ -295,6 +308,19 @@ export default class EditRole extends Component { ...@@ -295,6 +308,19 @@ export default class EditRole extends Component {
error={this.state.errorRoleName} error={this.state.errorRoleName}
helperText={this.state.msgErrorRN} helperText={this.state.msgErrorRN}
onChange={(e) => this.handleChange(e, '')} 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" // defaultValue="Default Value"
// helperText="Some important text" // helperText="Some important text"
/> />
...@@ -317,6 +343,19 @@ export default class EditRole extends Component { ...@@ -317,6 +343,19 @@ export default class EditRole extends Component {
KeyboardButtonProps={{ KeyboardButtonProps={{
'aria-label': 'change date', '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%' }} style={{ padding: 0, margin: 0, width: '100%' }}
/> />
...@@ -338,6 +377,19 @@ export default class EditRole extends Component { ...@@ -338,6 +377,19 @@ export default class EditRole extends Component {
KeyboardButtonProps={{ KeyboardButtonProps={{
'aria-label': 'change date', '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%' }} style={{ padding: 0, margin: 0, width: '100%' }}
/> />
...@@ -356,6 +408,19 @@ export default class EditRole extends Component { ...@@ -356,6 +408,19 @@ export default class EditRole extends Component {
// id="outlined-read-only-input" // id="outlined-read-only-input"
variant="filled" variant="filled"
value={this.state.tempData === null ? '' : this.state.tempData.status} 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) => ( {/* {periode.map((option) => (
<MenuItem key={option.value} value={option.value}> <MenuItem key={option.value} value={option.value}>
......
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