Skip to content

Commit

Permalink
Belegnummer wird in der Auswertung berücksichtigt (entsprechend der v…
Browse files Browse the repository at this point in the history 
…erwendeten Einstellung)
  • Loading branch information
@VinRud
VinRud committed Apr 13, 2020
1 parent 2e848db commit f1c553a
Show file tree
Hide file tree
Showing 13 changed files with 932 additions and 1,229 deletions.
199 changes: 77 additions & 122 deletions src/de/jost_net/JVerein/Queries/BuchungQuery.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/**********************************************************************
* Copyright (c) by Heiner Jostkleigrewe
* This program is free software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation, either version 3 of the
*
* This program is free software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
* the GNU General Public License for more details.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not,
* see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*
* heiner@jverein.de
* www.jverein.de
* heiner@jverein.de | www.jverein.de
**********************************************************************/
package de.jost_net.JVerein.Queries;

Expand All @@ -31,8 +31,7 @@
import de.willuhn.datasource.rmi.DBIterator;
import de.willuhn.datasource.rmi.DBService;

public class BuchungQuery
{
public class BuchungQuery {
private Date datumvon;

private Date datumbis;
Expand Down Expand Up @@ -65,10 +64,8 @@ public class BuchungQuery

private int order = ORDER_UMSATZID;

public BuchungQuery(Date datumvon, Date datumbis, Konto konto,
Buchungsart buchungsart, Projekt projekt, String text, String betrag,
Boolean hasMitglied)
{
public BuchungQuery(Date datumvon, Date datumbis, Konto konto, Buchungsart buchungsart,
Projekt projekt, String text, String betrag, Boolean hasMitglied) {
this.datumvon = datumvon;
this.datumbis = datumbis;
this.konto = konto;
Expand All @@ -79,139 +76,106 @@ public BuchungQuery(Date datumvon, Date datumbis, Konto konto,
this.hasMitglied = hasMitglied;
}

public void setOrderID()
{
public void setOrderID() {
order = ORDER_ID;
}

public Boolean getHasMitglied()
{
public Boolean getHasMitglied() {
return hasMitglied;
}

public void setHasMitglied(Boolean hasMitglied)
{
public void setHasMitglied(Boolean hasMitglied) {
this.hasMitglied = hasMitglied;
}

public void setOrderDatum()
{
public void setOrderDatum() {
order = ORDER_DATUM;
}

public void setOrderDatumID()
{
public void setOrderDatumID() {
order = ORDER_DATUM_ID;
}

public void setOrderDatumAuszugsnummerBlattnummer()
{
public void setOrderDatumAuszugsnummerBlattnummer() {
order = ORDER_DATUM_AUSZUGSNUMMER_BLATTNUMMER;
}

public void setOrderDatumName()
{
public void setOrderDatumName() {
order = ORDER_DATUM_NAME;
}

public Date getDatumvon()
{
public Date getDatumvon() {
return datumvon;
}

public Date getDatumbis()
{
public Date getDatumbis() {
return datumbis;
}

public Konto getKonto()
{
public Konto getKonto() {
return konto;
}

public Buchungsart getBuchungsart()
{
public Buchungsart getBuchungsart() {
return buchungart;
}

public Projekt getProjekt()
{
public Projekt getProjekt() {
return projekt;
}

public String getText()
{
public String getText() {
return text;
}

@SuppressWarnings("unchecked")
public List<Buchung> get() throws RemoteException
{
public List<Buchung> get() throws RemoteException {
final DBService service = Einstellungen.getDBService();

DBIterator<Buchung> it = service.createList(Buchung.class);
it.addFilter("datum >= ? ", datumvon);
it.addFilter("datum <= ? ", datumbis);

if (konto != null)
{
if (konto != null) {
it.addFilter("konto = ? ", konto.getID());
}
if (buchungart != null)
{
if (buchungart.getNummer() == -1)
{
if (buchungart != null) {
if (buchungart.getNummer() == -1) {
it.addFilter("buchungsart is null ");
}
else if (buchungart.getNummer() >= 0)
{
} else if (buchungart.getNummer() >= 0) {
it.addFilter("buchungsart = ? ", buchungart.getID());
}
}

if (hasMitglied != null)
{
if (hasMitglied)
{
if (hasMitglied != null) {
if (hasMitglied) {
it.addFilter("mitgliedskonto is not null");
}
else
{
} else {
it.addFilter("mitgliedskonto is null");
}
}

if (projekt != null)
{
if (projekt.getID() == null)
{
if (projekt != null) {
if (projekt.getID() == null) {
it.addFilter("projekt is null");
}
else
{
} else {
it.addFilter("projekt = ?", projekt.getID());
}
}

if (betrag != null && betrag.length() > 0)
{
try
{
if (betrag != null && betrag.length() > 0) {
try {
Suchbetrag suchbetrag = new Suchbetrag(betrag);
switch (suchbetrag.getSuchstrategie())
{
case GLEICH:
{
switch (suchbetrag.getSuchstrategie()) {
case GLEICH: {
it.addFilter("betrag = ?", suchbetrag.getBetrag());
break;
}
case GRÖSSER:
{
case GRÖSSER: {
it.addFilter("betrag > ?", suchbetrag.getBetrag());
break;
}
case GRÖSSERGLEICH:
{
case GRÖSSERGLEICH: {
it.addFilter("betrag >= ?", suchbetrag.getBetrag());
break;
}
Expand All @@ -230,84 +194,75 @@ else if (buchungart.getNummer() >= 0)
default:
break;
}
}
catch (Exception e)
{
} catch (Exception e) {
// throw new RemoteException(e.getMessage());
}
}

if (text.length() > 0)
{
if (text.length() > 0) {
String ttext = text.toUpperCase();
ttext = "%" + ttext + "%";
it.addFilter(
"(upper(name) like ? or upper(zweck) like ? or upper(kommentar) like ?) ",
ttext, ttext, ttext);
it.addFilter("(upper(name) like ? or upper(zweck) like ? or upper(kommentar) like ?) ", ttext,
ttext, ttext);
}
switch (order)
{
case ORDER_UMSATZID:
{
switch (order) {
case ORDER_UMSATZID: {
it.setOrder("ORDER BY umsatzid DESC");
break;
}
case ORDER_DATUM:
{
case ORDER_DATUM: {
it.setOrder("ORDER BY datum");
break;
}
case ORDER_DATUM_AUSZUGSNUMMER_BLATTNUMMER:
{
it.setOrder("ORDER BY datum, auszugsnummer, blattnummer, id");
case ORDER_DATUM_AUSZUGSNUMMER_BLATTNUMMER: {
it.setOrder("ORDER BY datum, auszugsnummer, blattnummer, "
+ (Einstellungen.getEinstellung().getVerwendeBelegnummer() ? "belegnummer, " : "")
+ "id");
break;
}
case ORDER_DATUM_NAME:
{
it.setOrder("ORDER BY datum, name, id");
case ORDER_DATUM_NAME: {
it.setOrder("ORDER BY datum, name, "
+ (Einstellungen.getEinstellung().getVerwendeBelegnummer() ? "belegnummer, " : "")
+ "id");
break;
}
case ORDER_ID:
{
it.setOrder("ORDER BY id");
case ORDER_ID: {
it.setOrder("ORDER BY "
+ (Einstellungen.getEinstellung().getVerwendeBelegnummer() ? "belegnummer, " : "")
+ "id");
break;
}
case ORDER_DATUM_ID:
{
it.setOrder("ORDER BY datum, id");
case ORDER_DATUM_ID: {
it.setOrder("ORDER BY datum, "
+ (Einstellungen.getEinstellung().getVerwendeBelegnummer() ? "belegnummer, " : "")
+ "id");
break;
}

}

this.ergebnis = PseudoIterator.asList(it);
return ergebnis;
}

public String getSubtitle() throws RemoteException
{
String subtitle = String.format("vom %s bis %s",
new JVDateFormatTTMMJJJJ().format(getDatumvon()),
new JVDateFormatTTMMJJJJ().format(getDatumbis()));
if (getKonto() != null)
{
subtitle += " " + String.format("für Konto %s - %s",
getKonto().getNummer(), getKonto().getBezeichnung());
public String getSubtitle() throws RemoteException {
String subtitle =
String.format("vom %s bis %s", new JVDateFormatTTMMJJJJ().format(getDatumvon()),
new JVDateFormatTTMMJJJJ().format(getDatumbis()));
if (getKonto() != null) {
subtitle += " "
+ String.format("für Konto %s - %s", getKonto().getNummer(), getKonto().getBezeichnung());
}
if (getProjekt() != null)
{
subtitle += ", "
+ String.format("Projekt %s", getProjekt().getBezeichnung());
if (getProjekt() != null) {
subtitle += ", " + String.format("Projekt %s", getProjekt().getBezeichnung());
}
if (getText() != null && getText().length() > 0)
{
if (getText() != null && getText().length() > 0) {
subtitle += ", " + String.format("Text=%s", getText());
}
return subtitle;
}

public int getSize()
{
public int getSize() {
return ergebnis.size();
}

Expand Down
28 changes: 13 additions & 15 deletions src/de/jost_net/JVerein/Variable/BuchungVar.java
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/**********************************************************************
* Copyright (c) by Heiner Jostkleigrewe
* This program is free software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation, either version 3 of the
*
* This program is free software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
* the GNU General Public License for more details.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not,
* see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*
* heiner@jverein.de
* www.jverein.de
* heiner@jverein.de | www.jverein.de
**********************************************************************/
package de.jost_net.JVerein.Variable;

public enum BuchungVar
{
public enum BuchungVar {
ABRECHNUNGSLAUF("buchung_abrechnungslauf"), //
ART("buchung_art"), //
AUSZUGSNUMMER("buchung_auszugsnummer"), //
BELEG("buchung_belegnummer"), //
BETRAG("buchung_betrag"), //
BLATTNUMMER("buchung_blattnummer"), //
BUCHUNGSARBEZEICHNUNG("buchung_buchungsart_bezeichnung"), //
Expand All @@ -41,13 +41,11 @@ public enum BuchungVar

private String name;

BuchungVar(String name)
{
BuchungVar(String name) {
this.name = name;
}

public String getName()
{
public String getName() {
return name;
}
}
Loading

0 comments on commit f1c553a

Please sign in to comment.