Skip to content

Commit

Permalink
Minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
@C4J
C4J committed Nov 29, 2023
1 parent c25471c commit d070198
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 30 deletions.
Binary file modified b6/commander4j.jar
View file
Binary file not shown.
14 changes: 5 additions & 9 deletions b6/reports/sorting_notification.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="304"/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="688"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="mySQL"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Commander WIs Dev"/>
<property name="com.jaspersoft.studio.property.dataset.dialog.DatasetDialog.sash.w1" value="494"/>
<property name="com.jaspersoft.studio.property.dataset.dialog.DatasetDialog.sash.w2" value="494"/>
<property name="com.jaspersoft.studio.report.description" value="Sorting Notification"/>
<parameter name="P_SSCC" class="java.lang.String">
<defaultValueExpression><![CDATA["350001615047523143"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["350001615047582331"]]></defaultValueExpression>
</parameter>
<parameter name="COMPANY_NAME" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["My Company"]]></defaultValueExpression>
Expand Down Expand Up @@ -565,7 +565,7 @@
</band>
</pageHeader>
<detail>
<band height="36" splitType="Stretch">
<band height="53" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="274" y="10" width="60" height="18" uuid="2fa7d52b-b0e5-4bef-b9e6-71cb63cdc14f">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="c7b6fd39-8eca-4666-9105-be98c62139ca"/>
Expand Down Expand Up @@ -615,16 +615,12 @@
<reportElement x="0" y="10" width="110" height="18" uuid="a03bff1c-3f51-4cf8-a393-9c717223c8c2"/>
<textFieldExpression><![CDATA[$F{SAMPLE_DATE}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>
<band height="22" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="792" height="20" isRemoveLineWhenBlank="true" uuid="ea4fceed-1002-4371-bf25-be70a9bcee72"/>
<reportElement positionType="Float" x="340" y="29" width="452" height="20" isRemoveLineWhenBlank="true" uuid="ea4fceed-1002-4371-bf25-be70a9bcee72"/>
<textFieldExpression><![CDATA[$F{SAMPLE_COMMENT}]]></textFieldExpression>
</textField>
</band>
</columnFooter>
</detail>
<pageFooter>
<band height="30" splitType="Stretch">
<textField pattern="" isBlankWhenNull="false">
Expand Down
4 changes: 3 additions & 1 deletion b6/src/com/commander4j/app/JInternalFramePalletSample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
import com.commander4j.util.JHelp;
import com.commander4j.util.JQuantityInput;
import com.commander4j.util.JUtility;
import javax.swing.ScrollPaneConstants;

/**
* The JInternalFramePalletSample class is used to record additional information
Expand Down Expand Up @@ -262,6 +263,7 @@ private void populateList()

this.setIconifiable(true);
jTable1.setModel(pstm);
scrollPane1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);

scrollPane1.setViewportView(jTable1);
JUtility.scrolltoHomePosition(scrollPane1);
Expand Down Expand Up @@ -1323,7 +1325,7 @@ public void actionPerformed(ActionEvent evt)
jDesktopPane1.add(panel_SampleResults);
panel_SampleResults.setLayout(null);

scrollPane1.setBounds(0, 20, 975, 160);
scrollPane1.setBounds(0, 20, 975, 142);
scrollPane1.getViewport().setBackground(Common.color_tablebackground);
panel_SampleResults.add(scrollPane1);

Expand Down
46 changes: 26 additions & 20 deletions b6/src/com/commander4j/table/JDBQMResultTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,21 @@ public JDBQMResultTable(String hostid, String sessionid, String inspectionid, St
setHost(hostid);
setSession(sessionid);

tableMode = mode;
test = new JDBQMTest(getHost(), getSession());
new JDBQMDictionary(getHost(), getSession());
selectlist = new JDBQMSelectList(getHost(), getSession());
try
{

tableMode = mode;
test = new JDBQMTest(getHost(), getSession());
new JDBQMDictionary(getHost(), getSession());
selectlist = new JDBQMSelectList(getHost(), getSession());

testPropertiesList = test.getTestsPropertiesList(inspectionid, activityid);
}
catch (Exception ex)
{

testPropertiesList = test.getTestsPropertiesList(inspectionid, activityid);
}


setDefaultRenderer(Object.class, Common.renderer_table);
getTableHeader().setDefaultRenderer(Common.renderer_tableheader);
setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
Expand All @@ -123,15 +130,17 @@ public void setColumnWidths()
width = ((JDBQMDictionary) testPropertiesList.get(x)).getFieldWidth();
setColumnWidth(x, width);
}
} else
}
else
{
if (tableMode.equals("index"))
{
setColumnWidth(0, 70);
setColumnWidth(1, 125);
setColumnWidth(2, 85);
setColumnWidth(3, 85);
} else
}
else
{
if (tableMode.equals("result"))
{
Expand Down Expand Up @@ -195,19 +204,19 @@ public void setCellRenderers(String processOrder, String inspectionid, String ac
setRenderer(x, defaultRenderer);

}



}
} else
}
else
{
if (tableMode.equals("index"))
{
setRenderer(0, indexRenderer);
setRenderer(1, indexRenderer);
setRenderer(2, indexRenderer);
setRenderer(3, indexRenderer);
} else
}
else
{
if (tableMode.equals("result"))
{
Expand All @@ -221,7 +230,7 @@ public void setCellRenderers(String processOrder, String inspectionid, String ac
setRenderer(7, indexRenderer);
if (getColumnModel().getColumnCount() > 8)
{
for (int y=8;y<getColumnModel().getColumnCount();y++)
for (int y = 8; y < getColumnModel().getColumnCount(); y++)
{
setRenderer(y, defaultRenderer);
setColumnWidth(y, 130);
Expand Down Expand Up @@ -254,25 +263,22 @@ public void setColumnEditors(String processOrder, String inspectionid, String ac
{

LinkedList<JDBQMSelectList> listValues = new LinkedList<JDBQMSelectList>();

listValues = selectlist.getSelectList(tempDict.getSelectListID());
JDBQMSelectList blank = new JDBQMSelectList();
listValues.addFirst(blank);

JComboBox4jAW<JDBQMSelectList> comboBox = new JComboBox4jAW<JDBQMSelectList>();
comboBox.setFont(Common.font_table);


//comboBox.setWide(true);
// comboBox.setWide(true);
comboBox.doLayout();

for (int y = 0; y < listValues.size(); y++)
{
comboBox.addItem(listValues.get(y));
}



column.setCellEditor(new ComboBoxCellEditorQMResult(listValues));

}
Expand All @@ -288,7 +294,7 @@ public void setColumnEditors(String processOrder, String inspectionid, String ac
tf.setFont(Common.font_table);
column.setCellEditor(new DefaultCellEditor(tf));
}

if (tempDict.getDataType().equals("boolean"))
{

Expand Down
Binary file modified b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar
View file
Binary file not shown.
Binary file modified b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war
View file
Binary file not shown.
Binary file modified b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar
View file
Binary file not shown.
Binary file modified b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war
View file
Binary file not shown.
Binary file modified c4jWS/target/c4jWS.war
View file
Binary file not shown.

0 comments on commit d070198

Please sign in to comment.