Merge Anmeldeformular into main #21
|
@ -113,7 +113,7 @@
|
||||||
|
|
||||||
<div class="flexContainerColumn">
|
<div class="flexContainerColumn">
|
||||||
<textarea cols="30" rows="7" readonly>{{infoTextEinzugermaechtigung}}</textarea>
|
<textarea cols="30" rows="7" readonly>{{infoTextEinzugermaechtigung}}</textarea>
|
||||||
<mat-checkbox formControlName="einzugsermaechtigung" required>Einzugsermächtigung</mat-checkbox>
|
<mat-checkbox formControlName="directDebitAuthorization" required>Einzugsermächtigung</mat-checkbox>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@
|
||||||
<ng-template matStepLabel>Einwilligung</ng-template>
|
<ng-template matStepLabel>Einwilligung</ng-template>
|
||||||
<div class="flexContainerColumn">
|
<div class="flexContainerColumn">
|
||||||
<textarea cols="30" rows="10" readonly>{{infoTextEinwilligungserklaerung}}</textarea>
|
<textarea cols="30" rows="10" readonly>{{infoTextEinwilligungserklaerung}}</textarea>
|
||||||
<mat-checkbox formControlName="einwilligung" required
|
<mat-checkbox formControlName="consent" required
|
||||||
>Einwilligung zur Erhebung, Speicherung, Verarbeitung und Nutzung von
|
>Einwilligung zur Erhebung, Speicherung, Verarbeitung und Nutzung von
|
||||||
personenbezogenen Daten
|
personenbezogenen Daten
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
|
@ -142,7 +142,7 @@
|
||||||
<br style="margin-bottom: 20px;">
|
<br style="margin-bottom: 20px;">
|
||||||
<div class="flexContainerColumn">
|
<div class="flexContainerColumn">
|
||||||
<textarea cols="30" rows="10" readonly>{{infoTextEinverstaendniserklaerung}}</textarea>
|
<textarea cols="30" rows="10" readonly>{{infoTextEinverstaendniserklaerung}}</textarea>
|
||||||
<mat-checkbox formControlName="einverstaendniserklaerung" required
|
<mat-checkbox formControlName="declarationOfConsent" required
|
||||||
>Einverständniserklärung zur Nutzung von Bild- und Videomaterial
|
>Einverständniserklärung zur Nutzung von Bild- und Videomaterial
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -81,12 +81,12 @@ export class StudentRegisterComponent implements OnInit {
|
||||||
iban: ['', [Validators.required, ValidatorService.validateIban]],
|
iban: ['', [Validators.required, ValidatorService.validateIban]],
|
||||||
bic: ['', Validators.required],
|
bic: ['', Validators.required],
|
||||||
nameOfFinancialInstitute: ['', Validators.required],
|
nameOfFinancialInstitute: ['', Validators.required],
|
||||||
einzugsermaechtigung: ['', Validators.required],
|
directDebitAuthorization: ['', Validators.required],
|
||||||
});
|
});
|
||||||
|
|
||||||
this.thirdFormGroup = this._formBuilder.group({
|
this.thirdFormGroup = this._formBuilder.group({
|
||||||
einwilligung: ['', Validators.required],
|
consent: ['', Validators.required],
|
||||||
einverstaendniserklaerung: ['', Validators.required],
|
declarationOfConsent: ['', Validators.required],
|
||||||
});
|
});
|
||||||
|
|
||||||
this.secondFormGroup.get("iban")?.valueChanges.subscribe(value => {
|
this.secondFormGroup.get("iban")?.valueChanges.subscribe(value => {
|
||||||
|
@ -121,11 +121,11 @@ export class StudentRegisterComponent implements OnInit {
|
||||||
iban: this.secondFormGroup.get('iban')?.value,
|
iban: this.secondFormGroup.get('iban')?.value,
|
||||||
bic: this.secondFormGroup.get('bic')?.value,
|
bic: this.secondFormGroup.get('bic')?.value,
|
||||||
nameOfFinancialInstitute: this.secondFormGroup.get('nameOfFinancialInstitute')?.value,
|
nameOfFinancialInstitute: this.secondFormGroup.get('nameOfFinancialInstitute')?.value,
|
||||||
einzugsermaechtigung: this.secondFormGroup.get('einzugsermaechtigung')?.value,
|
directDebitAuthorization: this.secondFormGroup.get('directDebitAuthorization')?.value,
|
||||||
|
|
||||||
// Third Form Group
|
// Third Form Group
|
||||||
einwilligung: this.thirdFormGroup.get('einwilligung')?.value,
|
consent: this.thirdFormGroup.get('consent')?.value,
|
||||||
einverstaendniserklaerung: this.thirdFormGroup.get('einverstaendniserklaerung')?.value
|
declarationOfConsent: this.thirdFormGroup.get('declarationOfConsent')?.value
|
||||||
};
|
};
|
||||||
|
|
||||||
this.registerService.set(studentRegistration);
|
this.registerService.set(studentRegistration);
|
||||||
|
|
|
@ -10,7 +10,7 @@ export interface StudentRegistration {
|
||||||
iban: string;
|
iban: string;
|
||||||
bic: string;
|
bic: string;
|
||||||
nameOfFinancialInstitute: string;
|
nameOfFinancialInstitute: string;
|
||||||
einzugsermaechtigung: boolean;
|
directDebitAuthorization: boolean;
|
||||||
alioezdemir marked this conversation as resolved
Outdated
|
|||||||
einwilligung: boolean;
|
consent: boolean;
|
||||||
einverstaendniserklaerung: boolean;
|
declarationOfConsent: boolean;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,10 +11,10 @@ export class RegisterService {
|
||||||
private readonly serviceName = 'register';
|
private readonly serviceName = 'register';
|
||||||
constructor(private http: HttpClient) { }
|
constructor(private http: HttpClient) { }
|
||||||
|
|
||||||
public set(registration: StudentRegistration): Observable<boolean> {
|
public set(registration: StudentRegistration): Observable<void> {
|
||||||
const payload = JSON.stringify(registration);
|
const payload = JSON.stringify(registration);
|
||||||
|
|
||||||
return this.http.post<boolean>(`${environment.apiUrl}${this.serviceName}/set.php`,
|
return this.http.post<void>(`${environment.apiUrl}${this.serviceName}/set.php`,
|
||||||
alioezdemir marked this conversation as resolved
Outdated
it-as
commented
Boolean macht an dieser Stelle keinen Sinn. Vermutlich ist das durch Copy&Paste entstanden. Boolean macht an dieser Stelle keinen Sinn. Vermutlich ist das durch Copy&Paste entstanden.
|
|||||||
payload
|
payload
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
/* Provide sufficient contrast against white background */
|
/* Provide sufficient contrast against white background */
|
||||||
|
|
||||||
@use "@angular/material" as mat;
|
@use "@angular/material" as mat;
|
||||||
@import '~bootstrap-icons/font/bootstrap-icons.css';
|
|
||||||
@include mat.core();
|
@include mat.core();
|
||||||
|
|
||||||
$my-primary: mat.define-palette(mat.$blue-palette);
|
$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;
|
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 {
|
body {
|
||||||
alioezdemir marked this conversation as resolved
Outdated
it-as
commented
Bitte keinen auskommentierten Code committen Bitte keinen auskommentierten Code committen
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
|
@ -50,76 +35,3 @@ html,
|
||||||
body {
|
body {
|
||||||
height: 100%;
|
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;
|
|
||||||
//}
|
|
||||||
|
|
Loading…
Reference in New Issue
Bitte keine deutschen Variablennamen