Skip to content

Commit b390863

Browse files
authored
Merge pull request #80 from OpenLMIS/OLMIS-8179-compact-inputs
OLMIS-8179: Compact dose and pack inputs
2 parents 749e767 + c97f7dc commit b390863

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
7.2.17-SNAPSHOT (WIP)
22
==================
3+
* [OLMIS-8179](https://openlmis.atlassian.net/browse/OLMIS-8179): Compact packs/doses quantity inputs.
34
* [OLMIS-8191](https://openlmis.atlassian.net/browse/OLMIS-8191) / [OLMIS-8192](https://openlmis.atlassian.net/browse/OLMIS-8192): Add openlmis-long-text class and directive so long free-text in table cells grows with content then wraps — for both the editable textarea and its read-only display.
45

56
7.2.16 / 2026-06-09
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"openlmisInputDosesPacks.Doses": "Doses",
33
"openlmisInputDosesPacks.Packs": "Packs",
4-
"openlmisInputDosesPacks.DosesBracket":" doses )"
4+
"openlmisInputDosesPacks.DosesHint": "doses"
55
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<div ng-if="vm.showInDoses" >
2-
<input id="quantity"
2+
<input id="quantity"
33
class="form-control"
44
ng-class="vm.inputClass"
55
ng-model="vm.item.quantity"
66
ng-change="vm.changeValue(vm.item)"
77
ng-disabled="vm.disabled"
8+
placeholder="{{'openlmisInputDosesPacks.DosesHint' | message }}"
89
positive-integer />
910
</div>
1011
<div class="openlmis-input" ng-if="!vm.showInDoses">
11-
<input id="quantityInPacks"
12+
<input id="quantityInPacks"
1213
class="form-control"
1314
ng-class="vm.inputClass"
1415
ng-model="vm.item.quantityInPacks"
@@ -17,13 +18,13 @@
1718
placeholder="{{'openlmisInputDosesPacks.Packs' | message }}"
1819
positive-integer />
1920
<p> ( + </p>
20-
<input id="quantityRemainderInDoses"
21+
<input id="quantityRemainderInDoses"
2122
class="form-control"
2223
ng-class="vm.inputClass"
2324
ng-model="vm.item.quantityRemainderInDoses"
2425
ng-change="vm.changeValue(vm.item)"
2526
ng-disabled="vm.disabled || vm.isQuantityRemainderInDosesDisabled()"
2627
placeholder="{{'openlmisInputDosesPacks.Doses' | message }}"
2728
positive-integer />
28-
<p>{{'openlmisInputDosesPacks.DosesBracket' | message }}</p>
29+
<p>)</p>
2930
</div>

src/openlmis-quantity-unit-input/openlmis-quantity-unit-input.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export default function QuantityUnitInput({
112112
value={localValues.orderedQuantity}
113113
onChange={(value) => handleLocalChange('orderedQuantity', value)}
114114
onBlur={handleBlur}
115+
placeholder={formatMessage('openlmisInputDosesPacks.DosesHint')}
115116
key={`orderedQuantity-${item?.orderable?.id}`}
116117
/>
117118
</div>
@@ -140,11 +141,10 @@ export default function QuantityUnitInput({
140141
disabled={
141142
inputCellProps.disabled || isQuantityRemainderInDosesDisabled()
142143
}
143-
placeholder={formatMessage('openlmisInputDosesPacks.Doses')}
144144
id='quantityRemainderInDoses'
145145
key={`quantityRemainderInDoses-${item?.orderable?.id}`}
146146
/>
147-
<p>{formatMessage('openlmisInputDosesPacks.DosesBracket')}</p>
147+
<p>)</p>
148148
</div>
149149
);
150150
}

0 commit comments

Comments
 (0)