Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
2061422c
Commit
2061422c
authored
2 years ago
by
5Amogh
Browse files
Options
Download
Patches
Plain Diff
Hotfix: Request and load status based on districts
parent
ebe69065
master
dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/express-4.17.3
dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3
dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3
dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/express-4.17.3
dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/qs-6.10.3
filters_5.1.1
gcp_test
release-5.0.0.1
release-5.0.0.2
release-5.0.0.3
release-5.0.1
release-5.0.2
release-5.1.0
release-5.1.1
sharathkashyap-patch-1
Tags unavailable
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
+9
-4
...components/program-datasets/program-datasets.component.ts
with
9 additions
and
4 deletions
+9
-4
src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
+
9
−
4
View file @
2061422c
...
...
@@ -542,9 +542,11 @@ export class DatasetsComponent implements OnInit, OnDestroy {
}
districtSelection
(
$event
)
{
this
.
globalDistrict
=
$event
.
value
this
.
globalDistrict
=
$event
.
value
;
this
.
reportForm
.
controls
.
districtName
.
setValue
(
$event
.
value
);
this
.
displayFilters
[
'
District
'
]
=
[
$event
?.
source
?.
triggerValue
]
this
.
tag
=
_
.
get
(
this
.
reportForm
,
'
controls.solution.value
'
)
+
'
_
'
+
this
.
userId
+
'
_
'
+
_
.
toLower
(
_
.
trim
([
$event
?.
source
?.
triggerValue
],
"
"
));
this
.
loadReports
();
}
organisationSelection
(
$event
)
{
...
...
@@ -645,7 +647,6 @@ export class DatasetsComponent implements OnInit, OnDestroy {
}
});
if
(
dataFound
&&
dataFound
.
length
>
0
)
{
this
.
popup
=
false
;
this
.
isProcessed
=
true
;
...
...
@@ -707,8 +708,12 @@ export class DatasetsComponent implements OnInit, OnDestroy {
let
requestStatus
=
true
;
const
selectedReportList
=
[];
_
.
forEach
(
this
.
onDemandReportData
,
(
value
)
=>
{
if
(
value
.
datasetConfig
.
type
==
this
.
selectedReport
.
datasetId
&&
value
.
datasetConfig
.
params
.
solutionId
==
this
.
selectedSolution
)
{
selectedReportList
.
push
(
value
);
if
(
value
.
datasetConfig
.
type
==
this
.
selectedReport
.
datasetId
){
_
.
forEach
(
value
.
datasetConfig
.
params
.
filters
,
(
filter
)
=>
{
if
([
'
solutionId
'
,
'
solution_id
'
].
includes
(
filter
[
'
dimension
'
])
&&
filter
.
value
===
this
.
selectedSolution
){
selectedReportList
.
push
(
value
);
}
});
}
});
const
sortedReportList
=
_
.
sortBy
(
selectedReportList
,
[(
data
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets