From: Bill Erickson Date: Thu, 30 Jun 2022 20:57:52 +0000 (-0400) Subject: LP1859701 Cash Reports Tidying X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=08ba2092da69fd7870cf751ad4bf4f87426b0ef7;p=evergreen%2Ftadl.git LP1859701 Cash Reports Tidying * Avoid manual currency data formatting when it can happen in the template. * Replace ngbTab with ngbNav. ngbTab is deprecated. * Tweak date filter form layout to fix some obscured fields. * Remove no longer needed view child static specifiers * Use 2-space "tabs" in HTML consistent w/ other angular components. * Remove unused code / css styles * ng lint Signed-off-by: Bill Erickson Signed-off-by: Jason Etheridge Signed-off-by: Jane Sandberg Signed-off-by: Michele Morgan --- diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html index 4191d6c3e6..bb136bc08b 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html @@ -1,109 +1,115 @@ - -
-
-
-
-
-
Start Date
- -
-
-
-
-
End Date
- -
-
-
-
-
View reports for
- -
- -
+
+
+
+
+
+
Start Date
+
+
+
+
+
End Date
+ +
+
+
+
+
View reports for
+
+ +
+
+ +
+
- - - -
-
-
Total Cash Payments
-
{{deskTotals.formatted_cash_payment}}
-
-
-
Total Check Payments
-
{{deskTotals.formatted_check_payment}}
-
-
-
Total Credit Card Payments
-
{{deskTotals.formatted_credit_card_payment}}
-
- - - - - - + +
    +
  • + Desk Payments + +
    +
    +
    Total Cash Payments
    +
    {{deskTotals.cash_payment | currency}}
    +
    +
    +
    Total Check Payments
    +
    {{deskTotals.check_payment | currency}}
    +
    +
    +
    Total Credit Card Payments
    +
    {{deskTotals.credit_card_payment | currency}}
    +
    + + + + + + +
    +     +
    • +
  • + User Payments + +
    +
    +
    Total Credit Payments
    +
    {{userTotals.credit_payment | currency}}
    +
    +
    +
    Total Forgive Payments
    +
    {{userTotals.forgive_payment | currency}}
    +
    +
    +
    Total Work Payments
    +
    {{userTotals.work_payment | currency}}
    - - - - -
    -
    -
    Total Credit Payments
    -
    {{userTotals.formatted_credit_payment}}
    -
    -
    -
    Total Forgive Payments
    -
    {{userTotals.formatted_forgive_payment}}
    -
    -
    -
    Total Work Payments
    -
    {{userTotals.formatted_work_payment}}
    -
    -
    -
    Total Goods Payments
    -
    {{userTotals.formatted_goods_payment}}
    -
    - - - - - - - -
    -     -     - +
    +
    Total Goods Payments
    +
    {{userTotals.goods_payment | currency}}
    +
    + + + + + + + +
    +     +
    • +
+
- - - - - - - - - + + + + + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.ts index ae98f804c1..e131e1b061 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit, Input, ViewChild} from '@angular/core'; import {GridComponent} from '@eg/share/grid/grid.component'; import {GridDataSource, GridColumn, GridRowFlairEntry} from '@eg/share/grid/grid'; -import {FormatService} from '@eg/core/format.service'; import {IdlService} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; @@ -12,21 +11,14 @@ class DeskTotals { cash_payment = 0; check_payment = 0; credit_card_payment = 0; - formatted_cash_payment = '0.00'; - formatted_check_payment = '0.00'; - formatted_credit_card_payment = '0.00'; -}; +} class UserTotals { forgive_payment = 0; work_payment = 0; credit_payment = 0; goods_payment = 0; - formatted_forgive_payment = '0.00'; - formatted_work_payment = '0.00'; - formatted_credit_payment = '0.00'; - formatted_goods_payment = '0.00'; -}; +} @Component({ templateUrl: './cash-reports.component.html' @@ -45,20 +37,20 @@ export class CashReportsComponent implements OnInit { deskTotals = new DeskTotals(); userTotals = new UserTotals(); disabledOrgs = []; + activeTab = 'deskPayments'; // Default sort field, used when no grid sorting is applied. @Input() sortField: string; - @ViewChild('userDialog', { static: true }) userDialog: UserDialogComponent; - @ViewChild('deskPaymentGrid', { static: true }) deskPaymentGrid: GridComponent; - @ViewChild('userPaymentGrid', { static: true }) userPaymentGrid: GridComponent; - @ViewChild('userGrid', { static: true }) userGrid: GridComponent; + @ViewChild('userDialog') userDialog: UserDialogComponent; + @ViewChild('deskPaymentGrid') deskPaymentGrid: GridComponent; + @ViewChild('userPaymentGrid') userPaymentGrid: GridComponent; + @ViewChild('userGrid') userGrid: GridComponent; constructor( private idl: IdlService, private net: NetService, private org: OrgService, - private format: FormatService, - private auth: AuthService){} + private auth: AuthService) {} ngOnInit() { this.disabledOrgs = this.getFilteredOrgList(); @@ -66,7 +58,7 @@ export class CashReportsComponent implements OnInit { } onRowActivate(userObject) { - if(userObject.user && this.userDataSource.data.length === 0) { + if (userObject.user && this.userDataSource.data.length === 0) { this.userDataSource.data = [userObject.user]; this.showUserInformation(); } else { @@ -75,16 +67,7 @@ export class CashReportsComponent implements OnInit { } showUserInformation() { - return new Promise((resolve, reject) => { - this.userDialog.open({size: 'lg'}).subscribe( - result => { - resolve(result); - }, - error => { - reject(error); - } - ); - }); + return this.userDialog.open({size: 'lg'}).toPromise(); } searchForData(start, end) { @@ -94,7 +77,8 @@ export class CashReportsComponent implements OnInit { 'open-ils.circ', 'open-ils.circ.money.org_unit.desk_payments', this.auth.token(), this.selectedOrg.id(), start, end)); - this.fillGridData(this.userIdlClass,'userPaymentDataSource', + + this.fillGridData(this.userIdlClass, 'userPaymentDataSource', this.net.request( 'open-ils.circ', 'open-ils.circ.money.org_unit.user_payments', @@ -103,26 +87,12 @@ export class CashReportsComponent implements OnInit { fillGridData(idlClass, dataSource, data) { data.subscribe((result) => { - let dataForTotal; - if(idlClass === this.deskIdlClass) { - dataForTotal = this.getDeskTotal(result); - this.deskTotals.formatted_cash_payment = this.format.transform({value: this.deskTotals.cash_payment, datatype: 'money'}); - this.deskTotals.formatted_check_payment = this.format.transform({value: this.deskTotals.check_payment, datatype: 'money'}); - this.deskTotals.formatted_credit_card_payment = this.format.transform({value: this.deskTotals.credit_card_payment, datatype: 'money'}); - } else if(idlClass === this.userIdlClass) { - dataForTotal = this.getUserTotal(result); - this.userTotals.formatted_credit_payment = this.format.transform({value: this.userTotals.credit_payment, datatype: 'money'}); - this.userTotals.formatted_forgive_payment = this.format.transform({value: this.userTotals.forgive_payment, datatype: 'money'}); - this.userTotals.formatted_work_payment = this.format.transform({value: this.userTotals.work_payment, datatype: 'money'}); - this.userTotals.formatted_goods_payment = this.format.transform({value: this.userTotals.goods_payment, datatype: 'money'}); + if (idlClass === this.userIdlClass) { result.forEach((userObject, index) => { result[index].user = userObject.usr(); - result[index].usr(userObject.usr().usrname()) + result[index].usr(userObject.usr().usrname()); }); } - //if(result.length > 0) { - // result.push(dataForTotal); - //} this[dataSource].data = result; this.eraseUserGrid(); }); @@ -134,8 +104,9 @@ export class CashReportsComponent implements OnInit { getDeskTotal(idlObjects) { this.deskTotals = new DeskTotals(); - if(idlObjects.length > 0) { - let idlObjectFormat = this.idl.create("mwps") + + if (idlObjects.length > 0) { + const idlObjectFormat = this.idl.create('mwps'); idlObjects.forEach((idlObject) => { this.deskTotals['cash_payment'] += parseFloat(idlObject.cash_payment()); this.deskTotals['check_payment'] += parseFloat(idlObject.check_payment()); @@ -150,8 +121,8 @@ export class CashReportsComponent implements OnInit { getUserTotal(idlObjects) { this.userTotals = new UserTotals(); - if(idlObjects.length > 0) { - let idlObjectFormat = this.idl.create("mups") + if (idlObjects.length > 0) { + const idlObjectFormat = this.idl.create('mups'); idlObjects.forEach((idlObject, index) => { this.userTotals['forgive_payment'] += parseFloat(idlObject.forgive_payment()); this.userTotals['work_payment'] += parseFloat(idlObject.work_payment()); @@ -168,17 +139,10 @@ export class CashReportsComponent implements OnInit { } getFilteredOrgList() { - let orgFilter = {canHaveUsers:false} + const orgFilter = {canHaveUsers: false}; return this.org.filterList(orgFilter, true); } - // getOrgIds(orgs) { - // orgs.forEach((element) => { - // this.disabledOrgs.push(element.id()); - // }); - // return orgs; - // } - onStartDateChange(date) { this.startDate = date; } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.module.ts index dec49bb03f..5ab480fe14 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.module.ts @@ -2,8 +2,8 @@ import {NgModule} from '@angular/core'; import {TreeModule} from '@eg/share/tree/tree.module'; import {StaffCommonModule} from '@eg/staff/common.module'; import {CashReportsComponent} from './cash-reports.component'; -import {UserDialogComponent} from './user-dialog.component' -import {CashReportsRoutingModule} from './routing.module' +import {UserDialogComponent} from './user-dialog.component'; +import {CashReportsRoutingModule} from './routing.module'; @NgModule({ declarations: [ @@ -22,4 +22,5 @@ import {CashReportsRoutingModule} from './routing.module' }) export class CashReportsModule { -} \ No newline at end of file +} + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/routing.module.ts index 65f7620c8c..b9b0e9dbcd 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/routing.module.ts @@ -12,4 +12,5 @@ const routes: Routes = [{ exports: [RouterModule] }) -export class CashReportsRoutingModule {} \ No newline at end of file +export class CashReportsRoutingModule {} + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/user-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/user-dialog.component.ts index 480e720b18..872aeea08e 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/user-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/user-dialog.component.ts @@ -4,7 +4,7 @@ import {Observable} from 'rxjs'; import { DialogComponent } from '@eg/share/dialog/dialog.component'; @Component({ - selector:'eg-user-dialog', + selector: 'eg-user-dialog', templateUrl: './user-dialog.component.html' }) export class UserDialogComponent extends DialogComponent implements OnInit {