Fees: Fee brief view

angular.json

@@ -22,6 +22,8 @@
             "tsConfig": "projects/admin/tsconfig.app.json",
             "assets": ["projects/admin/src/assets"],
             "styles": [
+              "node_modules/primeng/resources/themes/lara-light-blue/theme.css",
+              "node_modules/primeng/resources/primeng.min.css",
               "projects/admin/src/app/scss/styles.scss",
               "node_modules/ngx-bootstrap/datepicker/bs-datepicker.css"
             ],

package.json

@@ -67,6 +67,7 @@
   },
   "dependencies": {
     "@angular/animations": "^14.2.6",
+    "@angular/cdk": "^14.2.7",
     "@angular/common": "^14.2.6",
     "@angular/compiler": "^14.2.6",
     "@angular/core": "^14.2.6",
@@ -84,7 +85,8 @@
     "@ngx-loading-bar/http-client": "^6.0.0",
     "@ngx-loading-bar/router": "^6.0.0",
     "@ngx-translate/core": "^14.0.0",
-    "@rero/ng-core": "^14.0.0",
+    "@rero/ng-core": "^14.1.0",
+    "@swimlane/ngx-charts": "^20.1.2",
     "bootstrap": "^4.6.2",
     "crypto-js": "^4.1.1",
     "easymde": "^2.18.0",
@@ -97,6 +99,7 @@
     "ngx-build-plus": "^14.0.0",
     "ngx-spinner": "^14.0.0",
     "ngx-toastr": "^15.2.0",
+    "primeng": "^14.1.2",
     "rxjs": "~6.6.7",
     "simple-isbn": "^1.1.5",
     "tslib": "^2.4.0",

projects/admin/src/app/acquisition/components/account/account-brief-view/account-brief-view.component.ts

@@ -20,9 +20,9 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '@rero/shared';
 import { ToastrService } from 'ngx-toastr';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { OrganisationService } from 'projects/admin/src/app/service/organisation.service';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { OrganisationService } from '@app/admin/service/organisation.service';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
 import { IAcqAccount } from '../../../classes/account';
 import { AcqAccountApiService } from '../../../api/acq-account-api.service';
 

projects/admin/src/app/acquisition/components/account/account-list/account-list.component.ts

@@ -17,12 +17,12 @@
  */
 import { Component, OnInit } from '@angular/core';
 import { UserService } from '@rero/shared';
-import { OrganisationService } from '../../../../service/organisation.service';
-import { IAcqAccount } from '../../../classes/account';
-import { AcqAccountApiService } from '../../../api/acq-account-api.service';
+import { OrganisationService } from '@app/admin/service/organisation.service';
+import { IAcqAccount } from '@app/admin/acquisition/classes/account';
+import { AcqAccountApiService } from '@app/admin/acquisition/api/acq-account-api.service';
 import { ApiService, RecordService } from '@rero/ng-core';
 import { TranslateService } from '@ngx-translate/core';
-import { exportFormats } from '../../../routes/accounts-route';
+import { exportFormats } from '@app/admin/acquisition/routes/accounts-route';
 import { HttpParams } from '@angular/common/http';
 
 @Component({

projects/admin/src/app/acquisition/components/account/account-transfer/account-transfer.component.ts

@@ -23,7 +23,7 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '@rero/shared';
 import { ToastrService } from 'ngx-toastr';
-import { OrganisationService } from 'projects/admin/src/app/service/organisation.service';
+import { OrganisationService } from '@app/admin/service/organisation.service';
 import { IAcqAccount } from '../../../classes/account';
 import { AcqAccountApiService } from '../../../api/acq-account-api.service';
 import { orderAccountsAsTree } from '../../../utils/account';

projects/admin/src/app/acquisition/components/budget/budget-detail-view/budget-detail-view.component.ts

@@ -17,7 +17,7 @@
  */
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { DetailRecord } from '@rero/ng-core/lib/record/detail/view/detail-record';
-import { OrganisationService } from 'projects/admin/src/app/service/organisation.service';
+import { OrganisationService } from '@app/admin/service/organisation.service';
 import { Observable, Subscription } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { AcqBudgetApiService } from '../../../api/acq-budget-api.service';

projects/admin/src/app/acquisition/components/editor/widget/select-account-editor-widget/select-account-editor-widget.component.ts

@@ -20,8 +20,8 @@ import { Component, OnInit } from '@angular/core';
 import { FieldType } from '@ngx-formly/core';
 import { ApiService } from '@rero/ng-core';
 import { UserService } from '@rero/shared';
-import { IAcqAccount } from 'projects/admin/src/app/acquisition/classes/account';
-import { OrganisationService } from 'projects/admin/src/app/service/organisation.service';
+import { IAcqAccount } from '@app/admin/acquisition/classes/account';
+import { OrganisationService } from '@app/admin/service/organisation.service';
 import { AcqAccountApiService } from '../../../../api/acq-account-api.service';
 import { orderAccountsAsTree } from '../../../../utils/account';
 

projects/admin/src/app/acquisition/components/order/order-detail-view/order-detail-view.component.ts

@@ -19,9 +19,9 @@ import { ViewportScroller } from '@angular/common';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { DetailRecord } from '@rero/ng-core/lib/record/detail/view/detail-record';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
-import { CurrentLibraryPermissionValidator } from 'projects/admin/src/app/utils/permissions';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
+import { CurrentLibraryPermissionValidator } from '@app/admin/utils/permissions';
 import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AcqOrderStatus, IAcqOrder } from '../../../classes/order';

projects/admin/src/app/acquisition/components/order/order-detail-view/order-line/order-line.component.ts

@@ -17,9 +17,9 @@
  */
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { RecordService } from '@rero/ng-core';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
-import { CurrentLibraryPermissionValidator } from 'projects/admin/src/app/utils/permissions';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
+import { CurrentLibraryPermissionValidator } from '@app/admin/utils/permissions';
 import { forkJoin, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AcqOrderApiService } from '../../../../api/acq-order-api.service';

projects/admin/src/app/acquisition/components/order/order-detail-view/order-lines/order-lines.component.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
 import { Subscription } from 'rxjs';
 import { AcqOrderApiService } from '../../../../api/acq-order-api.service';
 import { IAcqOrder, IAcqOrderLine } from '../../../../classes/order';

projects/admin/src/app/acquisition/components/order/place-order-form/place-order-form.component.ts

@@ -20,8 +20,8 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { ToastrService } from 'ngx-toastr';
-import { AcqAddressRecipient, IAcqOrder, IAcqOrderPreviewResponse } from 'projects/admin/src/app/acquisition/classes/order';
-import { Notification } from 'projects/admin/src/app/classes/notification';
+import { AcqAddressRecipient, IAcqOrder, IAcqOrderPreviewResponse } from '@app/admin/acquisition/classes/order';
+import { Notification } from '@app/admin/classes/notification';
 import { finalize } from 'rxjs/operators';
 import { AcqOrderApiService } from '../../../api/acq-order-api.service';
 

projects/admin/src/app/acquisition/components/receipt/receipt-list/receipt-list.component.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
-import { CurrentLibraryPermissionValidator } from 'projects/admin/src/app/utils/permissions';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
+import { CurrentLibraryPermissionValidator } from '@app/admin/utils/permissions';
 import { of, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AcqReceiptApiService } from '../../../api/acq-receipt-api.service';

projects/admin/src/app/acquisition/components/receipt/receipt-summary/receipt-summary.component.ts

@@ -17,9 +17,9 @@
  */
 import { Component, Input, OnInit } from '@angular/core';
 import { forkJoin } from 'rxjs';
-import { RecordPermissionService } from 'projects/admin/src/app/service/record-permission.service';
-import { RecordPermissions } from 'projects/admin/src/app/classes/permissions';
-import { CurrentLibraryPermissionValidator } from 'projects/admin/src/app/utils/permissions';
+import { RecordPermissionService } from '@app/admin/service/record-permission.service';
+import { RecordPermissions } from '@app/admin/classes/permissions';
+import { CurrentLibraryPermissionValidator } from '@app/admin/utils/permissions';
 import { IAcqReceipt } from '../../../classes/receipt';
 import { AcqOrderApiService } from '../../../api/acq-order-api.service';
 import { AcqReceiptApiService } from '../../../api/acq-receipt-api.service';

projects/admin/src/app/acquisition/formly/type/select-account/select-account.component.ts

@@ -18,7 +18,7 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { FieldType } from '@ngx-formly/core';
 import { ApiService } from '@rero/ng-core';
-import { IAcqAccount } from 'projects/admin/src/app/acquisition/classes/account';
+import { IAcqAccount } from '@app/admin/acquisition/classes/account';
 
 @Component({
   selector: 'admin-select-account',

projects/admin/src/app/acquisition/routes/accounts-route.ts

@@ -19,8 +19,8 @@ import { getCurrencySymbol } from '@angular/common';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { DetailComponent, EditorComponent, JSONSchema7, RouteInterface } from '@rero/ng-core';
-import { CanUpdateGuard } from 'projects/admin/src/app/guard/can-update.guard';
-import { BaseRoute } from 'projects/admin/src/app/routes/base-route';
+import { CanUpdateGuard } from '@app/admin/guard/can-update.guard';
+import { BaseRoute } from '@app/admin/routes/base-route';
 import { of } from 'rxjs';
 import { OrganisationService } from '../../service/organisation.service';
 import { AccountDetailViewComponent } from '../components/account/account-detail-view/account-detail-view.component';

projects/admin/src/app/acquisition/routes/budgets-route.ts

@@ -17,7 +17,7 @@
  */
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DetailComponent, RecordSearchPageComponent, RouteInterface } from '@rero/ng-core';
-import { BaseRoute } from 'projects/admin/src/app/routes/base-route';
+import { BaseRoute } from '@app/admin/routes/base-route';
 import { BudgetsBriefViewComponent } from '../components/budget/budget-brief-view/budgets-brief-view.component';
 import { BudgetDetailViewComponent } from '../components/budget/budget-detail-view/budget-detail-view.component';
 

projects/admin/src/app/app.module.ts

@@ -1,6 +1,7 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2019 RERO
+ * Copyright (C) 2019-2022 RERO
+ * Copyright (C) 2019-2022 UCLouvain
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,6 +31,7 @@ import {
   TranslateLoader, TranslateService, TruncateTextPipe
 } from '@rero/ng-core';
 import { ItemHoldingsCallNumberPipe, MainTitlePipe, SharedModule, UserService } from '@rero/shared';
+import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { CollapseModule } from 'ngx-bootstrap/collapse';
 import { BsDatepickerModule, BsLocaleService } from 'ngx-bootstrap/datepicker';
@@ -42,6 +44,7 @@ import {
   SelectAccountEditorWidgetComponent
 } from './acquisition/components/editor/widget/select-account-editor-widget/select-account-editor-widget.component';
 import { ReceivedOrderPermissionValidator } from './acquisition/utils/permissions';
+import { PaymentsDataComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/payments-data.component';
 import { CurrentLibraryPermissionValidator } from './utils/permissions';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -144,7 +147,7 @@ import { PatronTypesDetailViewComponent } from './record/detail-view/patron-type
 import { RecordMaskedComponent } from './record/detail-view/record-masked/record-masked.component';
 import { TemplateDetailViewComponent } from './record/detail-view/template-detail-view/template-detail-view.component';
 import { VendorDetailViewComponent } from './record/detail-view/vendor-detail-view/vendor-detail-view.component';
-import { DocumentRecordSearchComponent } from './record/document-record-search/document-record-search.component';
+import { DocumentRecordSearchComponent } from './record/search-view/document-record-search/document-record-search.component';
 import { IdentifiedbyValueComponent } from './record/editor/wrappers/identifiedby-value.component';
 import { UserIdComponent } from './record/editor/wrappers/user-id/user-id.component';
 import { CipoPatronTypeItemTypeComponent } from './record/formly/type/cipo-patron-type-item-type/cipo-patron-type-item-type.component';
@@ -166,6 +169,13 @@ import { ExpectedIssueComponent } from './record/detail-view/holding-detail-view
 import { ReceivedIssueComponent } from './record/detail-view/holding-detail-view/serial-holding-detail-view/received-issue/received-issue.component';
 import { AppInitializerService } from './service/app-initializer.service';
 import { LoansBriefViewComponent } from './record/brief-view/loans-brief-view/loans-brief-view.component';
+import { PatronTransactionEventsBriefViewComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-events-brief-view.component';
+import { PatronNamePipe } from './pipe/patron-name.pipe';
+import { PatronTransactionEventOverdueComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-overdue.component';
+import { PatronTransactionEventDefaultComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-default.component';
+import { PatronTransactionEventSearchViewComponent } from './record/search-view/patron-transaction-event-search-view/patron-transaction-event-search-view.component';
+import { PaymentsDataTableComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/table/payments-data-table.component';
+import { PaymentDataPieComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/pie/payment-data-pie.component';
 
 /** Init application factory */
 export function appInitFactory(appInitializerService: AppInitializerService): () => Promise<any> {
@@ -272,7 +282,15 @@ export function appInitFactory(appInitializerService: AppInitializerService): ()
         ItemAvailabilityPipe,
         ExpectedIssueComponent,
         ReceivedIssueComponent,
-        LoansBriefViewComponent
+        LoansBriefViewComponent,
+        PatronTransactionEventsBriefViewComponent,
+        PatronNamePipe,
+        PatronTransactionEventOverdueComponent,
+        PatronTransactionEventDefaultComponent,
+        PatronTransactionEventSearchViewComponent,
+        PaymentsDataComponent,
+        PaymentsDataTableComponent,
+        PaymentDataPieComponent
     ],
     imports: [
         AppRoutingModule,
@@ -281,6 +299,7 @@ export function appInitFactory(appInitializerService: AppInitializerService): ()
         BrowserModule,
         BsDatepickerModule.forRoot(),
         BsDropdownModule.forRoot(),
+        NgxChartsModule,
         CollapseModule.forRoot(),
         FormsModule,
         HttpClientModule,

projects/admin/src/app/circulation/item/item.component.ts

@@ -20,10 +20,10 @@ import { RecordService } from '@rero/ng-core';
 import { ItemStatus, UserService } from '@rero/shared';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Item, ItemAction, ItemNote, ItemNoteType} from 'projects/admin/src/app/classes/items';
-import { Loan, LoanState } from 'projects/admin/src/app/classes/loans';
-import { ItemsService } from 'projects/admin/src/app/service/items.service';
-import { OrganisationService } from 'projects/admin/src/app/service/organisation.service';
+import { Item, ItemAction, ItemNote, ItemNoteType} from '@app/admin/classes/items';
+import { Loan, LoanState } from '@app/admin/classes/loans';
+import { ItemsService } from '@app/admin/service/items.service';
+import { OrganisationService } from '@app/admin/service/organisation.service';
 import { Organisation } from '../../classes/core';
 import { PatronTransactionService } from '../services/patron-transaction.service';
 

projects/admin/src/app/circulation/main-request/requested-item/requested-item.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { RecordService } from '@rero/ng-core';
-import { LoanState } from 'projects/admin/src/app/classes/loans';
+import { LoanState } from '@app/admin/classes/loans';
 
 @Component({
   selector: 'admin-requested-item',

projects/admin/src/app/circulation/main-request/requested-items-list/requested-items-list.component.ts

@@ -16,8 +16,8 @@
  */
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { Item } from 'projects/admin/src/app/classes/items';
-import { LoanState } from 'projects/admin/src/app/classes/loans';
+import { Item } from '@app/admin/classes/items';
+import { LoanState } from '@app/admin/classes/loans';
 
 @Component({
   selector: 'admin-circulation-requested-items-list',

projects/admin/src/app/circulation/patron/history/history-log/history-log.component.ts

@@ -18,7 +18,7 @@
 import { Component, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { ProvisionActivityType } from '@rero/shared';
-import { OperationLogsApiService } from 'projects/admin/src/app/api/operation-logs-api.service';
+import { OperationLogsApiService } from '@app/admin/api/operation-logs-api.service';
 
 @Component({
   selector: 'admin-history-log',

projects/admin/src/app/circulation/patron/loan/fixed-date-form/fixed-date-form.component.ts

@@ -25,8 +25,8 @@ import { UserService } from '@rero/shared';
 import moment from 'moment';
 import { BsLocaleService } from 'ngx-bootstrap/datepicker';
 import { BsModalRef } from 'ngx-bootstrap/modal';
-import { Library } from 'projects/admin/src/app/classes/library';
-import { DateValidators } from 'projects/admin/src/app/utils/validators';
+import { Library } from '@app/admin/classes/library';
+import { DateValidators } from '@app/admin/utils/validators';
 import { Subscription } from 'rxjs';
 import { CirculationService } from '../../../services/circulation.service';
 

projects/admin/src/app/circulation/patron/loan/loan.component.ts

@@ -22,9 +22,9 @@ import { ItemStatus, UserService } from '@rero/shared';
 import moment from 'moment';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { ToastrService } from 'ngx-toastr';
-import { Item, ItemAction, ItemNoteType } from 'projects/admin/src/app/classes/items';
-import { ItemsService } from 'projects/admin/src/app/service/items.service';
-import { PatronService } from 'projects/admin/src/app/service/patron.service';
+import { Item, ItemAction, ItemNoteType } from '@app/admin/classes/items';
+import { ItemsService } from '@app/admin/service/items.service';
+import { PatronService } from '@app/admin/service/patron.service';
 import { forkJoin, Subscription } from 'rxjs';
 import { CirculationService } from '../../services/circulation.service';
 import { FixedDateFormComponent } from './fixed-date-form/fixed-date-form.component';