Merge branch 'main' into funding_basket

3 files changed, 256 insertions, 35 deletions

diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.css b/ufund-ui/src/app/components/cupboard/cupboard.component.css
index e69de29..fe4971a 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.css
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.css
@@ -0,0 +1,21 @@
+:host {
+    display: block;
+    border: 2px solid #000;
+    border-radius: 5px;
+    padding: 10px 20px;
+}
+
+#menu, #create-form, #delete-form, #update-form {
+   background-color: #d9d9d9;
+   padding: 10px 20px 20px 20px;
+   border: 2px solid #000;
+   border-radius: 5px;  
+   width: 20%;
+   visibility: visible;
+
+}
+
+#create-button {
+   padding: 10px 20px;
+   
+}
\ No newline at end of file
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.html b/ufund-ui/src/app/components/cupboard/cupboard.component.html
index ad8e60c..76fdf0a 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -1,17 +1,50 @@
 <h1> Cupboard </h1>
-<form>
-    <label for="name">Name:</label><br>
-    <input #name type="text" name="name"><br>
-    <label for="id">Id:</label><br>
-    <input #id type="number" name="id"><br>
-    <label for="max-goal">Max Goal:</label><br>
-    <input #maxgoal type="number" name="max-goal"><br>
-    <label>Type</label><br>
-    <input id="monetary" type="radio" name="type" value="MONETARY">
-    <label for="monetary">Monetary</label><br>
-    <input #physical type="radio" name="type" value="PHYSICAL">
-    <label for="physical">Physical</label><br>   
-</form>
-<button (click)="submit(name.value, id.valueAsNumber, maxgoal.valueAsNumber, physical.value)">Submit</button>
-
-<app-need-list></app-need-list>
+<h2 *ngIf="isManager()" > Admin View </h2>
+<div id="menu" *ngIf="isManager()">
+    <button (click)="opencreate()">Create new Need</button>
+    <button (click)="openupdate()">Update existing Need</button>
+</div>
+<div id="create-form">
+    <h1> Create a new need </h1>
+    <form #cupboardForm="ngForm" (ngSubmit)="submit(cupboardForm.value)">
+        <label>Name:</label><br>
+        <input type="text" name="name" ngModel><br>
+        <label>Max Goal:</label><br>
+        <input type="number" name="maxGoal" ngModel><br>
+        <label>Type</label><br>
+        <input type="radio" name="type" value="MONETARY" ngModel>
+        <label>Monetary</label><br>
+        <input type="radio" name="type" value="PHYSICAL" ngModel>
+        <label>Physical</label><br>
+        <input type="submit" value="Submit"> 
+    </form>
+    <button (click)="back()">Close</button>
+    <span *ngIf="statusText">{{statusText | async}}</span>
+    
+</div>
+<div id="update-form">
+    <h1> Update a need </h1>
+    <label>Needs:</label><br>
+    <form #updateForm="ngForm" (ngSubmit)="update(updateForm.value)">
+        <div *ngFor="let need of needs">
+           
+            <input type="radio" name="id" [value]=need.id [(ngModel)]="selectedNeedId" (change)="populateForm(need)">
+            <label name="template">{{need.name}}</label><br>
+        </div>
+        <label>Name:</label><br>
+        <input type="text" name="name" [(ngModel)]="selectedNeed.name"><br>
+        <label>Max Goal:</label><br>
+        <input type="number" name="maxGoal" [(ngModel)]="selectedNeed.maxGoal"><br>
+        <label>Type</label><br>
+        <input type="radio" name="type" value="MONETARY" [(ngModel)]="selectedNeed.type">
+        <label>Monetary</label><br>
+        <input type="radio" name="type" value="PHYSICAL" [(ngModel)]="selectedNeed.type">
+        <label>Physical</label><br>
+        <input type="submit" value="Submit"> 
+    </form>
+    <button (click)="back()">Close</button>
+    <span *ngIf="statusText">{{statusText | async}}</span>
+    
+</div>
+<hr>
+<app-need-list></app-need-list>
\ No newline at end of file
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.ts b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
index 53dad8a..1b6d658 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.ts
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { CupboardService } from '../../services/cupboard.service';
-import { NeedListComponent } from '../need-list/need-list.component';
-
+import { UsersService } from '../../services/users.service';
 import { Need, GoalType } from '../../models/Need';
+import { userType } from '../../models/User';
+import { BehaviorSubject, catchError, of } from 'rxjs';
 
 @Component({
   selector: 'app-cupboard',
@@ -10,22 +11,188 @@ import { Need, GoalType } from '../../models/Need';
   templateUrl: './cupboard.component.html',
   styleUrl: './cupboard.component.css'
 })
-export class CupboardComponent implements 
-  OnInit {
-
-    constructor(private cupboardService: CupboardService){}
-    ngOnInit() {
-
-      
-    }
-    need!: Need;
-    submit(name: string, id: number, maxGoal: number, type: string) {
-      if (this.need) {
-        this.need.name = name;
-        this.need.id = id;
-        this.need.maxGoal = maxGoal;
-        console.log(type);
-        this.cupboardService.createNeed(this.need);
+
+export class CupboardComponent implements OnInit {
+
+    protected statusText = new BehaviorSubject("")
+
+needs: any;
+    constructor(private cupboardService: CupboardService, private usersService: UsersService) { }
+
+    ngOnInit(): void {
+      this.cupboardService.getNeeds().subscribe(n => this.needs = n);
+      this.close();
+      this.openmenu();
+
+      if (this.isManager()) {
+        console.log("Admin view of Cupboard");
+      } else {
+        console.log("Limited helper view of Cupboard");
+      }
+    }
+
+    selectedNeed: any = {
+      name: '',
+      id: null,
+      maxGoal: null,
+      type: ''
+    };
+    selectedNeedId: number | null = null;
+
+    private hideElement(element: any) {
+      if (element){
+        element.style.visibility = 'hidden';
+        element.style.position = 'absolute';
       }
     }
+
+    private showElement(element: any) {
+      if (element){
+        element.style.visibility = 'visible';
+        element.style.position = 'relative';
+      }
+    }
+
+    openmenu() {
+      const menuElement = document.getElementById('menu');
+      this.showElement(menuElement);
+    }
+
+    opencreate() {
+      this.close();
+      this.showElement(document.getElementById('create-form'));
+    }
+
+    openupdate() {
+      this.close();
+      this.showElement(document.getElementById('update-form'));
+    }
+
+    back() {
+      this.close();
+      this.openmenu();
+    }
+
+    close() {
+      this.hideElement(document.getElementById('create-form'));
+      this.hideElement(document.getElementById('destroy-form'));
+      this.hideElement(document.getElementById('menu'));
+      this.hideElement(document.getElementById('update-form'));
+    }
+
+    populateForm(need: any): void {
+      this.selectedNeed = { ...need };
+    }
+
+    isManager() {
+      const type = this.usersService.getCurrentUser()?.type;
+      return type === ("MANAGER" as unknown as userType);
+    }
+
+    update(form: any) {
+      console.log(form);
+      const need: Need = {
+        name: form.name,
+        id: form.id, //system will control this
+        maxGoal: form.maxGoal,
+        type: GoalType[form.type as keyof typeof GoalType],
+        filterAttributes: [],
+        current: 0
+      };
+      console.log("need:", need);
+      console.log(need.id, need, "need updated");
+      this.cupboardService.updateNeed(need.id, need)
+      .pipe(catchError((ex, r) => {
+              this.statusText.next("Max goal must be greater than 0 " + friendlyHttpStatus[ex.status])
+              return of()
+          }))
+      .subscribe(
+        (result) => {
+          if (result) {
+            console.log("need updated successfully");
+            location.reload();
+          } else {
+            console.log("need update failed");
+          }
+        }
+
+      );
+    }
+
+    submit(form: any) {
+      const need: Need = {
+        name: form.name,
+        id: 0,
+        maxGoal: form.maxGoal,
+        type: form.type,
+        filterAttributes: [],
+        current: 0
+      };
+      console.log("need:", need);
+      console.log("form submitted. creating need: ", need);
+      this.cupboardService.createNeed(need)
+      .pipe(catchError((ex, r) => {
+              this.statusText.next("Max goal must be greater than 0 " + friendlyHttpStatus[ex.status])
+              return of()
+          }))
+      .subscribe(
+        (result) => {
+          if (result) {
+            console.log("need created successfully");
+            location.reload();
+          } else {
+            console.log("need creation failed");
+          }
+        }
+
+      );
+    }
+
+    destroy() {
+
+    }
   }
+
+let friendlyHttpStatus: {[key: number]: string} = {
+    200: 'OK',
+    201: 'Created',
+    202: 'Accepted',
+    203: 'Non-Authoritative Information',
+    204: 'No Content',
+    205: 'Reset Content',
+    206: 'Partial Content',
+    300: 'Multiple Choices',
+    301: 'Moved Permanently',
+    302: 'Found',
+    303: 'See Other',
+    304: 'Not Modified',
+    305: 'Use Proxy',
+    306: 'Unused',
+    307: 'Temporary Redirect',
+    400: 'Bad Request',
+    401: 'Unauthorized',
+    402: 'Payment Required',
+    403: 'Forbidden',
+    404: 'Not Found',
+    405: 'Method Not Allowed',
+    406: 'Not Acceptable',
+    407: 'Proxy Authentication Required',
+    408: 'Request Timeout',
+    409: 'Conflict',
+    410: 'Gone',
+    411: 'Length Required',
+    412: 'Precondition Required',
+    413: 'Request Entry Too Large',
+    414: 'Request-URI Too Long',
+    415: 'Unsupported Media Type',
+    416: 'Requested Range Not Satisfiable',
+    417: 'Expectation Failed',
+    418: 'I\'m a teapot',
+    429: 'Too Many Requests',
+    500: 'Internal Server Error',
+    501: 'Not Implemented',
+    502: 'Bad Gateway',
+    503: 'Service Unavailable',
+    504: 'Gateway Timeout',
+    505: 'HTTP Version Not Supported',
+};
\ No newline at end of file