Merge branch 'develop' into milestone/ff-admin-unit

# Conflicts:
#	package-lock.json
#	package.json
#	src/views/admin/club/newsletter/NewsletterRecipients.vue

src/viewmodels/admin/club/member/member.models.ts

@@ -15,6 +15,7 @@ export interface MemberViewModel {
   sendNewsletter?: CommunicationViewModel;
   smsAlarming?: Array<CommunicationViewModel>;
   preferredCommunication?: Array<CommunicationViewModel>;
+  note?: string;
 }
 
 export interface MemberStatisticsViewModel {
@@ -36,6 +37,7 @@ export interface CreateMemberViewModel {
   nameaffix: string;
   birthdate: Date;
   internalId?: string;
+  note?: string;
 }
 
 export interface UpdateMemberViewModel {
@@ -46,4 +48,5 @@ export interface UpdateMemberViewModel {
   nameaffix: string;
   birthdate: Date;
   internalId?: string;
+  note?: string;
 }

src/viewmodels/admin/club/member/memberEducation.models.ts

@@ -0,0 +1,26 @@
+export interface MemberEducationViewModel {
+  id: number;
+  start: Date;
+  end?: Date;
+  place?: string;
+  note?: string;
+  education: string;
+  educationId: number;
+}
+
+export interface CreateMemberEducationViewModel {
+  start: Date;
+  end?: Date;
+  place?: string;
+  note?: string;
+  educationId: number;
+}
+
+export interface UpdateMemberEducationViewModel {
+  id: number;
+  start: Date;
+  end?: Date;
+  place?: string;
+  note?: string;
+  educationId: number;
+}

src/viewmodels/admin/club/member/membership.models.ts

@@ -21,6 +21,18 @@ export interface MembershipStatisticsViewModel {
   memberBirthdate: Date;
 }
 
+export interface MembershipTotalStatisticsViewModel {
+  durationInDays: number;
+  durationInYears: number;
+  exactDuration: string;
+  memberId: string;
+  memberSalutation: string;
+  memberFirstname: string;
+  memberLastname: string;
+  memberNameaffix: string;
+  memberBirthdate: Date;
+}
+
 export interface CreateMembershipViewModel {
   start: Date;
   statusId: number;

src/viewmodels/admin/club/newsletter/newsletter.models.ts

@@ -7,6 +7,7 @@ export interface NewsletterViewModel {
   newsletterSignatur: string;
   isSent: boolean;
   recipientsByQueryId?: string | null;
+  createdAt: Date;
 }
 
 export interface CreateNewsletterViewModel {

src/viewmodels/admin/configuration/education.models.ts

@@ -0,0 +1,16 @@
+export interface EducationViewModel {
+  id: number;
+  education: string;
+  description: string | null;
+}
+
+export interface CreateEducationViewModel {
+  education: string;
+  description: string | null;
+}
+
+export interface UpdateEducationViewModel {
+  id: number;
+  education: string;
+  description: string | null;
+}