Gui fixes

Author: C4J

c4j_commander4j/commander4j.jar

@@ -0,0 +1,108 @@
+DEFINE BARCODE BARCODE1   02<PADLEFT(<*EAN*>,14,0)>10<SUBSTRING(<*BATCH_NUMBER*>,1,4)>^90<*PART_NO*>^17<EXPIRYDATE(yy)><EXPIRYDATE(MM)><EXPIRYDATE(dd)>37<*QUANTITY^0000*>
+
+DEFINE BARCODE BARCODE2   00<*SSCC*>
+DEFINE BARCODE FNC1       >8
+DEFINE BARCODE CODEA      >9
+DEFINE BARCODE CODEB      >6
+DEFINE BARCODE CODEC      >;
+DEFINE BARCODE END        *END*
+
+/* Label initialisation  /*
+
+^XA^LT0040^XZ^XA
+^PW1200
+/* =====================================LABEL 1=========================================================================== */
+
+/* Horizontal Bar and Sight Lines */
+
+^FO567,0107^GB0,400,6^FS
+
+^FO17,0087^GB0,53,6^FS
+^FO1180,0087^GB0,53,6^FS
+^FO37,0107^GB1127,0,6^FS
+
+/* Heading for Label 1 */
+
+^FO40,0002^A0N,80,73^CI27^FH^FD<*CUSTOMER_NAME*>^FS
+^FO53,0133^A0N,33,33^CI27^FDITEM NUMBER^FS
+^FO53,0173^A0N,67,67^CI27^FD<*PART_NO*>^FS
+
+/* Printed by xxxxxxxxxxxxxxxx * /
+
+^FO1000,0065^A0N,20,20^CI27^FDCommander4j <VERSION()>^FS
+
+/* Product Code */
+
+^FO620,0133^A0N,33,33^CI27^FDCODIGO PRODUCTO^FS
+^FO620,0173^A0N,67,67^CI27^FD<*MATERIAL*>^FS
+
+/* EAN 13 PRODUCT BARCODE */
+
+^FO950,0133^A0N,33,33^CI27^FDORDER^FS
+^FO950,0173^A0N,67,67^CI27^FD<*PROCESS_ORDER*>^FS
+
+/* GTIN and Variant */
+
+^FO53,0253^A0N,33,33^CI27^FDCONTENT^FS
+^FO53,0293^A0N,67,67^CI27^FD<PADLEFT(<*EAN*>,14,0)>^FS
+
+/* Quantity */
+
+^FO620,0253^A0N,33,33^CI27^FDCANTIDAD^FS
+^FO620,0293^A0N,67,67^CI27^FD<*QUANTITY^0000*>^FS
+
+/* Batch Number */
+
+^FO53,380^A0N,33,33^CI27^FDNUMERO LOTE^FS
+^FO53,420^A0N,67,67^CI27^FD<SUBSTRING(<*BATCH_NUMBER*>,1,4)>^FS
+
+/* Expiry Date */
+
+^FO620,380^A0N,33,33^CI27^FDFECHA CADUCIDAD^FS
+^FO620,420^A0N,67,67^CI27^FD<EXPIRYDATE(MM yyyy)>^FS
+
+/* Horizontal Bar and Sight Lines */
+
+^FO17,0487^GB0,53,6^FS
+^FO1180,0487^GB0,53,6^FS
+^FO37,0507^GB1127,0,6^FS
+
+/* Product Description */
+
+^FO53,553^A0N,33,33^CI27^FDDESCRIPCION^FS
+^FO053,593^A0N,67,50^CI27^FH^FD<*DESCRIPTION*>^FS
+
+/* Pallet Number SSCC */
+
+^FO53,680^A0N,33,33^CI27^FDSSCC^FS
+^FO053,720^A0N,100,107^CI27^FD<SUBSTRING(<*SSCC*>,1,3)>^FS
+^FO260,720^A0N,100,107^CI27^FD<SUBSTRING(<*SSCC*>,4,5)>^FS
+^FO567,720^A0N,100,107^CI27^FD<SUBSTRING(<*SSCC*>,9,5)>^FS
+^FO867,720^A0N,100,107^CI27^FD<SUBSTRING(<*SSCC*>,14,5)>^FS
+
+/* Horizontal Bar and Sight Lines */
+
+^FO17,833^GB0,53,6^FS
+^FO1180,833^GB0,53,6^FS
+^FO37,853^GB1127,0,6^FS
+
+/* Top Barcode */
+
+^BY3,3.0^FO0107,889^BCN,300,N,N,Y,N^FR^FD<*BARCODE1*>^FS
+^FO137,1197^A0N,37,35^CI27^FR^FD(02)<PADLEFT(<*EAN*>,14,0)>(10)<SUBSTRING(<*BATCH_NUMBER*>,1,4)>(90)<*PART_NO*>(17)<EXPIRYDATE(yy)><EXPIRYDATE(MM)>00(37)<*QUANTITY^0000*>^FS
+
+/* Bottom Barcode */
+
+^BY6,2.0^FO107,1260^BCN,300,N,N,Y,N^FR^FD<*BARCODE2*>^FS
+^FO450,1569^A0N,37,35^CI27^FR^FD(00)<*SSCC*>^FS
+
+/* Horizontal Bar and Sight Lines */
+
+^FO17,1613^GB0,53,6^FS
+^FO1180,1613^GB0,53,6^FS
+^FO37,1633^GB1127,0,6^FS
+
+
+^XZ
+
+/* End of Label */

c4j_commander4j/labels/zebra_200dpi_pallet_label_a5_cdf_val10863.lbl

@@ -49,6 +49,7 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import com.commander4j.calendar.JCalendarButton;
 import com.commander4j.db.JDBControl;
 import com.commander4j.db.JDBCustomer;
 import com.commander4j.db.JDBLanguage;
@@ -82,6 +83,7 @@
  * @see com.commander4j.app.JInternalFrameProcessOrderLabel JInternalFrameProcessOrderLabel
  */
 public class JInternalFrameProcessOrderProperties extends JInternalFrame {
+	private JCalendarButton calendarButtonDueDate;
 	private JTextField4j jTextFieldMaterialDescription;
 	private JLabel4j_std jLabelMaterialDesc;
 	private JLabel4j_std jLabelQuantity;
@@ -403,6 +405,23 @@ public void keyTyped(KeyEvent evt)
 					});
 					jDesktopPane1.add(jTextFieldInspectionID);
 				}
+				JButton4j btnInspectionIDLookup = new JButton4j();
+				btnInspectionIDLookup.addActionListener(new ActionListener()
+				{
+					public void actionPerformed(ActionEvent arg0)
+					{
+						JLaunchLookup.dlgAutoExec = true;
+						JLaunchLookup.dlgCriteriaDefault = "";
+						if (JLaunchLookup.qmInspections())
+						{
+							JLaunchLookup.dlgCriteriaDefault = "";
+							jTextFieldInspectionID.setText(JLaunchLookup.dlgResult);
+						}
+					}
+				});
+				btnInspectionIDLookup.setIcon(Common.icon_lookup_16x16);
+				btnInspectionIDLookup.setBounds(292, 417, 21, 22);
+				jDesktopPane1.add(btnInspectionIDLookup);
 				{
 					jLabelDueDate = new JLabel4j_std();
 					jDesktopPane1.add(jLabelDueDate);
@@ -432,6 +451,11 @@ public void stateChanged(final ChangeEvent e)
 						}
 					});
 				}
+				{
+					calendarButtonDueDate = new JCalendarButton(jSpinnerDueDate);
+					calendarButtonDueDate.setBounds(292, 225, 21, 21);
+					jDesktopPane1.add(calendarButtonDueDate);
+				}
 				{
 					jLabelLocation = new JLabel4j_std();
 					jDesktopPane1.add(jLabelLocation);

c4j_commander4j/src/com/commander4j/app/JInternalFrameProcessOrderProperties.java

@@ -31,7 +31,7 @@ public class JVersion
 {
 
 	public static String getProgramVersion() {
-		return "12.00";
+		return "12.02";
 	}
 
 	public static Double getProgramVersionValue() {

c4j_commander4j/src/com/commander4j/app/JVersion.java

@@ -155,7 +155,7 @@ public class JFrameHostAdmin extends JFrame
 	private JLabel4j_std jLabelDatabase = new JLabel4j_std();
 	private JLabel4j_std jLabelDriver = new JLabel4j_std();
 	private JTextArea4j jTextFieldConnect = new JTextArea4j();
-	private JComboBox4j<String> jComboBoxjdbcDriver;
+	private JComboBox4j<String> jComboBoxjdbcDriver  = new JComboBox4j<String>();
 	private JLabel4j_std jLabelDatabaseType = new JLabel4j_std();
 	private JTextField4j jTextFieldDescription;
 	private JButton4j jButtonSave = new JButton4j(Common.icon_update_16x16);;

c4j_commander4j/src/com/commander4j/cfg/JFrameHostAdmin.java

@@ -178,12 +178,12 @@ private void filterBy(String fieldname) {
 
 			if (fieldname.equals("Event Action") == true)
 			{
-				jComboBoxEventAction.setSelectedItem(jTable1.getValueAt(row, 4).toString());
+				jComboBoxEventAction.setSelectedItem(jTable1.getValueAt(row, 5).toString());
 			}
 
 			if (fieldname.equals("Target") == true)
 			{
-				jTextFieldTarget.setText(jTable1.getValueAt(row, 5).toString());
+				jTextFieldTarget.setText(jTable1.getValueAt(row, 4).toString());
 			}
 
 			if (fieldname.equals("Data") == true)
@@ -205,7 +205,9 @@ private void clearFilter() {
 		jTextFieldUserID.setText("");
 		jTextFieldData.setText("");
 		jComboBoxEventAction.setSelectedItem("");
+		jComboBoxEventType.setSelectedItem("");
 		jTextFieldWorkstation.setText("");
+		jTextFieldTarget.setText("");
 		search();
 	}