From d4c7810b1c5adb523452c03dc28db60b85a54617 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Mon, 4 Mar 2024 15:28:25 +0100
Subject: [PATCH 1/2] fix(structureModificationSummary): equipment count
---
src/app/utils/utils.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/utils/utils.ts b/src/app/utils/utils.ts
index f3f11fdf1..ff2376afe 100644
--- a/src/app/utils/utils.ts
+++ b/src/app/utils/utils.ts
@@ -95,11 +95,11 @@ export class Utils {
case Equipment.wifi:
return 'Wifi en accès libre';
case Equipment.printer:
- return number > 1 ? `Imprimantes : ${number}` : `Imprimante : 1`;
+ return `Imprimantes : ${number}`;
case Equipment.computer:
- return number > 1 ? `Ordinateurs : ${number}` : `Ordinateur : 1`;
+ return `Ordinateurs : ${number}`;
case Equipment.scanner:
- return number > 1 ? `Scanners : ${number}` : `Scanner : 1`;
+ return `Scanners : ${number}`;
default:
return null;
}
--
GitLab
From e8c124c28d233f8a88118d81482c13ddd2837b29 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Wed, 6 Mar 2024 09:51:18 +0100
Subject: [PATCH 2/2] fix(structureModificationSummary): equipment count
---
src/app/utils/utils.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/utils/utils.ts b/src/app/utils/utils.ts
index ff2376afe..5326f3540 100644
--- a/src/app/utils/utils.ts
+++ b/src/app/utils/utils.ts
@@ -95,11 +95,11 @@ export class Utils {
case Equipment.wifi:
return 'Wifi en accès libre';
case Equipment.printer:
- return `Imprimantes : ${number}`;
+ return `Imprimante${number > 1 ? 's' : ''} : ${number}`;
case Equipment.computer:
- return `Ordinateurs : ${number}`;
+ return `Ordinateur${number > 1 ? 's' : ''} : ${number}`;
case Equipment.scanner:
- return `Scanners : ${number}`;
+ return `Scanner${number > 1 ? 's' : ''} : ${number}`;
default:
return null;
}
--
GitLab