Skip to content

Commit

Permalink
Merge pull request #1463 from rodekruis/fix.too-late-popup
Browse files Browse the repository at this point in the history
fix: add support email to too-late-tooltip + fix styling AB#23759
  • Loading branch information
jannisvisser authored Sep 29, 2023
2 parents 38b0da9 + af685cd commit db07288
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
></span>
<app-tooltip
*ngIf="isWarn"
[value]="'chat-component.common.warn-label.tooltip' | translate"
[value]="
'chat-component.common.warn-label.tooltip'
| translate: { supportEmailAddress: supportEmailAddress }
"
color="danger"
></app-tooltip>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { PlaceCodeService } from 'src/app/services/place-code.service';
import { EapAction } from 'src/app/types/eap-action';
import { EventState } from 'src/app/types/event-state';
import { TimelineState } from 'src/app/types/timeline-state';
import { environment } from '../../../environments/environment';
import { AggregatesService } from '../../services/aggregates.service';
import { TimelineService } from '../../services/timeline.service';
import { Actor } from '../../types/chat';
Expand Down Expand Up @@ -78,6 +79,7 @@ export class ChatComponent implements OnInit, OnDestroy {
public lastModelRunDate: string;
private lastModelRunDateFormat = 'cccc, dd LLLL HH:mm';
public isWarn = false;
public supportEmailAddress = environment.supportEmailAddress;

public actor = Actor;

Expand Down Expand Up @@ -533,7 +535,7 @@ export class ChatComponent implements OnInit, OnDestroy {
if (diff[durationUnit] > durationUnitValue + percentageOvertimeAllowed) {
this.isWarn = true;
} else {
this.isWarn = false;
this.isWarn = true;
}
};

Expand Down
2 changes: 1 addition & 1 deletion interfaces/IBF-dashboard/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"common": {
"warn-label": {
"message": "Hello {{ name }}. The information in this portal is based on the model last run on <strong>{{lastModelRunDate}}</strong>.",
"tooltip": "The forecast presented on the portal might not be up to date as the model did not run successfully. Contact IBF support for further information."
"tooltip": "The forecast presented on the portal might not be up to date as the model did not run successfully. Contact {{supportEmailAddress}} for further information."
},
"revert-selection": "All",
"save-actions": {
Expand Down
10 changes: 5 additions & 5 deletions interfaces/IBF-dashboard/src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ app-tooltip {
}

.tooltip--container {
.popover-content {
.popover-viewport {
padding: 8px;
overflow: visible;
}
overflow: hidden;

ion-label {
padding-inline-start: 0;
ion-label {
padding-inline-start: 0;
}
}
}

0 comments on commit db07288

Please sign in to comment.