Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
web-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
3435586f
Commit
3435586f
authored
6 years ago
by
ncastejon
Browse files
Options
Downloads
Patches
Plain Diff
Add ATMO hack for providers filter
parent
7830889e
No related branches found
No related tags found
1 merge request
!32
ATMO hack
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/geosource/components/filter-list/filter-detail/filter-detail.component.html
+12
-4
12 additions, 4 deletions
...ts/filter-list/filter-detail/filter-detail.component.html
src/i18n/messages.fr.xlf
+3
-3
3 additions, 3 deletions
src/i18n/messages.fr.xlf
with
15 additions
and
7 deletions
src/app/geosource/components/filter-list/filter-detail/filter-detail.component.html
+
12
−
4
View file @
3435586f
<aside
*ngIf=
"filter.aggregations && filter.aggregations.length > 0"
[ngClass]=
"{'is-active': displayFilterItems}"
>
<!--
TODO: There is one hack for ATMO provider:
If it is ATMO, we don't display the subfilters
Hack to remove at some moment (see the team)
-->
<aside
*ngIf=
"filter.aggregations && filter.aggregations.length > 0"
[ngClass]=
"{'is-active': displayFilterItems}"
>
<p
class=
"filter-label"
(click)=
"toggleFilterItems()"
>
<p
class=
"filter-label"
(click)=
"toggleFilterItems()"
>
<span>
{{ filter.label }}
</span>
<span>
{{ filter.label }}
</span>
<img
class=
"icon-plus-minus"
src=
"./assets/img/minus.svg"
alt=
"Minus icon"
*ngIf=
"displayFilterItems"
>
<img
class=
"icon-plus-minus"
src=
"./assets/img/minus.svg"
alt=
"Minus icon"
*ngIf=
"displayFilterItems"
>
...
@@ -7,7 +14,8 @@
...
@@ -7,7 +14,8 @@
<ul
class=
"filter-items"
[ngClass]=
"{'is-active': displayFilterItems}"
>
<ul
class=
"filter-items"
[ngClass]=
"{'is-active': displayFilterItems}"
>
<li
*ngFor=
"let aggregation of filter.aggregations; let i=index"
[ngClass]=
"{'active': (aggregation.isActive == true) }"
>
<li
*ngFor=
"let aggregation of filter.aggregations; let i=index"
[ngClass]=
"{'active': (aggregation.isActive == true) }"
>
<div
class=
"columns filter-item justify-content-between is-mobile"
>
<div
class=
"columns filter-item justify-content-between is-mobile"
>
<div
class=
"column is-9 filter-title"
*ngIf=
"aggregation.subAggregations.length < 2"
>
<div
class=
"column is-9 filter-title"
*ngIf=
"aggregation.subAggregations.length < 2 || aggregation.key === 'ATMO Auvergne-Rhône-Alpes'"
>
<div
class=
"field no-sub"
>
<div
class=
"field no-sub"
>
<input
type=
"checkbox"
[(ngModel)]=
"aggregation.isActive"
<input
type=
"checkbox"
[(ngModel)]=
"aggregation.isActive"
(click)=
"changeFilter(aggregation)"
(click)=
"changeFilter(aggregation)"
...
@@ -18,7 +26,7 @@
...
@@ -18,7 +26,7 @@
</label>
</label>
</div>
</div>
</div>
</div>
<div
class=
"column is-9 filter-title"
*ngIf=
"aggregation.subAggregations.length > 1"
>
<div
class=
"column is-9 filter-title"
*ngIf=
"aggregation.subAggregations.length > 1
&& aggregation.key !== 'ATMO Auvergne-Rhône-Alpes'
"
>
<span
class=
"icon is-small icon-toggle-sub"
(click)=
"subAreOpen[aggregation.key] = !subAreOpen[aggregation.key]"
>
<span
class=
"icon is-small icon-toggle-sub"
(click)=
"subAreOpen[aggregation.key] = !subAreOpen[aggregation.key]"
>
<i
class=
"fas fa-angle-right"
aria-hidden=
"true"
*ngIf=
"!subAreOpen[aggregation.key]"
></i>
<i
class=
"fas fa-angle-right"
aria-hidden=
"true"
*ngIf=
"!subAreOpen[aggregation.key]"
></i>
<i
class=
"fas fa-angle-down"
aria-hidden=
"true"
*ngIf=
"subAreOpen[aggregation.key]"
></i>
<i
class=
"fas fa-angle-down"
aria-hidden=
"true"
*ngIf=
"subAreOpen[aggregation.key]"
></i>
...
@@ -40,7 +48,7 @@
...
@@ -40,7 +48,7 @@
</div>
</div>
</div>
</div>
<ng-container
*ngIf=
"aggregation.subAggregations.length > 1 && subAreOpen[aggregation.key]"
>
<ng-container
*ngIf=
"aggregation.subAggregations.length > 1 && subAreOpen[aggregation.key]
&& aggregation.key !== 'ATMO Auvergne-Rhône-Alpes'
"
>
<div
class=
"sub-aggregations"
*ngFor=
"let subAgg of aggregation.subAggregations"
>
<div
class=
"sub-aggregations"
*ngFor=
"let subAgg of aggregation.subAggregations"
>
<a
class=
"link-without-decoration"
>
<a
class=
"link-without-decoration"
>
<div
class=
"columns filter-item justify-content-between is-mobile"
>
<div
class=
"columns filter-item justify-content-between is-mobile"
>
...
...
This diff is collapsed.
Click to expand it.
src/i18n/messages.fr.xlf
+
3
−
3
View file @
3435586f
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
</trans-unit>
</trans-unit>
<trans-unit
id=
"footer.cgu"
datatype=
"html"
>
<trans-unit
id=
"footer.cgu"
datatype=
"html"
>
<source>
Terms of use
</source>
<source>
Terms of use
</source>
<target>
Conditions d'utilisation
</target>
<target>
Conditions
générales
d'utilisation
</target>
</trans-unit>
</trans-unit>
<trans-unit
id=
"menu.actors"
datatype=
"html"
>
<trans-unit
id=
"menu.actors"
datatype=
"html"
>
<source>
Actors
</source>
<source>
Actors
</source>
...
@@ -460,7 +460,7 @@
...
@@ -460,7 +460,7 @@
</trans-unit>
</trans-unit>
<trans-unit
id=
"dataset.info.legalContraints"
datatype=
"html"
>
<trans-unit
id=
"dataset.info.legalContraints"
datatype=
"html"
>
<source>
Terms of use
</source>
<source>
Terms of use
</source>
<target>
Con
traintes légales
</target>
<target>
Con
ditions d'utilisation
</target>
</trans-unit>
</trans-unit>
<trans-unit
id=
"dataset.info.consultLicense"
datatype=
"html"
>
<trans-unit
id=
"dataset.info.consultLicense"
datatype=
"html"
>
<source>
Consult the license
</source>
<source>
Consult the license
</source>
...
@@ -1010,7 +1010,7 @@ La création d'un compte est gratuite et sans engagement. La désinscription est
...
@@ -1010,7 +1010,7 @@ La création d'un compte est gratuite et sans engagement. La désinscription est
</trans-unit>
</trans-unit>
<trans-unit
id=
"sitemap.cgu"
datatype=
"html"
>
<trans-unit
id=
"sitemap.cgu"
datatype=
"html"
>
<source>
General conditions of use
</source>
<source>
General conditions of use
</source>
<target>
Conditions d'utilisation
</target>
<target>
Conditions
générales
d'utilisation
</target>
</trans-unit>
</trans-unit>
<!-- Results page -->
<!-- Results page -->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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