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

Allgemeine Map in Emails verfügbar machen #545

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Allgemeine Map in Emails verfügbar machen #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/de/jost_net/JVerein/gui/action/OpenInsertVariableDialogAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

package de.jost_net.JVerein.gui.action;

import java.util.Map;

import de.jost_net.JVerein.Variable.AllgemeineMap;
import de.jost_net.JVerein.Variable.MitgliedMap;
import de.jost_net.JVerein.gui.dialogs.ShowVariablesDialog;
import de.jost_net.JVerein.gui.menu.ShowVariablesMenu;
Expand All @@ -28,8 +31,6 @@
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;

import java.util.Map;

public class OpenInsertVariableDialogAction implements Action
{
@SuppressWarnings("unchecked")
Expand All @@ -53,7 +54,7 @@ else if (context instanceof Map)
else if (context instanceof MailEmpfaenger)
{
map = new MitgliedMap().getMap(((MailEmpfaenger) context).getMitglied(),
null);
new AllgemeineMap().getMap(null));
prependCopyText = "$";
}
else
Expand Down
20 changes: 9 additions & 11 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 @@ -16,9 +16,16 @@
**********************************************************************/
package de.jost_net.JVerein.gui.control;

import java.rmi.RemoteException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.TreeSet;

import org.apache.velocity.app.Velocity;

import de.jost_net.JVerein.Einstellungen;
import de.jost_net.JVerein.Variable.AllgemeineMap;
import de.jost_net.JVerein.Variable.MitgliedMap;
import de.jost_net.JVerein.gui.action.MailDetailAction;
import de.jost_net.JVerein.gui.menu.MailAnhangMenu;
import de.jost_net.JVerein.gui.menu.MailAuswahlMenu;
Expand Down Expand Up @@ -49,15 +56,6 @@
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;
import de.willuhn.util.ProgressMonitor;
import org.apache.velocity.app.Velocity;

import java.rmi.RemoteException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.TreeSet;

public class MailControl extends FilterControl
{
Expand Down
23 changes: 13 additions & 10 deletions src/de/jost_net/JVerein/gui/util/EvalMail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@

package de.jost_net.JVerein.gui.util;

import de.jost_net.JVerein.Einstellungen;
import de.jost_net.JVerein.Variable.MitgliedMap;
import de.jost_net.JVerein.Variable.VarTools;
import de.jost_net.JVerein.rmi.MailEmpfaenger;
import de.jost_net.JVerein.rmi.Mitglied;
import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;
import java.io.StringWriter;
import java.rmi.RemoteException;
import java.util.Map;

import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;

import java.io.StringWriter;
import java.rmi.RemoteException;
import java.util.Map;
import de.jost_net.JVerein.Einstellungen;
import de.jost_net.JVerein.Variable.AllgemeineMap;
import de.jost_net.JVerein.Variable.MitgliedMap;
import de.jost_net.JVerein.Variable.VarTools;
import de.jost_net.JVerein.rmi.MailEmpfaenger;
import de.jost_net.JVerein.rmi.Mitglied;
import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;

public class EvalMail
{
Expand All @@ -50,7 +52,8 @@ public EvalMail(Mitglied mitglied) throws RemoteException
context.put("decimalformat", Einstellungen.DECIMALFORMAT);
context.put("email", mitglied.getEmail());
context.put("empf", mitglied);
Map<String, Object> map = new MitgliedMap().getMap(mitglied, null);
Map<String, Object> map = new MitgliedMap().getMap(mitglied,
new AllgemeineMap().getMap(null));
VarTools.add(context, map);
}

Expand Down
21 changes: 12 additions & 9 deletions src/de/jost_net/JVerein/gui/view/MailDetailView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
**********************************************************************/
package de.jost_net.JVerein.gui.view;

import java.io.File;
import java.io.FileInputStream;

import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;

import de.jost_net.JVerein.Einstellungen;
import de.jost_net.JVerein.Variable.AllgemeineMap;
import de.jost_net.JVerein.Variable.MitgliedMap;
import de.jost_net.JVerein.gui.action.DokumentationAction;
import de.jost_net.JVerein.gui.action.MailVorlageZuweisenAction;
Expand All @@ -38,14 +48,6 @@
import de.willuhn.jameica.system.Settings;
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;

import java.io.File;
import java.io.FileInputStream;

public class MailDetailView extends AbstractView
{
Expand Down Expand Up @@ -185,7 +187,8 @@ public void handleAction(Object context) throws ApplicationException
}
buttons.addButton(
new Button("Variablen anzeigen", new OpenInsertVariableDialogAction(),
new MitgliedMap().getMap(m, null), false, "bookmark.png"));
new MitgliedMap().getMap(m, new AllgemeineMap().getMap(null)),
false, "bookmark.png"));
buttons.addButton(
new Button("Vorschau", new MailVorschauAction(control), m, false,
"edit-copy.png"));
Expand Down
Loading