diff --git a/frontend/src/app/components/students/student-register/student-register.component.html b/frontend/src/app/components/students/student-register/student-register.component.html index 7404e7f..1ee0c8c 100644 --- a/frontend/src/app/components/students/student-register/student-register.component.html +++ b/frontend/src/app/components/students/student-register/student-register.component.html @@ -113,7 +113,7 @@
- Einzugsermächtigung + Einzugsermächtigung
@@ -134,7 +134,7 @@ Einwilligung
- Einwilligung zur Erhebung, Speicherung, Verarbeitung und Nutzung von personenbezogenen Daten @@ -142,7 +142,7 @@
- Einverständniserklärung zur Nutzung von Bild- und Videomaterial
diff --git a/frontend/src/app/components/students/student-register/student-register.component.ts b/frontend/src/app/components/students/student-register/student-register.component.ts index 574c234..affc528 100644 --- a/frontend/src/app/components/students/student-register/student-register.component.ts +++ b/frontend/src/app/components/students/student-register/student-register.component.ts @@ -81,12 +81,12 @@ export class StudentRegisterComponent implements OnInit { iban: ['', [Validators.required, ValidatorService.validateIban]], bic: ['', Validators.required], nameOfFinancialInstitute: ['', Validators.required], - einzugsermaechtigung: ['', Validators.required], + directDebitAuthorization: ['', Validators.required], }); this.thirdFormGroup = this._formBuilder.group({ - einwilligung: ['', Validators.required], - einverstaendniserklaerung: ['', Validators.required], + consent: ['', Validators.required], + declarationOfConsent: ['', Validators.required], }); this.secondFormGroup.get("iban")?.valueChanges.subscribe(value => { @@ -121,11 +121,11 @@ export class StudentRegisterComponent implements OnInit { iban: this.secondFormGroup.get('iban')?.value, bic: this.secondFormGroup.get('bic')?.value, nameOfFinancialInstitute: this.secondFormGroup.get('nameOfFinancialInstitute')?.value, - einzugsermaechtigung: this.secondFormGroup.get('einzugsermaechtigung')?.value, + directDebitAuthorization: this.secondFormGroup.get('directDebitAuthorization')?.value, // Third Form Group - einwilligung: this.thirdFormGroup.get('einwilligung')?.value, - einverstaendniserklaerung: this.thirdFormGroup.get('einverstaendniserklaerung')?.value + consent: this.thirdFormGroup.get('consent')?.value, + declarationOfConsent: this.thirdFormGroup.get('declarationOfConsent')?.value }; this.registerService.set(studentRegistration); diff --git a/frontend/src/app/models/student-registration.ts b/frontend/src/app/models/student-registration.ts index ddf801d..3f5d47e 100644 --- a/frontend/src/app/models/student-registration.ts +++ b/frontend/src/app/models/student-registration.ts @@ -10,7 +10,7 @@ export interface StudentRegistration { iban: string; bic: string; nameOfFinancialInstitute: string; - einzugsermaechtigung: boolean; - einwilligung: boolean; - einverstaendniserklaerung: boolean; + directDebitAuthorization: boolean; + consent: boolean; + declarationOfConsent: boolean; } diff --git a/frontend/src/app/services/register/register.service.ts b/frontend/src/app/services/register/register.service.ts index 0a63508..0cde0f8 100644 --- a/frontend/src/app/services/register/register.service.ts +++ b/frontend/src/app/services/register/register.service.ts @@ -11,10 +11,10 @@ export class RegisterService { private readonly serviceName = 'register'; constructor(private http: HttpClient) { } - public set(registration: StudentRegistration): Observable { + public set(registration: StudentRegistration): Observable { const payload = JSON.stringify(registration); - return this.http.post(`${environment.apiUrl}${this.serviceName}/set.php`, + return this.http.post(`${environment.apiUrl}${this.serviceName}/set.php`, payload ); } diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 57067a2..56f924a 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1,7 +1,6 @@ /* Provide sufficient contrast against white background */ @use "@angular/material" as mat; -@import '~bootstrap-icons/font/bootstrap-icons.css'; @include mat.core(); $my-primary: mat.define-palette(mat.$blue-palette); @@ -25,20 +24,6 @@ $my-theme: mat.define-light-theme(( background: rgba(255, 255, 255, 0.82) !important; } -// Include the theme mixins for other components you use here. -//a { -// color: #0366d6; -//} -// -//code { -// color: #e01a76; -//} -// -//.btn-primary { -// color: #fff; -// background-color: #1b6ec2; -// border-color: #1861ac; -//} body { margin: 0; @@ -50,76 +35,3 @@ html, body { height: 100%; } - - -//.mat-form-field-subscript-wrapper { -// font-size: 95%; -//} -// -//.mat-checkbox-checked.mat-accent .mat-checkbox-background { -// background-color: #0366d6 !important; -//} -//mat-checkbox-checked { -// border-color: white; -//} -//mat-checkbox { -// color: white; -// margin-bottom: 16px; -//} -//.mat-step-header .mat-step-icon-selected, -//.mat-step-icon-state-edit { -// background-color: #0366d6 !important; -//} - -// customize datepicker -//.mat-datepicker-content-container { -// background:transparent; -//} -//.mat-datepicker-content { -// color: black; -//} -//.mat-calendar-body-cell-content, .mat-calendar-body-label{ -// color: black; -// } - -// -//.mat-calendar-body-cell-content { -// background-color: #1861ac; -// color: #fff; -// font-weight: bold; -// font-size: 2em; -//} -// -//.mat-calendar-table { -// border: 1px solid white; -//} -// -//.mat-calendar-table-header { -// -// tr { -// th { -// padding-top: 2em; -// } -// -// th.mat-calendar-table-header-divider { -// padding: 0; -// } -// } -//} -// -//.mat-calendar-controls, -//.mat-calendar-table-header, -//.mat-calendar-body-label { -// color: #fff; -// font-size: 2em; -//} -// -//.mat-calendar-previous-button, -//.mat-calendar-next-button, -//.mat-calendar-period-button { -// font-size: 2em; -// height: 2em; -// color: #fff; -// background-color: #1b6ec2; -// border-color: #1861ac; -//}