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
601b72ac
Commit
601b72ac
authored
Jan 06, 2021
by
rifkaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into rifka
parents
0d1f7686
db7865a6
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
189 additions
and
106 deletions
+189
-106
OperatingIndicatorMR.js
src/container/MonthlyReport/OperatingIndicatorMR.js
+175
-105
OperatingIndicator.js
src/container/OprIndicator/OperatingIndicator.js
+14
-1
No files found.
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @
601b72ac
This diff is collapsed.
Click to expand it.
src/container/OprIndicator/OperatingIndicator.js
View file @
601b72ac
...
@@ -111,6 +111,7 @@ export default class OperatingIndicator extends Component {
...
@@ -111,6 +111,7 @@ export default class OperatingIndicator extends Component {
"periode"
:
this
.
state
.
periode
.
periode
,
"periode"
:
this
.
state
.
periode
.
periode
,
"report_type"
:
"operating indicator"
,
"report_type"
:
"operating indicator"
,
}
}
console
.
log
(
payload
);
api
.
create
().
getAllOperatingInd
(
payload
).
then
(
response
=>
{
api
.
create
().
getAllOperatingInd
(
payload
).
then
(
response
=>
{
console
.
log
(
response
);
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
)
{
...
@@ -312,6 +313,18 @@ export default class OperatingIndicator extends Component {
...
@@ -312,6 +313,18 @@ export default class OperatingIndicator extends Component {
})
})
}
else
if
(
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
"monthly report"
))
{
}
else
if
(
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
"monthly report"
))
{
console
.
log
(
item
);
console
.
log
(
item
);
let
month
=
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'jan'
)
?
1
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'feb'
)
?
2
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'mar'
)
?
3
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'apr'
)
?
4
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'may'
)
?
5
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'jun'
)
?
6
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'jul'
)
?
7
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'aug'
)
?
8
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'sep'
)
?
9
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'oct'
)
?
10
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'nov'
)
?
11
:
String
(
item
[
1
]).
toLocaleLowerCase
().
includes
(
'dec'
)
?
12
:
null
this
.
setState
({
this
.
setState
({
statusDetail
:
String
(
item
[
2
]).
toLocaleLowerCase
(),
statusDetail
:
String
(
item
[
2
]).
toLocaleLowerCase
(),
dataDetail
:
{
...
this
.
state
.
dataReport
[
index
],
periode
:
this
.
state
.
periode
.
periode
,
operatingIndID
:
this
.
state
.
operatingIndID
,
company
:
this
.
state
.
company
},
dataDetail
:
{
...
this
.
state
.
dataReport
[
index
],
periode
:
this
.
state
.
periode
.
periode
,
operatingIndID
:
this
.
state
.
operatingIndID
,
company
:
this
.
state
.
company
},
...
@@ -319,7 +332,7 @@ export default class OperatingIndicator extends Component {
...
@@ -319,7 +332,7 @@ export default class OperatingIndicator extends Component {
visibleDetailOpt
:
false
,
visibleDetailOpt
:
false
,
visibleDetailMonthly
:
true
,
visibleDetailMonthly
:
true
,
visibleDetailRolling
:
false
,
visibleDetailRolling
:
false
,
months
:
id
===
22
?
1
:
23
?
2
:
24
?
3
:
25
?
4
:
27
?
5
:
28
?
6
:
29
?
7
:
31
?
8
:
32
?
9
:
33
?
10
:
35
?
11
:
36
?
12
:
0
months
:
month
})
})
...
...
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