teams: smoother survey birthyear input (fixes #9119) (#9122)

Co-authored-by: dogi <[email protected]>

Author: Mutugiii

package.json

@@ -1,7 +1,7 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.20.33",
+  "version": "0.20.34",
   "myplanet": {
     "latest": "v0.32.97",
     "min": "v0.31.97"

src/app/users/users-update/users-update.component.html

@@ -107,9 +107,10 @@
         <ng-container *ngIf="submissionMode">
           <ng-container *ngIf="!showAdditionalFields">
             <mat-form-field>
-              <input matInput i18n-placeholder placeholder="Age" type="number" formControlName="age" [required]="false">
+              <input matInput i18n-placeholder placeholder="Birth Year" type="number" formControlName="birthYear" [required]="false">
+              <mat-hint i18n>Enter year (e.g., 1995)</mat-hint>
               <mat-error>
-                <planet-form-error-messages [control]="editForm.controls.age"></planet-form-error-messages>
+                <planet-form-error-messages [control]="editForm.controls.birthYear"></planet-form-error-messages>
               </mat-error>
             </mat-form-field>
           </ng-container>

src/app/users/users-update/users-update.component.ts

@@ -108,7 +108,12 @@ export class UsersUpdateComponent implements OnInit, CanComponentDeactivate {
         this.conditionalValidator(CustomValidators.dateValidRequired).bind(this),
         ac => this.validatorService.notDateInFuture$(ac)
       ],
-      age: [ '', [ Validators.min(0), Validators.max(120) ] ],
+      birthYear: [ '', [
+        Validators.min(1900),
+        Validators.max(new Date().getFullYear() - 1),
+        Validators.pattern(/^\d{4}$/)
+      ]],
+      age: [ '' ],
       gender: [ '', this.conditionalValidator(Validators.required).bind(this) ],
       level: [ '', this.conditionalValidator(Validators.required).bind(this) ],
       betaEnabled: false
@@ -128,6 +133,13 @@ export class UsersUpdateComponent implements OnInit, CanComponentDeactivate {
   }
 
   onSubmit() {
+    // exports don't break: calculate age from birthYear form validation
+    const birthYear = this.editForm.get('birthYear')?.value;
+    if (birthYear && birthYear.toString().length === 4) {
+      const calculatedAge = new Date().getFullYear() - parseInt(birthYear, 10);
+      this.editForm.patchValue({ age: calculatedAge }, { emitEvent: false });
+    }
+
     if (!this.editForm.valid) {
       showFormErrors(this.editForm.controls);
       return;
@@ -138,7 +150,9 @@ export class UsersUpdateComponent implements OnInit, CanComponentDeactivate {
 
   submitUser() {
     if (this.submissionMode) {
-      this.appendToSurvey(this.editForm.value);
+      // Remove birthYear from submitted data
+      const { birthYear, ...cleanUserData } = this.editForm.value;
+      this.appendToSurvey(cleanUserData);
     } else {
       const attachment = this.file ? this.createAttachmentObj() : {};
       this.userService.updateUser(Object.assign({}, this.user, this.editForm.value, attachment)).pipe(