Skip to content
Snippets Groups Projects
Commit 67fd8457 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #12074 TIME 0:20 change data resId ans chrono

parent 4cceb315
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 32 deletions
src/frontend/app/actions/actions-list.component.ts
+ 3
− 3
View file @ 67fd8457
......@@ -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;
}
......
src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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;"
......
src/frontend/app/actions/close-mail-action/close-mail-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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;"
......
src/frontend/app/actions/confirm-action/confirm-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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">
......
src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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">
......
src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
+ 1
− 1
View file @ 67fd8457
......@@ -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;
......
src/frontend/app/actions/redirect-action/redirect-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/actions/send-external-note-book-action/send-external-note-book-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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;"
......
src/frontend/app/actions/update-departure-date-action/update-departure-date-action.component.html
+ 1
− 1
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/actions/view-doc-action/view-doc-action.component.html
+ 1
− 1
View file @ 67fd8457
<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>
......
src/frontend/app/list/basket-list.component.html
+ 5
− 5
View file @ 67fd8457
......@@ -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>
......
src/frontend/app/list/basket-list.component.ts
+ 12
− 12
View file @ 67fd8457
......@@ -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;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment