From 6175a39031173e042288a6ca6729abb18bc566a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Mon, 9 Dec 2024 16:22:15 +0100 Subject: [PATCH] primeng: admin loans MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-by: Johnny MarieĢthoz Co-Authored-by: Bertrand Zuchuat --- projects/admin/src/app/app.module.ts | 2 - .../loans-brief-view.component.html | 103 ++++++++---------- .../loans-brief-view.component.scss | 29 ----- .../loans-brief-view.component.ts | 19 ++-- .../circulation-log-loan.component.html | 28 ++--- .../circulation-log-loan.component.scss | 39 ------- .../circulation-log-loan.component.ts | 3 +- ...irculation-log-notification.component.html | 33 +++--- ...irculation-log-notification.component.scss | 42 ------- .../circulation-log-notification.component.ts | 3 +- .../circulation-log.component.html | 63 +++++------ .../circulation-log.component.scss | 77 ------------- .../circulation-log.component.ts | 3 +- .../circulation-logs-dialog.component.ts | 70 ------------ .../circulation-logs.component.html | 31 +++--- .../circulation-logs.component.scss | 40 ------- .../circulation-logs.component.ts | 68 ++++++------ .../circulation-stats.component.html | 10 +- projects/admin/src/index.html | 4 +- .../component/open-close-button.component.ts | 8 +- 20 files changed, 188 insertions(+), 487 deletions(-) delete mode 100644 projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.scss delete mode 100644 projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.scss delete mode 100644 projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.scss delete mode 100644 projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.scss delete mode 100644 projects/admin/src/app/record/circulation-logs/circulation-logs-dialog.component.ts delete mode 100644 projects/admin/src/app/record/circulation-logs/circulation-logs.component.scss diff --git a/projects/admin/src/app/app.module.ts b/projects/admin/src/app/app.module.ts index ef77b3667..2e9b6c82f 100644 --- a/projects/admin/src/app/app.module.ts +++ b/projects/admin/src/app/app.module.ts @@ -81,7 +81,6 @@ import { VendorBriefViewComponent } from './record/brief-view/vendor-brief-view. import { CirculationLogLoanComponent } from './record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component'; import { CirculationLogNotificationComponent } from './record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component'; import { CirculationLogComponent } from './record/circulation-logs/circulation-log/circulation-log.component'; -import { CirculationLogsDialogComponent } from './record/circulation-logs/circulation-logs-dialog.component'; import { CirculationLogsComponent } from './record/circulation-logs/circulation-logs.component'; import { CirculationStatsComponent } from './record/circulation-logs/circulation-stats/circulation-stats.component'; import { DocumentEditorComponent } from './record/custom-editor/document-editor/document-editor.component'; @@ -278,7 +277,6 @@ export function appInitFactory(appInitializerService: AppInitializerService): () DialogImportComponent, NotificationTypePipe, CirculationLogsComponent, - CirculationLogsDialogComponent, CirculationLogComponent, ItemInCollectionPipe, CountryCodeTranslatePipe, diff --git a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.html b/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.html index c1330f482..6eb648211 100644 --- a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.html +++ b/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.html @@ -15,65 +15,58 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
+
-
-
-
{{ record.metadata.document.title | mainTitle }}
-
-
-
Item
-
- - ({{ record.metadata.item.barcode }}) -
-
Patron
-
- - {{ record.metadata.patron.formatted_name }} - -
-
Status
-
- {{ record.metadata.state | translate }} - @switch(record.metadata.state) { - - @case (loanState.ITEM_ON_LOAN) { - @if (record.metadata?.is_late) { - overdue - ({{ 'due date' | translate }} - - {{record.metadata.end_date | date: 'shortDate' }}) - } - } - - @case (loanState.ITEM_AT_DESK) { - ({{ 'request expire at' | translate }} - {{ record.metadata.request_expire_date | date: 'shortDate' }}) - } - } -
-
+
+
{{ record.metadata.document.title | mainTitle }}
+ +
+ + @if (canUseDebugMode) { + + + + }
- -
- - @if (canUseDebugMode) { - - } -
+
+
Item
+
+ + ({{ record.metadata.item.barcode }}) +
+
Patron
+
+ + {{ record.metadata.patron.formatted_name }} + +
+
Status
+
+ {{ record.metadata.state | translate }} + @switch(record.metadata.state) { + + @case (loanState.ITEM_ON_LOAN) { + @if (record.metadata?.is_late) { + overdue + ({{ 'due date' | translate }} + + {{record.metadata.end_date | date: 'shortDate' }}) + } + } + + @case (loanState.ITEM_AT_DESK) { + ({{ 'request expire at' | translate }} + {{ record.metadata.request_expire_date | date: 'shortDate' }}) + } + } +
+
+ @if (debugMode) { - 
{{ record.metadata | json }}
+ 
{{ record.metadata | json }}
}
-
diff --git a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.scss b/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.scss deleted file mode 100644 index 9a645a684..000000000 --- a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.scss +++ /dev/null @@ -1,29 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ -/* - * RERO ILS UI - * Copyright (C) 2022 RERO - * Copyright (C) 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 - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -@import 'bootstrap/scss/bootstrap'; - -dl dd { - margin-bottom: 0; -} -pre { - font-size: 60%; - background-color: $light; -} - diff --git a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.ts b/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.ts index bc8f7a5c3..2ec00d831 100644 --- a/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.ts +++ b/projects/admin/src/app/record/brief-view/loans-brief-view/loans-brief-view.component.ts @@ -22,16 +22,17 @@ import { DateTime } from 'luxon'; import { DialogService } from 'primeng/dynamicdialog'; import { LoanState } from '../../../classes/loans'; import { CirculationLogsComponent } from '../../circulation-logs/circulation-logs.component'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'admin-loans-brief-view', - templateUrl: './loans-brief-view.component.html', - styleUrls: ['./loans-brief-view.component.scss'] + templateUrl: './loans-brief-view.component.html' }) export class LoansBriefViewComponent implements ResultItem, OnInit { private dialogService: DialogService = inject(DialogService); private permissionsService: PermissionsService = inject(PermissionsService); + private translateService: TranslateService = inject(TranslateService); // COMPONENT ATTRIBUTES ===================================================== /** Information to build the URL on the record detail view. */ @@ -44,7 +45,7 @@ export class LoansBriefViewComponent implements ResultItem, OnInit { /** debug mode toggle */ debugMode = false; /** class to use for the state bullet */ - stateClass: string = null; + tagSeverity: string = null; /** Reference on LoanState */ loanState = LoanState; /** is the current request is expired */ @@ -63,7 +64,7 @@ export class LoansBriefViewComponent implements ResultItem, OnInit { /** OnInit hook */ ngOnInit() { // State bullet color - this._getBadgeStyle(); + this.setTagSeverity(); // Is request is expired this.record.metadata.request_expire_date = "2024-10-28T08:58:59.979434+00:00"; if ('request_expire_date' in this.record.metadata) { @@ -76,6 +77,8 @@ export class LoansBriefViewComponent implements ResultItem, OnInit { /** Open transaction history logs dialog */ openTransactionHistoryDialog(loanPid: string): void { this.dialogService.open(CirculationLogsComponent, { + header: this.translateService.instant("Circulation history"), + width: '60vw', dismissableMask: true, data: { resourcePid: loanPid, @@ -87,19 +90,19 @@ export class LoansBriefViewComponent implements ResultItem, OnInit { // PRIVATE COMPONENT FUNCTIONS ============================================== /** Define the bullet color. */ - private _getBadgeStyle(): void { + private setTagSeverity(): void { switch (this.record.metadata.state) { case LoanState.CREATED: case LoanState.PENDING: case LoanState.ITEM_AT_DESK: - this.stateClass = 'badge-info'; + this.tagSeverity = 'info'; break; case LoanState.ITEM_ON_LOAN: - this.stateClass = 'badge-success'; + this.tagSeverity = 'success'; break; case LoanState.ITEM_IN_TRANSIT_FOR_PICKUP: case LoanState.ITEM_IN_TRANSIT_TO_HOUSE: - this.stateClass = 'badge-warning'; + this.tagSeverity = 'warning'; } } } diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.html b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.html index dbeaa2aa2..c1ddf883a 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.html +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.html @@ -20,10 +20,11 @@ [isHighlight]="isHighlight" [separator]="separator" > - {{ record.metadata.loan.trigger | translate }} -
+ {{ record.metadata.loan.trigger | translate }} +
-
+
+   @if (record.metadata.loan.transaction_location) { @if (record.metadata.loan.transaction_location.pid | getRecord : 'locations' | async; as location) { {{ $any(location).metadata.library.pid | getRecord : 'libraries' : 'field' : 'name' | async }} @@ -33,7 +34,8 @@ }
-
+
+   @if (record.metadata.loan.patron.pid) { @if (record.metadata.loan.patron.pid | getRecord : 'patrons' | async; as patron) { @@ -45,10 +47,10 @@ }
-
+
-
Library
-
+
 {{'Library' | translate}}
+
@if (record.metadata.loan.transaction_location) { @if (record.metadata.loan.transaction_location.pid | getRecord : 'locations' | async; as location) { {{ $any(location).metadata.library.pid | getRecord : 'libraries' : 'field' : 'name' | async }} @@ -59,12 +61,12 @@
-
Pickup location
-
{{ record.metadata.loan.pickup_location.name }}
+
 {{'Pickup location' | translate}}
+
{{ record.metadata.loan.pickup_location.name }}
-
Patron
-
+
 {{ 'Patron' | translate }}
+
@if (record.metadata.loan.patron.pid) { @if (record.metadata.loan.patron.pid | getRecord : 'patrons' | async; as patron) { @@ -77,8 +79,8 @@
-
Operator
-
+
 {{ 'Operator' | translate }}
+
{{ record.metadata.user_name }} @if (record.metadata.loan.auto_extend) { ({{ 'automatic renewal' | translate }}) diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.scss b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.scss deleted file mode 100644 index 1f604db1e..000000000 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.scss +++ /dev/null @@ -1,39 +0,0 @@ -/* - * RERO ILS UI - * Copyright (C) 2023 RERO - * Copyright (C) 2023 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 - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -*[class^='fa-icon-'], *[class*=' fa-icon-'] { - &:before { - font-family: 'FontAwesome'; - font-weight: 100; - display: inline-block; - min-width: 20px; - } -} - -.fa-icon-library:before { - content: "\f0ac"; -} -.fa-icon-pickup-location:before { - content: "\f041"; -} -.fa-icon-patron:before { - content: "\f007"; -} -.fa-icon-operator:before { - content: "\f2be"; -} diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.ts b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.ts index 52a12e425..74bdb0036 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.ts +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component.ts @@ -19,8 +19,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'admin-circulation-log-loan', - templateUrl: './circulation-log-loan.component.html', - styleUrls: ['./circulation-log-loan.component.scss'] + templateUrl: './circulation-log-loan.component.html' }) export class CirculationLogLoanComponent { diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.html b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.html index fbe85adc8..0a2e1543f 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.html +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.html @@ -21,10 +21,11 @@ [separator]="separator" (isCollapsedEvent)="loadData($event)" > - Notification -
+ Notification +
-
+
+   @if (record.metadata.notification.sender_library_pid) { {{ record.metadata.notification.sender_library_pid | getRecord : 'libraries' : 'field' : 'name' | async }} } @else { @@ -33,13 +34,13 @@
- {{ record.metadata.notification.type | translate }} + {{ record.metadata.notification.type | translate }}
-
+
-
Library
-
+
 {{'Library' | translate}}
+
@if (record.metadata.notification.sender_library_pid) { {{ record.metadata.notification.sender_library_pid | getRecord : 'libraries' : 'field' : 'name' | async }} } @else { @@ -48,13 +49,13 @@
-
Type
-
{{ record.metadata.notification.type | translate }}
+
 {{ 'Type' | translate}}
+
{{ record.metadata.notification.type | translate }}
-
Recipients
-
-
    +
     {{ 'Recipients' | translate}}
    +
    +
      @for (recipient of record.metadata.notification.recipients; track recipient) {
    • {{ recipient }}
      • } @@ -63,12 +64,12 @@ @if (notificationRecord) { -
      Process date
      -
      {{ notificationRecord.process_date | dateTranslate :'medium' }}
      +
       {{ 'Process date' | translate}}
      +
      {{ notificationRecord.process_date | dateTranslate :'medium' }}
      -
      Status
      -
      +
       {{ 'Status' | translate}}
      +
      @if (notificationRecord.notification_sent) { {{ 'message sent' | translate }} } @else { diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.scss b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.scss deleted file mode 100644 index d1a7667d0..000000000 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.scss +++ /dev/null @@ -1,42 +0,0 @@ -/* - * RERO ILS UI - * Copyright (C) 2023 RERO - * Copyright (C) 2023 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 - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -*[class^='transaction-'], *[class*=' transaction-'] { - &:before { - font-family: 'FontAwesome'; - font-weight: 100; - display: inline-block; - min-width: 20px; - } -} - -.transaction-library:before { - content: "\f0ac"; -} -.transaction-type:before { - content: "\f024"; -} -.transaction-date:before { - content: "\f133"; -} -.transaction-status:before { - content: "\f06e"; -} -.transaction-email:before { - content: "\f0e0"; -} diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.ts b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.ts index 400651a9a..94891ea82 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.ts +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component.ts @@ -20,8 +20,7 @@ import { NotificationApiService } from '@app/admin/api/notification-api.service' @Component({ selector: 'admin-circulation-log-notification', - templateUrl: './circulation-log-notification.component.html', - styleUrls: ['./circulation-log-notification.component.scss'] + templateUrl: './circulation-log-notification.component.html' }) export class CirculationLogNotificationComponent { diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.html b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.html index 40883e9b6..dca03bb25 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.html +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.html @@ -15,45 +15,42 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
      - -
      -
      +
      +
      -
      -
      {{ record.metadata.date | dateTranslate :'shortDate' }}
      -
      {{ record.metadata.date | dateTranslate :'mediumTime' }}
      -
      +
      +
      + +
      +
       {{ record.metadata.date | dateTranslate :'shortDate' }}
      +
       {{ record.metadata.date | dateTranslate :'mediumTime' }}
      +
      +
      +
      -
      - -
      +
      + +
      -
      +
      @if (isCollapsed) { - + } @else { - +
      + + + @if (canUseDebugMode) { + + + + } +
      } -
      +
      +
      - 
      {{ record | json }}
      -
      -
      - - @if (canUseDebugMode && !isCollapsed) { - - } - + 
      {{ record | json }}
      diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.scss b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.scss deleted file mode 100644 index 0b7f05d01..000000000 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.scss +++ /dev/null @@ -1,77 +0,0 @@ -/* - * RERO ILS UI - * Copyright (C) 2021-2023 RERO - * Copyright (C) 2022-2023 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 - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -@import 'bootstrap/scss/functions'; -@import 'bootstrap/scss/variables'; - -.transaction-log { - display: flex; - position: relative; - - &:before { - content: ""; - background-color: $border-color; - position: absolute; - left: 0.85rem; - top: 0; - width: 1px; - height: 100%; - z-index: 1; - } - - &.highlight .btn-show-more{ - background-color: theme-color-level('info', -10); - border-color: $info; - } - - &:hover { - background-color: $light !important; - border-top: $border-width solid $border-color; - border-bottom: $border-width solid $border-color; - } - - .btn-show-more{ - z-index: 2; - } - - *[class^='transaction-'], *[class*=' transaction-'] { - &:before { - font-family: 'FontAwesome'; - font-weight: 100; - display: inline-block; - min-width: 20px; - } - } - - .transaction-date:before { - content: "\f133"; - } - .transaction-time:before{ - content: "\f017"; - } - .transaction-trigger { - font-variant: small-caps; - } - - .debug-button{ - position: absolute; - top: map-get($spacers, 1); - right: map-get($spacers, 1); - } -} - diff --git a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.ts b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.ts index a262cc6d6..dc025f682 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.ts +++ b/projects/admin/src/app/record/circulation-logs/circulation-log/circulation-log.component.ts @@ -20,8 +20,7 @@ import { PermissionsService } from '@rero/shared'; @Component({ selector: 'admin-circulation-log', - templateUrl: './circulation-log.component.html', - styleUrls: ['./circulation-log.component.scss'] + templateUrl: './circulation-log.component.html' }) export class CirculationLogComponent { diff --git a/projects/admin/src/app/record/circulation-logs/circulation-logs-dialog.component.ts b/projects/admin/src/app/record/circulation-logs/circulation-logs-dialog.component.ts deleted file mode 100644 index cefc9b35f..000000000 --- a/projects/admin/src/app/record/circulation-logs/circulation-logs-dialog.component.ts +++ /dev/null @@ -1,70 +0,0 @@ -/* - * RERO ILS UI - * Copyright (C) 2021-2024 RERO - * - * 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 - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -import { Component, inject, Input } from '@angular/core'; -import { IPermissions, PERMISSION_OPERATOR, PERMISSIONS } from '@rero/shared'; -import { DialogService } from 'primeng/dynamicdialog'; -import { CirculationLogsComponent } from './circulation-logs.component'; -import { TranslateService } from '@ngx-translate/core'; - -@Component({ - selector: 'admin-circulation-logs-dialog', - template: ` -
      - -
      - ` -}) -export class CirculationLogsDialogComponent { - - private dialogService: DialogService = inject(DialogService); - private translateService: TranslateService = inject(TranslateService); - - // COMPONENT ATTRIBUTES ===================================================== - /** Resource pid */ - @Input() resourcePid: string; - /** Resource type */ - @Input() resourceType: 'item'|'loan' = 'item'; - - /** return all permissions */ - permissions: IPermissions = PERMISSIONS; - - /** Available operators for permissions */ - permissionOperator = PERMISSION_OPERATOR; - - // COMPONENT FUNCTIONS ====================================================== - /** Open operation logs dialog */ - openDialog(): void { - this.dialogService.open(CirculationLogsComponent, { - header: this.translateService.instant('Circulation history'), - dismissableMask: true, - width: '60vw', - data: { - resourcePid: this.resourcePid, - resourceType: this.resourceType - } - }); - } -} diff --git a/projects/admin/src/app/record/circulation-logs/circulation-logs.component.html b/projects/admin/src/app/record/circulation-logs/circulation-logs.component.html index 090a480b3..425daa9ad 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-logs.component.html +++ b/projects/admin/src/app/record/circulation-logs/circulation-logs.component.html @@ -15,28 +15,25 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
      +
      @if (resourceType === 'item') { - + } -
      - Filter -
        - @for (filter of filterTypes | keyvalue; track filter) { -
      • -
        - - -
        -
        • - } -
      -
      +
      +
      + {{ 'Filter' | translate}}: + @for (filter of filterTypes; track filter) { + + + } +
      +
      @defer { @if (recordTotals > 0) { @for (record of records; track record; let isFirst = $first; let idx = $index) { @if (isFirst || !isSamePeriod(record, records[idx-1])) { -
      +
      +   {{ record.metadata.date | dateTranslate :'MMMM Y' | titlecase }}
      } @@ -48,7 +45,7 @@ [separator]="!isSamePeriod(record, records[idx-1], 'days')" (mouseenter)="mouseEventTransaction(record, $event)" (mouseleave)="highlightedLoanPid=null" - > + /> } @case('circulation') { . - */ - -@import 'bootstrap/scss/functions'; -@import 'bootstrap/scss/variables'; - -.overflow-max-size { - max-height: 750px; -} - - -.transactionDate { - border-top: $border-width solid $border-color; - border-bottom: $border-width solid $border-color; - padding-top: map-get($spacers, 2); - padding-bottom: map-get($spacers, 2); - background-color: $light; - - &:before { - font-family: 'FontAwesome'; - font-weight: 100; - content: " \f073"; - margin-left: map-get($spacers, 2); - margin-right: map-get($spacers, 3); - } -} diff --git a/projects/admin/src/app/record/circulation-logs/circulation-logs.component.ts b/projects/admin/src/app/record/circulation-logs/circulation-logs.component.ts index 18240f40f..ed4d78d1e 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-logs.component.ts +++ b/projects/admin/src/app/record/circulation-logs/circulation-logs.component.ts @@ -15,22 +15,22 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import { Component, inject, OnInit } from '@angular/core'; +import { Component, inject, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { Record } from '@rero/ng-core'; import { DateTime } from 'luxon'; import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { Observable, Subscription } from 'rxjs'; +import { map, switchMap } from 'rxjs/operators'; import { OperationLogsApiService } from '../../api/operation-logs-api.service'; @Component({ selector: 'admin-circulation-logs', - templateUrl: './circulation-logs.component.html', - styleUrls: ['./circulation-logs.component.scss'] + templateUrl: './circulation-logs.component.html' }) -export class CirculationLogsComponent implements OnInit { +export class CirculationLogsComponent implements OnInit, OnDestroy { private dynamicDialogConfig: DynamicDialogConfig = inject(DynamicDialogConfig); private dynamicDialogRef: DynamicDialogRef = inject(DynamicDialogRef); @@ -54,11 +54,13 @@ export class CirculationLogsComponent implements OnInit { records = []; /** first loaded record */ loadedRecord = false; - /** Types of operation history (field: record.type) */ - filterTypes = { - 'loan': true, - 'notif': true - } + + formGroup: FormGroup | undefined; + + filterTypes = ['loan', 'notif']; + + /** all component subscription */ + private subscriptions = new Subscription(); // GETTER & SETTER ========================================================== /** @@ -88,12 +90,30 @@ export class CirculationLogsComponent implements OnInit { ngOnInit(): void { const { data } = this.dynamicDialogConfig; this.resourcePid = data.resourcePid; + this.formGroup = new FormGroup( + this.filterTypes.reduce((acc, elem) => { + acc[elem] = new FormControl(undefined); + return acc + }, {}) + ); this.resourceType = data.resourceType || 'item'; - this._circulationLogsQuery(1).subscribe((response: any) => { + this.subscriptions.add( + this.formGroup.valueChanges.pipe( + switchMap(res => this.circulationLogsQuery(1)) + ).subscribe((response: any) => { this.recordTotals = response.total.value; this.records = response.hits; this.loadedRecord = true; - }); + })); + + this.formGroup.setValue(this.filterTypes.reduce((acc, elem) => { + acc[elem] = true + return acc + }, {})); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); } // PUBLIC FUNCTIONS ========================================================= @@ -105,7 +125,7 @@ export class CirculationLogsComponent implements OnInit { /** show more */ showMore(): void { this.page++; - this._circulationLogsQuery(this.page) + this.circulationLogsQuery(this.page) .subscribe((response: any) => { this.records = this.records.concat(response.hits); }); @@ -122,7 +142,7 @@ export class CirculationLogsComponent implements OnInit { if (date1 && date2) { const transDate1 = DateTime.fromISO(date1.metadata.date); const transDate2 = DateTime.fromISO(date2.metadata.date); - return transDate1.haSame(transDate2, period); + return transDate1.hasSame(transDate2, period); } return true; } @@ -155,29 +175,15 @@ export class CirculationLogsComponent implements OnInit { } } - /** - * Filter check - * Allows you to add filters for a selection of records. - * @param type - string (Filter key) - */ - filterCheck(type: string): void { - this.filterTypes[type] = !this.filterTypes[type]; - this._circulationLogsQuery(1).subscribe((response: any) => { - this.recordTotals = response.total.value; - this.records = response.hits; - this.loadedRecord = true; - }); - } - // PRIVATE FUNCTIONS ======================================================== /** * Circulation logs query * @param page - number * @return Observable */ - private _circulationLogsQuery(page: number): Observable { + private circulationLogsQuery(page: number): Observable { return this.operationLogsApiService - .getCirculationLogs(this.resourceType, this.resourcePid, page, this.itemsPerPage, this.filterTypes) + .getCirculationLogs(this.resourceType, this.resourcePid, page, this.itemsPerPage, this.formGroup.value) .pipe(map((response: Record) => response.hits)); } } diff --git a/projects/admin/src/app/record/circulation-logs/circulation-stats/circulation-stats.component.html b/projects/admin/src/app/record/circulation-logs/circulation-stats/circulation-stats.component.html index a23c02bd4..125890c05 100644 --- a/projects/admin/src/app/record/circulation-logs/circulation-stats/circulation-stats.component.html +++ b/projects/admin/src/app/record/circulation-logs/circulation-stats/circulation-stats.component.html @@ -16,17 +16,17 @@ along with this program. If not, see . --> @if (stats) { -
      +
      - Past year (last 365 days) -
        + Past year (last 365 days) +
        • {{ 'checkout' | translate | ucfirst }}: {{ stats.total_year.checkout | default: 0 }}
        • {{ 'renewal' | translate | ucfirst }}: {{ stats.total_year.extend | default: 0 }}
      - Total -
        + Total +
        • {{ 'checkout' | translate | ucfirst }}: {{ stats.total.checkout | default: 0 }}
        • {{ 'renewal' | translate| ucfirst }}: {{ stats.total.extend | default: 0 }}
        diff --git a/projects/admin/src/index.html b/projects/admin/src/index.html index 4572e3091..0fd5e9233 100644 --- a/projects/admin/src/index.html +++ b/projects/admin/src/index.html @@ -8,7 +8,7 @@ - - + + diff --git a/projects/shared/src/lib/component/open-close-button.component.ts b/projects/shared/src/lib/component/open-close-button.component.ts index 679650ffe..35d7844e4 100644 --- a/projects/shared/src/lib/component/open-close-button.component.ts +++ b/projects/shared/src/lib/component/open-close-button.component.ts @@ -20,7 +20,7 @@ import { Component, input, OnChanges, output, SimpleChanges } from '@angular/cor selector: 'shared-open-close-button', template: ` (true); + styleClass = input('bg-white'); + status = output(); internalStatus: boolean = true; ngOnChanges(changes: SimpleChanges): void { - this.internalStatus = changes.collapsed.currentValue; + if (changes?.collapsed) { + this.internalStatus = changes.collapsed.currentValue; + } } updateStatus(): void {