Merge branch 'informatici:develop' into OP-749-oh-gui-to-extend-labor…

…atory-filter-panel-with-search-by-patient-id

.github/workflows/maven.yml

@@ -29,20 +29,27 @@ jobs:
         run: |
           # Set default FORK_REPO and BRANCH_NAME values.
           BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
-          FORK_REPO="${GITHUB_HEAD_REPOSITORY:-${GITHUB_ACTOR}/openhospital-core}"
-          CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/$BRANCH_NAME"
-          echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
           
-          # Determine FORK_REPO with fallback logic
-          if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
-            echo "Using ${GITHUB_HEAD_REPOSITORY}."
-            FORK_REPO=${GITHUB_HEAD_REPOSITORY}
-          elif curl -s -o /dev/null -w "%{http_code}" $CHECK_BRANCH_URL | grep -q "200"; then
-            echo "Using ${GITHUB_ACTOR}/openhospital-core"
-            FORK_REPO=${GITHUB_ACTOR}/openhospital-core
-          else
-            echo "Using informatici/openhospital-core."
+          if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-gui" ]]; then
+            # For pushes to the main repository, default to the main core repo
             FORK_REPO="informatici/openhospital-core"
+          else
+            # For pull requests or other pushes, use the contributor fork if applicable
+            if [[ -n "$GITHUB_HEAD_REPOSITORY" ]]; then
+              FORK_REPO="$GITHUB_HEAD_REPOSITORY"
+            else
+              # Check if the actor's repo exists with the branch
+              FORK_REPO="${GITHUB_ACTOR}/openhospital-core"
+              CHECK_BRANCH_URL="https://github.com/$FORK_REPO/tree/$BRANCH_NAME"
+              echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
+
+              if curl -s -o /dev/null -w "%{http_code}" "$CHECK_BRANCH_URL" | grep -q "200"; then
+                echo "Branch $BRANCH_NAME exists in $FORK_REPO."
+              else
+                # Fallback to the main repository if the branch doesn’t exist in the fork
+                FORK_REPO="informatici/openhospital-core"
+              fi
+            fi
           fi
           
           # Export FORK_REPO and BRANCH_NAME to GITHUB_ENV for the next step

pom.xml

@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.5.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

rpt_extra/hmis108_adm_by_diagnosisOut.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.15.0.final using JasperReports Library version 6.15.0-dd49bfb94918336b8321d5507193f0169ead4e95  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hmis108_adm_by_diagnosisOut" pageWidth="595" pageHeight="842" whenNoDataType="NoPages" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" resourceBundle="hmis108_adm_by_diagnosisOut" whenResourceMissingType="Key" uuid="9d78b390-7df4-49d5-af10-dc4189e248c6">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -156,7 +156,7 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="68" splitType="Stretch">
+		<band height="77" splitType="Stretch">
 			<textField>
 				<reportElement key="staticText-2" mode="Opaque" x="0" y="1" width="392" height="28" forecolor="#FFFFFF" backcolor="#000000" uuid="0f09694d-3bfc-43ed-82b6-1bfc09e82ddc"/>
 				<box>
@@ -196,19 +196,6 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 				</textElement>
 				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="false">
-				<reportElement key="textField-2" x="461" y="1" width="74" height="14" uuid="7596b513-611d-4d87-a854-6d64e46c50c8"/>
-				<box leftPadding="2">
-					<topPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement verticalAlignment="Middle">
-					<font fontName="DejaVu Sans" size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement key="staticText-19" mode="Opaque" x="393" y="1" width="69" height="14" forecolor="#FFFFFF" backcolor="#000000" uuid="21a7ba7a-9476-4ac7-a3e4-3dc0db2efe25"/>
 				<box rightPadding="2">
@@ -242,6 +229,19 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 				</textElement>
 				<textFieldExpression><![CDATA[$R{OnlyClosedAdmissionWillBeCounted}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-2" x="462" y="1" width="73" height="14" uuid="4c62c72e-7740-4c1b-8fd9-f838a56f5fa1"/>
+				<box leftPadding="2">
+					<topPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="DejaVu Sans" size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{month}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>

rpt_extra/hmis108_cover.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.15.0.final using JasperReports Library version 6.15.0-dd49bfb94918336b8321d5507193f0169ead4e95  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hmis108_cover" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" resourceBundle="hmis108_cover" whenResourceMissingType="Key" uuid="3da1a980-22df-45a2-9ff8-016d6c27b23a">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -146,7 +146,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{Hmis108InpatientMonthlyReport}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement key="textField" x="474" y="4" width="61" height="15" uuid="66f18c63-aed0-4806-ad97-5fde7cb81364"/>
+				<reportElement key="textField" x="465" y="4" width="68" height="15" uuid="66f18c63-aed0-4806-ad97-5fde7cb81364"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -159,7 +159,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$P{fromdate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement key="textField" x="474" y="19" width="61" height="15" uuid="f7c7b01b-7eab-4f18-a8f4-8dd22f8d946e"/>
+				<reportElement key="textField" x="464" y="19" width="69" height="15" uuid="f7c7b01b-7eab-4f18-a8f4-8dd22f8d946e"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -237,7 +237,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{Deaths}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-32" mode="Transparent" x="434" y="4" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="503d0d9c-893b-4c5d-9421-143e361ce871"/>
+				<reportElement key="staticText-32" mode="Transparent" x="426" y="4" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="503d0d9c-893b-4c5d-9421-143e361ce871"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -251,7 +251,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{From}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-33" mode="Transparent" x="434" y="19" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="504c10fa-b54c-4354-8ac6-233dd8e6986a"/>
+				<reportElement key="staticText-33" mode="Transparent" x="426" y="19" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="504c10fa-b54c-4354-8ac6-233dd8e6986a"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>

src/main/java/org/isf/accounting/gui/PatientBillEdit.java

@@ -845,11 +845,13 @@ private JButton getJButtonTrashPatient() {
 			jButtonTrashPatient.setPreferredSize(new Dimension(25, 25));
 			jButtonTrashPatient.setIcon(new ImageIcon("rsc/icons/remove_patient_button.png"));
 			jButtonTrashPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.removethepatientassociatedwiththisbill.tooltip"));
+			if (thisBill.getBillPatient() == null) {
+				jButtonTrashPatient.setEnabled(false);
+			}
 			jButtonTrashPatient.addActionListener(actionEvent -> {
 				// BILL
 				thisBill.setBillPatient(null);
 				thisBill.setIsPatient(false);
-				thisBill.getBillPatient().setCode(0);
 				thisBill.setPatName(""); //$NON-NLS-1$
 				thisBill.setAdmission(null);
 				// INTERFACE
@@ -895,6 +897,9 @@ private void setJButtonPickPatient() {
 			jButtonPickPatient.setText(MessageBundle.getMessage("angal.newbill.changepatient.btn"));
 			jButtonPickPatient.setMnemonic(MessageBundle.getMnemonic("angal.newbill.changepatient.btn.key"));
 			jButtonPickPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.changethepatientassociatedwiththisbill.tooltip"));
+			if (jButtonTrashPatient != null) {
+				jButtonTrashPatient.setEnabled(true);	
+			}
 		}
 	}
 

src/main/java/org/isf/examination/gui/PatientExaminationEdit.java

@@ -1468,15 +1468,15 @@ public void actionPerformed(ActionEvent actionEvent) {
 
 			if (weight != 0 && height != 0) {
 				if (weight == ExaminationParameters.WEIGHT_MIN || weight == ExaminationParameters.WEIGHT_MAX || height == ExaminationParameters.HEIGHT_MIN || height == ExaminationParameters.HEIGHT_MAX) {
-					int response = MessageDialog.yesNo(null, MessageBundle.getMessage("angal.patient.examination.minmaxvalues.msg"));
+					int response = MessageDialog.yesNo(null, "angal.patient.examination.minmaxvalues.msg");
 					if (response == JOptionPane.YES_OPTION) {
 						savePatientExamaination();
 					}
 				} else {
 					savePatientExamaination();
 				}
 			} else {
-				MessageDialog.error(null, MessageBundle.getMessage("angal.patient.examination.nonzero.msg"));
+				MessageDialog.error(null, "angal.patient.examination.nonzero.msg");
 			}
 		}
 	}

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

@@ -595,7 +595,7 @@ private JComboBox getComboBoxMedicalType() {
 			pbox.addItem(STR_ALL);
 			List<MedicalType> type;
 			try {
-				type = medicalTypeManager.getMedicalType();
+				type = medicalTypeManager.getAllActiveMedicalType();
 				for (MedicalType elem : type) {
 					pbox.addItem(elem);
 				}

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

@@ -432,7 +432,7 @@ private JComboBox<MedicalType> getTypeComboBox() {
 		if (typeComboBox == null) {
 			typeComboBox = new JComboBox<>();
 			try {
-				List<MedicalType> types = medicalTypeManager.getMedicalType();
+				List<MedicalType> types = medicalTypeManager.getAllActiveMedicalType();
 				for (MedicalType elem : types) {
 					typeComboBox.addItem(elem);
 				}

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

@@ -618,7 +618,7 @@ private JComboBox getMedicalTypeBox() {
 		medicalTypeBox.addItem(TEXT_ALL);
 
 		try {
-			medical = medicalTypeBrowserManager.getMedicalType();
+			medical = medicalTypeBrowserManager.getAllActiveMedicalType();
 
 			for (MedicalType aMedicalType : medical) {
 				medicalTypeBox.addItem(aMedicalType);

src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java

@@ -783,8 +783,7 @@ public void focusLost(FocusEvent e) {
 						weightFrom = Integer.parseInt(jWeightFromTextField.getText());
 						if (weightTo < 0 || weightTo > 200) {
 							jWeightToTextField.setText(""); //$NON-NLS-1$
-							JOptionPane
-											.showMessageDialog(WardPharmacy.this, MessageBundle.getMessage("angal.medicalstockward.insertavalidweight")); //$NON-NLS-1$
+							MessageDialog.error(WardPharmacy.this, "angal.medicalstockward.insertavalidweight");
 						}
 					} catch (NumberFormatException ex) {
 						jWeightToTextField.setText("0"); //$NON-NLS-1$
@@ -813,7 +812,7 @@ public void focusLost(FocusEvent e) {
 						weightTo = Integer.parseInt(jWeightToTextField.getText());
 						if (weightFrom < 0) {
 							jWeightFromTextField.setText("");
-							JOptionPane.showMessageDialog(WardPharmacy.this, MessageBundle.getMessage("angal.medicalstockward.insertavalidweight"));
+							MessageDialog.error(WardPharmacy.this, "angal.medicalstockward.insertavalidweight");
 						}
 					} catch (NumberFormatException ex) {
 						jWeightFromTextField.setText("0");
@@ -1461,8 +1460,8 @@ class DrugsModel extends DefaultTableModel {
 
 		public DrugsModel() {
 			try {
-				tableModel = movWardBrowserManager.getMedicalsWardTotalQuantity(wardSelected.getCode().charAt(0));
-				wardDrugs = movWardBrowserManager.getMedicalsWard(wardSelected.getCode().charAt(0), true);
+				tableModel = movWardBrowserManager.getMedicalsWardTotalQuantity(wardSelected.getCode());
+				wardDrugs = movWardBrowserManager.getMedicalsWard(wardSelected.getCode(), true);
 			} catch (OHServiceException e) {
 				OHServiceExceptionUtil.showMessages(e);
 				tableModel = new ArrayList<>();

src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java

@@ -162,7 +162,7 @@ public WardPharmacyRectify(JFrame owner, Ward ward) {
 		super(owner, true);
 		selectedWard = ward;
 		try {
-			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode().charAt(0), false);
+			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode(), false);
 		} catch (OHServiceException e) {
 			OHServiceExceptionUtil.showMessages(e);
 		}
@@ -184,7 +184,7 @@ public WardPharmacyRectify(JFrame owner, Ward ward, Medical medical) {
 		super(owner, true);
 		selectedWard = ward;
 		try {
-			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode().charAt(0), false);
+			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode(), false);
 		} catch (OHServiceException e) {
 			OHServiceExceptionUtil.showMessages(e);
 		}
@@ -376,7 +376,7 @@ private void initComponents() {
 			double movQuantity = lotQty - newQty;
 
 			if (movQuantity == 0. || newQty < 0) {
-				JOptionPane.showMessageDialog(this, MessageBundle.getMessage("angal.medicalstockward.rectify.pleaseinsertavalidvalue"));
+				MessageDialog.error(this, "angal.medicalstockward.rectify.pleaseinsertavalidvalue");
 				return;
 			}
 			if (newQty == 0.) {

src/main/java/org/isf/medtype/gui/MedicalTypeBrowser.java

@@ -54,9 +54,10 @@ public class MedicalTypeBrowser extends ModalJFrame implements MedicalTypeListen
 	private List<MedicalType> pMedicalType;
 	private String[] pColumns = {
 			MessageBundle.getMessage("angal.common.code.txt").toUpperCase(),
-			MessageBundle.getMessage("angal.common.description.txt").toUpperCase()
+			MessageBundle.getMessage("angal.common.description.txt").toUpperCase(),
+			MessageBundle.getMessage("angal.common.deleted.label").toUpperCase()
 	};
-	private int[] pColumnWidth = {80, 200};
+	private final int[] pColumnWidth = { 20, 200, 20 };
 	private JPanel jContainPanel;
 	private JPanel jButtonPanel;
 	private JButton jNewButton;
@@ -198,6 +199,7 @@ private JTable getJTable() {
 			jTable = new JTable(model);
 			jTable.getColumnModel().getColumn(0).setMinWidth(pColumnWidth[0]);
 			jTable.getColumnModel().getColumn(1).setMinWidth(pColumnWidth[1]);
+			jTable.getColumnModel().getColumn(2).setMinWidth(pColumnWidth[2]);
 		}
 		return jTable;
 	}
@@ -243,6 +245,8 @@ public Object getValueAt(int r, int c) {
 				return medType.getCode();
 			} else if (c == 1) {
 				return medType.getDescription();
+			} else if (c == 2) {
+				return medType.getDeleted() == 'Y';
 			}
 			return null;
 		}
@@ -251,6 +255,11 @@ public Object getValueAt(int r, int c) {
 		public boolean isCellEditable(int arg0, int arg1) {
 			return false;
 		}
+
+		@Override
+		public Class getColumnClass(int column) {
+			return (column == 2) ? Boolean.class : String.class;
+		}
 	}
 
 	@Override

src/main/java/org/isf/medtype/gui/MedicalTypeBrowserEdit.java

@@ -26,6 +26,7 @@
 import java.util.EventListener;
 
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -95,8 +96,10 @@ private void fireMedicalUpdated() {
 	private JButton cancelButton;
 	private JButton okButton;
 	private JTextField descriptionTextField;
+	private JCheckBox deletedCheckbox;
 	private VoLimitedTextField codeTextField;
 	private String lastdescription;
+	private char isLastDeleted;
 	private MedicalType medicalType;
 	private boolean insert;
 	private JPanel jDataPanel;
@@ -110,6 +113,7 @@ public MedicalTypeBrowserEdit(JFrame owner, MedicalType old, boolean inserting)
 		insert = inserting;
 		medicalType = old; //medical type will be used for every operation
 		lastdescription = medicalType.getDescription();
+		isLastDeleted = medicalType.getDeleted();
 		initialize();
 	}
 
@@ -124,6 +128,7 @@ private void initialize() {
 			this.setTitle(MessageBundle.getMessage("angal.medtype.editmedicaltype.title"));
 		}
 		this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+		this.getDeletedField();
 		this.pack();
 		this.setLocationRelativeTo(null);
 	}
@@ -197,7 +202,8 @@ private JButton getOkButton() {
 
 				medicalType.setDescription(descriptionTextField.getText());
 				medicalType.setCode(codeTextField.getText());
-
+				medicalType.setDeleted(deletedCheckbox.isSelected() ? 'Y' : 'N');
+
 				if (insert) { // inserting
 					try {
 						MedicalType insertedMedicalType = medicalTypeBrowserManager.newMedicalType(medicalType);
@@ -211,7 +217,7 @@ private JButton getOkButton() {
 						OHServiceExceptionUtil.showMessages(e1);
 					}
 				} else { // updating
-					if (descriptionTextField.getText().equals(lastdescription)) {
+					if (descriptionTextField.getText().equals(lastdescription) && medicalType.getDeleted() == isLastDeleted) {
 						dispose();
 					} else {
 						try {
@@ -263,6 +269,14 @@ private JTextField getCodeTextField() {
 		}
 		return codeTextField;
 	}
+
+	private JCheckBox getDeletedField() {
+		if (deletedCheckbox == null) {
+			deletedCheckbox = new JCheckBox(MessageBundle.getMessage("angal.common.deleted.label"));
+			deletedCheckbox.setSelected(medicalType.getDeleted() == 'Y');
+		}
+		return deletedCheckbox;
+	}
 
 	/**
 	 * This method initializes jDataPanel	
@@ -276,7 +290,9 @@ private JPanel getJDataPanel() {
 			jDataPanel.add(getCodeTextField());
 			jDataPanel.add(new JLabel(MessageBundle.getMessage("angal.common.description.txt") + ':'));
 			jDataPanel.add(getDescriptionTextField());
-			SpringUtilities.makeCompactGrid(jDataPanel, 2, 2, 5, 5, 5, 5);
+			jDataPanel.add(new JLabel(MessageBundle.getMessage("angal.common.deleted.label") + ':'));
+			jDataPanel.add(getDeletedField());
+			SpringUtilities.makeCompactGrid(jDataPanel, 3, 2, 5, 5, 5, 5);
 		}
 		return jDataPanel;
 	}