Version 10.18

Mostly enhancements to Quality Control module
C4J · Oct 27, 2023 · 5011dff · 5011dff
1 parent f4b3298
commit 5011dff
Show file tree

Hide file tree

Showing 57 changed files with 1,199 additions and 228 deletions.
diff --git a/b6/commander4j.install4j b/b6/commander4j.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.6" transformSequenceNumber="10">
   <directoryPresets config="./images/icons/CMD4j_Icons" />
-  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="10.17" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
+  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="10.18" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
     <languages skipLanguageSelection="true">
       <additionalLanguages>
         <language id="nl" />
@@ -13,7 +13,7 @@
         <language id="es" />
       </additionalLanguages>
     </languages>
-    <jreBundles jdkProviderId="Zulu" release="17/17.0.8.1" />
+    <jreBundles jdkProviderId="Zulu" release="17/17.0.9" />
   </application>
   <files keepModificationTimes="true" missingFilesStrategy="error" globalExcludeSuffixes="dirClean.ok,.DS_Store">
     <mountPoints>

diff --git a/b6/commander4j.jar b/b6/commander4j.jar
diff --git a/b6/images/16x16/default.png b/b6/images/16x16/default.png
diff --git a/b6/images/24x24/default.png b/b6/images/24x24/default.png
diff --git a/b6/images/32x32/default.png b/b6/images/32x32/default.png
diff --git a/b6/javadoc.xml b/b6/javadoc.xml
diff --git a/b6/src/com/commander4j/app/JDialogQMDictionaryProperties.java b/b6/src/com/commander4j/app/JDialogQMDictionaryProperties.java
@@ -86,7 +86,7 @@ public class JDialogQMDictionaryProperties extends javax.swing.JDialog {
 	private JComboBox4j<String> comboBoxSelectList;
 	private JComboBox4j<String> comboBoxDataType;
 	private JCheckBox4j chckbxVisible;
-	private JTextField4j textFieldUOM;
+	private JTextField4j textFieldDefaultValue;
 	private JSpinner spinnerWidth;
 	private String[] fieldAlignment = new String[] { "Left", "Right", "Center" };
 	private JComboBox4j<String> comboBoxAlignment;
@@ -113,16 +113,16 @@ private void save() {
 
 		if (dict.isValid(insp) == false) {
 			// dict.create(insp,description);
-			dict.create(insp, JLabel.TRAILING, comboBoxDataType.getSelectedItem().toString(), textFieldUOM.getText(),
-					"Y", description, visible, Integer.valueOf(spinnerWidth.getValue().toString()));
+			dict.create(insp, JLabel.TRAILING, comboBoxDataType.getSelectedItem().toString(), "","Y", description, visible, Integer.valueOf(spinnerWidth.getValue().toString()), textFieldDefaultValue.getText());
 		}
 
 		dict.setFieldAlignment(comboBoxAlignment.getSelectedItem().toString());
 		dict.setDescription(description);
 		dict.setDataType(comboBoxDataType.getSelectedItem().toString());
 		dict.setSelectListID(comboBoxSelectList.getSelectedItem().toString());
 		dict.setVisible(visible);
-		dict.setUOM(textFieldUOM.getText());
+		dict.setUOM("");
+		dict.setDefaultValue(textFieldDefaultValue.getText());
 		dict.setFieldWidth(Integer.valueOf(spinnerWidth.getValue().toString()));
 		dict.update();
 
@@ -270,22 +270,22 @@ public void actionPerformed(ActionEvent e) {
 		lblVisible.setBounds(8, 179, 92, 16);
 		desktopPane.add(lblVisible);
 
-		JLabel4j_std lblUOM = new JLabel4j_std(lang.get("lbl_Material_UOM"));
+		JLabel4j_std lblUOM = new JLabel4j_std(lang.get("lbl_default"));
 		lblUOM.setHorizontalAlignment(SwingConstants.TRAILING);
 		lblUOM.setBounds(8, 213, 92, 16);
 		desktopPane.add(lblUOM);
 
-		textFieldUOM = new JTextField4j(JDBQMDictionary.field_uom);
-		textFieldUOM.addKeyListener(new KeyAdapter() {
+		textFieldDefaultValue = new JTextField4j(JDBQMDictionary.field_uom);
+		textFieldDefaultValue.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent arg0) {
 				enableSave();
 			}
 		});
-		textFieldUOM.setText("");
-		textFieldUOM.setColumns(10);
-		textFieldUOM.setBounds(112, 206, 143, 28);
-		desktopPane.add(textFieldUOM);
+		textFieldDefaultValue.setText("");
+		textFieldDefaultValue.setColumns(10);
+		textFieldDefaultValue.setBounds(112, 206, 143, 28);
+		desktopPane.add(textFieldDefaultValue);
 
 		spinnerWidth = new JSpinner();
 
@@ -334,7 +334,7 @@ public void stateChanged(ChangeEvent e) {
 		else
 			chckbxVisible.setSelected(false);
 
-		textFieldUOM.setText(dict.getUOM());
+		textFieldDefaultValue.setText(dict.getDefaultValue());
 
 		spinnerWidth.setValue(dict.getFieldWidth());