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

Fomular Zähler nicht gespeichert #570

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Fomular Zähler nicht gespeichert #570

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
1 change: 1 addition & 0 deletions src/de/jost_net/JVerein/gui/action/FreiesFormularAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ private void generiereFreiesFormular(Mitglied[] m) throws Exception
Map<String, Object> map = new MitgliedMap().getMap(mi, null);
map = new AllgemeineMap().getMap(map);
fa.writeForm(fo, map);
fo.store();
}
fa.showFormular();

Expand Down
1 change: 1 addition & 0 deletions src/de/jost_net/JVerein/gui/action/SpendenbescheinigungPrintAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ else if (context instanceof Spendenbescheinigung[])
fa.printAnschreiben(spb, text);
}
fa.closeFormular();
fo.store();
}
}
String erfolg = (spbArr.length > 1) ? "Die Spendenbescheinigungen wurden erstellt und unter " + path + " gespeichert."
Expand Down
5 changes: 4 additions & 1 deletion src/de/jost_net/JVerein/gui/control/FreieFormulareControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package de.jost_net.JVerein.gui.control;

import java.io.IOException;

import de.jost_net.JVerein.io.FreiesFormularAusgabe;
import de.willuhn.jameica.gui.AbstractView;
import de.willuhn.jameica.gui.Action;
import de.willuhn.jameica.gui.GUI;
import de.willuhn.jameica.gui.parts.Button;
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;

public class FreieFormulareControl extends DruckMailControl
{
Expand Down Expand Up @@ -41,7 +43,8 @@ public void handleAction(Object context)
return button;
}

private void generiereFreieFormulare(Object currentObject) throws IOException
private void generiereFreieFormulare(Object currentObject)
throws IOException, ApplicationException
{
saveDruckMailSettings();
new FreiesFormularAusgabe(this);
Expand Down
6 changes: 4 additions & 2 deletions src/de/jost_net/JVerein/gui/control/PreNotificationControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import de.willuhn.jameica.system.OperationCanceledException;
import de.willuhn.jameica.system.Settings;
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;
import de.willuhn.util.ProgressMonitor;

public class PreNotificationControl extends DruckMailControl
Expand Down Expand Up @@ -251,7 +252,7 @@ public void handleAction(Object context)
}

private void generierePDF(Object currentObject, boolean mitMail,
String pdfMode) throws IOException
String pdfMode) throws IOException, ApplicationException
{
ArrayList<Lastschrift> lastschriften = new ArrayList<>();
if (currentObject instanceof Abrechnungslauf)
Expand Down Expand Up @@ -599,11 +600,12 @@ else if (currentObject instanceof Lastschrift[])
}

private void aufbereitenFormular(Lastschrift ls, Formular fo)
throws RemoteException
throws RemoteException, ApplicationException
{
Map<String, Object> map = new LastschriftMap().getMap(ls, null);
map = new AllgemeineMap().getMap(map);
fa.writeForm(fo, map);
fo.store();
}

private void sendeMail(final ArrayList<Lastschrift> lastschriften, final String betr,
Expand Down
9 changes: 6 additions & 3 deletions src/de/jost_net/JVerein/io/FreiesFormularAusgabe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import de.jost_net.JVerein.util.JVDateFormatJJJJMMTT;
import de.jost_net.JVerein.util.StringTool;
import de.willuhn.jameica.gui.GUI;
import de.willuhn.util.ApplicationException;

public class FreiesFormularAusgabe
{
Expand All @@ -40,7 +41,8 @@ public class FreiesFormularAusgabe

ZipOutputStream zos = null;

public FreiesFormularAusgabe(FreieFormulareControl control) throws IOException
public FreiesFormularAusgabe(FreieFormulareControl control)
throws IOException, ApplicationException
{
this.control = control;
Formular formular = (Formular) control
Expand Down Expand Up @@ -79,7 +81,7 @@ public FreiesFormularAusgabe(FreieFormulareControl control) throws IOException
}

public void aufbereitung(Formular formular, ArrayList<Mitglied> mitglieder)
throws IOException
throws IOException, ApplicationException
{
for (Mitglied m : mitglieder)
{
Expand Down Expand Up @@ -154,11 +156,12 @@ File getDateiAuswahl(String extension, String name) throws RemoteException
}

void aufbereitenFormular(Mitglied m, FormularAufbereitung fa, Formular fo)
throws RemoteException
throws RemoteException, ApplicationException
{
Map<String, Object> map = new MitgliedMap().getMap(m, null);
map = new AllgemeineMap().getMap(map);
fa.writeForm(fo, map);
fo.store();
}

String getDateiname(Mitglied m) throws RemoteException
Expand Down
Loading