diff --git a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html index 12d5625..d19a4fe 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html +++ b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html @@ -14,6 +14,7 @@ +
diff --git a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts index aaa72ec..13f4400 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts +++ b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts @@ -1,8 +1,9 @@ import { Component, OnInit, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormArray } from '@angular/forms'; -import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef, MatDialog } from '@angular/material'; import { contributorValidator } from '../contributor-validator'; import { Transaction } from '../transaction'; +import { AddUserPopupComponent } from '../../popups/add-user-popup/add-user-popup.component'; export interface ValDisplay { value: number; @@ -41,7 +42,7 @@ export class AddTransactionPopupComponent implements OnInit { funds: ValDisplay[]; types: ValDisplay[]; - constructor(private formBuilder: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: DialogData, private dialogRef:MatDialogRef) { + constructor(private dialogService: MatDialog, private formBuilder: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: DialogData, private dialogRef:MatDialogRef) { this.contributors = this.data.contributors || []; this.funds = this.data.funds || []; this.types = this.data.types || []; @@ -101,4 +102,19 @@ export class AddTransactionPopupComponent implements OnInit { this.dialogRef.close(); } + addUser() { + const ref = this.dialogService.open(AddUserPopupComponent); + + ref.afterClosed().subscribe((res: any) => { + if (res && res.id > 0) { + + this.contributors.push({ value: res.id, display: res.lastName + ' ' + res.firstName }); + + let contrib = this.contributors.find(c => c.value === res.id); + + this.form.get("contributor").setValue(contrib); + } + }); + } + } diff --git a/Client/src/app/components/popups/add-user-popup/add-user-popup.component.css b/Client/src/app/components/popups/add-user-popup/add-user-popup.component.css index 8286984..52ca3db 100644 --- a/Client/src/app/components/popups/add-user-popup/add-user-popup.component.css +++ b/Client/src/app/components/popups/add-user-popup/add-user-popup.component.css @@ -1,3 +1,7 @@ .full-width { width: 100%; +} + +.m-5 { + margin: 5px; } \ No newline at end of file diff --git a/Client/src/app/components/popups/add-user-popup/add-user-popup.component.html b/Client/src/app/components/popups/add-user-popup/add-user-popup.component.html index 45aa077..b0bd5ec 100644 --- a/Client/src/app/components/popups/add-user-popup/add-user-popup.component.html +++ b/Client/src/app/components/popups/add-user-popup/add-user-popup.component.html @@ -31,7 +31,7 @@ {{error}}

- + \ No newline at end of file diff --git a/Server/src/database/users.js b/Server/src/database/users.js index 65a4751..2638ad5 100644 --- a/Server/src/database/users.js +++ b/Server/src/database/users.js @@ -98,7 +98,8 @@ exports.createUser = async function(firstName, lastName, street, city, state, zi Country: country, EmailVerified: false, Federated: false, - FederationCode: hash.createVerificationCode() + FederationCode: hash.createVerificationCode(), + Password: '' }; const newUserResult = await connectionAsync.nonQuery('INSERT INTO Users Set ?', newUser); return await this.getUser2(tempUserName);