Commit 5600f0c2 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'syadziy' into 'master'

Syadziy

See merge request !389
parents cc68ef05 8b513030
...@@ -2188,7 +2188,7 @@ export default class ProfitLoss extends Component { ...@@ -2188,7 +2188,7 @@ export default class ProfitLoss extends Component {
}} }}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complate</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div> </div>
</button> </button>
</div> </div>
......
...@@ -65,7 +65,7 @@ export default class CreateReportItems extends Component { ...@@ -65,7 +65,7 @@ export default class CreateReportItems extends Component {
messageAlert: '', messageAlert: '',
kpiType: ['HIG', 'HIB'], kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'], maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'MIN', 'MAX'], formulaYtd: ['SUM', 'AVG', 'LAST'],
kpiTypeValue: null, kpiTypeValue: null,
maxAchValue: null, maxAchValue: null,
formulaYTDValue: null, formulaYTDValue: null,
......
...@@ -69,7 +69,7 @@ export default class EditReportItems extends Component { ...@@ -69,7 +69,7 @@ export default class EditReportItems extends Component {
messageAlert: '', messageAlert: '',
kpiType: ['HIG', 'HIB'], kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'], maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'MIN', 'MAX'], formulaYtd: ['SUM', 'AVG', 'LAST'],
kpiTypeValue: null, kpiTypeValue: null,
maxAchValue: null, maxAchValue: null,
formulaYTDValue: null formulaYTDValue: null
......
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