From bda0b385ae45387f87a8dc40eecbb8ebb465acf4 Mon Sep 17 00:00:00 2001
From: dan <ofbadmin@ofbbutte.com>
Date: Mon, 22 Jul 2019 22:49:06 -0600
Subject: [PATCH] Update fellowship, error popup, and submit label

---
 .../missionary-form-page.component.html                     | 1 +
 .../missionary-form-page/missionary-form-page.component.ts  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Client/src/app/components/missionary-form-page/missionary-form-page.component.html b/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
index ea90de9..2adb858 100644
--- a/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
+++ b/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
@@ -315,6 +315,7 @@
           <textarea matInput type="text" placeholder="Your Answer" formControlName="honeyPot" required></textarea>
         </mat-form-field>
         <button mat-raised-button type="submit" [disabled]="!form.valid || submitButtonDisabled">{{submitButtonText}}</button> 
+        <p *ngIf="!form.valid">Please enter all fields to submit.</p>
       </form>
     </div>
     <div sideBar class="side-bar">
diff --git a/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts b/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
index 45ef713..2110ca8 100644
--- a/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
+++ b/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
@@ -64,7 +64,7 @@ export class MissionaryFormPageComponent implements OnInit {
       numberWeeklyTracts: ['', [Validators.required, Validators.min(0), Validators.max(10000)]],
       rateOfSuccess: ['', Validators.required],
       predestination: ['', Validators.required],
-      fellowshipAssocation: ['', Validators.required],
+      fellowshipAssociation: ['', Validators.required],
       collegeRecommendations: this.formBuilder.array([this.createCollegeRecommendation(),this.createCollegeRecommendation(),this.createCollegeRecommendation()], this.minCollegeValidator),
       admittedWrong: ['', Validators.required],
       divorced: [undefined, Validators.required],
@@ -134,7 +134,7 @@ export class MissionaryFormPageComponent implements OnInit {
 
   private emailSuccess(){
     let opts = new MatDialogConfig;
-    opts.data = { title:'Email Sent','message':'Thank You! Your message has been sent.' };
+    opts.data = { title:'Missionary Support','message':'Thank You! Your submission has been received.' };
     let popup = this.matDialog.open(OkPopupComponent,opts);
     this.submitButtonText = "Submit";
     this.submitButtonDisabled = false;
@@ -146,7 +146,7 @@ export class MissionaryFormPageComponent implements OnInit {
   private emailError(){
     console.error("error");
     let opts = new MatDialogConfig;
-    opts.data = { title:'Email Error','message':'Please make sure that you have entered a valid email address.' };
+    opts.data = { title:'Error','message':'Please make sure that you have entered all fields correctly.' };
     let popup = this.matDialog.open(OkPopupComponent,opts);
     this.submitButtonText = "Submit";
     this.submitButtonDisabled = false;