From 942bf201951ba2af6038c2bcb2b1cae13e609c77 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Tue, 1 Oct 2024 20:31:17 -0600 Subject: [PATCH 1/4] lmendoza/fixes-oct-1 --- .../trusted-summary/trusted-summary.component.html | 2 +- .../observability-events/observability-events.service.ts | 9 ++++++--- .../form-anti-robots/form-anti-robots.component.ts | 8 ++++++-- .../components/form-terms/form-terms.component.ts | 9 +++++++-- .../register2/components/step-d/step-d.component.html | 2 -- src/app/register2/components/step-d/step-d.component.ts | 2 -- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html index d6176472cb..433600d262 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html @@ -144,7 +144,7 @@

[activitySection]="'affiliations'" > - + { + this.nextButtonWasClicked = true + }) } constructor( private _register: Register2Service, - private _errorStateMatcher: ErrorStateMatcher + private _registerStateService: RegisterStateService ) { super() } diff --git a/src/app/register2/components/form-terms/form-terms.component.ts b/src/app/register2/components/form-terms/form-terms.component.ts index ec3bf671cf..4dd9ed5132 100644 --- a/src/app/register2/components/form-terms/form-terms.component.ts +++ b/src/app/register2/components/form-terms/form-terms.component.ts @@ -11,6 +11,7 @@ import { Register2Service } from 'src/app/core/register2/register2.service' import { environment } from 'src/environments/environment' import { BaseForm } from '../BaseForm' +import { RegisterStateService } from '../../register-state.service' @Component({ selector: 'app-form-terms', @@ -36,11 +37,12 @@ import { BaseForm } from '../BaseForm' }) // tslint:disable-next-line: class-name export class FormTermsComponent extends BaseForm implements OnInit, DoCheck { - @Input() nextButtonWasClicked: boolean + nextButtonWasClicked: boolean environment = environment constructor( private _register: Register2Service, - private _errorStateMatcher: ErrorStateMatcher + private _errorStateMatcher: ErrorStateMatcher, + private _registerStateService: RegisterStateService ) { super() } @@ -53,6 +55,9 @@ export class FormTermsComponent extends BaseForm implements OnInit, DoCheck { termsOfUse: this.termsOfUse, dataProcessed: this.dataProcessed, }) + this._registerStateService.getNextButtonClickFor('d').subscribe(() => { + this.nextButtonWasClicked = true + }) } // OVERWRITE diff --git a/src/app/register2/components/step-d/step-d.component.html b/src/app/register2/components/step-d/step-d.component.html index 3c441ffcc5..44872cfe51 100644 --- a/src/app/register2/components/step-d/step-d.component.html +++ b/src/app/register2/components/step-d/step-d.component.html @@ -40,11 +40,9 @@

>