Merge pull request #46 from OpenLMIS/OLMIS-6908

OLMIS-6908: fix input onchange functionality
OpenLMIS · Oct 15, 2024 · 82da7b3 · 82da7b3
2 parents 20f22e9 + 7087553
commit 82da7b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ New functionality:
 Bug fixes:
 * [OLMIS-7749](https://openlmis.atlassian.net/browse/OLMIS-7749): Added note in popover on Supply Line page if there are not memeber facilities
 * [OLMIS-7900](https://openlmis.atlassian.net/browse/OLMIS-7900): Updated breadcrumbs and added missing nav tag to New Requisition Group page
+* [OLMIS-6908](https://openlmis.atlassian.net/browse/OLMIS-6908): Adding non-full supply product to the R&R
 
 5.6.12 / 2024-04-19
 ==================

diff --git a/src/select-products-modal/_select-products-modal.scss b/src/select-products-modal/_select-products-modal.scss
@@ -0,0 +1,10 @@
+.products-modal-input {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.products-modal-input > div.input-control {
+  width: 100%;
+}
diff --git a/src/select-products-modal/select-products-modal.html b/src/select-products-modal/select-products-modal.html
@@ -45,9 +45,10 @@ <h4>{{'selectProductsModal.addProducts' | message}}</h4>
                         <label for="search">
                             {{'selectProductsModal.searchProduct' | message}}
                         </label>
-                        <input type="text" id="search" name="search" ng-model="vm.searchText"
-                               ng-change="vm.search()"/>
-                        <p class="note">{{'selectProductsModal.searchByCodeInfo' | message}}</p>
+                        <div class='products-modal-input'>
+                            <input type="text" id="search" name="search" ng-model="vm.searchText" style="margin-right: 20px"/>
+                            <button class="primary" type="submit" ng-click="vm.search()">{{'requisitionInitiate.search' | message}}</button>
+                        </div>
                     </fieldset>
                     <br/>
                     <div class="openlmis-table-container">
@@ -75,9 +76,9 @@ <h4>{{'selectProductsModal.addProducts' | message}}</h4>
                 </form>
             </div>
             <div class="modal-footer">
-                    <button id="cancel" ng-click="vm.close()">{{'selectProductsModal.cancel' | message}}</button>
-                    <button ng-if="vm.isUnpackKitState" class="primary" ng-click="vm.selectProducts()">{{'selectProductsModal.addProducts' | message}}</button>
-                    <button ng-if="!vm.isUnpackKitState" class="primary" type="submit" form="productForm">{{'selectProductsModal.addProducts' | message}}</button>
+                <button id="cancel" ng-click="vm.close()">{{'selectProductsModal.cancel' | message}}</button>
+                <button ng-if="vm.isUnpackKitState" class="primary" ng-click="vm.selectProducts()">{{'selectProductsModal.addProducts' | message}}</button>
+                <button ng-if="!vm.isUnpackKitState" class="primary" type="submit" form="productForm">{{'selectProductsModal.addProducts' | message}}</button>
             </div>
         </div>
     </div>