Skip to content

T
Tia-dev
Commit 6921ae0d authored by a.bairuha's avatar a.bairuha
Browse files
Options

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

parents ef8e7b62 ffa7a76b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 242 deletions
src/api/index.js
View file @ 6921ae0d
......@@ -91,7 +91,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const uploadUnitBisnis = (body) => api.post('/business_unit/import_business_unit', body)
const getUnitBisnisActive = () => api.get('business_unit/get_all_business_unit_active')
const getDetailUnitBisnis = (id) => api.get(`business_unit/get_business_unit_by_id/${id}`)
const deleteUnitBisnis = (id) => api.post(`business_unit/delete_business_unit/${id}`)
// Perusahaan
const getPerusahaan = () => api.get('company/get_all_company')
......@@ -154,6 +154,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const checkUploadParameter = (body) => api.post('setting/check_import', body)
const uploadParameter = (body) => api.post('/setting/import_setting', body)
const searchParameter = (body) => api.post('setting/search_setting', body)
const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
//Transaction
const getReportTypeBody = (body) => api.post('transaction/get_all_report', body)
......@@ -268,7 +269,9 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
getPeriodeTransaction,
getRevision,
deleteAttachment,
getDetailReportMB
getDetailReportMB,
deleteUnitBisnis,
deleteParameter
}
}
......
src/assets/Images.js
View file @ 6921ae0d
......@@ -44,11 +44,13 @@ const Images = {
logout: require('./setting.png'),
setting: require('./logout.png'),
failedCopy: require('./failed-copy.svg'),
failed: require('./failed.svg'),
triputraLogo: require('./triputra-logo.png'),
photo: require('./photo.svg'),
camera: require('./camera.svg'),
meeting: require('./meeting.jpg'),
triputraBlack: require('./triputra-black.jpg'),
delete: require('./delete.svg')
}
......
src/assets/delete.svg 0 → 100644
View file @ 6921ae0d
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g transform="translate(-404 -219) translate(332 151) translate(0 56) translate(72 12)">
<circle cx="16" cy="16" r="16" fill="#ED5050"/>
<g fill="#FFF" fill-rule="nonzero">
<path d="M11.75 2H9v-.5C9 .673 8.327 0 7.5 0h-2C4.673 0 4 .673 4 1.5V2H1.25C.56 2 0 2.56 0 3.25V5c0 .276.224.5.5.5h.273l.432 9.071c.038.801.696 1.429 1.498 1.429h7.594c.802 0 1.46-.628 1.498-1.429l.432-9.071h.273c.276 0 .5-.224.5-.5V3.25C13 2.56 12.44 2 11.75 2zM5 1.5c0-.276.224-.5.5-.5h2c.276 0 .5.224.5.5V2H5v-.5zM1 3.25c0-.138.112-.25.25-.25h10.5c.138 0 .25.112.25.25V4.5H1V3.25zm9.796 11.274c-.013.267-.232.476-.5.476H2.705c-.268 0-.487-.21-.5-.476L1.774 5.5h9.452l-.43 9.024z" transform="translate(9 8)"/>
<path d="M6.5 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5S6 6.724 6 7v6.5c0 .276.224.5.5.5zM9 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5zM4 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5z" transform="translate(9 8)"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
src/assets/failed.svg 0 → 100644
View file @ 6921ae0d
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g transform="translate(-685 -449) translate(420 393) translate(265 56)">
<circle cx="36" cy="36" r="36" fill="#ED8080"/>
<path fill="#FF3939" d="M36 72c19.882 0 36-16.118 36-36S55.882 0 36 0"/>
<circle cx="35.95" cy="35.95" r="31.95" fill="#FFF" fill-rule="nonzero"/>
<g fill="#FF3939" transform="translate(31 17)">
<rect width="11" height="24" rx="3"/>
<circle cx="5.5" cy="32.5" r="5.5"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
src/container/MasterData/Parameter/CreateParameter.js
View file @ 6921ae0d
......@@ -621,11 +621,10 @@ export default class CreateParameter extends Component {
}}
name="value"
onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({
tempData: {
...this.state.tempData,
value: coba
value: e.target.value
}
})
this.clearMessage()
......@@ -1006,9 +1005,8 @@ export default class CreateParameter extends Component {
}}
name="value"
onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({
value: coba
value: e.target.value
})
this.clearMessage()
}
......
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @ 6921ae0d
......@@ -388,7 +388,7 @@ export default class CreatePerusahaan extends Component {
margin="normal"
id="startDate"
label="Valid From"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')}
KeyboardButtonProps={{
......@@ -491,7 +491,7 @@ export default class CreatePerusahaan extends Component {
margin="normal"
id="endDate"
label="Valid To"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.endDate}
minDate={this.state.startDate}
onChange={(e) => this.handleChange(e, 'end_date')}
......@@ -614,7 +614,7 @@ export default class CreatePerusahaan extends Component {
margin="normal"
id="startDate"
label="Valid From"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.startDate == "" ? null : this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')}
KeyboardButtonProps={{
......@@ -710,7 +710,7 @@ export default class CreatePerusahaan extends Component {
margin="normal"
id="endDate"
label="Valid To"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
error={this.state.errorED}
helperText={this.state.msgErrorED}
minDate={this.state.startDate}
......
src/container/MasterData/ReportItems.js
View file @ 6921ae0d
This diff is collapsed.
src/container/MasterData/UnitBisnis.js
View file @ 6921ae0d
This diff is collapsed.
src/container/MasterData/formReportItems/CreateReportItems.js
View file @ 6921ae0d
......@@ -785,7 +785,7 @@ export default class CreateReportItems extends Component {
margin="normal"
id="startDate"
label="Valid From"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.startDate == "" ? null : this.state.startDate}
error={this.state.errorStartDate}
helperText={this.state.msgErrorSD}
......@@ -817,7 +817,7 @@ export default class CreateReportItems extends Component {
margin="normal"
id="endDate"
label="Valid To"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.endDate == "" ? null : this.state.endDate}
error={this.state.errorEndDate}
helperText={this.state.msgErrorED}
......
src/container/MasterData/formReportItems/EditReportItems.js
View file @ 6921ae0d
......@@ -767,7 +767,7 @@ export default class EditReportItems extends Component {
margin="normal"
id="startDate"
label="Valid From"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.tempData === null ? null : this.state.tempData.start_date}
error={this.state.errorStartDate}
helperText={this.state.msgErrorSD}
......@@ -798,7 +798,7 @@ export default class EditReportItems extends Component {
margin="normal"
id="endDate"
label="Valid To"
format="dd MMMM yyyy"
format="dd-MM-yyyy"
value={this.state.tempData === null ? null : this.state.tempData.end_date}
error={this.state.errorEndDate}
helperText={this.state.msgErrorED}
......
src/container/ResetPassword.js
View file @ 6921ae0d
......@@ -76,7 +76,7 @@ class ResetPassword extends Component {
} else if (!this.isRegex(this.state.password)) {
this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' })
} else if (this.state.confirmPassword.trim() == "") {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Confirmation Cannot be Empty.' })
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Repeat Password Cannot be Empty.' })
} else if (this.state.password !== this.state.confirmPassword) {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
} else {
......
src/library/PopUpDelete.js 0 → 100644
View file @ 6921ae0d
import React, { Component } from 'react';
import Images from '../assets/Images';
import { Typography } from '@material-ui/core';
export default class PopUpDelete extends Component {
render() {
return (
<div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div style={{ display: 'flex', justifyContent: 'center', paddingTop: 20 }}>
<img src={Images.failed} />
</div>
<div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
<span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', fontFamily: 'Nunito Sans, sans-serif' }}>
{this.props.intent === 'parameter' ?
`Delete [${this.props.rowData[2]}, ${this.props.rowData[3]}, ${this.props.rowData[4]}, ${this.props.rowData[7] === "" ? this.props.rowData[8] + ' + ' + this.props.rowData[9] : this.props.rowData[7]}]?`
:
`Delete ${this.props.name}?`
}
</span>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}>
<button
type="button"
onClick={() => this.props.onClickClose()}
>
<div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
</div>
</button>
</div>
<div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
<button
type="button"
onClick={() => this.props.onClickDelete(this.props.rowData)}
>
<div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#fff', fontSize: 11 }}>Delete</span>
</div>
</button>
</div>
</div>
</div>
</div>
);
}
}
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