diff --git a/src/frontend/app/actions/actions-list.component.ts b/src/frontend/app/actions/actions-list.component.ts
index 1d62ba2bf00c67bc92accaf065372535abfe25bd..a3e4276600c88fd91687d6f8273f6ac7ce871dab 100644
--- a/src/frontend/app/actions/actions-list.component.ts
+++ b/src/frontend/app/actions/actions-list.component.ts
@@ -71,8 +71,8 @@ export class ActionsListComponent implements OnInit {
this.currentResource = row;
- this.contextMenuTitle = row.alt_identifier;
- this.contextResId = row.res_id;
+ this.contextMenuTitle = row.chrono;
+ this.contextResId = row.resId;
this.folderList = row.folders !== undefined ? row.folders : [];
@@ -96,7 +96,7 @@ export class ActionsListComponent implements OnInit {
}
if (row !== undefined) {
- this.contextMenuTitle = row.alt_identifier;
+ this.contextMenuTitle = row.chrono;
this.currentResource = row;
}
diff --git a/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html b/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html
index 3203d20bb9f480f4e8fde2d16811b07845b9209d..ce563c125536a96ed815ee80703668084c38f20c 100644
--- a/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html
+++ b/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html
@@ -7,7 +7,7 @@
<div class="col-md-12">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
<div class="alert-message alert-message-info" role="alert" style="margin-top: 30px;"
diff --git a/src/frontend/app/actions/close-mail-action/close-mail-action.component.html b/src/frontend/app/actions/close-mail-action/close-mail-action.component.html
index 3b3fee009f11ced112fa5f812c0dd1f20614c497..1b63892f137ff95c7cfb647b582a0a101b134ebb 100644
--- a/src/frontend/app/actions/close-mail-action/close-mail-action.component.html
+++ b/src/frontend/app/actions/close-mail-action/close-mail-action.component.html
@@ -7,7 +7,7 @@
<div class="col-md-12">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
<div class="alert-message alert-message-info" role="alert" style="margin-top: 30px;"
diff --git a/src/frontend/app/actions/confirm-action/confirm-action.component.html b/src/frontend/app/actions/confirm-action/confirm-action.component.html
index 0ea3f554d02b380e0d231463be7c6b1f288f9ffd..074c9d73202d5dd5a8c0bd5dc9fc4120e4c9c6c6 100644
--- a/src/frontend/app/actions/confirm-action/confirm-action.component.html
+++ b/src/frontend/app/actions/confirm-action/confirm-action.component.html
@@ -7,7 +7,7 @@
<div class="col-md-12">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b> ?
</div>
<div class="col-md-12">
diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
index 82ce04854a3d3d2257fd19266a8f8e4f0e3cd119..cc9b3fd795538d31a64e221e0f79f88be7a08072 100755
--- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
+++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
@@ -8,7 +8,7 @@
<p *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper">{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
<b *ngIf="data.resIds.length == 1" color="primary"
- class="highlight">{{data.resource.alt_identifier}}</b>
+ class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
<div *ngIf="acknowledgement.alreadySend.number">
diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
index 5e64bd3779f8ae0773c26e109b66b603bf9e5753..23efdb0a70a00f5abdbd68e511453faa3f78c2a9 100644
--- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
+++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
@@ -33,7 +33,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit {
ngOnInit(): void {
this.loadingInit = true;
- this.http.post('../../rest/resourcesList/users/' + this.data.userId + '/groups/' + this.data.groupId + '/baskets/' + this.data.basketId + '/checkAcknowledgementReceipt', { resources: this.data.selectedRes })
+ this.http.post('../../rest/resourcesList/users/' + this.data.userId + '/groups/' + this.data.groupId + '/baskets/' + this.data.basketId + '/checkAcknowledgementReceipt', { resources: this.data.resIds })
.subscribe((data: any) => {
this.acknowledgement = data;
this.loadingInit = false;
diff --git a/src/frontend/app/actions/redirect-action/redirect-action.component.html b/src/frontend/app/actions/redirect-action/redirect-action.component.html
index 97997ee6c1b63b4e3dd2dece1b3a3f1c3c6090f0..c48034cedd753b8f158d2ef192f4657c8994ac2b 100644
--- a/src/frontend/app/actions/redirect-action/redirect-action.component.html
+++ b/src/frontend/app/actions/redirect-action/redirect-action.component.html
@@ -6,7 +6,7 @@
<ng-container *ngIf="!loading">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b>
?<br />
</ng-container>
diff --git a/src/frontend/app/actions/send-external-note-book-action/send-external-note-book-action.component.html b/src/frontend/app/actions/send-external-note-book-action/send-external-note-book-action.component.html
index 177e73c87e7593774efea2a0995cda40bf8933f1..31ebda228067dd6e95b63c1ee717afc593b1b046 100644
--- a/src/frontend/app/actions/send-external-note-book-action/send-external-note-book-action.component.html
+++ b/src/frontend/app/actions/send-external-note-book-action/send-external-note-book-action.component.html
@@ -11,7 +11,7 @@
<b *ngIf="data.resIds.length === 0" color="primary"
class="highlight">{{lang.currentIndexingMail}}</b>
<b *ngIf="data.resIds.length == 1" color="primary"
- class="highlight">{{data.resource.alt_identifier}}</b>
+ class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
</div>
diff --git a/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html b/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
index 677b72dc9b00bf5e23cfc4cef4473041fa3b0d27..6869206b2403a5f3bebccf286ad60effaba30740 100644
--- a/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
+++ b/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
@@ -11,7 +11,7 @@
<b *ngIf="data.resIds.length === 0" color="primary"
class="highlight">{{lang.currentIndexingMail}}</b>
<b *ngIf="data.resIds.length == 1" color="primary"
- class="highlight">{{data.resource.alt_identifier}}</b>
+ class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b>> ?
</div>
diff --git a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
index 588b52e3184a7137b035408bdbd6e17bb3834a49..ba2eec65332daae5b82c1faca6a8e34bc7895fdd 100644
--- a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
+++ b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
@@ -22,7 +22,7 @@
<b *ngIf="data.resIds.length === 0" color="primary"
class="highlight">{{lang.currentIndexingMail}}</b>
<b *ngIf="data.resIds.length == 1" color="primary"
- class="highlight">{{data.resource.alt_identifier}}</b>
+ class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
</div>
diff --git a/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html b/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html
index 0cd12575b82075eea120bc6b386b4690d54cc484..a3fb2ae11b3388ea6757dabc0659157c8f79f964 100644
--- a/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html
+++ b/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html
@@ -7,7 +7,7 @@
<div class="col-md-12">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}}
{{lang.elements}}</b> ?
<div class="alert-message alert-message-info" role="alert" style="margin-top: 30px;"
diff --git a/src/frontend/app/actions/update-departure-date-action/update-departure-date-action.component.html b/src/frontend/app/actions/update-departure-date-action/update-departure-date-action.component.html
index fdafd5bafd19bdbb49dc85d32c2c9fd8fd2e6975..dcfa92401dc0acbae46e299660d18cd17cff3aea 100644
--- a/src/frontend/app/actions/update-departure-date-action/update-departure-date-action.component.html
+++ b/src/frontend/app/actions/update-departure-date-action/update-departure-date-action.component.html
@@ -7,7 +7,7 @@
<div class="col-md-12">
{{lang.makeActionOn}}
<b *ngIf="data.resIds.length === 0" color="primary" class="highlight">{{lang.currentIndexingMail}}</b>
- <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.alt_identifier}}</b>
+ <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.chrono}}</b>
<b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b> ?
<div class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" [innerHTML]="lang.updateDepartureDate"></div>
</div>
diff --git a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
index 763be5a1c8a80f5d7837de401cdeaa0ef22e241f..ac535df2f219baaafaa58bf9f0716ce6dff31f62 100644
--- a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
+++ b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>{{data.resource.alt_identifier}}
+<h1 mat-dialog-title>{{data.resource.chrono}}
<button title="{{lang.close}}" mat-icon-button [mat-dialog-close]="">
<mat-icon class="fa fa-times-circle fa-2x"></mat-icon>
</button>
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index d8f72ca9d14ec201195d75918a18cc765a8cafef..1bd8bed62e76ab84a405590784c4af420164138a 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -63,9 +63,9 @@
</div>
<div style="height:90%;overflow:auto;position:absolute;width:100%;">
<table cdkDropList id="document-list" [cdkDropListConnectedTo]="listTodrag()" [cdkDropListData]="data" #tableBasketListSort="matSort" mat-table [dataSource]="data" matSort
- matSortActive="res_id" matSortDisableClear matSortDirection="asc" style="width:100%;" [cdkDropListDisabled]="dragInit || appService.getViewMode()">
+ matSortActive="resId" matSortDisableClear matSortDirection="asc" style="width:100%;" [cdkDropListDisabled]="dragInit || appService.getViewMode()">
- <ng-container matColumnDef="res_id">
+ <ng-container matColumnDef="resId">
<td mat-cell *matCellDef="let row"
style="padding:0;border-top: solid 1px rgba(0, 0, 0, 0.12);"
[class.selected-data]="row.checked">
@@ -128,13 +128,13 @@
</span>
<span *ngIf="!appService.getViewMode()" class="main-info-data" style="width:200px;text-align:center;cursor:pointer;" (click)="launch(defaultAction,row);">
<ng-container
- *ngIf="row.alt_identifier == lang.undefined && row.barcode != lang.undefined">
+ *ngIf="row.chrono == lang.undefined && row.barcode != lang.undefined">
<span style="color: rgba(0,0,0,0.4);font-size: 90%;"><i
title="{{lang.barcode}}" class="fas fa-barcode"></i>
{{row.barcode}}</span>
</ng-container>
<ng-container *ngIf="row.barcode == lang.undefined">
- {{row.alt_identifier}}
+ {{row.chrono}}
</ng-container>
</span>
<span class="main-info-data" style="font-weight:bold;flex:1;cursor:pointer;"
@@ -174,7 +174,7 @@
<tr mat-row *matRowDef="let row; columns: displayedColumnsBasket;"
(contextmenu)="open($event,row);" class="rowData" [class.locked]="row.isLocked == true" cdkDrag (cdkDragStarted)="selectSpecificRes(row);" [cdkDragData]="row" >
<div class="example-custom-placeholder" *cdkDragPlaceholder></div>
- <div class="dragPreview" *cdkDragPreview><i class="fas fa-envelope-open-text fa-2x"></i><br/>{{lang.classifyInFolder}} : <b>{{row.alt_identifier}}</b></div>
+ <div class="dragPreview" *cdkDragPreview><i class="fas fa-envelope-open-text fa-2x"></i><br/>{{lang.classifyInFolder}} : <b>{{row.chrono}}</b></div>
</tr>
</table>
</div>
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 10a0393209730027bc64c0cd14c20c83c64ddb79..602626915581d6fe1cc0b89cc5255e2158e4ce6b 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -53,11 +53,11 @@ export class BasketListComponent implements OnInit {
@ViewChild('snav', { static: true }) sidenavLeft: MatSidenav;
@ViewChild('snav2', { static: true }) sidenavRight: MatSidenav;
- displayedColumnsBasket: string[] = ['res_id'];
+ displayedColumnsBasket: string[] = ['resId'];
displayedMainData: any = [
{
- 'value': 'alt_identifier',
+ 'value': 'chrono',
'cssClasses': ['softColorData', 'align_centerData', 'chronoData'],
'icon': ''
},
@@ -212,11 +212,11 @@ export class BasketListComponent implements OnInit {
goTo(row: any) {
this.filtersListService.filterMode = false;
- if (this.docUrl == '../../rest/resources/' + row.res_id + '/content' && this.sidenavRight.opened) {
+ if (this.docUrl == '../../rest/resources/' + row.resId + '/content' && this.sidenavRight.opened) {
this.sidenavRight.close();
} else {
- this.docUrl = '../../rest/resources/' + row.res_id + '/content';
- this.currentChrono = row.alt_identifier;
+ this.docUrl = '../../rest/resources/' + row.resId + '/content';
+ this.currentChrono = row.chrono;
this.innerHtml = this.sanitizer.bypassSecurityTrustHtml(
"<iframe style='height:100%;width:100%;' src='" + this.docUrl + "' class='embed-responsive-item'>" +
"</iframe>");
@@ -225,7 +225,7 @@ export class BasketListComponent implements OnInit {
}
goToDetail(row: any) {
- location.href = "index.php?page=details&dir=indexing_searching&id=" + row.res_id;
+ location.href = "index.php?page=details&dir=indexing_searching&id=" + row.resId;
}
togglePanel(mode: string, row: any) {
@@ -235,7 +235,7 @@ export class BasketListComponent implements OnInit {
this.toggleAllRes(thisDeselect);
this.toggleRes(thisSelect, row);
- if(this.currentResource.res_id == row.res_id && this.sidenavRight.opened && this.currentMode == mode) {
+ if(this.currentResource.resId == row.resId && this.sidenavRight.opened && this.currentMode == mode) {
this.sidenavRight.close();
} else {
this.currentMode = mode;
@@ -271,7 +271,7 @@ export class BasketListComponent implements OnInit {
}
viewThumbnail(row: any) {
- this.thumbnailUrl = '../../rest/resources/' + row.res_id + '/thumbnail';
+ this.thumbnailUrl = '../../rest/resources/' + row.resId + '/thumbnail';
$j('#viewThumbnail').show();
$j('#listContent').css({ "overflow": "hidden" });
}
@@ -381,7 +381,7 @@ export class BasketListComponent implements OnInit {
key.label = this.lang[key.value];
});
- if (this.selectedRes.indexOf(element['res_id']) === -1) {
+ if (this.selectedRes.indexOf(element['resId']) === -1) {
element['checked'] = false;
} else {
element['checked'] = true;
@@ -392,12 +392,12 @@ export class BasketListComponent implements OnInit {
toggleRes(e: any, row: any) {
if (e.checked) {
- if (this.selectedRes.indexOf(row.res_id) === -1) {
- this.selectedRes.push(row.res_id);
+ if (this.selectedRes.indexOf(row.resId) === -1) {
+ this.selectedRes.push(row.resId);
row.checked = true;
}
} else {
- let index = this.selectedRes.indexOf(row.res_id);
+ let index = this.selectedRes.indexOf(row.resId);
this.selectedRes.splice(index, 1);
row.checked = false;
}