Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 17 Pull requests Projects Releases 36 Packages Wiki Activity Actions

change salutation to separate table

Browse source
This commit is contained in:
Julian Krauser 2025-01-25 10:20:57 +01:00
parent ff651b7d8f
commit 21cf811a56
17 changed files with 64 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controller/admin/club/memberController.ts
View file

@ -285,7 +285,7 @@ export async function createMemberPrintoutList(req: Request, res: Response): Pro
* @returns {Promise<*>}
*/
export async function createMember(req: Request, res: Response): Promise<any> {
const salutation = req.body.salutation;
const salutationId = req.body.salutationId;
const firstname = req.body.firstname;
const lastname = req.body.lastname;
const nameaffix = req.body.nameaffix;
@ -293,7 +293,7 @@ export async function createMember(req: Request, res: Response): Promise<any> {
const internalId = req.body.internalId;
let createMember: CreateMemberCommand = {
salutation,
salutationId,
firstname,
lastname,
nameaffix,
@ -453,7 +453,7 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
*/
export async function updateMemberById(req: Request, res: Response): Promise<any> {
const memberId = parseInt(req.params.id);
const salutation = req.body.salutation;
const salutationId = req.body.salutationId;
const firstname = req.body.firstname;
const lastname = req.body.lastname;
const nameaffix = req.body.nameaffix;
@ -462,7 +462,7 @@ export async function updateMemberById(req: Request, res: Response): Promise<any
let updateMember: UpdateMemberCommand = {
id: memberId,
salutation,
salutationId,
firstname,
lastname,
nameaffix,

5
src/controller/admin/club/newsletterController.ts
View file

@ -21,7 +21,6 @@ import UserService from "../../../service/user/userService";
import { TemplateHelper } from "../../../helpers/templateHelper";
import MailHelper from "../../../helpers/mailHelper";
import { NewsletterEventType, NewsletterHelper } from "../../../helpers/newsletterHelper";
import { Salutation } from "../../../enums/salutation";
/**
* @description get all newsletters
@ -142,7 +141,7 @@ export async function createNewsletterPrintoutPreviewById(req: Request, res: Res
data.recipient = {
firstname: recipient.firstname,
lastname: recipient.lastname,
salutation: Salutation.none,
salutation: "Anrede",
nameaffix: "",
street: "Straße",
streetNumber: "Hausnummer",
@ -248,7 +247,7 @@ export async function createNewsletterMailPreviewById(req: Request, res: Respons
data.recipient = {
firstname: recipient.firstname,
lastname: recipient.lastname,
salutation: Salutation.none,
salutation: "Anrede",
nameaffix: "",
street: "Straße",
streetNumber: "Hausnummer",