Merge pull request #81 from OpenLMIS/OLMIS-8178-compact-quantity-strings

michaldev0 · web-flow · commit eb8a325dcbcc · 2026-06-22T12:22:30.000+02:00
OLMIS-8178: Compact quantity display strings
diff --git a/src/openlmis-quantity-unit-toggle/messages_en.json b/src/openlmis-quantity-unit-toggle/messages_en.json
@@ -1,5 +1,5 @@
 {
     "openlmisQuantityUnitToggle.packs": "Packs",
     "openlmisQuantityUnitToggle.doses": "Doses",
-    "openlmisInputDosesPacks.DosesBracket":" doses )"
+    "openlmisInputDosesPacks.DosesBracket":" )"
 }
diff --git a/src/openlmis-quantity-unit-toggle/quantity-unit.service.js b/src/openlmis-quantity-unit-toggle/quantity-unit.service.js
@@ -61,7 +61,9 @@
             var packs = (stockOnHand > 0) ? Math.floor(stockOnHand / netContent) : Math.ceil(stockOnHand / netContent);
             var remainderDoses = stockOnHand % netContent;
 
-            return packs + ' ( +' + remainderDoses + messageService.get('openlmisInputDosesPacks.DosesBracket');
+            var doseSign = remainderDoses < 0 ? '' : '+';
+            var bracket = messageService.get('openlmisInputDosesPacks.DosesBracket');
+            return packs + ' ( ' + doseSign + remainderDoses + bracket;
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"openlmisQuantityUnitToggle.packs": "Packs",`
`3`	`3`	`"openlmisQuantityUnitToggle.doses": "Doses",`
`4`		`- "openlmisInputDosesPacks.DosesBracket":" doses )"`
	`4`	`+ "openlmisInputDosesPacks.DosesBracket":" )"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@`
`61`	`61`	`var packs = (stockOnHand > 0) ? Math.floor(stockOnHand / netContent) : Math.ceil(stockOnHand / netContent);`
`62`	`62`	`var remainderDoses = stockOnHand % netContent;`
`63`	`63`
`64`		`- return packs + ' ( +' + remainderDoses + messageService.get('openlmisInputDosesPacks.DosesBracket');`
	`64`	`+ var doseSign = remainderDoses < 0 ? '' : '+';`
	`65`	`+ var bracket = messageService.get('openlmisInputDosesPacks.DosesBracket');`
	`66`	`+ return packs + ' ( ' + doseSign + remainderDoses + bracket;`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`/**`