Merge pull request #188 from HackRVA/issue-186-187

Issue 186-187: Allow member to add full name when creating a new member

web/src/app/pages/member/member.component.ts

@@ -150,7 +150,10 @@ export class MemberComponent implements OnInit {
       .open(
         MemberRFIDManagementComponent,
         member
-          ? RFIDManagementFactory.createEditMemberData(member.email)
+          ? RFIDManagementFactory.createEditMemberData(
+              member.name,
+              member.email
+            )
           : RFIDManagementFactory.createNewMemberData()
       )
       .afterClosed()

web/src/app/pages/user/user.component.ts

@@ -35,7 +35,7 @@ export class UserComponent implements OnInit {
     this.dialog
       .open(
         MemberRFIDManagementComponent,
-        RFIDManagementFactory.createSelfData(this.user.email)
+        RFIDManagementFactory.createSelfData(this.user.name, this.user.email)
       )
       .afterClosed()
       .pipe(

web/src/app/shared/components/member-rfid-management/member-rfid-management.component.html

@@ -7,6 +7,11 @@ <h2>{{ title }}</h2>
   </header>
 
   <form [formGroup]="rfidManagementGroup" (ngSubmit)="submit()">
+    <mat-form-field appearance="outline">
+      <mat-label>Full name</mat-label>
+      <input matInput formControlName="name" />
+    </mat-form-field>
+
     <mat-form-field appearance="outline">
       <mat-label>Email address</mat-label>
       <input matInput type="email" formControlName="email" />
@@ -21,8 +26,9 @@ <h2>{{ title }}</h2>
     <p>
       This is an option if the new member's info hasn't been sent from paypal
       yet. Check the table before trying to add them manually.
-      <strong>Note:</strong> if you add the member with this method, their email
-      has to match what they use in paypal.
+      <strong>Note:</strong> if you add the member with this method, their
+      <strong>email</strong> and <strong>full name</strong> have to match what
+      they use in PayPal.
     </p>
     }
 

web/src/app/shared/components/member-rfid-management/member-rfid-management.component.ts

@@ -16,7 +16,6 @@ import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MemberService } from '../../services';
 import {
   AssignRFIDRequest,
-  CreateMemberRequest,
   RFIDManagementData,
   RFIDManagementType,
 } from '../../types';
@@ -44,6 +43,7 @@ export class MemberRFIDManagementComponent implements OnInit {
   memberRFIDType: RFIDManagementType;
 
   rfidManagementGroup: FormGroup = new FormGroup({
+    name: new FormControl<string>(null, [Validators.required]),
     email: new FormControl<string>(null, [
       Validators.required,
       Validators.email,
@@ -69,7 +69,7 @@ export class MemberRFIDManagementComponent implements OnInit {
 
   submit(): void {
     let memberObs$: Observable<void> = null;
-    const request: CreateMemberRequest | AssignRFIDRequest = {
+    const request: AssignRFIDRequest = {
       email: this.rfidManagementGroup.get('email').value,
       rfid: this.rfidManagementGroup.get('rfid').value.toString(),
     };
@@ -79,7 +79,10 @@ export class MemberRFIDManagementComponent implements OnInit {
         memberObs$ = this.memberService.assignRFIDToSelf(request);
         break;
       case RFIDManagementType.New:
-        memberObs$ = this.memberService.assignNewMemberRFID(request);
+        memberObs$ = this.memberService.assignNewMemberRFID({
+          ...request,
+          name: this.rfidManagementGroup.get('name').value,
+        });
         break;
       case RFIDManagementType.Edit:
         memberObs$ = this.memberService.assignRFID(request);
@@ -101,11 +104,16 @@ export class MemberRFIDManagementComponent implements OnInit {
   }
 
   private handleData(data: RFIDManagementData): void {
+    if (data.name) {
+      this.rfidManagementGroup.get('name').setValue(data.name);
+    }
+
     if (data.email) {
       this.rfidManagementGroup.get('email').setValue(data.email);
     }
 
     if (data.shouldDisable) {
+      this.rfidManagementGroup.get('name').disable();
       this.rfidManagementGroup.get('email').disable();
     }
 

web/src/app/shared/functions/rfid-management-factory.ts

@@ -3,13 +3,14 @@ import { RFIDManagementData, RFIDManagementType } from '../types';
 
 export class RFIDManagementFactory {
   public static createSelfData(
+    name: string,
     email: string
   ): MatDialogConfig<RFIDManagementData> {
     return {
       autoFocus: false,
-      height: '380px',
       width: '320px',
       data: {
+        name: name,
         email: email,
         title: 'Assign RFID',
         shouldDisable: true,
@@ -31,13 +32,14 @@ export class RFIDManagementFactory {
   }
 
   public static createEditMemberData(
+    name: string,
     email: string
   ): MatDialogConfig<RFIDManagementData> {
     return {
       autoFocus: false,
-      height: '380px',
       width: '320px',
       data: {
+        name: name,
         email: email,
         title: 'Assign member RFID',
         shouldDisable: true,

web/src/app/shared/types/member.types.ts

@@ -33,7 +33,7 @@ export type AssignRFIDRequest = {
   rfid: string;
 };
 
-export type CreateMemberRequest = AssignRFIDRequest;
+export type CreateMemberRequest = AssignRFIDRequest & { name: string };
 
 export type UpdateMemberRequest = {
   fullName: string;

web/src/app/shared/types/rfid-management-data.ts

@@ -1,4 +1,5 @@
 export type RFIDManagementData = {
+  name: string;
   title: string;
   email: string;
   shouldDisable: boolean;