forked from jverein/jverein
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* NEW: Manuelle Korrektur Verwendungszweck * NEW: Automatische Korrektur Verwendungszweck bei Buchungsübernahme aus Hibiscus * Update symbol for Buchungskorrektur Menu * Add possibility of deactivating the automatic correction of usage purposes - Checkbox "Automatische Korrektur der Verwendungszecke ... " * Change order in navigation menu Buchführung * Fix NullPointerException in getBuchungsZweckKorrektur java.lang.NullPointerException: Cannot invoke "String.replace(java.lang.CharSequence, java.lang.CharSequence)" because "value" is null * Format code snippet * Fix spelling mistakes * resolve conflict --------- Co-authored-by: Dennis Schlevoigt <schlevoigt@visus.com> Co-authored-by: dippeal <info@dippe-it.de>
- Loading branch information
1 parent
5e13e31
commit b148140
Showing
12 changed files
with
526 additions
and
4 deletions.
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
src/com/schlevoigt/JVerein/Queries/BuchungsKorrekturQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/********************************************************************** | ||
* 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 | ||
* 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. | ||
* | ||
* 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 | ||
**********************************************************************/ | ||
package com.schlevoigt.JVerein.Queries; | ||
|
||
import java.rmi.RemoteException; | ||
import java.util.List; | ||
|
||
import de.jost_net.JVerein.Einstellungen; | ||
import de.jost_net.JVerein.rmi.Buchung; | ||
import de.willuhn.datasource.pseudo.PseudoIterator; | ||
import de.willuhn.datasource.rmi.DBIterator; | ||
import de.willuhn.datasource.rmi.DBService; | ||
|
||
public class BuchungsKorrekturQuery { | ||
|
||
private List<Buchung> ergebnis; | ||
|
||
public BuchungsKorrekturQuery() { | ||
} | ||
|
||
@SuppressWarnings("unchecked") | ||
public List<Buchung> get() throws RemoteException { | ||
final DBService service = Einstellungen.getDBService(); | ||
|
||
DBIterator<Buchung> it = service.createList(Buchung.class); | ||
|
||
String text1 = "%SVWZ%"; | ||
it.addFilter("upper(zweck) like ?", text1); | ||
|
||
it.setOrder("ORDER BY datum"); | ||
|
||
this.ergebnis = PseudoIterator.asList(it); | ||
return ergebnis; | ||
} | ||
|
||
public int getSize() { | ||
return ergebnis.size(); | ||
} | ||
|
||
} |
31 changes: 31 additions & 0 deletions
31
src/com/schlevoigt/JVerein/gui/action/BuchungsTexteKorrigierenAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/********************************************************************** | ||
* 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 | ||
* 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. | ||
* | ||
* 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 | ||
**********************************************************************/ | ||
package com.schlevoigt.JVerein.gui.action; | ||
|
||
import com.schlevoigt.JVerein.gui.view.BuchungsTexteKorrigierenView; | ||
|
||
import de.willuhn.jameica.gui.Action; | ||
import de.willuhn.jameica.gui.GUI; | ||
|
||
public class BuchungsTexteKorrigierenAction implements Action | ||
{ | ||
@Override | ||
public void handleAction(Object context) | ||
{ | ||
GUI.startView(BuchungsTexteKorrigierenView.class.getName(), null); | ||
} | ||
} |
228 changes: 228 additions & 0 deletions
228
src/com/schlevoigt/JVerein/gui/control/BuchungsTextKorrekturControl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
/********************************************************************** | ||
* 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 | ||
* 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. | ||
* | ||
* 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 | ||
**********************************************************************/ | ||
package com.schlevoigt.JVerein.gui.control; | ||
|
||
import java.rmi.RemoteException; | ||
import java.util.ArrayList; | ||
|
||
import com.schlevoigt.JVerein.Queries.BuchungsKorrekturQuery; | ||
import com.schlevoigt.JVerein.util.Misc; | ||
|
||
import de.jost_net.JVerein.DBTools.DBTransaction; | ||
import de.jost_net.JVerein.Messaging.BuchungMessage; | ||
import de.jost_net.JVerein.gui.action.BuchungAction; | ||
import de.jost_net.JVerein.gui.parts.BuchungListTablePart; | ||
import de.jost_net.JVerein.rmi.Buchung; | ||
import de.jost_net.JVerein.rmi.Konto; | ||
import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ; | ||
import de.willuhn.jameica.gui.AbstractControl; | ||
import de.willuhn.jameica.gui.AbstractView; | ||
import de.willuhn.jameica.gui.Action; | ||
import de.willuhn.jameica.gui.GUI; | ||
import de.willuhn.jameica.gui.Part; | ||
import de.willuhn.jameica.gui.formatter.DateFormatter; | ||
import de.willuhn.jameica.gui.formatter.Formatter; | ||
import de.willuhn.jameica.gui.parts.Button; | ||
import de.willuhn.jameica.gui.parts.TablePart; | ||
import de.willuhn.jameica.messaging.Message; | ||
import de.willuhn.jameica.messaging.MessageConsumer; | ||
import de.willuhn.jameica.system.Application; | ||
import de.willuhn.logging.Logger; | ||
import de.willuhn.util.ApplicationException; | ||
|
||
public class BuchungsTextKorrekturControl extends AbstractControl { | ||
|
||
private TablePart buchungsList; | ||
|
||
private BuchungsKorrekturQuery query; | ||
|
||
private BuchungMessageConsumer mc = null; | ||
|
||
public BuchungsTextKorrekturControl(AbstractView view) { | ||
super(view); | ||
} | ||
|
||
public Button getStartKorrekturButton() { | ||
Button b = new Button("Korrektur", new Action() { | ||
|
||
@Override | ||
public void handleAction(Object context) { | ||
starteKorrektur(); | ||
} | ||
}, null, true, "import_obj.gif"); // "true" defines this button as the | ||
// default | ||
return b; | ||
} | ||
|
||
public Part getBuchungsList() throws RemoteException { | ||
// Buchungen holen | ||
query = new BuchungsKorrekturQuery(); | ||
if (buchungsList == null) { | ||
buchungsList = new BuchungListTablePart(query.get(), new BuchungAction(false)); | ||
buchungsList.addColumn("Nr", "id-int"); | ||
buchungsList.addColumn("S", "splitid", new Formatter() { | ||
@Override | ||
public String format(Object o) { | ||
return (o != null ? "S" : " "); | ||
} | ||
}); | ||
buchungsList.addColumn("Konto", "konto", new Formatter() { | ||
|
||
@Override | ||
public String format(Object o) { | ||
Konto k = (Konto) o; | ||
if (k != null) { | ||
try { | ||
return k.getBezeichnung(); | ||
} catch (RemoteException e) { | ||
Logger.error("Fehler", e); | ||
} | ||
} | ||
return ""; | ||
} | ||
}); | ||
buchungsList.addColumn("Datum", "datum", new DateFormatter(new JVDateFormatTTMMJJJJ())); | ||
|
||
buchungsList.addColumn("Verwendungszweck neu", "zweck", new Formatter() { | ||
@Override | ||
public String format(Object value) { | ||
if (value == null) { | ||
return null; | ||
} | ||
return Misc.getBuchungsZweckKorrektur(value.toString(), false); | ||
} | ||
}); | ||
buchungsList.addColumn("Verwendungszweck alt", "zweck", new Formatter() { | ||
@Override | ||
public String format(Object value) { | ||
if (value == null) { | ||
return null; | ||
} | ||
String s = value.toString(); | ||
s = s.replaceAll("\r\n", "|"); | ||
s = s.replaceAll("\r", "|"); | ||
s = s.replaceAll("\n", "|"); | ||
return s; | ||
} | ||
}); | ||
buchungsList.setMulti(true); | ||
buchungsList.setRememberColWidths(true); | ||
buchungsList.setRememberOrder(true); | ||
buchungsList.setRememberState(true); | ||
this.mc = new BuchungMessageConsumer(); | ||
Application.getMessagingFactory().registerMessageConsumer(this.mc); | ||
} else { | ||
buchungsList.removeAll(); | ||
|
||
for (Buchung bu : query.get()) { | ||
buchungsList.addItem(bu); | ||
} | ||
buchungsList.sort(); | ||
} | ||
|
||
return buchungsList; | ||
} | ||
|
||
public void refreshBuchungen() throws RemoteException { | ||
if (buchungsList == null) { | ||
return; | ||
} | ||
buchungsList.removeAll(); | ||
|
||
for (Buchung b : query.get()) { | ||
buchungsList.addItem(b); | ||
} | ||
} | ||
|
||
private void starteKorrektur() { | ||
try { | ||
int count = 0; | ||
DBTransaction.starten(); | ||
|
||
for (Object item : buchungsList.getItems()) { | ||
Buchung b = (Buchung) item; | ||
if (b.getJahresabschluss() != null) { | ||
continue; | ||
} | ||
String zweck = b.getZweck(); | ||
zweck = Misc.getBuchungsZweckKorrektur(zweck, true); | ||
b.setZweck(zweck); | ||
b.store(); | ||
count++; | ||
} | ||
|
||
DBTransaction.commit(); | ||
GUI.getStatusBar().setSuccessText(count + " Buchungen korrigiert"); | ||
refreshBuchungen(); | ||
} catch (ApplicationException e) { | ||
DBTransaction.rollback(); | ||
GUI.getStatusBar().setErrorText(e.getLocalizedMessage()); | ||
} catch (RemoteException e) { | ||
DBTransaction.rollback(); | ||
GUI.getStatusBar().setErrorText(e.getLocalizedMessage()); | ||
} | ||
} | ||
|
||
/** | ||
* Wird benachrichtigt um die Anzeige zu aktualisieren. | ||
*/ | ||
private class BuchungMessageConsumer implements MessageConsumer { | ||
|
||
/** | ||
* @see de.willuhn.jameica.messaging.MessageConsumer#autoRegister() | ||
*/ | ||
@Override | ||
public boolean autoRegister() { | ||
return false; | ||
} | ||
|
||
/** | ||
* @see de.willuhn.jameica.messaging.MessageConsumer#getExpectedMessageTypes() | ||
*/ | ||
@Override | ||
public Class<?>[] getExpectedMessageTypes() { | ||
return new Class[] { BuchungMessage.class }; | ||
} | ||
|
||
/** | ||
* @see de.willuhn.jameica.messaging.MessageConsumer#handleMessage(de.willuhn.jameica.messaging.Message) | ||
*/ | ||
@Override | ||
public void handleMessage(final Message message) throws Exception { | ||
GUI.getDisplay().syncExec(new Runnable() { | ||
|
||
@Override | ||
public void run() { | ||
try { | ||
if (buchungsList == null) { | ||
// Eingabe-Feld existiert nicht. Also abmelden | ||
Application.getMessagingFactory().unRegisterMessageConsumer(BuchungMessageConsumer.this); | ||
return; | ||
} | ||
refreshBuchungen(); | ||
} catch (Exception e) { | ||
// Wenn hier ein Fehler auftrat, deregistrieren wir uns | ||
// wieder | ||
Logger.error("unable to refresh Splitbuchungen", e); | ||
Application.getMessagingFactory().unRegisterMessageConsumer(BuchungMessageConsumer.this); | ||
} | ||
} | ||
}); | ||
} | ||
|
||
} | ||
} |
39 changes: 39 additions & 0 deletions
39
src/com/schlevoigt/JVerein/gui/view/BuchungsTexteKorrigierenView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/********************************************************************** | ||
* 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 | ||
* 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. | ||
* | ||
* 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 | ||
**********************************************************************/ | ||
package com.schlevoigt.JVerein.gui.view; | ||
|
||
import com.schlevoigt.JVerein.gui.control.BuchungsTextKorrekturControl; | ||
|
||
import de.willuhn.jameica.gui.AbstractView; | ||
import de.willuhn.jameica.gui.GUI; | ||
import de.willuhn.jameica.gui.parts.ButtonArea; | ||
|
||
public class BuchungsTexteKorrigierenView extends AbstractView { | ||
|
||
@Override | ||
public void bind() throws Exception { | ||
GUI.getView().setTitle("Buchungstexte korrigieren"); | ||
|
||
final BuchungsTextKorrekturControl control = new BuchungsTextKorrekturControl(this); | ||
|
||
control.getBuchungsList().paint(this.getParent()); | ||
|
||
ButtonArea buttons = new ButtonArea(); | ||
buttons.addButton(control.getStartKorrekturButton()); | ||
buttons.paint(this.getParent()); | ||
} | ||
} |
Oops, something went wrong.