Skip to content

Commit

Permalink
Version 11.50
Browse files Browse the repository at this point in the history
  • Loading branch information
@C4J
C4J committed Dec 2, 2024
1 parent 932fbc8 commit 0f723bb
Show file tree
Hide file tree
Showing 27 changed files with 505 additions and 124 deletions.
Binary file modified b6/commander4j.jar
View file
Binary file not shown.
381 changes: 381 additions & 0 deletions b6/reports/bom_enquiry.jrxml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion b6/src/com/commander4j/app/JVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class JVersion
{

public static String getProgramVersion() {
return "11.20";
return "11.50";
}

public static Double getProgramVersionValue() {
Expand Down
67 changes: 53 additions & 14 deletions b6/src/com/commander4j/bom/JInternalFrameViewBomEnquiry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Vector;

import javax.swing.BorderFactory;
Expand Down Expand Up @@ -70,6 +72,7 @@
import com.commander4j.sys.Common;
import com.commander4j.sys.JLaunchMenu;
import com.commander4j.sys.JLaunchReport;
import com.commander4j.util.JExcel;
import com.commander4j.util.JHelp;
import com.commander4j.util.JUtility;

Expand All @@ -78,6 +81,7 @@ public class JInternalFrameViewBomEnquiry extends JInternalFrame
private static final long serialVersionUID = 1;
private JDesktopPane jDesktopPane1;

private JButton4j jButtonViewEdit;
private JButton4j jButtonClear;
private JButton4j jButtonExcel;
private JButton4j jButtonPrint;
Expand Down Expand Up @@ -248,12 +252,27 @@ private void sortBy(String fieldname)
private void export()
{

try
{
JExcel export = new JExcel();
PreparedStatement temp = buildSQLr();
ResultSet rs;
rs = temp.executeQuery();
export.saveAs("bom_enquiry.xls",rs, Common.mainForm);
populateList();
rs.close();
temp.close();
}
catch (SQLException e)
{

}
}

private void print()
{
PreparedStatement temp = buildSQLr();
JLaunchReport.runReport("RPT_VIEW_BOM", null, "", temp, "");
JLaunchReport.runReport("RPT_BOM_ENQUIRY", null, "", temp, "");
}

private void search()
Expand Down Expand Up @@ -452,13 +471,7 @@ private void initGUI()
{
public void actionPerformed(final ActionEvent e)
{
int row = jTable1.getSelectedRow();
if (row >= 0)
{
String id = jTable1.getValueAt(row, JDBViewBomTableModel.bom_id_col).toString();
String ver = jTable1.getValueAt(row, JDBViewBomTableModel.bom_version_col).toString();
JLaunchMenu.runForm("FRM_BOM_ADMIN", id,ver);
}
viewEditBOM();
}
});
newItemMenuItem.setText(lang.get("mod_MENU_BOM"));
Expand Down Expand Up @@ -756,7 +769,7 @@ public void actionPerformed(final ActionEvent e)
jButtonSearch = new JButton4j(Common.icon_search_16x16);
jDesktopPane1.add(jButtonSearch);
jButtonSearch.setText(lang.get("btn_Search"));
jButtonSearch.setBounds(162, 112, 109, 32);
jButtonSearch.setBounds(3, 112, 139, 32);
jButtonSearch.setMnemonic(lang.getMnemonicChar());
jButtonSearch.addActionListener(new ActionListener()
{
Expand Down Expand Up @@ -886,15 +899,15 @@ public void actionPerformed(ActionEvent evt)
jButtonHelp = new JButton4j(Common.icon_help_16x16);
jDesktopPane1.add(jButtonHelp);
jButtonHelp.setText(lang.get("btn_Help"));
jButtonHelp.setBounds(596, 112, 109, 32);
jButtonHelp.setBounds(693, 112, 139, 32);
jButtonHelp.setMnemonic(lang.getMnemonicChar());
}

{
jButtonClose = new JButton4j(Common.icon_close_16x16);
jDesktopPane1.add(jButtonClose);
jButtonClose.setText(lang.get("btn_Close"));
jButtonClose.setBounds(704, 112, 109, 32);
jButtonClose.setBounds(831, 112, 139, 32);
jButtonClose.setMnemonic(lang.getMnemonicChar());
jButtonClose.addActionListener(new ActionListener()
{
Expand All @@ -909,7 +922,7 @@ public void actionPerformed(ActionEvent evt)
jButtonPrint = new JButton4j(Common.icon_report_16x16);
jDesktopPane1.add(jButtonPrint);
jButtonPrint.setText(lang.get("btn_Print"));
jButtonPrint.setBounds(379, 112, 109, 32);
jButtonPrint.setBounds(417, 112, 139, 32);
jButtonPrint.setMnemonic(lang.getMnemonicChar());
jButtonPrint.addActionListener(new ActionListener()
{
Expand Down Expand Up @@ -970,7 +983,7 @@ public void actionPerformed(final ActionEvent e)

jButtonExcel.setText(lang.get("btn_Excel"));
jButtonExcel.setMnemonic(lang.getMnemonicChar());
jButtonExcel.setBounds(488, 112, 109, 32);
jButtonExcel.setBounds(555, 112, 139, 32);
jDesktopPane1.add(jButtonExcel);
}

Expand All @@ -985,9 +998,24 @@ public void actionPerformed(final ActionEvent e)
});
jButtonClear.setText(lang.get("btn_Clear_Filter"));
jButtonClear.setMnemonic(lang.getMnemonicChar());
jButtonClear.setBounds(270, 112, 109, 32);
jButtonClear.setBounds(141, 112, 139, 32);
jDesktopPane1.add(jButtonClear);
}

{
jButtonViewEdit = new JButton4j(Common.icon_bom_16x16);
jButtonViewEdit.addActionListener(new ActionListener()
{
public void actionPerformed(final ActionEvent e)
{
viewEditBOM();
}
});
jButtonViewEdit.setText(lang.get("mod_FRM_BOM_ADMIN"));
jButtonViewEdit.setMnemonic(lang.getMnemonicChar());
jButtonViewEdit.setBounds(279, 112, 139, 32);
jDesktopPane1.add(jButtonViewEdit);
}

JLabel4j_std label4j_std = new JLabel4j_std();
label4j_std.setText(lang.get("lbl_Limit"));
Expand Down Expand Up @@ -1015,6 +1043,17 @@ public void actionPerformed(final ActionEvent e)
}
}

private void viewEditBOM()
{
int row = jTable1.getSelectedRow();
if (row >= 0)
{
String id = jTable1.getValueAt(row, JDBViewBomTableModel.bom_id_col).toString();
String ver = jTable1.getValueAt(row, JDBViewBomTableModel.bom_version_col).toString();
JLaunchMenu.runForm("FRM_BOM_ADMIN", id,ver);
}
}

/**
* WindowBuilder generated method.<br>
* Please don't remove this method or its invocations.<br>
Expand Down
99 changes: 0 additions & 99 deletions b6/src/com/commander4j/bom/JTreePrintPreview.java
View file

This file was deleted.

6 changes: 5 additions & 1 deletion b6/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
4 changes: 4 additions & 0 deletions b6/xml/schema/com.mysql.cj.jdbc.Driver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>

<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
6 changes: 5 additions & 1 deletion b6/xml/schema/oracle.jdbc.driver.OracleDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
Binary file modified b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar
View file
Binary file not shown.
6 changes: 5 additions & 1 deletion ...android_eb3/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
4 changes: 4 additions & 0 deletions b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>

<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
6 changes: 5 additions & 1 deletion b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
Binary file modified b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war
View file
Binary file not shown.
Binary file modified b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar
View file
Binary file not shown.
6 changes: 5 additions & 1 deletion ...b_t10_react/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
4 changes: 4 additions & 0 deletions b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>

<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
6 changes: 5 additions & 1 deletion b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000199.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','IT','Stadio o Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','NL','Fase of Fase','0')</statement>
<statement>INSERT INTO SYS_LANGUAGE (RESOURCE_KEY, LANGUAGE_ID, TEXT, MNEMONIC) VALUES ('lbl_Stage_Phase','ES','Etapa o Fase','0')</statement>


<statement>
INSERT INTO SYS_MODULES(MODULE_ID, RF_ACTIVE, DK_ACTIVE, MODULE_TYPE, HINT, MNEMONIC, ICON_FILENAME, HELPSET_ID, REPORT_FILENAME, EXEC_FILENAME, EXEC_DIR, PRINT_PREVIEW, PRINT_DIALOG, PRINT_COPIES, REPORT_TYPE, RESOURCE_KEY, AUTO_LABELLER_COMMAND_FILE, AUTO_LABELLER_LABEL_FILE) VALUES ('RPT_BOM_ENQUIRY', 'N', 'Y', 'REPORT', 'BOM Enquiry', 0, '', '', 'bom_enquiry.jrxml', '', '', 'Y', 'N', 1, 'Standard', 'mod_FRM_BOM_ENQUIRY', '', '')
</statement>

</DDL>
Loading

0 comments on commit 0f723bb

Please sign in to comment.