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 bc3bfcd626127cae28d8e28c70c735273c853ae2..bc8c85df35d32ee643259dccf7a2dedbf94bac02 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 @@ -22,6 +22,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe loadingInit: boolean = false; emailsubject: string = ''; + emailContent: string = ''; availableEmailModels: any[] = []; availableSignEmailModels: any[] = []; emailSignListForm = new FormControl(); diff --git a/src/frontend/app/administration/contact/page/form/contacts-form.component.html b/src/frontend/app/administration/contact/page/form/contacts-form.component.html index 3d6be021172bd3dcaf6a3cd1ecd8e2be92a6f6b2..24e212ce4b7b5eca2ec17d99b8778b0443499d49 100644 --- a/src/frontend/app/administration/contact/page/form/contacts-form.component.html +++ b/src/frontend/app/administration/contact/page/form/contacts-form.component.html @@ -316,7 +316,7 @@ </mat-autocomplete> </mat-form-field> <mat-card style="margin:10px;" *ngIf="!emptyAddress()"> - <mat-list-item class="contact-address" (click)="goTo(contact)" + <mat-list-item class="contact-address" (click)="goTo()" [title]="lang.address"> <mat-icon mat-list-icon color="primary" class="contact-group fas fa-map-marker-alt"></mat-icon> diff --git a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.html b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.html index 5ec064f8b82ab5b96bf4fb485eac59fd2d5213c5..8e9bc916443626163622272e02a6eb00dbdc9e11 100755 --- a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.html +++ b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.html @@ -18,7 +18,7 @@ <mat-spinner style="margin:auto;"></mat-spinner> </div> <mat-card *ngIf="!loading" class="card-app-content"> - <mat-tab-group [(selectedIndex)]="selectedTabIndex_1"> + <mat-tab-group> <mat-tab label="{{lang.informations}}"> <form (ngSubmit)="onSubmit()" #diffusionModelForm="ngForm"> <mat-form-field> diff --git a/src/frontend/app/administration/group/group-administration.component.html b/src/frontend/app/administration/group/group-administration.component.html index 0b97daed3d5b539715248df29a348df9d5a57ff9..61a8db60300b6451690b709245430f92c884c528 100755 --- a/src/frontend/app/administration/group/group-administration.component.html +++ b/src/frontend/app/administration/group/group-administration.component.html @@ -18,7 +18,7 @@ <mat-spinner style="margin:auto;"></mat-spinner> </div> <mat-card *ngIf="!loading" class="card-app-content"> - <mat-tab-group [(selectedIndex)]="selectedTabIndex_1"> + <mat-tab-group> <mat-tab label="{{lang.informations}}"> <form class="form-horizontal" (ngSubmit)="onSubmit()" #groupForm="ngForm"> <mat-form-field> @@ -51,7 +51,7 @@ </form> </mat-tab> <mat-tab label="{{lang.privileges}}" *ngIf="!creationMode"> - <mat-tab-group [(selectedIndex)]="selectedTabIndex_2" *ngIf="!creationMode"> + <mat-tab-group *ngIf="!creationMode"> <mat-tab label="{{lang.menus}}"> <mat-list> <mat-list-item *ngFor="let menu of privilegeService.getMenus() | sortBy: 'label'"> diff --git a/src/frontend/app/administration/group/group-administration.component.ts b/src/frontend/app/administration/group/group-administration.component.ts index 64caafa8c238e174869577893db4f42ec8550ad1..63aeb2d67f836f1d47ddf7f0c97a353333aadf85 100755 --- a/src/frontend/app/administration/group/group-administration.component.ts +++ b/src/frontend/app/administration/group/group-administration.component.ts @@ -69,7 +69,7 @@ export class GroupAdministrationComponent implements OnInit { private notify: NotificationService, private headerService: HeaderService, public appService: AppService, - private privilegeService: PrivilegeService, + public privilegeService: PrivilegeService, private dialog: MatDialog ) { } diff --git a/src/frontend/app/administration/template/template-administration.component.ts b/src/frontend/app/administration/template/template-administration.component.ts index 0f77090f02ca214627bd8a3b4bb6c0089a6993d7..0d65d05f471459f7e0929cbbaa10517ed8ad3576 100755 --- a/src/frontend/app/administration/template/template-administration.component.ts +++ b/src/frontend/app/administration/template/template-administration.component.ts @@ -96,7 +96,7 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy { public dialog: MatDialog, public appService: AppService, private viewContainerRef: ViewContainerRef, - private functionsService: FunctionsService + public functionsService: FunctionsService ) { } ngOnInit(): void { diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts index f40614eb462b08c46b99c68e451603ce6d1735da..badb0e13efacb821bcd523e4b4c9bf7887b79030 100755 --- a/src/frontend/app/administration/user/user-administration.component.ts +++ b/src/frontend/app/administration/user/user-administration.component.ts @@ -29,6 +29,7 @@ export class UserAdministrationComponent implements OnInit { lang: any = LANG; loading: boolean = false; dialogRef: MatDialogRef<any>; + highlightMe: boolean = false; config: any = {}; serialId: number; userId: string; diff --git a/src/frontend/app/avis/avis-workflow.component.html b/src/frontend/app/avis/avis-workflow.component.html index 40a11c03b3c2ad3869fdb039b4c565dc0cf291be..b8583505df0bed60278c6e572c6563173ace1978 100644 --- a/src/frontend/app/avis/avis-workflow.component.html +++ b/src/frontend/app/avis/avis-workflow.component.html @@ -1,5 +1,5 @@ <mat-list *ngIf="!loading"> - <mat-form-field appearance="outline" *ngIf="adminMode && !linkedToMaarchParapheur"> + <mat-form-field appearance="outline" *ngIf="adminMode"> <input type="text" #searchAvisUserInput matInput placeholder="Ajouter des personnes" id="searchAvisUserInput" [formControl]="searchAvisUser" [matAutocomplete]="autoGroup"> <mat-autocomplete #autoGroup="matAutocomplete" (optionSelected)="addItemToWorkflow($event.option.value)" diff --git a/src/frontend/app/printedFolder/printed-folder-modal.component.ts b/src/frontend/app/printedFolder/printed-folder-modal.component.ts index 929c485a9d6ab5fc9865373b4027f6cf95bb44dd..d3fb6c3c7168d85dffa7b263a47e4c6b2d995761 100644 --- a/src/frontend/app/printedFolder/printed-folder-modal.component.ts +++ b/src/frontend/app/printedFolder/printed-folder-modal.component.ts @@ -28,7 +28,7 @@ export class PrintedFolderModalComponent implements OnInit { withSeparator: boolean = false; isLoadingResults: boolean = false; - mainDocumentInformation: {}; + mainDocumentInformation: any = {}; printedFolderElement: any = { attachments: [], diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html index e4348249c59756f3d4c1042c6489fd158a1bfd52..2e7cba07a35fb5ca6560673a54ca3cc74bc40450 100644 --- a/src/frontend/app/process/process.component.html +++ b/src/frontend/app/process/process.component.html @@ -27,7 +27,7 @@ {{lang.printedFolder}} </button> </div> - <div class="banner" [style.borderColor]="currentPriorityColor"> + <div class="banner"> <div class="title" (click)="currentTool = 'history'"> {{lang.history}} <div class="title-divider"></div> @@ -38,7 +38,7 @@ </app-history-workflow-resume> </div> </div> - <div class="banner" [style.borderColor]="currentPriorityColor"> + <div class="banner"> <div class="title" (click)="currentTool = 'notes'"> {{lang.notesAlt}} <div class="title-divider"></div> @@ -48,7 +48,7 @@ </app-note-resume> </div> </div> - <div class="banner" [style.borderColor]="currentPriorityColor"> + <div class="banner"> <div class="title" (click)="currentTool = 'attachments'"> {{lang.attachments}} <div class="title-divider"></div> @@ -59,7 +59,7 @@ </app-attachments-resume> </div> </div> - <div class="banner" [style.borderColor]="currentPriorityColor"> + <div class="banner"> <div class="title" (click)="currentTool = 'emails'"> {{lang.mailsSentAlt}} <div class="title-divider"></div> @@ -101,7 +101,7 @@ [resId]="currentResourceInformations.resId" [autoOpenCreation]="isMailing" [target]="'process'" (reloadBadgeAttachments)="refreshBadge($event,'attachments')"> </app-attachments-list> - <app-select-indexing-model *ngIf="currentTool === 'info' && !loading" #appSelectIndexingModel [defaultIndexingModelId]="currentResourceInformations.modelId" [adminMode]="canChangeModel" [indexingForm]="indexingForm" (afterSelectedListModel)="this.currentIndexingModel = $event;indexingForm.loadForm($event.id, false)"></app-select-indexing-model> + <app-select-indexing-model *ngIf="currentTool === 'info' && !loading" #appSelectIndexingModel [defaultIndexingModelId]="currentResourceInformations.modelId" [adminMode]="canChangeModel" [indexingForm]="indexingForm" (afterSelectedListModel)="indexingForm.loadForm($event.id, false)"></app-select-indexing-model> <app-indexing-form *ngIf="currentTool === 'info' && !loading" #indexingForm [groupId]="currentGroupId" [resId]="currentResourceInformations.resId" [indexingFormId]="currentResourceInformations.modelId" [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true" @@ -287,7 +287,7 @@ <app-attachments-list *ngIf="modal.id === 'attachments' && !loading" #appAttachmentsList [resId]="currentResourceInformations.resId" [autoOpenCreation]="isMailing" (reloadBadgeAttachments)="refreshBadge($event,'attachments')"> </app-attachments-list> - <app-select-indexing-model *ngIf="modal.id === 'info' && !loading" #appSelectIndexingModel [adminMode]="canChangeModel" [indexingForm]="indexingForm" [defaultIndexingModelId]="currentResourceInformations.modelId" (afterSelectedListModel)="this.currentIndexingModel = $event;indexingForm.loadForm($event.id, false)"></app-select-indexing-model> + <app-select-indexing-model *ngIf="modal.id === 'info' && !loading" #appSelectIndexingModel [adminMode]="canChangeModel" [indexingForm]="indexingForm" [defaultIndexingModelId]="currentResourceInformations.modelId" (afterSelectedListModel)="indexingForm.loadForm($event.id, false)"></app-select-indexing-model> <app-indexing-form *ngIf="modal.id === 'info' && !loading" #indexingForm [groupId]="currentGroupId" [indexingFormId]="currentResourceInformations.modelId" [resId]="currentResourceInformations.resId" [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true" diff --git a/src/frontend/app/profile.component.html b/src/frontend/app/profile.component.html index f86dcea18baf959cec40673a5988b3891fe4bdfa..c93f37bf786be03bd624470b3e97c39bcf3bf57f 100755 --- a/src/frontend/app/profile.component.html +++ b/src/frontend/app/profile.component.html @@ -780,7 +780,7 @@ </form> </div> <div class="col-sm-6" *ngIf="contactsListMode"> - <mat-tab-group [(selectedIndex)]="selectedTabIndex_1"> + <mat-tab-group> <mat-tab label="{{contactsGroup.contacts.length}} {{lang.relatedContacts}}"> <div class="row" style="margin:0px;"> diff --git a/src/frontend/app/profile.component.ts b/src/frontend/app/profile.component.ts index ba61caa37e454287a0845f97ec6a3255bc2807e1..5785e44b97c470666fa03c7ae97bebaab41f860d 100755 --- a/src/frontend/app/profile.component.ts +++ b/src/frontend/app/profile.component.ts @@ -30,6 +30,7 @@ export class ProfileComponent implements OnInit { dialogRef: MatDialogRef<any>; lang: any = LANG; + highlightMe: boolean = false; user: any = { baskets: [] }; diff --git a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.html b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.html index b56621985af2473d6164305e39102ddaab5b59fb..6f27a1af5516c9b9c769eb9520b206e733763c1d 100644 --- a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.html +++ b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.html @@ -30,7 +30,7 @@ [cdkDropListConnectedTo]="['copies-list','invcopies-list']" [cdkDropListData]="recipients" (cdkDropListDropped)="drop($event)"> <mat-chip cdkDrag [cdkDragDisabled]="emailStatus == 'SENT' || emailStatus == 'ERROR'" class="recipients" - *ngFor="let recipient of recipients" [selectable]="selectable" [removable]="canManageMail()" + *ngFor="let recipient of recipients" [removable]="canManageMail()" (removed)="remove(recipient, 'recipients')" (click)="remove(recipient, 'recipients')" [title]="recipient.email" [class.badFormat]="recipient.badFormat"> {{recipient.label}}{{recipient.label !== recipient.email ? ' (' + recipient.email + ')' : ''}} @@ -55,7 +55,7 @@ [cdkDropListConnectedTo]="['recipients-list','invcopies-list']" [cdkDropListData]="copies" (cdkDropListDropped)="drop($event)"> <mat-chip cdkDrag [cdkDragDisabled]="emailStatus == 'SENT' || emailStatus == 'ERROR'" class="copy" - *ngFor="let copy of copies" [selectable]="selectable" [removable]="canManageMail()" + *ngFor="let copy of copies" [removable]="canManageMail()" (removed)="remove(copy, 'copies')" (click)="remove(copycopy, 'recipients')" [title]="copy.email" [class.badFormat]="copy.badFormat"> {{copy.label}}{{copy.label !== copy.email ? ' (' + copy.email + ')' : ''}} @@ -79,7 +79,7 @@ [cdkDropListConnectedTo]="['recipients-list','copies-list']" [cdkDropListData]="invisibleCopies" (cdkDropListDropped)="drop($event)"> <mat-chip cdkDrag [cdkDragDisabled]="emailStatus == 'SENT' || emailStatus == 'ERROR'" class="copy" - *ngFor="let invCopy of invisibleCopies" [selectable]="selectable" [removable]="canManageMail()" + *ngFor="let invCopy of invisibleCopies" [removable]="canManageMail()" (removed)="remove(invCopy, 'invisibleCopies')" (click)="remove(invCopy, 'recipients')" [title]="invCopy.email" [class.badFormat]="invCopy.badFormat"> {{invCopy.label}}{{invCopy.label !== invCopy.email ? ' (' + invCopy.email + ')' : ''}} @@ -163,7 +163,7 @@ <ng-container *ngFor="let keyVal of emailAttach | keyvalue"> <ng-container *ngIf="keyVal.key !== 'document'"> <mat-chip class="copy" *ngFor="let item of emailAttach[keyVal.key]; let i=index;" - [selectable]="selectable" [removable]="canManageMail()" + [removable]="canManageMail()" (removed)="removeAttachMail(i, keyVal.key)" [title]="item.title"> <i class="{{emailAttachTool[keyVal.key].icon}} attachLabel"></i> {{item.label | shorten: 25: '...'}} <small diff --git a/src/frontend/app/signature-book.component.html b/src/frontend/app/signature-book.component.html index ae98838e750d64ff530a441bc3eacd71bc082900..16e2efadfdf74af92bd78e50457d4bd4816297be 100755 --- a/src/frontend/app/signature-book.component.html +++ b/src/frontend/app/signature-book.component.html @@ -212,10 +212,10 @@ </app-attachments-list> </div> <div class="visaNoWorkflowWarning"> - <div style="margin-top:200px;" [innerHTML]="noVisaWorkflowNoSignature"></div> + <div style="margin-top:200px;" [innerHTML]="lang.noVisaWorkflowNoSignature"></div> </div> <div *ngIf="!signatureBook.attachments[rightSelectedThumbnail]" class="visaNoPjWarning"> - <div style="margin-top:200px;" [innerHTML]="noAttachmentClickToAddOne"></div> + <div style="margin-top:200px;" [innerHTML]="lang.noAttachmentClickToAddOne"></div> </div> </div> <div class="panelRight">