Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filter für Mail View #235

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Filter für Mail View #235

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dc6ed8
Filter für Mail View
JohannMaierhofer Jun 3, 2024
1cd5c29
Mailempfänger in Filter
JohannMaierhofer Jun 3, 2024
265489d
Umstellung auf DBIterator
JohannMaierhofer Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/de/jost_net/JVerein/gui/control/FilterControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public class FilterControl extends AbstractControl

protected DateInput abbuchungsdatumbis = null;

protected TextInput suchtext = null;

public enum Mitgliedstyp {
MITGLIED,
Expand Down Expand Up @@ -845,6 +846,23 @@ public boolean isAbbuchungsdatumbisAktiv()
return abbuchungsdatumbis != null;
}

public TextInput getSuchtext()
{
if (suchtext != null)
{
return suchtext;
}
this.suchtext = new TextInput(settings.getString(settingsprefix + "suchtext", ""),
50);
suchtext.setName("Text");
return suchtext;
}

public boolean isSuchtextAktiv()
{
return suchtext != null;
}

/**
* Buttons
*/
Expand Down Expand Up @@ -955,6 +973,8 @@ public void handleAction(Object context) throws ApplicationException
abbuchungsdatumvon.setValue(null);
if (abbuchungsdatumbis != null)
abbuchungsdatumbis.setValue(null);
if (suchtext != null)
suchtext.setValue("");
refresh();
}
}, null, false, "eraser.png");
Expand Down Expand Up @@ -1313,6 +1333,19 @@ public void saveFilterSettings() throws RemoteException
saveDate( (Date) abbuchungsdatumbis.getValue(), "abbuchungsdatum.bis");
}

if (suchtext != null)
{
String tmp = (String) suchtext.getValue();
if (tmp != null)
{
settings.setAttribute(settingsprefix + "suchtext", tmp);
}
else
{
settings.setAttribute(settingsprefix + "suchtext", "");
}
}

}

private void saveDate(Date tmp, String setting)
Expand Down
136 changes: 127 additions & 9 deletions src/de/jost_net/JVerein/gui/control/MailControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.IOException;
import java.io.StringWriter;
import java.rmi.RemoteException;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
Expand Down Expand Up @@ -48,7 +50,7 @@
import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;
import de.willuhn.datasource.rmi.DBIterator;
import de.willuhn.datasource.rmi.DBService;
import de.willuhn.jameica.gui.AbstractControl;
import de.willuhn.datasource.rmi.ResultSetExtractor;
import de.willuhn.jameica.gui.AbstractView;
import de.willuhn.jameica.gui.Action;
import de.willuhn.jameica.gui.GUI;
Expand All @@ -67,11 +69,9 @@
import de.willuhn.util.ApplicationException;
import de.willuhn.util.ProgressMonitor;

public class MailControl extends AbstractControl
public class MailControl extends FilterControl
{

private de.willuhn.jameica.system.Settings settings;

private TablePart empfaenger;

private TextInput betreff;
Expand All @@ -85,6 +85,13 @@ public class MailControl extends AbstractControl
private Mail mail;

private TablePart mailsList;

private boolean and = false;

private String sql = "";

private ArrayList<Object> bedingungen = new ArrayList<>();


public MailControl(AbstractView view)
{
Expand Down Expand Up @@ -613,11 +620,11 @@ public void handleStore(boolean mitversand)

public Part getMailList() throws RemoteException
{
DBService service = Einstellungen.getDBService();
DBIterator<Mail> mails = service.createList(Mail.class);
mails.setOrder("ORDER BY betreff");

mailsList = new TablePart(mails, new MailDetailAction());
if (mailsList != null)
{
return mailsList;
}
mailsList = new TablePart(getMails(), new MailDetailAction());
mailsList.addColumn("Betreff", "betreff");
mailsList.addColumn("Bearbeitung", "bearbeitung",
new DateFormatter(new JVDateFormatDATETIME()));
Expand All @@ -628,6 +635,117 @@ public Part getMailList() throws RemoteException
mailsList.setRememberOrder(true);
return mailsList;
}

public void TabRefresh()
{
try
{
if (mailsList == null)
{
return;
}
mailsList.removeAll();
ArrayList<Mail> mails = getMails();
for (Mail mail: mails)
{
mailsList.addItem(mail);
}
}
catch (RemoteException e1)
{
Logger.error("Fehler", e1);
}
}

@SuppressWarnings("unchecked")
private ArrayList<Mail> getMails() throws RemoteException
{
and = false;
bedingungen = new ArrayList<>();
final DBService service = Einstellungen.getDBService();
ArrayList<Mail> mails = new ArrayList<>();
sql = "select DISTINCT mail.id, lower(mail.betreff) from mail ";
sql += "join mailempfaenger on mail.id = mailempfaenger.mail ";
sql += "join mitglied on mailempfaenger.mitglied = mitglied.id ";
if (isSuchnameAktiv() && getSuchname().getValue() != null)
{
String tmpSuchname = (String) getSuchname().getValue();
if (tmpSuchname.length() > 0)
{
addCondition("(lower(mitglied.name) like ?)", "%" + tmpSuchname.toLowerCase() + "%");
}
}
if (isSuchtextAktiv() && getSuchtext().getValue() != null)
{
String tmpSuchtext = (String) getSuchtext().getValue();
if (tmpSuchtext.length() > 0)
{
addCondition("(lower(betreff) like ?)", "%" + tmpSuchtext.toLowerCase() + "%");
}
}
if (isEingabedatumvonAktiv() && getEingabedatumvon().getValue() != null)
{
Date d = (Date) getEingabedatumvon().getValue();
addCondition("bearbeitung >= ?", new java.sql.Date(d.getTime()));
}
if (isEingabedatumbisAktiv() && getEingabedatumbis().getValue() != null)
{
Date d = (Date) getEingabedatumbis().getValue();
addCondition("bearbeitung <= ?", new java.sql.Date(d.getTime()));
}
if (isDatumvonAktiv() && getDatumvon().getValue() != null)
{
Date d = (Date) getDatumvon().getValue();
addCondition("versand >= ?", new java.sql.Date(d.getTime()));
}
if (isDatumbisAktiv() && getDatumbis().getValue() != null)
{
Date d = (Date) getDatumbis().getValue();
addCondition("versand <= ?", new java.sql.Date(d.getTime()));
}
sql += " ORDER BY lower(mail.betreff)";

ResultSetExtractor rs = new ResultSetExtractor()
{

@Override
public Object extract(ResultSet rs) throws RemoteException, SQLException
{
ArrayList<Mail> list = new ArrayList<>();
while (rs.next())
{
list.add((Mail) service.createObject(Mail.class,
rs.getString(1)));
}
return list;
}
};
mails = (ArrayList<Mail>) service.execute(sql,
bedingungen.toArray(), rs);

return mails;
}


private void addCondition(String condition)
{
if (and)
{
sql += " AND ";
}
else
{
sql += "where ";
}
and = true;
sql += condition;
}

private void addCondition(String condition, Object obj)
{
addCondition(condition);
bedingungen.add(obj);
}

public class EvalMail
{
Expand Down
23 changes: 23 additions & 0 deletions src/de/jost_net/JVerein/gui/view/MailUebersichtView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
import de.willuhn.jameica.gui.AbstractView;
import de.willuhn.jameica.gui.GUI;
import de.willuhn.jameica.gui.parts.ButtonArea;
import de.willuhn.jameica.gui.util.ColumnLayout;
import de.willuhn.jameica.gui.util.LabelGroup;
import de.willuhn.jameica.gui.util.SimpleContainer;

public class MailUebersichtView extends AbstractView
{
Expand All @@ -32,6 +35,26 @@ public void bind() throws Exception
GUI.getView().setTitle("Mails");

MailControl control = new MailControl(this);

LabelGroup group = new LabelGroup(getParent(), "Filter");
ColumnLayout cl = new ColumnLayout(group.getComposite(), 3);

SimpleContainer left = new SimpleContainer(cl.getComposite());
left.addLabelPair("Mail Empf�nger", control.getSuchname());
left.addLabelPair("Betreff", control.getSuchtext());

SimpleContainer middle = new SimpleContainer(cl.getComposite());
middle.addLabelPair("Bearbeitung von", control.getEingabedatumvon());
middle.addLabelPair("Bearbeitung bis", control.getEingabedatumbis());

SimpleContainer right = new SimpleContainer(cl.getComposite());
right.addLabelPair("Versand von", control.getDatumvon());
right.addLabelPair("Versand bis", control.getDatumbis());

ButtonArea fbuttons = new ButtonArea();
fbuttons.addButton(control.getResetButton());
fbuttons.addButton(control.getSuchenButton());
group.addButtonArea(fbuttons);

control.getMailList().paint(this.getParent());

Expand Down