added capacity error, turned off location input for events seeded from hubs, and added redirect when editing profile

Author: shoshannaTM

src/app/pages/create-event/create-event.page.html

@@ -85,8 +85,20 @@
     <ion-item>
       <ion-input type="number" formControlName="minimumCapacity"  placeholder="Min"></ion-input>
       <ion-input type="number" formControlName="maximumCapacity"  placeholder="Max"></ion-input>
+      <ion-label>
+         <ion-text *ngIf="(myForm.hasError('invalidCapacity') || maximumCapacity.hasError('lessThanMin')) 
+                     && (minimumCapacity.touched || maximumCapacity.touched)"
+              color="danger">*</ion-text>
+      </ion-label>
+      <ion-note slot="helper" *ngIf="(myForm.hasError('invalidCapacity') || maximumCapacity.hasError('lessThanMin')) 
+                 && (minimumCapacity.touched || maximumCapacity.touched)"
+                color="danger">
+              Min must be less than Max.
+    </ion-note>
     </ion-item>
 
+    
+    
       <ion-list-header class="ion-padding-bottom">
         <ion-text>Description</ion-text>
       </ion-list-header>
@@ -99,8 +111,8 @@
         <ion-text>Location</ion-text>
       </ion-list-header>
 
-      <ion-item>
-        <ion-input readonly [disabled]="seedType === 'hub' || seed?.hub" type="text" placeholder="Location" [value]="location.value?.label" (click)="toggleMapModal()"></ion-input>
+      <ion-item *ngIf="!(seedType === 'hub' || seed?.hub)">
+        <ion-input type="text" placeholder="Location" [value]="location.value?.label" (click)="toggleMapModal()"></ion-input>
       </ion-item>
 
       <app-hub-card

src/app/pages/create-event/create-event.page.ts

@@ -21,6 +21,23 @@ export const eventGroupValidator: ValidatorFn = (control: AbstractControl): Vali
   } : null;
 };
 
+export const capacityValidator: ValidatorFn = (group: AbstractControl): ValidationErrors | null => {
+  const minCtrl = group.get('minimumCapacity');
+  const maxCtrl = group.get('maximumCapacity');
+
+  const minVal = minCtrl.value;
+  const maxVal = maxCtrl.value;
+
+  if (minVal === '' || minVal == null || maxVal === '' || maxVal == null) return null;
+
+  const min = Number(minVal);
+  const max = Number(maxVal);
+
+  return max < min
+    ? { invalidCapacity: true, message: 'Min must be less than Max.' }
+    : null;
+};
+
 @Component({
   selector: 'app-create-event',
   templateUrl: './create-event.page.html',
@@ -108,7 +125,7 @@ export class CreateEventPage implements OnInit, OnDestroy {
       minimumCapacity: new FormControl(),
       maximumCapacity: new FormControl(),
       location: new FormControl(),
-    }, { validators: eventGroupValidator });
+    }, { validators: [eventGroupValidator, capacityValidator]});
 
     if (this.seed?.latitude && this.seed?.longitude && this.seed?.locationLabel) {
       this.myForm.patchValue({
@@ -149,7 +166,7 @@ export class CreateEventPage implements OnInit, OnDestroy {
       .toPromise()
       .then(async result => {
         this.loading = false;
-        await this.navCtrl.navigateForward(`/event/${result?.data?.createEvent?.eventId}`);
+        await this.navCtrl.navigateForward(`/tabs/event/${result?.data?.createEvent?.eventId}`);
       })
       .catch(err => this.errorService.handleError(err, this.loading));
   }

src/app/pages/profile/settings/settings.page.ts

@@ -154,9 +154,11 @@ export class SettingsPage implements OnInit {
         this.loading = false;
 
         await this.authService.iOSAutofillSavePassword(this.email.value, this.password.value);
+        await this.navCtrl.navigateForward('/tabs/profile');
       } else {
         this.alertService.presentToast('Saved');
         this.loading = false;
+        await this.navCtrl.navigateForward('/tabs/profile');
       }
     } catch (error) {
       this.errorService.handleError(error, this.loading);