Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
cbe17f11
Commit
cbe17f11
authored
Dec 31, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
apdet See merge request
!884
parents
0cb33513
836b73d8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
136 additions
and
125 deletions
+136
-125
CorporateAnnualTargetMR.js
src/container/MonthlyReport/CorporateAnnualTargetMR.js
+99
-92
FixedAssetsMovementMR.js
src/container/MonthlyReport/FixedAssetsMovementMR.js
+11
-11
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+26
-22
No files found.
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @
cbe17f11
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @
cbe17f11
...
...
@@ -951,17 +951,17 @@ export default class FixedAssetsMovementMR extends Component {
}
/
>
:
tableMeta
.
rowData
[
0
]
===
5
||
tableMeta
.
rowData
[
0
]
===
6
?
<
span
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
}}
>
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleValueFormula
(
tableMeta
,
9
)).
toFixed
(
1
)}
/
>
<
/span>
:
//
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
//
<span style={{ fontSize: 12, textAlign: 'right' }}>
//
<NumberFormat
//
thousandSeparator={true}
//
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
//
type="text"
//
placeholder=""
//
disabled={true}
//
value={Number(handleValueFormula(tableMeta, 9)).toFixed(1)}
//
/>
//
</span> :
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
...
...
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
cbe17f11
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment