Skip to content

Commit 800990c

Browse files
willuhnwilluhn
committed
Hinweistext in Auftragslisten anzeigen, wenn durch Filterkriterien Aufträge ausgeblendet sind - siehe https://homebanking-hilfe.de/forum/topic.php?p=161817#real161817 
1 parent a503b18 commit 800990c

File tree

5 files changed

+115
-20
lines changed

5 files changed

+115
-20
lines changed

‎build/ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
HEAD 2.11 (nightly)
22

3+
* NEW: 0972 Hinweistext in Auftragslisten anzeigen, wenn durch Filterkriterien Auftr�ge ausgeblendet sind - siehe https://homebanking-hilfe.de/forum/topic.php?p=161817#real161817
34
* BUG: 0971 Parameter "usage.list.all" und "usage.display.all" zu "usage.display.all" zusammengefasst. Vorher konnte mit beiden Parametern in Detail-Ansicht und Liste zwischen gek�rztem und komplettem Verwendungszweck umgeschaltet werden
45
* NEW: 0970 Flickercode bei Bedarf in QR-Code umwandeln. Code stammt von https://github.com/oezgueremir/hibiscus/tree/feature/QRDataFromFlickerData
56
* NEW: 0969 Update auf HBCI4Java 3.1.57 - https://github.com/hbci4j/hbci4java/releases/tag/hbci4j-core-3.1.57

‎src/de/willuhn/jameica/hbci/gui/parts/AbstractSammelTransferList.java

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import de.willuhn.jameica.hbci.rmi.SammelTransferBuchung;
5252
import de.willuhn.jameica.messaging.Message;
5353
import de.willuhn.jameica.messaging.MessageConsumer;
54+
import de.willuhn.jameica.messaging.StatusBarMessage;
5455
import de.willuhn.jameica.reminder.Reminder;
5556
import de.willuhn.jameica.reminder.ReminderStorageProvider;
5657
import de.willuhn.jameica.services.BeanService;
@@ -169,26 +170,57 @@ protected boolean hasChanged()
169170
*/
170171
protected DBIterator getList(Object konto, Date from, Date to, String text) throws RemoteException
171172
{
173+
int filterCount = 0;
174+
172175
HBCIDBService service = (HBCIDBService) Settings.getDBService();
173176

174177
DBIterator list = service.createList(getObjectType());
175-
if (from != null) list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
176-
if (to != null) list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
178+
if (from != null)
179+
{
180+
list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
181+
filterCount++;
182+
}
183+
if (to != null)
184+
{
185+
list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
186+
filterCount++;
187+
}
188+
177189
if (text != null && text.length() > 0)
178190
{
179191
list.addFilter("LOWER(bezeichnung) like ?", "%" + text.toLowerCase() + "%");
192+
filterCount++;
193+
}
194+
195+
if (konto != null)
196+
{
197+
if (konto instanceof Konto)
198+
list.addFilter("konto_id = " + ((Konto) konto).getID());
199+
else if (konto instanceof String)
200+
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
201+
202+
filterCount++;
180203
}
181-
182-
if (konto != null && (konto instanceof Konto))
183-
list.addFilter("konto_id = " + ((Konto) konto).getID());
184-
else if (konto != null && (konto instanceof String))
185-
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
186204

187205
boolean pending = ((Boolean) this.getPending().getValue()).booleanValue();
188206
if (pending)
207+
{
189208
list.addFilter("ausgefuehrt = 0");
209+
filterCount++;
210+
}
190211

191212
list.setOrder("ORDER BY " + service.getSQLTimestamp("termin") + " DESC, id DESC");
213+
214+
if (filterCount > 0)
215+
{
216+
final int all = service.createList(getObjectType()).size();
217+
final int size = list.size();
218+
if (all != size)
219+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0} - Anzeige: {1} von {2} Aufträgen",Integer.toString(filterCount), Integer.toString(size), Integer.toString(all)),StatusBarMessage.TYPE_INFO));
220+
else
221+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0}",Integer.toString(filterCount)),StatusBarMessage.TYPE_INFO));
222+
}
223+
192224
return list;
193225
}
194226

‎src/de/willuhn/jameica/hbci/gui/parts/AbstractSepaSammelTransferList.java

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import de.willuhn.jameica.hbci.rmi.SepaSammelTransferBuchung;
5353
import de.willuhn.jameica.messaging.Message;
5454
import de.willuhn.jameica.messaging.MessageConsumer;
55+
import de.willuhn.jameica.messaging.StatusBarMessage;
5556
import de.willuhn.jameica.reminder.Reminder;
5657
import de.willuhn.jameica.reminder.ReminderStorageProvider;
5758
import de.willuhn.jameica.services.BeanService;
@@ -209,26 +210,57 @@ protected boolean hasChanged()
209210
*/
210211
protected DBIterator getList(Object konto, Date from, Date to, String text) throws RemoteException
211212
{
213+
int filterCount = 0;
214+
212215
HBCIDBService service = (HBCIDBService) Settings.getDBService();
213216

214217
DBIterator list = service.createList(getObjectType());
215-
if (from != null) list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
216-
if (to != null) list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
218+
if (from != null)
219+
{
220+
list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
221+
filterCount++;
222+
}
223+
if (to != null)
224+
{
225+
list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
226+
filterCount++;
227+
}
228+
217229
if (text != null && text.length() > 0)
218230
{
219231
list.addFilter("LOWER(bezeichnung) like ?", "%" + text.toLowerCase() + "%");
232+
filterCount++;
220233
}
221234

222-
if (konto != null && (konto instanceof Konto))
223-
list.addFilter("konto_id = " + ((Konto) konto).getID());
224-
else if (konto != null && (konto instanceof String))
225-
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
235+
if (konto != null)
236+
{
237+
if (konto instanceof Konto)
238+
list.addFilter("konto_id = " + ((Konto) konto).getID());
239+
else if (konto instanceof String)
240+
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
241+
242+
filterCount++;
243+
}
226244

227245
boolean pending = ((Boolean) this.getPending().getValue()).booleanValue();
228246
if (pending)
247+
{
229248
list.addFilter("ausgefuehrt = 0");
249+
filterCount++;
250+
}
230251

231252
list.setOrder("ORDER BY " + service.getSQLTimestamp("termin") + " DESC, id DESC");
253+
254+
if (filterCount > 0)
255+
{
256+
final int all = service.createList(getObjectType()).size();
257+
final int size = list.size();
258+
if (all != size)
259+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0} - Anzeige: {1} von {2} Aufträgen",Integer.toString(filterCount), Integer.toString(size), Integer.toString(all)),StatusBarMessage.TYPE_INFO));
260+
else
261+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0}",Integer.toString(filterCount)),StatusBarMessage.TYPE_INFO));
262+
}
263+
232264
return list;
233265
}
234266

‎src/de/willuhn/jameica/hbci/gui/parts/AbstractTransferList.java

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import de.willuhn.jameica.hbci.rmi.Terminable;
5252
import de.willuhn.jameica.messaging.Message;
5353
import de.willuhn.jameica.messaging.MessageConsumer;
54+
import de.willuhn.jameica.messaging.StatusBarMessage;
5455
import de.willuhn.jameica.reminder.Reminder;
5556
import de.willuhn.jameica.reminder.ReminderStorageProvider;
5657
import de.willuhn.jameica.services.BeanService;
@@ -204,22 +205,51 @@ public void widgetDisposed(DisposeEvent e)
204205
*/
205206
protected DBIterator getList(Object konto, Date from, Date to, String text) throws RemoteException
206207
{
208+
int filterCount = 0;
209+
207210
HBCIDBService service = (HBCIDBService) Settings.getDBService();
208211

209212
DBIterator list = service.createList(getObjectType());
210-
if (from != null) list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
211-
if (to != null) list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
213+
if (from != null)
214+
{
215+
list.addFilter("termin >= ?", new java.sql.Date(DateUtil.startOfDay(from).getTime()));
216+
filterCount++;
217+
}
218+
if (to != null)
219+
{
220+
list.addFilter("termin <= ?", new java.sql.Date(DateUtil.endOfDay(to).getTime()));
221+
filterCount++;
222+
}
212223

213-
if (konto != null && (konto instanceof Konto))
214-
list.addFilter("konto_id = " + ((Konto) konto).getID());
215-
else if (konto != null && (konto instanceof String))
216-
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
224+
if (konto != null)
225+
{
226+
if (konto instanceof Konto)
227+
list.addFilter("konto_id = " + ((Konto) konto).getID());
228+
else if (konto instanceof String)
229+
list.addFilter("konto_id in (select id from konto where kategorie = ?)", (String) konto);
230+
231+
filterCount++;
232+
}
217233

218234
boolean pending = ((Boolean) this.getPending().getValue()).booleanValue();
219235
if (pending)
236+
{
220237
list.addFilter("ausgefuehrt = 0");
238+
filterCount++;
239+
}
221240

222241
list.setOrder("ORDER BY " + service.getSQLTimestamp("termin") + " DESC, id DESC");
242+
243+
if (filterCount > 0)
244+
{
245+
final int all = service.createList(getObjectType()).size();
246+
final int size = list.size();
247+
if (all != size)
248+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0} - Anzeige: {1} von {2} Aufträgen",Integer.toString(filterCount), Integer.toString(size), Integer.toString(all)),StatusBarMessage.TYPE_INFO));
249+
else
250+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Suchkriterien: {0}",Integer.toString(filterCount)),StatusBarMessage.TYPE_INFO));
251+
}
252+
223253
return list;
224254
}
225255

‎src/de/willuhn/jameica/hbci/gui/parts/KontoauszugList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ private synchronized List<Umsatz> getUmsaetze() throws RemoteException
666666
if (typ != null) this.filterCount++;
667667

668668
if (this.filterCount > 0)
669-
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Anzahl der Suchkriterien: {0}",Integer.toString(this.filterCount)),StatusBarMessage.TYPE_INFO));
669+
Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Anzahl der Suchkriterien: {0}",Integer.toString(this.filterCount)),StatusBarMessage.TYPE_INFO));
670670

671671
if (search != null)
672672
{

0 commit comments

Comments
 (0)