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
ccb4dae4
Commit
ccb4dae4
authored
Apr 21, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update a lot
parent
badc6d02
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+26
-26
CreateReportItems.js
...container/MasterData/formReportItems/CreateReportItems.js
+1
-1
EditReportItems.js
src/container/MasterData/formReportItems/EditReportItems.js
+1
-1
No files found.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
ccb4dae4
...
@@ -620,18 +620,18 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -620,18 +620,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach"
:
i
[
10
]
==
null
?
""
:
i
[
10
].
value
,
"max_ach"
:
i
[
10
]
==
null
?
""
:
i
[
10
].
value
,
"formula"
:
i
[
11
]
==
null
?
""
:
i
[
11
].
value
,
"formula"
:
i
[
11
]
==
null
?
""
:
i
[
11
].
value
,
"total_actual_before"
:
String
(
i
[
12
])
==
""
?
"0.0"
:
String
(
i
[
12
]),
"total_actual_before"
:
String
(
i
[
12
])
==
""
?
"0.0"
:
String
(
i
[
12
]),
"january"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
13
])
:
String
(
Number
(
i
[
13
].
value
).
toFixed
(
1
))
:
String
(
i
[
13
]),
"january"
:
i
[
13
].
value
!=
undefined
?
String
(
Number
(
i
[
13
].
value
).
toFixed
(
1
))
:
String
(
i
[
13
]),
"february"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
14
])
:
String
(
Number
(
i
[
14
].
value
).
toFixed
(
1
))
:
String
(
i
[
14
]),
"february"
:
i
[
14
].
value
!=
undefined
?
String
(
Number
(
i
[
14
].
value
).
toFixed
(
1
))
:
String
(
i
[
14
]),
"march"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
15
])
:
String
(
Number
(
i
[
15
].
value
).
toFixed
(
1
))
:
String
(
i
[
15
]),
"march"
:
i
[
15
].
value
!=
undefined
?
String
(
Number
(
i
[
15
].
value
).
toFixed
(
1
))
:
String
(
i
[
15
]),
"april"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
16
])
:
String
(
Number
(
i
[
16
].
value
).
toFixed
(
1
))
:
String
(
i
[
16
]),
"april"
:
i
[
16
].
value
!=
undefined
?
String
(
Number
(
i
[
16
].
value
).
toFixed
(
1
))
:
String
(
i
[
16
]),
"may"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
17
])
:
String
(
Number
(
i
[
17
].
value
).
toFixed
(
1
))
:
String
(
i
[
17
]),
"may"
:
i
[
17
].
value
!=
undefined
?
String
(
Number
(
i
[
17
].
value
).
toFixed
(
1
))
:
String
(
i
[
17
]),
"june"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
18
])
:
String
(
Number
(
i
[
18
].
value
).
toFixed
(
1
))
:
String
(
i
[
18
]),
"june"
:
i
[
18
].
value
!=
undefined
?
String
(
Number
(
i
[
18
].
value
).
toFixed
(
1
))
:
String
(
i
[
18
]),
"july"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
19
])
:
String
(
Number
(
i
[
19
].
value
).
toFixed
(
1
))
:
String
(
i
[
19
]),
"july"
:
i
[
19
].
value
!=
undefined
?
String
(
Number
(
i
[
19
].
value
).
toFixed
(
1
))
:
String
(
i
[
19
]),
"august"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
20
])
:
String
(
Number
(
i
[
20
].
value
).
toFixed
(
1
))
:
String
(
i
[
20
]),
"august"
:
i
[
20
].
value
!=
undefined
?
String
(
Number
(
i
[
20
].
value
).
toFixed
(
1
))
:
String
(
i
[
20
]),
"september"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
21
])
:
String
(
Number
(
i
[
21
].
value
).
toFixed
(
1
))
:
String
(
i
[
21
]),
"september"
:
i
[
21
].
value
!=
undefined
?
String
(
Number
(
i
[
21
].
value
).
toFixed
(
1
))
:
String
(
i
[
21
]),
"october"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
22
])
:
String
(
Number
(
i
[
22
].
value
).
toFixed
(
1
))
:
String
(
i
[
22
]),
"october"
:
i
[
22
].
value
!=
undefined
?
String
(
Number
(
i
[
22
].
value
).
toFixed
(
1
))
:
String
(
i
[
22
]),
"november"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
23
])
:
String
(
Number
(
i
[
23
].
value
).
toFixed
(
1
))
:
String
(
i
[
23
]),
"november"
:
i
[
23
].
value
!=
undefined
?
String
(
Number
(
i
[
23
].
value
).
toFixed
(
1
))
:
String
(
i
[
23
]),
"december"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
24
])
:
String
(
Number
(
i
[
24
].
value
).
toFixed
(
1
))
:
String
(
i
[
24
]),
"december"
:
i
[
24
].
value
!=
undefined
?
String
(
Number
(
i
[
24
].
value
).
toFixed
(
1
))
:
String
(
i
[
24
]),
"total_current_year"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
)),
"total_current_year"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
)),
"total_next_year"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
)),
"total_next_year"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
)),
"total_more_year"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
)),
"total_more_year"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
)),
...
@@ -848,18 +848,18 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -848,18 +848,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach"
:
i
[
10
]
==
null
?
""
:
i
[
10
].
value
,
"max_ach"
:
i
[
10
]
==
null
?
""
:
i
[
10
].
value
,
"formula"
:
i
[
11
]
==
null
?
""
:
i
[
11
].
value
,
"formula"
:
i
[
11
]
==
null
?
""
:
i
[
11
].
value
,
"total_actual_before"
:
String
(
i
[
12
])
==
""
?
"0.0"
:
String
(
i
[
12
]),
"total_actual_before"
:
String
(
i
[
12
])
==
""
?
"0.0"
:
String
(
i
[
12
]),
"january"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
13
])
:
String
(
Number
(
i
[
13
].
value
).
toFixed
(
1
))
:
String
(
i
[
13
]),
"january"
:
i
[
13
].
value
!=
undefined
?
String
(
Number
(
i
[
13
].
value
).
toFixed
(
1
))
:
String
(
i
[
13
]),
"february"
:
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
14
])
:
String
(
Number
(
i
[
14
].
value
).
toFixed
(
1
))
:
String
(
i
[
14
]),
"february"
:
i
[
14
].
value
!=
undefined
?
String
(
Number
(
i
[
14
].
value
).
toFixed
(
1
))
:
String
(
i
[
14
]),
"march"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
15
])
:
String
(
Number
(
i
[
15
].
value
).
toFixed
(
1
))
:
String
(
i
[
15
]),
"march"
:
i
[
15
].
value
!=
undefined
?
String
(
Number
(
i
[
15
].
value
).
toFixed
(
1
))
:
String
(
i
[
15
]),
"april"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
16
])
:
String
(
Number
(
i
[
16
].
value
).
toFixed
(
1
))
:
String
(
i
[
16
]),
"april"
:
i
[
16
].
value
!=
undefined
?
String
(
Number
(
i
[
16
].
value
).
toFixed
(
1
))
:
String
(
i
[
16
]),
"may"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
17
])
:
String
(
Number
(
i
[
17
].
value
).
toFixed
(
1
))
:
String
(
i
[
17
]),
"may"
:
i
[
17
].
value
!=
undefined
?
String
(
Number
(
i
[
17
].
value
).
toFixed
(
1
))
:
String
(
i
[
17
]),
"june"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
18
])
:
String
(
Number
(
i
[
18
].
value
).
toFixed
(
1
))
:
String
(
i
[
18
]),
"june"
:
i
[
18
].
value
!=
undefined
?
String
(
Number
(
i
[
18
].
value
).
toFixed
(
1
))
:
String
(
i
[
18
]),
"july"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
19
])
:
String
(
Number
(
i
[
19
].
value
).
toFixed
(
1
))
:
String
(
i
[
19
]),
"july"
:
i
[
19
].
value
!=
undefined
?
String
(
Number
(
i
[
19
].
value
).
toFixed
(
1
))
:
String
(
i
[
19
]),
"august"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
20
])
:
String
(
Number
(
i
[
20
].
value
).
toFixed
(
1
))
:
String
(
i
[
20
]),
"august"
:
i
[
20
].
value
!=
undefined
?
String
(
Number
(
i
[
20
].
value
).
toFixed
(
1
))
:
String
(
i
[
20
]),
"september"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
21
])
:
String
(
Number
(
i
[
21
].
value
).
toFixed
(
1
))
:
String
(
i
[
21
]),
"september"
:
i
[
21
].
value
!=
undefined
?
String
(
Number
(
i
[
21
].
value
).
toFixed
(
1
))
:
String
(
i
[
21
]),
"october"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
22
])
:
String
(
Number
(
i
[
22
].
value
).
toFixed
(
1
))
:
String
(
i
[
22
]),
"october"
:
i
[
22
].
value
!=
undefined
?
String
(
Number
(
i
[
22
].
value
).
toFixed
(
1
))
:
String
(
i
[
22
]),
"november"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
23
])
:
String
(
Number
(
i
[
23
].
value
).
toFixed
(
1
))
:
String
(
i
[
23
]),
"november"
:
i
[
23
].
value
!=
undefined
?
String
(
Number
(
i
[
23
].
value
).
toFixed
(
1
))
:
String
(
i
[
23
]),
"december"
:
i
[
6
]
===
stateFR
?
i
[
0
]
==
3
?
String
(
i
[
24
])
:
String
(
Number
(
i
[
24
].
value
).
toFixed
(
1
))
:
String
(
i
[
24
]),
"december"
:
i
[
24
].
value
!=
undefined
?
String
(
Number
(
i
[
24
].
value
).
toFixed
(
1
))
:
String
(
i
[
24
]),
"total_current_year"
:
i
[
6
]
===
String
(
Number
(
i
[
25
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
)),
"total_current_year"
:
i
[
6
]
===
String
(
Number
(
i
[
25
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
25
]).
toFixed
(
1
)),
"total_next_year"
:
i
[
6
]
===
String
(
Number
(
i
[
26
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
)),
"total_next_year"
:
i
[
6
]
===
String
(
Number
(
i
[
26
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
26
]).
toFixed
(
1
)),
"total_more_year"
:
i
[
6
]
===
String
(
Number
(
i
[
27
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
)),
"total_more_year"
:
i
[
6
]
===
String
(
Number
(
i
[
27
]).
toFixed
(
1
))
==
""
?
"0.0"
:
String
(
Number
(
i
[
27
]).
toFixed
(
1
)),
...
@@ -1313,9 +1313,9 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -1313,9 +1313,9 @@ export default class CorporateAnnualTarget extends Component {
// }
// }
// } else {
// } else {
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
value
==
undefined
)
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
]
=
total
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
]
=
total
.
toFixed
(
1
)
}
else
{
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
value
=
total
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
value
=
total
.
toFixed
(
1
)
}
}
// }
// }
...
...
src/container/MasterData/formReportItems/CreateReportItems.js
View file @
ccb4dae4
...
@@ -67,7 +67,7 @@ export default class CreateReportItems extends Component {
...
@@ -67,7 +67,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'
,
'LAST'
],
formulaYtd
:
[
'SUM'
,
'AVG'
,
'LAST'
,
'FORMULA'
],
kpiTypeValue
:
null
,
kpiTypeValue
:
null
,
maxAchValue
:
null
,
maxAchValue
:
null
,
formulaYTDValue
:
null
,
formulaYTDValue
:
null
,
...
...
src/container/MasterData/formReportItems/EditReportItems.js
View file @
ccb4dae4
...
@@ -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'
,
'LAST'
],
formulaYtd
:
[
'SUM'
,
'AVG'
,
'LAST'
,
'FORMULA'
],
kpiTypeValue
:
null
,
kpiTypeValue
:
null
,
maxAchValue
:
null
,
maxAchValue
:
null
,
formulaYTDValue
:
null
formulaYTDValue
:
null
...
...
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