From 91e8835b84b00bffc6db350f7cf6641c0d128a93 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Wed, 2 Apr 2025 10:27:48 -0400
Subject: negative and large input handling for need page amount

---
 .../src/app/components/need-list/need-list.component.html     |  2 +-
 ufund-ui/src/app/components/need-list/need-list.component.ts  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'ufund-ui/src/app/components/need-list')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.html b/ufund-ui/src/app/components/need-list/need-list.component.html
index c0501ba..c166152 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.html
+++ b/ufund-ui/src/app/components/need-list/need-list.component.html
@@ -16,7 +16,7 @@
             <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
         </button>
         <label>Needs per page: </label>
-        <input type ="number" [(ngModel)]="itemsPerPage" (change)="resetVisibleNeeds()" min="1" max="{{searchResults.length}}">
+        <input type ="number" [(ngModel)]="itemsPerPage" (change)="editNeedsPerPage()" min="1" max="{{searchResults.length}}">
     </div>
     <!--<button (click)="close()">Close</button>-->
 </div>
diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts
index cd3d9bd..ed14d6a 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.ts
+++ b/ufund-ui/src/app/components/need-list/need-list.component.ts
@@ -82,9 +82,14 @@ export class NeedListComponent {
     this.updateVisibleNeeds();    
   }
 
-  editNeedsPerPage(amount: number) {
-    this.itemsPerPage = amount;
-    this.updateVisibleNeeds();
+  editNeedsPerPage() {
+    if (this.itemsPerPage > this.searchResults.length) {
+      this.itemsPerPage = this.searchResults.length;
+    }
+    if (this.itemsPerPage < 1) {
+      this.itemsPerPage = 1;
+    }
+    this.resetVisibleNeeds();
   }
 
   updateVisibleNeeds() {
-- 
cgit v1.2.3


From 81414e1ce9223801585214d8d7a3bbf51f0ac5a7 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Wed, 2 Apr 2025 10:31:11 -0400
Subject: dollar label for monetary needs

---
 ufund-ui/src/app/components/need-list/need-list.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/need-list')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.html b/ufund-ui/src/app/components/need-list/need-list.component.html
index c166152..0d64c99 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.html
+++ b/ufund-ui/src/app/components/need-list/need-list.component.html
@@ -44,7 +44,7 @@
 
             <div class="prog">
                 <span id="hover-status-label-{{need.id}}"> </span>
-                <span>{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
+                <span>{{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}/{{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
                 <progress [value]="need.current" [max]="need.maxGoal"></progress>
             </div>
 
-- 
cgit v1.2.3


From 4d382ccf9de889e4b339dd13220c3f761497e419 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Wed, 2 Apr 2025 16:08:52 -0400
Subject: Added dollar signs and other small additions to needs

---
 ufund-ui/src/app/components/need-list/need-list.component.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/need-list')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts
index 06a612e..2ec850e 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.ts
+++ b/ufund-ui/src/app/components/need-list/need-list.component.ts
@@ -1,5 +1,5 @@
 import {Component, EventEmitter, Output} from '@angular/core';
-import {Need} from '../../models/Need';
+import {GoalType, Need} from '../../models/Need';
 import {CupboardService} from '../../services/cupboard.service';
 import {UsersService} from '../../services/users.service';
 import {userType} from '../../models/User';
@@ -72,6 +72,10 @@ export class NeedListComponent {
   itemsPerPage: number = 5;
   totalPages: number = Math.ceil(this.needs.length / this.itemsPerPage);
 
+  getPrefix(need: Need) {
+      return (need.type === GoalType.MONETARY) ? "$" : "";
+  }
+
   decrementPage() {
     this.currentPage--;
     this.updateVisibleNeeds();
@@ -229,6 +233,7 @@ export class NeedListComponent {
     if (currentUser) {
       if (!currentUser.basket.includes(need.id)) {
         currentUser.basket.push(need.id);
+        this.toastService.sendToast(ToastType.INFO, "Need added to your basket!")
         this.usersService.updateUser(currentUser)
             .pipe(catchError((err, _) =>  {
                 console.error(err);
@@ -278,5 +283,7 @@ export class NeedListComponent {
         button.style.visibility = 'hidden';
       }
   }
+
+    protected readonly GoalType = GoalType;
 }
 
-- 
cgit v1.2.3


From bc23c624a760b33bb67b3c0df5fd3d8f39f36e77 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Wed, 2 Apr 2025 16:09:24 -0400
Subject: Added dollar signs and other small additions to needs

---
 ufund-ui/src/app/components/need-list/need-list.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/need-list')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.html b/ufund-ui/src/app/components/need-list/need-list.component.html
index 88317dd..593aebf 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.html
+++ b/ufund-ui/src/app/components/need-list/need-list.component.html
@@ -42,7 +42,7 @@
 
             <div class="prog">
                 <span id="hover-status-label-{{need.id}}"> </span>
-                <span>{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
+                <span>{{getPrefix(need)}}{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
                 <progress [value]="need.current" [max]="need.maxGoal"></progress>
             </div>
 
-- 
cgit v1.2.3