Skip to content

Commit

Permalink
Update to db build scripts
Browse files Browse the repository at this point in the history 
Fix to collation
  • Loading branch information
@C4J
C4J committed Aug 16, 2024
1 parent 2a28896 commit 0486ca0
Show file tree
Hide file tree
Showing 39 changed files with 303 additions and 155 deletions.
4 changes: 2 additions & 2 deletions b6/commander4j.install4j
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1384,14 +1384,14 @@ else
<unixInstaller name="Linux Installer" id="403" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_linux${compiler:sys.withJre}" installDir="Commander4j">
<jreBundle jreBundleSource="none" />
</unixInstaller>
<macosFolder name="Mac OS X Folder intel (with JRE)" id="678" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_intel_mac${compiler:sys.withJre}" installDir="Commander4j" useLegacyMediaFileIds="true" legacyMediaFileIds="584">
<macosFolder name="Mac OS X Folder intel (with JRE)" id="678" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_apple_intel${compiler:sys.withJre}" installDir="Commander4j" useLegacyMediaFileIds="true" legacyMediaFileIds="584">
<jreBundle usePack200="false" manualJreEntry="true">
<modules>
<defaultModules set="all" />
</modules>
</jreBundle>
</macosFolder>
<macosFolder name="Mac OS X Folder arm (with JRE)" id="1312" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_silicon_mac${compiler:sys.withJre}" installDir="Commander4j" useLegacyMediaFileIds="true" legacyMediaFileIds="584" architecture="aarch64">
<macosFolder name="Mac OS X Folder arm (with JRE)" id="1312" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_apple_silicon${compiler:sys.withJre}" installDir="Commander4j" useLegacyMediaFileIds="true" legacyMediaFileIds="584" architecture="aarch64">
<jreBundle usePack200="false" manualJreEntry="true">
<modules>
<defaultModules set="all" />
Expand Down
Binary file modified b6/commander4j.jar
View file
Binary file not shown.
46 changes: 23 additions & 23 deletions b6/src/com/commander4j/app/JInternalFramePalletSampleProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,43 +188,43 @@ public JInternalFramePalletSampleProperties(String sscc, Long sequence)

final JHelp help = new JHelp();
help.enableHelpOnButton(jButtonHelp, JUtility.getHelpSetIDforModule("FRM_PAL_SAMPLE_EDIT"));

JLabel4j_std jLabelLane1 = new JLabel4j_std();
jLabelLane1.setForeground(Color.BLUE);
jLabelLane1.setFont(new Font("Arial", Font.ITALIC, 11));
jLabelLane1.setText(lang.get("lbl_Lane")+ " 1");
jLabelLane1.setText(lang.get("lbl_Lane") + " 1");
jLabelLane1.setHorizontalAlignment(SwingConstants.TRAILING);
jLabelLane1.setBounds(218, 248, 51, 21);
jDesktopPane1.add(jLabelLane1);

JLabel4j_std jLabelLane2 = new JLabel4j_std();
jLabelLane2.setForeground(Color.BLUE);
jLabelLane2.setFont(new Font("Arial", Font.ITALIC, 11));
jLabelLane2.setText(lang.get("lbl_Lane")+ " 2");
jLabelLane2.setText(lang.get("lbl_Lane") + " 2");
jLabelLane2.setHorizontalAlignment(SwingConstants.TRAILING);
jLabelLane2.setBounds(331, 248, 51, 21);
jDesktopPane1.add(jLabelLane2);

JLabel4j_std jLabelLane3 = new JLabel4j_std();
jLabelLane3.setForeground(Color.BLUE);
jLabelLane3.setFont(new Font("Arial", Font.ITALIC, 11));
jLabelLane3.setText(lang.get("lbl_Lane")+ " 3");
jLabelLane3.setText(lang.get("lbl_Lane") + " 3");
jLabelLane3.setHorizontalAlignment(SwingConstants.TRAILING);
jLabelLane3.setBounds(444, 248, 51, 21);
jDesktopPane1.add(jLabelLane3);

JLabel4j_std jLabelLane4 = new JLabel4j_std();
jLabelLane4.setForeground(Color.BLUE);
jLabelLane4.setFont(new Font("Arial", Font.ITALIC, 11));
jLabelLane4.setText(lang.get("lbl_Lane")+ " 4");
jLabelLane4.setText(lang.get("lbl_Lane") + " 4");
jLabelLane4.setHorizontalAlignment(SwingConstants.TRAILING);
jLabelLane4.setBounds(557, 248, 51, 21);
jDesktopPane1.add(jLabelLane4);

JLabel4j_std jLabelLane5 = new JLabel4j_std();
jLabelLane5.setForeground(Color.BLUE);
jLabelLane5.setFont(new Font("Arial", Font.ITALIC, 11));
jLabelLane5.setText(lang.get("lbl_Lane")+ " 5");
jLabelLane5.setText(lang.get("lbl_Lane") + " 5");
jLabelLane5.setHorizontalAlignment(SwingConstants.TRAILING);
jLabelLane5.setBounds(670, 248, 51, 21);
jDesktopPane1.add(jLabelLane5);
Expand Down Expand Up @@ -278,13 +278,13 @@ public void setSampleID(String sscc, Long sequence)
jTextFieldOperative.setText(sampleProperties.getOperative());

jFormattedTextFieldSampleQuantity.setValue(sampleProperties.getSampleQuantity());

jFormattedTextFieldLane1Quantity.setValue(sampleProperties.getLane1Quantity());
jFormattedTextFieldLane2Quantity.setValue(sampleProperties.getLane2Quantity());
jFormattedTextFieldLane3Quantity.setValue(sampleProperties.getLane3Quantity());
jFormattedTextFieldLane4Quantity.setValue(sampleProperties.getLane4Quantity());
jFormattedTextFieldLane5Quantity.setValue(sampleProperties.getLane5Quantity());

jTextFieldFiller_ID.setText(sampleProperties.getSamplePoint());
jTextFieldUserID.setText(sampleProperties.getUserID());

Expand Down Expand Up @@ -562,7 +562,7 @@ public void keyTyped(KeyEvent evt)
});
jDesktopPane1.add(jFormattedTextFieldSampleQuantity);
}

{
jFormattedTextFieldLane1Quantity = new JQuantityInput(new BigDecimal("0"));
jFormattedTextFieldLane1Quantity.setHorizontalAlignment(SwingConstants.TRAILING);
Expand All @@ -577,7 +577,7 @@ public void keyTyped(KeyEvent evt)
});
jDesktopPane1.add(jFormattedTextFieldLane1Quantity);
}

{
jFormattedTextFieldLane2Quantity = new JQuantityInput(new BigDecimal("0"));
jFormattedTextFieldLane2Quantity.setHorizontalAlignment(SwingConstants.TRAILING);
Expand Down Expand Up @@ -607,7 +607,7 @@ public void keyTyped(KeyEvent evt)
});
jDesktopPane1.add(jFormattedTextFieldLane3Quantity);
}

{
jFormattedTextFieldLane4Quantity = new JQuantityInput(new BigDecimal("0"));
jFormattedTextFieldLane4Quantity.setHorizontalAlignment(SwingConstants.TRAILING);
Expand All @@ -622,7 +622,7 @@ public void keyTyped(KeyEvent evt)
});
jDesktopPane1.add(jFormattedTextFieldLane4Quantity);
}

{
jFormattedTextFieldLane5Quantity = new JQuantityInput(new BigDecimal("0"));
jFormattedTextFieldLane5Quantity.setHorizontalAlignment(SwingConstants.TRAILING);
Expand All @@ -637,7 +637,7 @@ public void keyTyped(KeyEvent evt)
});
jDesktopPane1.add(jFormattedTextFieldLane5Quantity);
}

{
jLabelSampleQuantity = new JLabel4j_std();
jLabelSampleQuantity.setHorizontalAlignment(SwingConstants.TRAILING);
Expand Down Expand Up @@ -851,12 +851,12 @@ private boolean save()
sampleProperties.setSampleComment(jTextFieldComment.getText());

sampleProperties.setSampleQuantity(JUtility.stringToBigDecimal(jFormattedTextFieldSampleQuantity.getText().toString()));
sampleProperties.setLane1Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane1Quantity.getText().toString()));
sampleProperties.setLane2Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane2Quantity.getText().toString()));
sampleProperties.setLane3Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane3Quantity.getText().toString()));
sampleProperties.setLane4Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane4Quantity.getText().toString()));
sampleProperties.setLane5Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane5Quantity.getText().toString()));

sampleProperties.setLane1Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane1Quantity.getValue().toString()));
sampleProperties.setLane2Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane2Quantity.getValue().toString()));
sampleProperties.setLane3Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane3Quantity.getValue().toString()));
sampleProperties.setLane4Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane4Quantity.getValue().toString()));
sampleProperties.setLane5Quantity(JUtility.stringToBigDecimal(jFormattedTextFieldLane5Quantity.getValue().toString()));

sampleProperties.setUserID(Common.userList.getUser(Common.sessionID).getUserId());

Expand Down
46 changes: 41 additions & 5 deletions b6/src/com/commander4j/db/JDBPalletSamples.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public class JDBPalletSamples
private BigDecimal dbLane3Quantity = new BigDecimal("0.00");
private BigDecimal dbLane4Quantity = new BigDecimal("0.00");
private BigDecimal dbLane5Quantity = new BigDecimal("0.00");
private BigDecimal zero = new BigDecimal("0.00");

private final Logger logger = org.apache.logging.log4j.LogManager.getLogger(JDBPalletSamples.class);
private String hostID;
Expand Down Expand Up @@ -228,31 +229,46 @@ public BigDecimal getSampleQuantity()

public BigDecimal getLane1Quantity()
{

if (dbLane1Quantity == null)
{
dbLane1Quantity = zero;
}
return dbLane1Quantity;
}

public BigDecimal getLane2Quantity()
{

if (dbLane2Quantity == null)
{
dbLane2Quantity = zero;
}
return dbLane2Quantity;
}

public BigDecimal getLane3Quantity()
{

if (dbLane3Quantity == null)
{
dbLane3Quantity = zero;
}
return dbLane3Quantity;
}

public BigDecimal getLane4Quantity()
{

if (dbLane4Quantity == null)
{
dbLane4Quantity = zero;
}
return dbLane4Quantity;
}

public BigDecimal getLane5Quantity()
{

if (dbLane5Quantity == null)
{
dbLane5Quantity = zero;
}
return dbLane5Quantity;
}

Expand Down Expand Up @@ -469,26 +485,46 @@ public void setSampleQuantity(BigDecimal removed)

public void setLane1Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane1Quantity = removed;
}

public void setLane2Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane2Quantity = removed;
}

public void setLane3Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane3Quantity = removed;
}

public void setLane4Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane4Quantity = removed;
}

public void setLane5Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane5Quantity = removed;
}

Expand Down
46 changes: 41 additions & 5 deletions b6/src/com/commander4j/db/JDBViewPalletSample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class JDBViewPalletSample
private BigDecimal dbLane3Quantity = new BigDecimal("0.00");
private BigDecimal dbLane4Quantity = new BigDecimal("0.00");
private BigDecimal dbLane5Quantity = new BigDecimal("0.00");
private BigDecimal zero = new BigDecimal("0.00");

private final Logger logger = org.apache.logging.log4j.LogManager.getLogger(JDBViewPalletSample.class);
private String hostID;
Expand Down Expand Up @@ -103,56 +104,91 @@ public void clear()

public void setLane1Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane1Quantity = removed;
}

public void setLane2Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane2Quantity = removed;
}

public void setLane3Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane3Quantity = removed;
}

public void setLane4Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane4Quantity = removed;
}

public void setLane5Quantity(BigDecimal removed)
{
if (removed == null)
{
removed = zero;
}
dbLane5Quantity = removed;
}

public BigDecimal getLane1Quantity()
{

if (dbLane1Quantity == null)
{
dbLane1Quantity = zero;
}
return dbLane1Quantity;
}

public BigDecimal getLane2Quantity()
{

if (dbLane2Quantity == null)
{
dbLane2Quantity = zero;
}
return dbLane2Quantity;
}

public BigDecimal getLane3Quantity()
{

if (dbLane3Quantity == null)
{
dbLane3Quantity = zero;
}
return dbLane3Quantity;
}

public BigDecimal getLane4Quantity()
{

if (dbLane4Quantity == null)
{
dbLane4Quantity = zero;
}
return dbLane4Quantity;
}

public BigDecimal getLane5Quantity()
{

if (dbLane5Quantity == null)
{
dbLane5Quantity = zero;
}
return dbLane5Quantity;
}

Expand Down
Loading

0 comments on commit 0486ca0

Please sign in to comment.