Skip to content

Commit 69de4ed

Browse files
committed
resolves rtl feedback.
Signed-off-by: Diana Barsan <[email protected]>
1 parent 5735d1c commit 69de4ed

7 files changed

+30
-6
lines changed

Diff for: webapp/src/css/rtl.less

+10
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@
157157

158158
}
159159

160+
.target .target-progress .goal label {
161+
margin-left: auto;
162+
margin-right: -40%;
163+
}
164+
160165
.progress-bar {
161166
float: right;
162167
}
@@ -170,6 +175,11 @@
170175
margin-right: 0;
171176
}
172177

178+
[type=tel] {
179+
direction: ltr!important;
180+
unicode-bidi: embed;
181+
}
182+
173183

174184
@media (max-width: 767px) {
175185
mm-sidebar-menu .mat-sidenav-container .nav-item mat-icon {

Diff for: webapp/src/ts/components/analytics-targets-progress/analytics-targets-progress.component.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
</div>
88
</div>
99

10-
<div class="goal" *ngIf="target?.goal > 0" [ngStyle]="{ 'padding-left': (target?.goal || 0) + '%' }">
10+
<div class="goal"
11+
*ngIf="target?.goal > 0"
12+
[ngStyle]="{ 'padding-left': ((direction === 'ltr' && target?.goal) || 0) + '%', 'padding-right': ((direction === 'rtl' && target?.goal) || 0) + '%' }"
13+
>
1114
<label [ngClass]="{ 'pin-left': !aggregate && target?.goal < 10, 'pin-right': aggregate || target?.goal > 85 }">
1215
<span>{{'analytics.target.monthly_goal' | translate}}</span>
1316
{{ target.goal | localizeNumber }}<span *ngIf="target?.type === 'percent'">%</span>

Diff for: webapp/src/ts/components/analytics-targets-progress/analytics-targets-progress.component.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export class AnalyticsTargetsProgressComponent {
88
@Input() target;
99
@Input() value;
1010
@Input() aggregate;
11+
@Input() direction;
1112

1213
constructor() { }
1314
}

Diff for: webapp/src/ts/modules/analytics/analytics-target-aggregates-detail.component.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export class AnalyticsTargetAggregatesDetailComponent implements OnInit, OnDestr
2222
selected: any = null;
2323
error: any = null;
2424
reportingPeriod;
25+
direction;
2526
private aggregates = null;
2627
private viewInited = new Subject();
2728

@@ -53,11 +54,13 @@ export class AnalyticsTargetAggregatesDetailComponent implements OnInit, OnDestr
5354
const subscriptionStore = combineLatest(
5455
this.store.select(Selectors.getTargetAggregates),
5556
this.store.select(Selectors.getSelectedTargetAggregate),
56-
this.store.select(Selectors.getTargetAggregatesError)
57-
).subscribe(([aggregates, selected, error]) => {
57+
this.store.select(Selectors.getTargetAggregatesError),
58+
this.store.select(Selectors.getDirection),
59+
).subscribe(([aggregates, selected, error, direction]) => {
5860
this.aggregates = aggregates;
5961
this.selected = selected;
6062
this.error = error;
63+
this.direction = direction;
6164
if (this.selected) {
6265
this.reportingPeriod = this.getReportingPeriodText(this.selected);
6366
}

Diff for: webapp/src/ts/modules/analytics/analytics-targets.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="body">
2121
<mm-analytics-targets-progress
2222
*ngIf="target.type === 'percent'"
23-
[target]="target" [value]="target.value"
23+
[target]="target" [value]="target.value" [direction]="direction"
2424
[aggregate]="false">
2525
</mm-analytics-targets-progress>
2626
<div class="count" *ngIf="target.type !== 'percent'">

Diff for: webapp/src/ts/modules/analytics/analytics-targets.component.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
2+
import { Store } from '@ngrx/store';
23

34
import { RulesEngineService } from '@mm-services/rules-engine.service';
45
import { PerformanceService } from '@mm-services/performance.service';
6+
import { Selectors } from '@mm-selectors/index';
57

68
@Component({
79
templateUrl: './analytics-targets.component.html'
@@ -12,12 +14,17 @@ export class AnalyticsTargetsComponent implements OnInit {
1214
targetsDisabled = false;
1315
errorStack;
1416
trackPerformance;
17+
direction;
1518

1619
constructor(
1720
private rulesEngineService: RulesEngineService,
18-
private performanceService: PerformanceService
21+
private performanceService: PerformanceService,
22+
private store: Store,
1923
) {
2024
this.trackPerformance = this.performanceService.track();
25+
this.store.select(Selectors.getDirection).subscribe(direction => {
26+
this.direction = direction;
27+
});
2128
}
2229

2330
ngOnInit(): void {

Diff for: webapp/src/ts/modules/reports/reports-more-menu.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</section>
3636

3737
<ng-template #verifyReportWrapper>
38-
<section class="verify-report-options-wrapper">
38+
<section class="verify-report-options-wrapper" [dir]="direction">
3939
<mm-panel-header headerTitle="reports.verify" (onClose)="closeVerifyReportComponents()"></mm-panel-header>
4040
<div class="verify-report-options-body">
4141
<button mat-flat-button class="invalid-option" [class.active-option]="selectedReportDoc?.verified === false" (click)="isReportCorrect(false)">

0 commit comments

Comments
 (0)