Skip to content

T
Tia-dev
Commit 454c6a59 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

tap

See merge request !509
parents 09be5c13 702014bb
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
src/container/HomePage.js
View file @ 454c6a59
...@@ -325,7 +325,7 @@ class HomePage extends Component { ...@@ -325,7 +325,7 @@ class HomePage extends Component {
</div> </div>
<div style={{ flex: 1, padding: 20, width: '100%' }}> <div style={{ flex: 1, padding: 20, width: '100%' }}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Typography style={{ color: '#656565', fontSize: '16px', fontWeight: 'bold' }}>Task That Must be Done</Typography> <Typography style={{ color: '#656565', fontSize: '16px', fontWeight: 'bold' }}>Tasks to be Complete</Typography>
</div> </div>
</div> </div>
<div style={{ flex: 1, padding: 20, width: '100%' }}> <div style={{ flex: 1, padding: 20, width: '100%' }}>
......
src/container/OprIndicator/OperatingIndicator.js
View file @ 454c6a59
...@@ -577,7 +577,7 @@ export default class OperatingIndicator extends Component { ...@@ -577,7 +577,7 @@ export default class OperatingIndicator extends Component {
})} })}
getReport={() => this.getOperatingID()} getReport={() => this.getOperatingID()}
saveOperatingInd={this.saveOperatingInd.bind(this)} saveOperatingInd={this.saveOperatingInd.bind(this)}
// superUser={this.state.superUser} isSubmit={this.state.isSubmit}
permission={{ create: this.state.buttonCreate, edit: this.state.buttonEdit, delete: this.state.buttonDelete }} permission={{ create: this.state.buttonCreate, edit: this.state.buttonEdit, delete: this.state.buttonDelete }}
/> />
} }
......
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @ 454c6a59
...@@ -694,7 +694,7 @@ export default class BalanceSheet extends Component { ...@@ -694,7 +694,7 @@ export default class BalanceSheet extends Component {
placeholder="" placeholder=""
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -736,7 +736,7 @@ export default class BalanceSheet extends Component { ...@@ -736,7 +736,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -777,7 +777,7 @@ export default class BalanceSheet extends Component { ...@@ -777,7 +777,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
decimalScale={1} decimalScale={1}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
...@@ -819,7 +819,7 @@ export default class BalanceSheet extends Component { ...@@ -819,7 +819,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
decimalScale={1} decimalScale={1}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
...@@ -862,7 +862,7 @@ export default class BalanceSheet extends Component { ...@@ -862,7 +862,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -903,7 +903,7 @@ export default class BalanceSheet extends Component { ...@@ -903,7 +903,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
decimalScale={1} decimalScale={1}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
...@@ -946,7 +946,7 @@ export default class BalanceSheet extends Component { ...@@ -946,7 +946,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -988,7 +988,7 @@ export default class BalanceSheet extends Component { ...@@ -988,7 +988,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1030,7 +1030,7 @@ export default class BalanceSheet extends Component { ...@@ -1030,7 +1030,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1072,7 +1072,7 @@ export default class BalanceSheet extends Component { ...@@ -1072,7 +1072,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1114,7 +1114,7 @@ export default class BalanceSheet extends Component { ...@@ -1114,7 +1114,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1156,7 +1156,7 @@ export default class BalanceSheet extends Component { ...@@ -1156,7 +1156,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1198,7 +1198,7 @@ export default class BalanceSheet extends Component { ...@@ -1198,7 +1198,7 @@ export default class BalanceSheet extends Component {
type="text" type="text"
placeholder="" placeholder=""
decimalScale={1} decimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit} disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
...@@ -1258,7 +1258,7 @@ export default class BalanceSheet extends Component { ...@@ -1258,7 +1258,7 @@ export default class BalanceSheet extends Component {
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{(this.props.permission.create || this.props.permission.edit) && <a data-tip={'Download Template'} data-for="template"> {(this.props.permission.create || this.props.permission.edit) && this.props.isSubmit && <a data-tip={'Download Template'} data-for="template">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -1272,7 +1272,7 @@ export default class BalanceSheet extends Component { ...@@ -1272,7 +1272,7 @@ export default class BalanceSheet extends Component {
</button> </button>
</a>} </a>}
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
{(this.props.permission.create || this.props.permission.edit) && <a data-tip={'Upload'} data-for="upload"> {(this.props.permission.create || this.props.permission.edit) && this.props.isSubmit && <a data-tip={'Upload'} data-for="upload">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -1337,7 +1337,7 @@ export default class BalanceSheet extends Component { ...@@ -1337,7 +1337,7 @@ export default class BalanceSheet extends Component {
</div> </div>
</button> </button>
</div> </div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}> {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && this.props.isSubmit && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button <button
type="button" type="button"
onClick={() => onClick={() =>
......
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