Merge pull request #20 from mogray5/infinitypfm_085

Infinitypfm 085

appimage/create_appimage.sh

@@ -11,7 +11,7 @@ read doinstall
 
 if [[ "${doinstall}" == *"y"* ]]
 then
-	sudo apt-get install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java
+	sudo apt-get install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java libfreemarker-java liblog4j1.2-java
 	sudo apt-get install libswt-gtk-3-java libswt-webkit-gtk-3-jni libswt-cairo-gtk-3-jni	
 	sudo apt-get install ant default-jdk
 fi
@@ -25,7 +25,7 @@ cp appimage/AppRun infinitypfm.AppDir/;
 chmod a+x infinitypfm.AppDir/AppRun;
 cp infinitypfm-ui/infinitypfm.desktop infinitypfm.AppDir/;
 cp infinitypfm-ui/infinitypfm.xpm infinitypfm.AppDir/;
-cp *.jar infinitypfm.AppDir/usr/lib/;
+cp target/*.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/swt.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/ibatis.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/commons-io.jar infinitypfm.AppDir/usr/lib/;
@@ -50,8 +50,10 @@ cp -L /usr/lib/jni/libswt-pi-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-webkit-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/mailapi.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/commons-csv.jar infinitypfm.AppDir/usr/lib/;
+cp -L /usr/share/java/freemarker.jar infinitypfm.AppDir/usr/lib/;
+cp -L /usr/share/java/log4j-1.2.jar infinitypfm.AppDir/usr/lib/;
 cp -L -R /usr/lib/jvm/java-1.8.0-openjdk-amd64 infinitypfm.AppDir/usr/lib/;
 
 #cp infinitypfm.run infinitypfm.AppDir/usr/bin/infinitypfm
 
-appimagetool-x86_64.AppImage infinitypfm.AppDir infinitypfm-"$response".AppImage generate
+~/bin/appimagetool-x86_64.AppImage infinitypfm.AppDir infinitypfm-"$response".AppImage generate

archive/create_archive.sh

@@ -19,7 +19,7 @@ rm infinitypfm-$response.zip
 
 if [[ "${doinstall}" == *"y"* ]]
 then
-	sudo apt install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java
+	sudo apt install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java libfreemarker-java liblog4j1.2-java
 	sudo apt install libswt-gtk-3-java libswt-webkit-gtk-3-jni libswt-cairo-gtk-3-jni	
 	sudo apt install ant default-jdk
 fi
@@ -34,7 +34,7 @@ cp archive/infinitypfm.sh infinitypfm.archive/bin;
 chmod a+x infinitypfm.archive/bin;
 #cp infinitypfm-ui/infinitypfm.desktop infinitypfm.archive/;
 #cp infinitypfm-ui/infinitypfm.xpm infinitypfm.archive/;
-cp *.jar infinitypfm.archive/lib/;
+cp target/*.jar infinitypfm.archive/lib/;
 cp -L /usr/share/java/swt.jar infinitypfm.archive/lib/;
 cp -L $WIN_SWT_LOCAL/swt.jar infinitypfm.archive/lib/swt_win.jar;
 cp -L /usr/share/java/ibatis.jar infinitypfm.archive/lib/;
@@ -60,6 +60,8 @@ cp -L /usr/lib/jni/libswt-pi-gtk-3836.so infinitypfm.archive/lib/;
 cp -L /usr/lib/jni/libswt-webkit-gtk-3836.so infinitypfm.archive/lib/;
 cp -L /usr/share/java/mailapi.jar infinitypfm.archive/lib/;
 cp -L /usr/share/java/commons-csv.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/freemarker.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/log4j-1.2.jar infinitypfm.archive/lib/;
 #cp -L -R /usr/lib/jvm/java-1.8.0-openjdk-amd64 infinitypfm.archive/lib/;
 
 #cp infinitypfm.run infinitypfm.archive/usr/bin/infinitypfm

build.xml

@@ -10,6 +10,7 @@
     <delete>
 	<fileset  dir=".">
 	 <include name="infinitypfm-*.AppImage" />
+	 <include name="infinitypfm*.snap" />
 	<include name="infinitypfm-*.zip" />
 	<include name="TEST*.txt" />
 	<include name="TEST*.xml" />
@@ -18,11 +19,16 @@
     <delete dir="infinitypfm-flatpak" />
     <delete dir="infinitypfm-0.8.0" />
     <delete dir="infinitypfm.archive" />
+    <delete dir="target" />
 </target>
 
 <target name="compile" depends="compileUI" />
 
-<target name="compileCommon">
+<target name="init">
+	<mkdir dir="target"/>
+</target>
+
+<target name="compileCommon" depends="init">
     <ant antfile="infinitypfm-common/build.xml" target="junit" />
 </target>
 <target name="compileBTC" depends="compileCommon">

infinitypfm-btc/build.xml

@@ -4,7 +4,7 @@
 	<property name="build.directory" value="build" />
 	<property name="build.outputDirectory" value="${build.directory}/classes" />
 	<property name="classpath" value="/usr/share/java/json-lib.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-lang.jar" />
-	<property name="jar" value="infinitypfm-btc.jar" />
+	<property name="jar" value="target/infinitypfm-btc.jar" />
 	<target name="clean">
 		<delete dir="${build.directory}" />
 		<delete file="${jar}" />

infinitypfm-common/build.xml

@@ -5,7 +5,7 @@
 	<property name="build.directory" value="build" />
 	<property name="build.outputDirectory" value="${build.directory}/classes" />
 	<property name="classpath" value="/usr/share/java/commons-codec.jar:/usr/share/java/commons-lang.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/jackson-core-lgpl.jar:/usr/share/java/mailapi.jar:/usr/share/java/junit4.jar:/usr/share/java/hamcrest-core-1.3.jar" />
-	<property name="jar" value="infinitypfm-common.jar" />
+	<property name="jar" value="target/infinitypfm-common.jar" />
 
 	<path id="src.path">
 	  <pathelement location="${build.sourceDirectory}" />

infinitypfm-common/src/main/java/org/infinitypfm/core/conf/LangLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2018 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2020 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -268,7 +268,7 @@ public LangLoader(){
 		hmPhrases.put("222", i18n.tr("Start Date"));
 		hmPhrases.put("223", i18n.tr("End Date"));
 		hmPhrases.put("224", i18n.tr("Currencies"));
-		hmPhrases.put("225", i18n.tr("Currency Precision"));
+		hmPhrases.put("225", i18n.tr("Precision"));
 		hmPhrases.put("226", i18n.tr("Method Name"));
 		hmPhrases.put("227", i18n.tr("Service URL"));
 		hmPhrases.put("228", i18n.tr("Search Path"));
@@ -295,7 +295,7 @@ public LangLoader(){
 		hmPhrases.put("249",  i18n.tr("Open reports externally in web browser."));
 		hmPhrases.put("250",  i18n.tr("General"));
 		hmPhrases.put("251",  i18n.tr("Open console on start."));
-		hmPhrases.put("251",  i18n.tr("Invalid Credentials"));
+		//hmPhrases.put("251",  i18n.tr("Invalid Credentials"));
 		hmPhrases.put("252",  i18n.tr("Mail"));
 		hmPhrases.put("253",  i18n.tr("CSV"));
 		hmPhrases.put("254",  i18n.tr("Import Name"));
@@ -306,6 +306,19 @@ public LangLoader(){
 		hmPhrases.put("259",  i18n.tr("None"));
 		hmPhrases.put("260",  i18n.tr("Date Format"));
 		hmPhrases.put("261",  i18n.tr("Continue"));
+		hmPhrases.put("262",  i18n.tr("Income Total"));
+		hmPhrases.put("263",  i18n.tr("Expense Total"));
+		hmPhrases.put("264",  i18n.tr("Liability Total"));
+		hmPhrases.put("265",  i18n.tr("Year-Month"));
+		hmPhrases.put("266",  i18n.tr("Account Balance"));
+		hmPhrases.put("267",  i18n.tr("Expense Balance"));
+		hmPhrases.put("268",  i18n.tr("Budget Balance"));
+		hmPhrases.put("269",  i18n.tr("Budget Name"));
+		hmPhrases.put("270",  i18n.tr("Income Balance"));
+		hmPhrases.put("271",  i18n.tr("Liability Balance"));
+		hmPhrases.put("272",  i18n.tr("Account Type"));
+		hmPhrases.put("273", i18n.tr("Account History All Time"));
+		hmPhrases.put("274", i18n.tr("Apache FreeMarker (https://freemarker.apache.org/) "));
 	}
 
 

infinitypfm-common/src/main/java/org/infinitypfm/core/data/BudgetBalance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2018 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2020 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -20,6 +20,7 @@
 
 import java.io.Serializable;
 
+
 /**
  * POJO for storing budget totals.
  *
@@ -38,11 +39,16 @@ public class BudgetBalance implements Serializable, IReportable {
 	int budgetId = -1;
 	String budgetName = null;
 	String actName = null;
+	DataFormatUtil _formatter;
 
 	public int getYr() {
 		return yr;
 	}
 
+	public String getYrString() {
+		return Integer.toString(yr);
+	}
+
 	public void setYr(int yr) {
 		this.yr = yr;
 	}
@@ -59,6 +65,10 @@ public long getBudgetBalance() {
 		return budgetBalance;
 	}
 
+	public String getBudgetBalanceFmt() {
+		return _formatter.getAmountFormatted(budgetBalance, "###0.00");
+	}
+
 	public void setBudgetBalance(long budgetBalance) {
 		this.budgetBalance = budgetBalance;
 	}
@@ -67,6 +77,10 @@ public long getExpenseBalance() {
 		return expenseBalance;
 	}
 
+	public String getExpenseBalanceFmt() {
+		return _formatter.getAmountFormatted(expenseBalance, "###0.00");
+	}
+
 	public void setExpenseBalance(long expenseBalance) {
 		this.expenseBalance = expenseBalance;
 	}
@@ -125,4 +139,9 @@ public String toReportRow() {
 		return sb.toString();
 	}
 
+	@Override
+	public void setFormatter(DataFormatUtil formatter) {
+		_formatter = formatter;
+	}
+
 }

infinitypfm-common/src/main/java/org/infinitypfm/core/data/IReportable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2020 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -22,5 +22,6 @@ public interface IReportable {
 
 	public String getHeaderRow();
 	public String toReportRow();
+	public void setFormatter(DataFormatUtil _formatter);
 
 }

infinitypfm-common/src/main/java/org/infinitypfm/core/data/MonthlyBalance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2018 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2020 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -20,19 +20,8 @@
 
 import java.io.Serializable;
 
-
-/**
- * @author wayne
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-//@JsonIgnoreProperties(ignoreUnknown = true)
 public class MonthlyBalance implements Serializable, IReportable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1L;
 	int actId=0;
 	int yr = 0;
@@ -41,7 +30,11 @@ public class MonthlyBalance implements Serializable, IReportable {
 	String actTypeName = "";
 	String actName = "";
 	String isoCode = "";
+	DataFormatUtil _formatter;
 
+	public MonthlyBalance() {
+		super();
+	}
 
 	public String getActTypeName() {
 		return actTypeName;
@@ -60,19 +53,25 @@ public void setActName(String actName) {
 	}
 
 	/**
-	 * 
+	 * @return Returns the actBalance.
 	 */
-	public MonthlyBalance() {
-		super();
-		// TODO Auto-generated constructor stub
+	public long getActBalance() {
+		if (actTypeName.equalsIgnoreCase("income"))
+			return -actBalance;
+		else return actBalance;
 	}
-
+	
 	/**
 	 * @return Returns the actBalance.
 	 */
-	public long getActBalance() {
-		return actBalance;
+	public String getActBalanceFmt() {
+
+		if (_formatter != null) 
+			return _formatter.getAmountFormatted(actBalance, "###0.00");
+		 else 
+			return Long.toString(actBalance);
 	}
+
 	/**
 	 * @param actBalance The actBalance to set.
 	 */
@@ -109,6 +108,11 @@ public void setMth(int mth) {
 	public int getYr() {
 		return yr;
 	}
+
+	public String getYrString() {
+		return Integer.toString(yr);
+	}
+
 	/**
 	 * @param yr The yr to set.
 	 */
@@ -123,6 +127,11 @@ public String getIsoCode() {
 	public void setIsoCode(String isoCode) {
 		this.isoCode = isoCode;
 	}
+
+	@Override
+	public void setFormatter(DataFormatUtil _formatter) {
+		this._formatter = _formatter;
+	}
 
 	@Override
 	public String getHeaderRow() {
@@ -147,4 +156,5 @@ public String toReportRow() {
 		sb.append(yr).append("-").append(mth);
 		return sb.toString();
 	}
+
 }