Skip to content

Commit

Permalink
Updated reports and bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
C4J committed Jun 6, 2024
1 parent 141a8f8 commit 62bfc6e
Show file tree
Hide file tree
Showing 38 changed files with 369 additions and 238 deletions.
2 changes: 1 addition & 1 deletion b6/commander4j.install4j
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="10.0.8" transformSequenceNumber="10">
<directoryPresets config="./lib/db/auth" />
<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.34" 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.35" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
<languages skipLanguageSelection="true">
<additionalLanguages>
<language id="nl" />
Expand Down
Binary file modified b6/commander4j.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions b6/reports/users.jrxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e -->
<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="users" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="c2ffa8a4-03f8-40c4-9e57-cd4addc8abe6">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
Expand All @@ -15,7 +15,7 @@
<defaultValueExpression><![CDATA["Company Name"]]></defaultValueExpression>
</parameter>
<queryString language="SQL">
<![CDATA[select * from SYS_USERS order by user_id]]>
<![CDATA[select * from SYS_USERS WHERE ACCOUNT_ENABLED = 'Y' order by user_id]]>
</queryString>
<field name="USER_ID" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
Expand Down
8 changes: 5 additions & 3 deletions b6/reports/users2.jrxml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e -->
<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="user2" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="c2ffa8a4-03f8-40c4-9e57-cd4addc8abe6">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="411"/>
<property name="ireport.y" value="0"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="MySQL"/>
<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
<property name="com.jaspersoft.studio.unit." value="pixel"/>
<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
Expand All @@ -17,14 +16,17 @@
<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="mySQL"/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="237"/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="757"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
<parameter name="COMPANY_NAME" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["Company Name"]]></defaultValueExpression>
</parameter>
<queryString language="SQL">
<![CDATA[select * from SYS_USERS WHERE USER_ID NOT IN ('ADMIN','INTERFACE') order by last_logon]]>
<![CDATA[select * from SYS_USERS WHERE USER_ID NOT IN ('ADMIN','INTERFACE') AND ACCOUNT_ENABLED = 'Y' order by last_logon DESC]]>
</queryString>
<field name="USER_ID" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
Expand Down
2 changes: 1 addition & 1 deletion b6/src/com/commander4j/app/JVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class JVersion
{

public static String getProgramVersion() {
return "10.34";
return "10.35";
}

public static Double getProgramVersionValue() {
Expand Down
Loading

0 comments on commit 62bfc6e

Please sign in to comment.