diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.html b/src/app/register2/components/form-current-employment/form-current-employment.component.html
index 44c5785088..f8b7927bb9 100644
--- a/src/app/register2/components/form-current-employment/form-current-employment.component.html
+++ b/src/app/register2/components/form-current-employment/form-current-employment.component.html
@@ -21,7 +21,7 @@
Based on your emails we think you are currently affiliated with
- TEST.
+ {{ autoCompleteDisplayOrganization(organization) }}.
-
+
Step 1 of 5 - Names and emails
+
+ Step 1 of 4 - Names and emails
+
diff --git a/src/app/register2/components/step-a/step-a.component.ts b/src/app/register2/components/step-a/step-a.component.ts
index 40e5870d80..b9a657cde7 100644
--- a/src/app/register2/components/step-a/step-a.component.ts
+++ b/src/app/register2/components/step-a/step-a.component.ts
@@ -27,6 +27,7 @@ import { BaseStepDirective } from '../BaseStep'
export class StepAComponent extends BaseStepDirective implements AfterViewInit {
@ViewChild('firstInput') firstInput: ElementRef
+ @Input() togglzregistration21: boolean
@Input() reactivation: ReactivationLocal
nextButtonWasClicked: boolean
diff --git a/src/app/register2/components/step-b/step-b.component.html b/src/app/register2/components/step-b/step-b.component.html
index 169dbafa7a..a4f13e5967 100644
--- a/src/app/register2/components/step-b/step-b.component.html
+++ b/src/app/register2/components/step-b/step-b.component.html
@@ -21,9 +21,20 @@
-
+
Step 2 of 5 - Password
+
+ Step 2 of 4 - Password
+
diff --git a/src/app/register2/components/step-b/step-b.component.ts b/src/app/register2/components/step-b/step-b.component.ts
index 4d3549abac..782f7ff963 100644
--- a/src/app/register2/components/step-b/step-b.component.ts
+++ b/src/app/register2/components/step-b/step-b.component.ts
@@ -15,6 +15,8 @@ import { BaseStepDirective } from '../BaseStep'
export class StepBComponent extends BaseStepDirective {
@Input() personalData
@Input() reactivation: ReactivationLocal
+ @Input() togglzregistration21: boolean
+
nextButtonWasClicked = false
constructor() {
diff --git a/src/app/register2/components/step-c/step-c.component.html b/src/app/register2/components/step-c/step-c.component.html
index 644a256f0c..c7772a6951 100644
--- a/src/app/register2/components/step-c/step-c.component.html
+++ b/src/app/register2/components/step-c/step-c.component.html
@@ -27,9 +27,20 @@
-
+
Step 4 of 5 - Visibility
+
+ Step 3 of 4 - Visibility
+
diff --git a/src/app/register2/components/step-c/step-c.component.ts b/src/app/register2/components/step-c/step-c.component.ts
index 4060b11ccd..991b0787c3 100644
--- a/src/app/register2/components/step-c/step-c.component.ts
+++ b/src/app/register2/components/step-c/step-c.component.ts
@@ -15,6 +15,7 @@ import { BaseStepDirective } from '../BaseStep'
export class StepCComponent extends BaseStepDirective {
@Input() loading
@Input() reactivation: ReactivationLocal
+ @Input() togglzregistration21: boolean
constructor() {
super()
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 afbf43998e..01f09eb1f9 100644
--- a/src/app/register2/components/step-d/step-d.component.html
+++ b/src/app/register2/components/step-d/step-d.component.html
@@ -27,9 +27,20 @@
-
+
Step 5 of 5 - Terms and conditions
+
+ Step 4 of 4 - Terms and conditions
+
diff --git a/src/app/register2/components/step-d/step-d.component.ts b/src/app/register2/components/step-d/step-d.component.ts
index 4494886392..20cf6ec58f 100644
--- a/src/app/register2/components/step-d/step-d.component.ts
+++ b/src/app/register2/components/step-d/step-d.component.ts
@@ -15,6 +15,8 @@ import { BaseStepDirective } from '../BaseStep'
export class StepDComponent extends BaseStepDirective {
@Input() loading
@Input() reactivation: ReactivationLocal
+ @Input() togglzregistration21: boolean
+
nextButtonWasClicked = false
constructor() {
diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html
index 4b753714ef..4c2f56d434 100644
--- a/src/app/register2/pages/register/register2.component.html
+++ b/src/app/register2/pages/register/register2.component.html
@@ -18,6 +18,7 @@
[(formGroup)]="FormGroupStepA"
[reactivation]="reactivation"
#stepComponentA
+ [togglzregistration21]="registration21"
>
@@ -29,9 +30,11 @@
[(formGroup)]="FormGroupStepB"
[personalData]="personalData"
[reactivation]="reactivation"
+ [togglzregistration21]="registration21"
>
@@ -52,6 +55,7 @@
[(formGroup)]="FormGroupStepC"
[loading]="loading"
[reactivation]="reactivation"
+ [togglzregistration21]="registration21"
>
@@ -59,6 +63,7 @@
>Visibility and terms
{
this.platform = platform
@@ -92,6 +95,9 @@ export class Register2Component implements OnInit, AfterViewInit {
})
}
ngOnInit() {
+ this._togglz.getStateOf('REGISTRATION_2_1').subscribe((value) => {
+ this.registration21 = value
+ })
this._register.getRegisterForm().subscribe()
this.FormGroupStepA = this._formBuilder.group({
diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
index 0131543c07..6e3ad94204 100644
--- a/src/locale/properties/register/register.en.properties
+++ b/src/locale/properties/register/register.en.properties
@@ -157,11 +157,12 @@ register.onlyPeopleAndOrganization=Only people and organizations you’ve given
register.itemsArePrivateAndOnly=Items are private and only visible to you
register.step1.2=Step 1 of 4 - Names and emails
register.step2.2=Step 2 of 4 - Password
+register.step3.2=Step 3 of 4 - Visibility
+register.step4.2=Step 4 of 4 - Terms and conditions
register.step2.3=Step 2 of 5 - Password
-register.step2.4=Step 4 of 4 - Terms and conditions
register.step1.3=Step 1 of 5 - Names and emails
-register.step3.3=Step 3 of 5 - Current employment
register.step4.3=Step 4 of 5 - Visibility
+register.step3.3=Step 3 of 5 - Current employment
register.step5.3=Step 5 of 5 - Terms and conditions
register.nextStep=Next Step
register.cancelRegistration=Cancel registration