Commit b1adec00 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'rifka' into 'master'

issue docmanag & taxplan

See merge request !449
parents 9f65e6d7 32d31217
This diff is collapsed.
...@@ -223,7 +223,7 @@ export default class getAllDocument extends Component { ...@@ -223,7 +223,7 @@ export default class getAllDocument extends Component {
</button> </button>
</a> </a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
{this.props.btnedit && <span> {this.props.btnedit && this.props.allsubcoEdit && <span>
<a data-tip={'Edit'} data-for="edit"> <a data-tip={'Edit'} data-for="edit">
<button <button
style={{ style={{
......
...@@ -132,12 +132,23 @@ export default class CreateManagementDoc extends Component { ...@@ -132,12 +132,23 @@ export default class CreateManagementDoc extends Component {
if (response.data) { if (response.data) {
if (response.data.status == 'success') { if (response.data.status == 'success') {
let data = response.data.data let data = response.data.data
let typeData = data.map((item) => { let typeData = []
return { data.map((item) => {
if (String(item.value).includes('Manual')){
if( this.props.allsubcoCreate ){
typeData.push( {
document_category_id: item.setting_id, document_category_id: item.setting_id,
document_category_name: item.value document_category_name: item.value
})
} }
} else {
typeData.push( {
document_category_id: item.setting_id,
document_category_name: item.value
}) })
}
})
console.log(typeData)
let typeProps = { let typeProps = {
options: typeData.sort((a, b) => a.document_category_id - b.document_category_id), options: typeData.sort((a, b) => a.document_category_id - b.document_category_id),
getOptionLabel: (option) => option.document_category_name, getOptionLabel: (option) => option.document_category_name,
...@@ -243,16 +254,14 @@ export default class CreateManagementDoc extends Component { ...@@ -243,16 +254,14 @@ export default class CreateManagementDoc extends Component {
validasi() { validasi() {
if (this.state.disabledPeriode === true) { if (this.state.disabledPeriode === true) {
if (R.isNil(this.state.getPerusahaan)) { if (R.isNil(this.state.getDocument)) {
this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
} else if (R.isNil(this.state.getDocument)) {
this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' }) this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' })
} else if (R.isNil(this.state.file)) { } else if (R.isNil(this.state.file)) {
this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' })
} else { } else {
const formData = new FormData(); const formData = new FormData();
formData.append("file", this.state.file); formData.append("file", this.state.file);
formData.append("companyId", this.state.getPerusahaan.company_id); formData.append("companyId", 1);
formData.append("settingId", this.state.getDocument.document_category_id); formData.append("settingId", this.state.getDocument.document_category_id);
formData.append("description", this.state.description); formData.append("description", this.state.description);
formData.append("extension", this.state.fileType); formData.append("extension", this.state.fileType);
...@@ -381,7 +390,6 @@ export default class CreateManagementDoc extends Component { ...@@ -381,7 +390,6 @@ export default class CreateManagementDoc extends Component {
/> />
</div> </div>
</div> </div>
{/* {String(this.props.name).includes('Manual Book TIA') ? false : ( */}
{this.state.disabledPeriode === false ? {this.state.disabledPeriode === false ?
<div className="column-1"> <div className="column-1">
<div style={{ padding: 10, borderRadius: 5 }}> <div style={{ padding: 10, borderRadius: 5 }}>
...@@ -403,8 +411,6 @@ export default class CreateManagementDoc extends Component { ...@@ -403,8 +411,6 @@ export default class CreateManagementDoc extends Component {
/> />
</div> </div>
</div> </div>
// )}
// {String(this.props.name).includes('Manual Book TIA') ? false : (
: true} : true}
{this.state.disabledPeriode === false ? {this.state.disabledPeriode === false ?
<div className="column-2"> <div className="column-2">
......
...@@ -93,7 +93,7 @@ export default class DocumentManagement extends Component { ...@@ -93,7 +93,7 @@ export default class DocumentManagement extends Component {
} }
createDocument(payload, settingID, menuName) { createDocument(payload, settingID, menuName) {
this.setState({ loading: true }) this.setState({ visibleCreate: false, loading: true })
api.create().uploadDocument(payload).then(response => { api.create().uploadDocument(payload).then(response => {
console.log(response) console.log(response)
if (response.data) { if (response.data) {
...@@ -127,6 +127,7 @@ export default class DocumentManagement extends Component { ...@@ -127,6 +127,7 @@ export default class DocumentManagement extends Component {
} }
createUploadDocument() { createUploadDocument() {
this.setState({ visibleCreate: false, loading: true })
const formData = this.state.formData const formData = this.state.formData
formData.append("documentId", this.state.docId) formData.append("documentId", this.state.docId)
formData.append("updated", 1) formData.append("updated", 1)
...@@ -253,7 +254,7 @@ export default class DocumentManagement extends Component { ...@@ -253,7 +254,7 @@ export default class DocumentManagement extends Component {
{this.state.loading && loadingComponent} {this.state.loading && loadingComponent}
<Paper style={{ padding: 20 }}> <Paper style={{ padding: 20 }}>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
{(this.state.btncreate && this.state.btnadd) && <span> {(this.state.btncreate) && <span>
<a data-tip={'Add'} data-for="add"> <a data-tip={'Add'} data-for="add">
<div style={{ display: 'grid', justifyContent: 'flex-end' }}> <div style={{ display: 'grid', justifyContent: 'flex-end' }}>
<button <button
...@@ -295,6 +296,7 @@ export default class DocumentManagement extends Component { ...@@ -295,6 +296,7 @@ export default class DocumentManagement extends Component {
load={this.state.load} load={this.state.load}
setId={this.state.id} setId={this.state.id}
userCompActive={this.state.userCompActive} userCompActive={this.state.userCompActive}
allsubcoEdit={this.state.btnadd}
/> />
// this.state.id === 68542 ? // this.state.id === 68542 ?
// <AuditTahunan // <AuditTahunan
...@@ -359,6 +361,7 @@ export default class DocumentManagement extends Component { ...@@ -359,6 +361,7 @@ export default class DocumentManagement extends Component {
setting_id={this.state.id} setting_id={this.state.id}
name={this.state.name} name={this.state.name}
handleLoading={this.handleLoading.bind(this)} handleLoading={this.handleLoading.bind(this)}
allsubcoCreate={this.state.btnadd}
/> />
)} )}
</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