update

Author: devnamdev2003

src/app/component/list-expenses/expense-list/expense-list.component.ts

@@ -26,9 +26,32 @@ export class ExpenseListComponent {
 
   getFormattedDate(exp: any): string {
     const date = new Date(exp.date);
-    return date.toLocaleDateString();
+
+    const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    const months = [
+      "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    ];
+
+    const dayName = days[date.getDay()];
+    const day = date.getDate();
+    const month = months[date.getMonth()];
+    const year = date.getFullYear();
+
+    const suffix = (d: number): string => {
+      if (d > 3 && d < 21) return "th";
+      switch (d % 10) {
+        case 1: return "st";
+        case 2: return "nd";
+        case 3: return "rd";
+        default: return "th";
+      }
+    };
+
+    return `${dayName} ${day}${suffix(day)} ${month} ${year}`;
   }
 
+
   darkenColor(color: string, percent: number): string {
     try {
       const num = parseInt(color.replace('#', ''), 16);

src/app/features/list-expenses/list-expenses.component.ts

@@ -11,14 +11,15 @@ import { SearchButtonComponent } from '../../component/search-button/search-butt
 
 /**
  * ListExpensesComponent
- *
+ * 
  * Displays a list of expenses with support for:
  * - Sorting
  * - Filtering (date range, categories, payment mode, extra spending)
  * - Searching
  * - Editing and deleting expenses
  * - Viewing expense details in a modal
  */
+
 @Component({
   standalone: true,
   selector: 'app-list-expenses',
@@ -33,37 +34,34 @@ export class ListExpensesComponent implements OnInit {
   /** All categories, sorted by expense count. */
   categories: Category[] = [];
 
+  /** Currently selected expense (for modal view/edit). */
+  selectedExpense: Expense | null = null;
+
   /** User's preferred currency (retrieved from UserService). */
   currency: string | null;
 
-  /** Controls visibility of sort dropdown. */
-  isSortByDropdownOpen: boolean = false;
-
   /** Currently selected sort option label. */
   selectedFieldName: string = 'Sort By';
 
-  /** Controls visibility of filter dropdown. */
-  isFilterDropdownOpen: boolean = false;
-
-  /** Currently selected expense (for modal view/edit). */
-  selectedExpense: Expense | null = null;
+  /** Search query for filtering expenses. */
+  searchQuery: string = '';
 
   /** Sort direction (1 = asc, -1 = desc). */
   fieldDirection: number = 0;
 
   /** Index of column used for sorting. */
   fieldColIndex: number = 0;
 
-  /** Whether the expense edit modal is open. */
-  isEditOpen: boolean = false;
+  /** Total amount of currently visible expenses. */
+  totalAmount: number = 0;
 
   /** Filter state before being applied. */
   filter = {
     fromDate: '',
     toDate: '',
     selectedCategoryIds: [] as string[],
     paymentMode: [] as string[],
-    isExtraSpending: true
+    isExtraSpending: false
   };
 
   /** Currently applied filters (saved state). */
@@ -72,17 +70,20 @@ export class ListExpensesComponent implements OnInit {
     toDate: '',
     selectedCategoryIds: [] as string[],
     paymentMode: [] as string[],
-    isExtraSpending: true
+    isExtraSpending: false
   };
 
-  /** Whether filter is active. */
-  isFiltered: boolean = false;
-
   /** Whether sorting is active. */
   isSorted: boolean = false;
 
-  /** Total amount of currently visible expenses. */
-  totalAmount: number = 0;
+  /** Whether the expense edit modal is open. */
+  isEditOpen: boolean = false;
+
+  /** Controls visibility of sort dropdown. */
+  isSortByDropdownOpen: boolean = false;
+
+  /** Controls visibility of filter dropdown. */
+  isFilterDropdownOpen: boolean = false;
 
   /** Reference to sort dropdown element. */
   @ViewChild('sortRef') sortRef!: ElementRef;
@@ -129,14 +130,6 @@ export class ListExpensesComponent implements OnInit {
     } catch (err) {
       console.error("Failed to load expenses:", err);
     }
-    finally {
-      if (this.isSorted) {
-        this.sortList(this.fieldColIndex, this.selectedFieldName, this.fieldDirection);
-      }
-      if (this.isFiltered) {
-        this.applyFilter();
-      }
-    }
   }
 
   /**
@@ -178,38 +171,13 @@ export class ListExpensesComponent implements OnInit {
     this.isSortByDropdownOpen = !this.isSortByDropdownOpen;
   }
 
-  /**
-   * Handles document click to close dropdowns when clicking outside.
-   * @param event Mouse click event
-   */
-  @HostListener('document:click', ['$event'])
-  onDocumentClick(event: MouseEvent): void {
-    const target = event.target as HTMLElement;
-    if (this.isSortByDropdownOpen && this.sortRef && !this.sortRef.nativeElement.contains(target)) {
-      this.toggleSortByDropdown();
-    }
-
-    if (this.isFilterDropdownOpen && this.filterRef && !this.filterRef.nativeElement.contains(target)) {
-      this.toggleFilterDropdown();
-    }
-  }
-
-  /** Toggles the filter dropdown and resets filter state accordingly. */
-  toggleFilterDropdown(): void {
-    if (this.isFiltered) {
-      this.filter = structuredClone(this.appliedFilter);
-    } else {
-      this.clearFilter();
-    }
-    this.isFilterDropdownOpen = !this.isFilterDropdownOpen;
-  }
-
   /**
    * Applies the current filter to the expense list.
    */
   applyFilter(): void {
     this.totalAmount = 0;
-    let filtered = this.expenses;
+    this.searchData(this.searchQuery);
+    let filtered: Expense[] = this.expenses;
     this.appliedFilter = structuredClone(this.filter);
 
     if (this.appliedFilter.fromDate) {
@@ -241,7 +209,26 @@ export class ListExpensesComponent implements OnInit {
       this.sortList(this.fieldColIndex, this.selectedFieldName, this.fieldDirection);
     }
     this.isFilterDropdownOpen = false;
-    this.isFiltered = true;
+  }
+
+  /** Toggles the filter dropdown and resets filter state accordingly. */
+  toggleFilterDropdown(): void {
+    this.filter = structuredClone(this.appliedFilter);
+    this.isFilterDropdownOpen = !this.isFilterDropdownOpen;
+  }
+
+  /**
+    * Handles payment mode checkbox changes inside filter modal.
+    * @param event Checkbox change event
+    * @param categoryId Payment mode value
+    */
+  onPaymentModeCheckboxChange(event: Event, categoryId: string): void {
+    const checkbox = event.target as HTMLInputElement;
+    if (checkbox.checked) {
+      this.filter.paymentMode.push(categoryId);
+    } else {
+      this.filter.paymentMode = this.filter.paymentMode.filter(id => id !== categoryId);
+    }
   }
 
   /**
@@ -258,6 +245,28 @@ export class ListExpensesComponent implements OnInit {
     }
   }
 
+  /** Clears all filters and reloads expenses. */
+  clearFilter(): void {
+    this.filter = {
+      fromDate: '',
+      toDate: '',
+      selectedCategoryIds: [],
+      paymentMode: [],
+      isExtraSpending: false
+    };
+  }
+
+  /** Clears the applied filter. */
+  clearAppliedFilter(): void {
+    this.appliedFilter = {
+      fromDate: '',
+      toDate: '',
+      selectedCategoryIds: [],
+      paymentMode: [],
+      isExtraSpending: false
+    };
+  }
+
   /**
    * Opens the expense modal with selected expense.
    * @param expense Expense to display
@@ -283,7 +292,6 @@ export class ListExpensesComponent implements OnInit {
     this.expenseService.update(expense_id, newData);
     this.toastService.show('Expense updated successfully', 'success');
     this.isEditOpen = false;
-    this.listExpenses();
   }
 
   /**
@@ -296,39 +304,18 @@ export class ListExpensesComponent implements OnInit {
       this.toastService.show("Expense deleted successfully", 'success');
       this.closeModal();
     }
-    this.listExpenses();
-  }
-
-  /** Clears all filters and reloads expenses. */
-  clearFilter(): void {
-    this.filter.fromDate = '';
-    this.filter.toDate = '';
-    this.filter.selectedCategoryIds = [];
-    this.filter.paymentMode = [];
-    this.filter.isExtraSpending = false;
-    this.isFiltered = false;
-    this.listExpenses();
-  }
-
-  /** Clears sorting and reloads expenses. */
-  clearSort(): void {
-    this.isSorted = false;
-    this.selectedFieldName = "Sort By";
-    this.listExpenses();
   }
 
   /**
-   * Handles payment mode checkbox changes inside filter modal.
-   * @param event Checkbox change event
-   * @param categoryId Payment mode value
+   * Searches expenses by location or note.
+   * @param query Search query string
    */
-  onPaymentModeCheckboxChange(event: Event, categoryId: string): void {
-    const checkbox = event.target as HTMLInputElement;
-    if (checkbox.checked) {
-      this.filter.paymentMode.push(categoryId);
-    } else {
-      this.filter.paymentMode = this.filter.paymentMode.filter(id => id !== categoryId);
-    }
+  searchData(query: string): void {
+    this.expenses = this.expenseService.getAll();
+    this.expenses = this.expenses.filter(ex => {
+      return ((ex.location && ex.location.toLowerCase().includes(query.toLowerCase())) ||
+        (ex.note && ex.note.toLowerCase().includes(query.toLowerCase())));
+    });
   }
 
   /**
@@ -337,12 +324,8 @@ export class ListExpensesComponent implements OnInit {
    */
   onSearch(query: string): void {
     this.totalAmount = 0;
-    console.log('Parent received search query:', query);
-    this.expenses = this.expenseService.getAll();
-    this.expenses = this.expenses.filter(ex => {
-      return ((ex.location && ex.location.toLowerCase().includes(query.toLowerCase())) || 
-              (ex.note && ex.note.toLowerCase().includes(query.toLowerCase())));
-    });
+    this.searchQuery = query;
+    this.searchData(this.searchQuery);
     this.expenses.forEach((val) => {
       this.totalAmount = this.totalAmount + val.amount;
     })
@@ -352,13 +335,25 @@ export class ListExpensesComponent implements OnInit {
 
   /** Resets both filters and sorting without reloading expenses. */
   clearFiltersAndSorting(): void {
-    this.filter.fromDate = '';
-    this.filter.toDate = '';
-    this.filter.selectedCategoryIds = [];
-    this.filter.paymentMode = [];
-    this.filter.isExtraSpending = false;
-    this.isFiltered = false;
+    this.clearFilter();
+    this.clearAppliedFilter();
     this.isSorted = false;
     this.selectedFieldName = "Sort By";
   }
-}
+
+  /**
+   * Handles document click to close dropdowns when clicking outside.
+   * @param event Mouse click event
+   */
+  @HostListener('document:click', ['$event'])
+  onDocumentClick(event: MouseEvent): void {
+    const target = event.target as HTMLElement;
+    if (this.isSortByDropdownOpen && this.sortRef && !this.sortRef.nativeElement.contains(target)) {
+      this.toggleSortByDropdown();
+    }
+
+    if (this.isFilterDropdownOpen && this.filterRef && !this.filterRef.nativeElement.contains(target)) {
+      this.toggleFilterDropdown();
+    }
+  }
+}

src/app/service/gemini-api/gemini-api.service.ts

@@ -75,7 +75,7 @@ You are a polite and helpful financial assistant AI. Your sole purpose is to hel
 - Structure your response using bullet points, short sentences, or paragraph style that's visually appealing.
 - Do not add any extra message at the beginning.
 
-🚫 When the user asks something unrelated (e.g., weather, politics, personal advice), respond with:
+🚫 When the user asks something unrelated (e.g., weather, politics), respond with:
 - "❌ I'm here only to help with your expense data. Please ask something related to your recent spending."
 - "⚠️ I cannot process questions outside your expense data."
 - "🛑 Let’s keep this focused on your expenses so I can assist you better."

src/app/service/saavan-api/saavan.service.ts

@@ -63,6 +63,7 @@ ${formatField('Name', currentSong.name)}${formatField('Type', currentSong.type)}
 - Suggest the next song that is the most accurate match in mood, vibe, and style to provide a smooth and positive user experience.
 - Use only the current song’s metadata to infer the best next song.
 - Do not include any additional text, explanation, or formatting in your response.
+- Do not repeat the already suggested song.
 
 Provide only the JSON object and no extra text, no backticks, no markdown formatting:
 {

src/environments/environments.ts

@@ -13,13 +13,13 @@ export const environment = {
    * API key for accessing the Gemini AI API.
    * Replace or secure this key before deploying to production.
    */
-  geminiApiKey: 'AIzaSyAZT2MYoLB9gRwRa6NRan8NdFSVmmwzz04',
+  geminiApiKey: 'AIzaSyBkBmHCsVna6d8bPYjQQhbpdymn7_Nvm2w',
 
   /**
    * Current environment type.
    * Possible values: 'local', 'live'
    */
-  developmentEnvironment: 'live', // Change to 'live' for production or 'local' for local development
+  developmentEnvironment: 'local', // Change to 'live' for production or 'local' for local development
 
   /**
    * Application version.