ChrisChen/ROLAC
1
0
Fork 0
Code Issues 66 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor finance.

Browse Source
This commit is contained in:
Chris Chen
2026-05-29 23:56:29 -07:00
parent 241870fe48
commit 769597d769
22 changed files with 1392 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
APP/src/app/features/expense/models/expense.model.ts
+2 -1
View File
@@ -19,9 +19,10 @@ export interface ExpenseListItemDto {
ministryId: number; ministryName: string; categoryGroupId: number; categoryGroupName: string;
subCategoryId: number; subCategoryName: string; vendorName: string | null;
memberId: number | null; memberName: string | null; expenseDate: string; hasReceipt: boolean;
checkNumber: string | null;
}
export interface ExpenseDto extends ExpenseListItemDto {
checkNumber: string | null; notes: string | null; reviewNotes: string | null;
notes: string | null; reviewNotes: string | null;
submittedBy: string | null; submittedAt: string | null; reviewedAt: string | null; paidAt: string | null;
}
export interface CreateExpenseRequest {
APP/src/app/features/expense/pages/expenses-page/expenses-page.component.html
+7 -1
View File
@@ -7,7 +7,7 @@
<div class="flex flex-wrap gap-3 items-end mb-4">
<label class="flex flex-col gap-1">
Search
<kendo-textbox placeholder="Search description / vendor / member"
<kendo-textbox placeholder="Search description / vendor / member / check #"
[(ngModel)]="filter.search"
(keydown.enter)="applyFilter()">
</kendo-textbox>
@@ -76,6 +76,12 @@
<kendo-grid-column field="amount" title="Amount" [width]="110" format="c2"></kendo-grid-column>
<kendo-grid-column title="Check #" [width]="90">
<ng-template kendoGridCellTemplate let-dataItem>
{{ dataItem.status === 'Paid' && dataItem.checkNumber ? dataItem.checkNumber : '—' }}
</ng-template>
</kendo-grid-column>
<kendo-grid-column title="Status" [width]="140">
<ng-template kendoGridCellTemplate let-dataItem>
<span [class]="statusClass(dataItem.status)">{{ dataItem.status }}</span>
APP/src/app/features/expense/services/expense-api.service.ts
+1
View File
@@ -10,6 +10,7 @@ import {
export interface ExpenseQuery {
page?: number; pageSize?: number; search?: string; ministryId?: number;
categoryGroupId?: number; status?: string; from?: string; to?: string;
subCategoryId?: number; statuses?: string;
}
@Injectable({ providedIn: 'root' })