From 8fdfa38be0d969ca9dd83b2a2189e73ce696b235 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 4 Nov 2019 18:47:15 +0100
Subject: [PATCH] FEAT #12097 TIME 0:10 fix timelimit pipe if day limit is
today
---
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
src/frontend/plugins/timeLimit.pipe.ts | 39 ++++----------------------
4 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 851ee3d16fb..fdeab8d264d 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1241,4 +1241,5 @@ export const LANG_EN = {
"dashboard" : "Dashboard",
"noSendmail" : "No mail sent",
"noEvent" : "Aucun event",
+ "hours" : "hours",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 659bece474d..c5863775bef 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1278,4 +1278,5 @@ export const LANG_FR = {
"dashboard" : "Vue d'ensemble",
"noSendmail" : "Aucun envoi",
"noEvent" : "Aucun évênement",
+ "hours" : "heures",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 050d8cf2f3b..4be6e552491 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1266,4 +1266,5 @@ export const LANG_NL = {
"dashboard" : "Dashboard", //_TO_TRANSLATE
"noSendmail" : "No mail sent", //_TO_TRANSLATE
"noEvent" : "Aucun event", //_TO_TRANSLATE
+ "hours" : "hours", //_TO_TRANSLATE
};
diff --git a/src/frontend/plugins/timeLimit.pipe.ts b/src/frontend/plugins/timeLimit.pipe.ts
index fdae009da57..01fa614471e 100755
--- a/src/frontend/plugins/timeLimit.pipe.ts
+++ b/src/frontend/plugins/timeLimit.pipe.ts
@@ -51,8 +51,13 @@ export class TimeLimitPipe implements PipeTransform, OnDestroy {
} else if(now > d) {
return '<span class="timeDanger" color="warn"><b>' + this.lang.outdated + ' !</b></span>';
} else {
+ console.log(days);
if (Number.isNaN(seconds)){
return '';
+ } else if (minutes <= 59){
+ return '<span color="warn"><b>'+ minutes + ' ' + this.lang.minutes +'</b></span>';
+ } else if (hours <= 23){
+ return '<span color="warn"><b>'+ hours + ' ' + this.lang.hours +'</b></span>';
} else if (days <= 3) {
return '<span color="warn"><b>'+ days + ' ' + this.lang.dayS +'</b></span>';
} else if (days <= 7) {
@@ -65,40 +70,6 @@ export class TimeLimitPipe implements PipeTransform, OnDestroy {
return dayNumber + '/' + monthNumber + '/' + d.getFullYear();
}
}
-
-
- /*if (Number.isNaN(seconds)){
- return '';
- } else if (seconds <= 45) {
- return seconds + ' secondes';
- } else if (seconds <= 90) {
- //return 'une minute';
- } else if (minutes <= 45) {
- return minutes + ' minutes';
- } else if (minutes <= 90) {
- //return 'une heure';
- } else if (hours <= 22) {
- return hourNumber+':'+minuteNumber;
- //return hours + ' heures';
- } else if (hours <= 36) {
- return dayNumber+' '+ month[d.getMonth()];
- //return 'un jour';
- } else if (days <= 25) {
- return d.getDate()+' '+ month[d.getMonth()];
- //return days + ' jours';
- } else if (days <= 45) {
- return d.getDate()+' '+ month[d.getMonth()];
- //return 'un mois';
- } else if (days <= 345) {
- return d.getDate()+' '+ month[d.getMonth()];
- //return months + ' mois';
- } else if (days <= 545) {
- return dayNumber + '/' + monthNumber + '/' + d.getFullYear();
- //return 'un an';
- } else { // (days > 545)
- return dayNumber + '/' + monthNumber + '/' + d.getFullYear();
- //return years + ' ans';
- }*/
}
ngOnDestroy(): void {
this.removeTimer();
--
GitLab