OP-1186 View Inventory

bundle/language_en.properties

@@ -706,7 +706,7 @@ angal.inventoryrow.pleaseselectoneinventoryrow.msg
 angal.inventoryrow.thislotcodealreadyexists.msg                                                        = This lot code already exists. Please change it.
 angal.inventory.inventoryisalreadysaved.msg                                                            = This inventory is already saved. Please enter at least one inventory row before continue.
 angal.inventory.pleaseselectonlyoneinventory.msg                                                       = Please select only one inventory.
-angal.inventory.pleaseinsertinventory.msg                                                              = Please add and inventory in this inventory row. 
+angal.inventory.pleaseinsertinventory.msg                                                              = Please add and inventory in this inventory row.
 angal.inventory.pleaseselectinventory.msg                                                              = Please select inventory.
 angal.inventoryoperation.save.error.msg                                                                = Inventory not saved.
 angal.inventory.nextarrow.btn                                                                          = >
@@ -893,7 +893,7 @@ angal.medicalstock.lotpreparationdate
 angal.medicalstock.medtype.col                                                                         = Med Type
 angal.medicalstock.movement                                                                            = Movement
 angal.medicalstock.movementdatefromcannotbelaterthanmovementdateto                                     = Movement Date From cannot be later than movement Date To
-angal.medicalstock.movementquantityisgreaterthanthequantityof.msg                                      = Movement quantity is greater than the quantity of the lot selected; split the movement.
+angal.medicalstock.movementquantityisgreaterthanthequantityof.fmt.msg                                  = Movement quantity ({0}) is greater than the quantity of the lot selected ({1}); split the movement or adjust Units/Packets.
 angal.medicalstock.multiplecharging.adateinthefutureisnotallowed.msg                                   = A date in the future is not allowed.
 angal.medicalstock.multiplecharging.chargetype                                                         = Charge Type
 angal.medicalstock.multiplecharging.chooseamedical                                                     = Choose a Medical
@@ -935,7 +935,9 @@ angal.medicalstock.multipledischarging.isabouttoend
 angal.medicalstock.multipledischarging.lotinformations                                                 = Lot Information
 angal.medicalstock.multipledischarging.lotnumberabb                                                    = Lot No.
 angal.medicalstock.multipledischarging.lyinginstock                                                    = Lying in stock:
+angal.medicalstock.multipledischarging.movementexceedstheavailablequantityformedical.fmt.msg           = Movement exceeds the available quantity ({0}) for medical {1}.
 angal.medicalstock.multipledischarging.noelementtosave                                                 = No elements to save
+angal.medicalstock.multipledischarging.nolotswithavailablequantityfoundformedicalpleasereport.fmt.msg  = No lots with available quantity found for medical {0}; please report to system administrator.
 angal.medicalstock.multipledischarging.outofstock                                                      = Out of stock!
 angal.medicalstock.multipledischarging.packets                                                         = Packets
 angal.medicalstock.multipledischarging.pleaseinsertavalidvalue                                         = Insert a valid value

pom.xml

@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -192,7 +192,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.6.1</version>
+				<version>3.7.1</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -336,13 +336,13 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.10.2</version>
+			<version>5.10.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.25.3</version>
+			<version>3.26.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java

@@ -354,7 +354,6 @@ private JButton getNewButton() {
 		});
 		return jButtonNew;
 	}
-
 	private JButton getUpdateButton() {
 		jButtonEdit = new JButton(MessageBundle.getMessage("angal.common.edit.btn"));
 		jButtonEdit.setMnemonic(MessageBundle.getMnemonic("angal.common.edit.btn.key"));

src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

@@ -147,8 +147,7 @@ private void fireInventoryUpdated() {
 		for (int i = 0; i < listeners.length; i++) {
 			((InventoryListener) listeners[i]).InventoryUpdated(event);
 		}
-		jTableInventoryRow.updateUI();
-
+		jTableInventoryRow.updateUI();	
 	}
 
 	private GoodDateChooser jCalendarInventory;
@@ -215,11 +214,15 @@ private void fireInventoryUpdated() {
 	private MedicalDsrStockMovementTypeBrowserManager movTypeManager = Context.getApplicationContext().getBean(MedicalDsrStockMovementTypeBrowserManager.class);
 	private SupplierBrowserManager supplierManager = Context.getApplicationContext().getBean(SupplierBrowserManager.class);
 	private WardBrowserManager wardManager = Context.getApplicationContext().getBean(WardBrowserManager.class);
-
 
 	public InventoryEdit() {
 		mode = "new";
 		initComponents();
+		if (mode.equals("view")) {
+			saveButton.setVisible(false);
+			deleteButton.setVisible(false);
+			columnEditable = columnEditableView;
+		}
 	}
 
 	private boolean isAutomaticLotIn() {
@@ -992,6 +995,7 @@ public InventoryRowModel() throws OHServiceException {
 					}
 				}
 			}
+
 		}
 
 		public Class< ? > getColumnClass(int c) {

src/main/java/org/isf/medicals/gui/MedicalBrowser.java

@@ -559,7 +559,7 @@ private JButton getJButtonNew() {
 		buttonNew.setMnemonic(MessageBundle.getMnemonic("angal.common.new.btn.key"));
 		buttonNew.addActionListener(actionEvent -> {
 			// medical will reference the new record
-			medical = new Medical(null, new MedicalType("", ""), "", "", 0, 0, 0, 0, 0);
+			medical = new Medical(null, new MedicalType("", ""), "", "", 0, 0, 0, 0);
 			MedicalEdit newrecord = new MedicalEdit(medical, true, me);
 			newrecord.addMedicalListener(this);
 			newrecord.setVisible(true);

src/main/java/org/isf/medicalstock/gui/MovStockMultipleDischarging.java

@@ -114,7 +114,7 @@ public class MovStockMultipleDischarging extends JDialog {
 			MessageBundle.getMessage("angal.medicalstock.multipledischarging.expiringdate").toUpperCase()
 	};
 	private final Class[] columnClasses = { String.class, String.class, Integer.class, Integer.class, String.class, Integer.class, String.class, String.class };
-	private boolean[] columnEditable = { false, false, false, false, true, false, false, false };
+	private boolean[] columnEditable = { false, false, false, true, true, false, false, false };
 	private int[] columnWidth = { 50, 100, 70, 50, 70, 50, 100, 80 };
 	private boolean[] columnResizable = { false, true, false, false, false, false, false, false };
 	private boolean[] columnVisible = { true, true, true, true, true, true, !GeneralData.AUTOMATICLOT_OUT, !GeneralData.AUTOMATICLOT_OUT };
@@ -315,12 +315,7 @@ private JTextField getJTextFieldSearch() {
 					String refNo = jTextFieldReference.getText();
 
 					Movement movement = new Movement(med, (MovementType) jComboBoxDischargeType.getSelectedItem(), null, lot, date, qty, null, refNo);
-					if (med.getPcsperpck() > 1) {
-						model.addItem(movement, PACKETS);
-					} else {
-						model.addItem(movement, UNITS);
-					}
-
+					model.addItem(movement, UNITS);
 					jTextFieldSearch.setText(""); //$NON-NLS-1$
 					jTextFieldSearch.requestFocus();
 				}
@@ -596,7 +591,7 @@ protected Lot chooseLot(List<Lot> lots, double qty) {
 	private boolean checkQuantityInLot(Lot lot, double qty) {
 		double lotQty = lot.getMainStoreQuantity();
 		if (qty > lotQty) {
-			MessageDialog.error(this, "angal.medicalstock.movementquantityisgreaterthanthequantityof.msg");
+			MessageDialog.error(this, "angal.medicalstock.movementquantityisgreaterthanthequantityof.fmt.msg", qty, lotQty);
 			return false;
 		}
 		return true;
@@ -862,6 +857,15 @@ public Object getValueAt(int r, int c) {
 		@Override
 		public void setValueAt(Object value, int r, int c) {
 			Movement movement = movements.get(r);
+			if (c == 3) {
+				int oldQuantity = movement.getQuantity();
+				movement.setQuantity((int) value);
+
+				int total = calcTotal(movement, units.get(r));
+				if (!checkQuantityInMovement(movement, total)) {
+					movement.setQuantity(oldQuantity);
+				}
+			}
 			if (c == 4) {
 				int newOption = 0;
 				if (qtyOption[1].equals(value)) {