Skip to content

T
Tia-dev
Commit 833c9a31 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

parents 5675f958 f914de1d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 90 deletions
src/container/Laporan/SubHolding.js
View file @ 833c9a31
...@@ -671,7 +671,7 @@ export default class SubHolding extends Component { ...@@ -671,7 +671,7 @@ export default class SubHolding extends Component {
getOptionLabel={(option) => titleCase(option.label)} getOptionLabel={(option) => titleCase(option.label)}
id="typereport" id="typereport"
onChange={(event, newInputValue) => this.setState({ report: newInputValue, loading: true, previewTable: false }, () => { onChange={(event, newInputValue) => this.setState({ report: newInputValue, loading: true, previewTable: false }, () => {
this.getSubmission() this.getReportType()
})} })}
disableClearable disableClearable
style={{ width: 250 }} style={{ width: 250 }}
...@@ -685,7 +685,7 @@ export default class SubHolding extends Component { ...@@ -685,7 +685,7 @@ export default class SubHolding extends Component {
id="company" id="company"
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.intent === 'Home' ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => { onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
this.getSubmission() this.getReportType()
})} })}
disableClearable disableClearable
style={{ width: 250 }} style={{ width: 250 }}
...@@ -698,7 +698,7 @@ export default class SubHolding extends Component { ...@@ -698,7 +698,7 @@ export default class SubHolding extends Component {
{...this.state.listPeriode} {...this.state.listPeriode}
id="periode" id="periode"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => { onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
this.getSubmission() this.getReportType()
})} })}
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.intent === 'Home' ? true : false}
disableClearable disableClearable
......
src/container/Laporan/TableSubHolding.js
View file @ 833c9a31
...@@ -3078,7 +3078,7 @@ export default class TableSubHolding extends Component { ...@@ -3078,7 +3078,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)} value={Number(tableMeta.rowData[7]).toFixed(2)}
/> />
} }
/> />
...@@ -3101,7 +3101,7 @@ export default class TableSubHolding extends Component { ...@@ -3101,7 +3101,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]).toFixed(2)}
/> />
} }
/> />
...@@ -3124,7 +3124,7 @@ export default class TableSubHolding extends Component { ...@@ -3124,7 +3124,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)} value={Number(tableMeta.rowData[9]).toFixed(2)}
/> />
} }
/> />
...@@ -3147,7 +3147,7 @@ export default class TableSubHolding extends Component { ...@@ -3147,7 +3147,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]).toFixed(2)}
/> />
} }
/> />
...@@ -3172,7 +3172,7 @@ export default class TableSubHolding extends Component { ...@@ -3172,7 +3172,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(1)} value={Number(tableMeta.rowData[11]).toFixed(2)}
/> />
} }
/> />
...@@ -3195,7 +3195,7 @@ export default class TableSubHolding extends Component { ...@@ -3195,7 +3195,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(1)} value={Number(tableMeta.rowData[12]).toFixed(2)}
/> />
} }
/> />
...@@ -3218,7 +3218,7 @@ export default class TableSubHolding extends Component { ...@@ -3218,7 +3218,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(1)} value={Number(tableMeta.rowData[13]).toFixed(2)}
/> />
} }
/> />
...@@ -3241,7 +3241,7 @@ export default class TableSubHolding extends Component { ...@@ -3241,7 +3241,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(1)} value={Number(tableMeta.rowData[14]).toFixed(2)}
/> />
} }
/> />
...@@ -3266,7 +3266,7 @@ export default class TableSubHolding extends Component { ...@@ -3266,7 +3266,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(1)} value={Number(tableMeta.rowData[15]).toFixed(2)}
/> />
} }
/> />
...@@ -3289,7 +3289,7 @@ export default class TableSubHolding extends Component { ...@@ -3289,7 +3289,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(1)} value={Number(tableMeta.rowData[16]).toFixed(2)}
/> />
} }
/> />
...@@ -3312,7 +3312,7 @@ export default class TableSubHolding extends Component { ...@@ -3312,7 +3312,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(1)} value={Number(tableMeta.rowData[17]).toFixed(2)}
/> />
} }
/> />
...@@ -3335,7 +3335,7 @@ export default class TableSubHolding extends Component { ...@@ -3335,7 +3335,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)} value={Number(tableMeta.rowData[18]).toFixed(2)}
/> />
} }
/> />
...@@ -3433,7 +3433,7 @@ export default class TableSubHolding extends Component { ...@@ -3433,7 +3433,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[20]).toFixed(1)} value={Number(tableMeta.rowData[20]).toFixed(2)}
/> />
} }
/> />
...@@ -3478,7 +3478,7 @@ export default class TableSubHolding extends Component { ...@@ -3478,7 +3478,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[21]).toFixed(1)} value={Number(tableMeta.rowData[21]).toFixed(2)}
/> />
} }
/> />
......
src/container/MonthlyReport.js
View file @ 833c9a31
...@@ -759,9 +759,10 @@ export default class MonthlyReport extends Component { ...@@ -759,9 +759,10 @@ export default class MonthlyReport extends Component {
company={this.state.company} company={this.state.company}
revision={this.state.revisionTable} revision={this.state.revisionTable}
periode={this.state.periode.periode} periode={this.state.periode.periode}
submissionID={this.state.submissionID} // submissionID={this.state.submissionID}
monthlyReportId={this.state.monthlyReportId}
month={this.state.month}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)} // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
// onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
// getReport={this.getCompanyActive.bind(this)} // getReport={this.getCompanyActive.bind(this)}
onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })} onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
/> />
......
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