diff --git a/projects/admin/src/app/acquisition/acquisition-routing.module.ts b/projects/admin/src/app/acquisition/acquisition-routing.module.ts
index 6fecdb0aa..6a9f32203 100644
--- a/projects/admin/src/app/acquisition/acquisition-routing.module.ts
+++ b/projects/admin/src/app/acquisition/acquisition-routing.module.ts
@@ -24,16 +24,33 @@ import { AccountListComponent } from './components/account/account-list/account-
import { AccountTransferComponent } from './components/account/account-transfer/account-transfer.component';
import { OrderReceiptViewComponent } from './components/receipt/receipt-form/order-receipt-view.component';
import { CanOrderReceiptGuard } from './routes/guards/can-order-receipt.guard';
+import { AcquisitionMainComponent } from './components/acquisition-main/acquisition-main.component';
const routes: Routes = [
- { path: '', redirectTo: 'accounts', pathMatch: 'full' },
- { path: 'accounts/transfer', component: AccountTransferComponent, canActivate: [ PermissionGuard ], data: { permissions: [ PERMISSIONS.ACAC_TRANSFER ] } },
- { path: 'accounts', component: AccountListComponent, canActivate: [ PermissionGuard ], data: { permissions: [ PERMISSIONS.ACAC_ACCESS, PERMISSIONS.ACAC_SEARCH ], operator: PERMISSION_OPERATOR.AND } },
- { path: 'acq_orders/:pid/receive', component: OrderReceiptViewComponent, canActivate: [ CanOrderReceiptGuard ] }
+ {
+ path: '',
+ component: AcquisitionMainComponent,
+ children: [
+ { path: '', redirectTo: 'accounts', pathMatch: 'full' },
+ {
+ path: 'accounts/transfer',
+ component: AccountTransferComponent,
+ canActivate: [PermissionGuard],
+ data: { permissions: [PERMISSIONS.ACAC_TRANSFER] },
+ },
+ {
+ path: 'accounts',
+ component: AccountListComponent,
+ canActivate: [PermissionGuard],
+ data: { permissions: [PERMISSIONS.ACAC_ACCESS, PERMISSIONS.ACAC_SEARCH], operator: PERMISSION_OPERATOR.AND },
+ },
+ { path: 'acq_orders/:pid/receive', component: OrderReceiptViewComponent, canActivate: [CanOrderReceiptGuard] },
+ ],
+ },
];
@NgModule({
imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
+ exports: [RouterModule],
})
-export class AcquisitionRoutingModule { }
+export class AcquisitionRoutingModule {}
diff --git a/projects/admin/src/app/acquisition/acquisition.module.ts b/projects/admin/src/app/acquisition/acquisition.module.ts
index 48c1ef238..c79955325 100644
--- a/projects/admin/src/app/acquisition/acquisition.module.ts
+++ b/projects/admin/src/app/acquisition/acquisition.module.ts
@@ -28,7 +28,6 @@ import { PreviewEmailModule } from '../shared/preview-email/preview-email.module
import { AcquisitionRoutingModule } from './acquisition-routing.module';
import { AcqAccountApiService } from './api/acq-account-api.service';
import { AcqOrderApiService } from './api/acq-order-api.service';
-import { AccountBriefViewComponent } from './components/account/account-brief-view/account-brief-view.component';
import { AccountDetailViewComponent } from './components/account/account-detail-view/account-detail-view.component';
import { AccountListComponent } from './components/account/account-list/account-list.component';
import { AccountTransferComponent } from './components/account/account-transfer/account-transfer.component';
@@ -57,14 +56,13 @@ import { NoteBadgeColorPipe } from './pipes/note-badge-color.pipe';
import { PreviewContentPipe } from './pipes/preview-content.pipe';
import { ReceiptLineTotalAmountPipe } from './pipes/receipt-line-total-amount.pipe';
import { ReceptionDatesPipe } from './pipes/reception-dates.pipe';
-import { ChipsModule } from 'primeng/chips';
import { PrimengImportModule } from '../shared/primeng-import/primeng-import.module';
import { NotesComponent } from './components/notes/notes.component';
+import { AcquisitionMainComponent } from './components/acquisition-main/acquisition-main.component';
@NgModule({
declarations: [
AccountListComponent,
- AccountBriefViewComponent,
AccountTransferComponent,
AccountDetailViewComponent,
BudgetsBriefViewComponent,
@@ -89,7 +87,8 @@ import { NotesComponent } from './components/notes/notes.component';
PreviewContentPipe,
ReceiptLineTotalAmountPipe,
OrderEmailFormComponent,
- NotesComponent
+ NotesComponent,
+ AcquisitionMainComponent
],
imports: [
CommonModule,
diff --git a/projects/admin/src/app/acquisition/acquisition.scss b/projects/admin/src/app/acquisition/acquisition.scss
deleted file mode 100644
index 256beaf66..000000000
--- a/projects/admin/src/app/acquisition/acquisition.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2021-2023 RERO
- * Copyright (C) 2021-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
Allocated amount | -+ | ||||||
---|---|---|---|---|---|---|---|
Allocated amount | +{{ account.allocated_amount | currency: organisation.default_currency }} | ||||||
Distribution | -0}"> + | Distribution | +0}"> {{ account.distribution | negativeAmount | currency: organisation.default_currency }} | ||||
Current encumbrance | -Self | -0}"> + | Current encumbrance | +Self | +0}"> {{ account.encumbrance_amount.self | negativeAmount | currency: organisation.default_currency }} | ||
- | Children | -0}"> + | + | Children | +0}"> {{ account.encumbrance_amount.children | negativeAmount | currency: organisation.default_currency }} | ||
Current expenditure | -Self | -0}"> + | Current expenditure | +Self | +0}"> {{ account.expenditure_amount.self | negativeAmount | currency: organisation.default_currency }} | ||
- | Children | -0}"> + | + | Children | +0}"> {{ account.expenditure_amount.children | negativeAmount | currency: organisation.default_currency }} | ||
Balance | -+ | Balance | +0, - 'text-danger': account.remaining_balance.self < 0 + 'text-error': account.remaining_balance.self < 0 }"> {{ account.remaining_balance.self | currency: organisation.default_currency }} | ||||
Allowed encumbrance exceedance | -{{ account.encumbrance_exceedance.value }}% | -+ | Allowed encumbrance exceedance | +{{ account.encumbrance_exceedance.value }}% | +{{ account.encumbrance_exceedance.amount | currency: organisation.default_currency }} | ||
Allowed expenditure exceedance | -{{ account.expenditure_exceedance.value }}% | -+ | Allowed expenditure exceedance | +{{ account.expenditure_exceedance.value }}% | +{{ account.expenditure_exceedance.amount | currency: organisation.default_currency }} |