Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2022-08-31 18:34:47 +03:00
commit 4c0a645cb5
7 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/red-ui/src/app/modules/dossiers-listing/config.service.ts
View File

@ -201,49 +201,31 @@ export class ConfigService {
return filterGroups;
}
private _myDossiersChecker = (dw: Dossier) => dw.ownerId === this._currentUser.id;
private _dossierOwnerChecker = (dw: Dossier) => dw.ownerId === this._currentUser.id;
private _toApproveChecker = (dw: Dossier) => dw.approverIds.includes(this._currentUser.id);
private _toReviewChecker = (dw: Dossier) => dw.memberIds.includes(this._currentUser.id);
private _otherChecker = (dw: Dossier) => !dw.memberIds.includes(this._currentUser.id);
private _dossierMemberChecker = (dw: Dossier) =>
dw.memberIds.includes(this._currentUser.id) || dw.approverIds.includes(this._currentUser.id);
private _openAddDossierDialog(dossierTemplateId: string): void {
this._dialogService.openDialog('addDossier', null, { dossierTemplateId });
}
private _quickFilters(entities: Dossier[]): NestedFilter[] {
const myDossiersLabel = this._translateService.instant('dossier-listing.quick-filters.my-dossiers');
const filters = [
return [
{
id: 'my-dossiers',
label: myDossiersLabel,
checker: this._myDossiersChecker,
disabled: entities.filter(this._myDossiersChecker).length === 0,
id: 'owner',
label: this._translateService.instant('dossier-listing.quick-filters.owner'),
checker: this._dossierOwnerChecker,
disabled: entities.filter(this._dossierOwnerChecker).length === 0,
helpModeKey: 'filter_dossier_list',
},
{
id: 'to-approve',
label: this._translateService.instant('dossier-listing.quick-filters.to-approve'),
checker: this._toApproveChecker,
disabled: entities.filter(this._toApproveChecker).length === 0,
},
{
id: 'to-review',
label: this._translateService.instant('dossier-listing.quick-filters.to-review'),
checker: this._toReviewChecker,
disabled: entities.filter(this._toReviewChecker).length === 0,
},
{
id: 'other',
label: this._translateService.instant('dossier-listing.quick-filters.other'),
checker: this._otherChecker,
disabled: entities.filter(this._otherChecker).length === 0,
id: 'member',
label: this._translateService.instant('dossier-listing.quick-filters.member'),
checker: this._dossierMemberChecker,
disabled: entities.filter(this._dossierMemberChecker).length === 0,
},
].map(filter => new NestedFilter(filter));
return filters.filter(f => f.label === myDossiersLabel || this._userPreferenceService.areDevFeaturesEnabled);
}
private _dossierStatusChecker = (dossier: Dossier, filter: INestedFilter) => {

2
apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
View File

@ -54,7 +54,7 @@
></iqser-circle-button>
<mat-menu #hiddenButtonsMenu="matMenu" class="padding-bottom-8">
<button (click)="btn.action($event)" *ngFor="let btn of hiddenButtons" [disabled]="btn.disabled" mat-menu-item>
<button (click)="onButtonClick(btn, $event)" *ngFor="let btn of hiddenButtons" [disabled]="btn.disabled" mat-menu-item>
<ng-container *ngIf="btn.type === 'circleBtn'">
<mat-icon [svgIcon]="btn.icon"></mat-icon>
{{ btn.tooltip | translate }}

10
apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
View File

@ -1,10 +1,11 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
import { Action, ActionTypes, File } from '@red/domain';
import { CircleButtonType, IqserTooltipPosition, ScrollableParentView, ScrollableParentViews, Toaster } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { FileDownloadService } from '@upload-download/services/file-download.service';
import { PermissionsService } from '@services/permissions.service';
import { firstValueFrom } from 'rxjs';
import { MatMenuTrigger } from '@angular/material/menu';
@Component({
selector: 'redaction-expandable-file-actions',
@ -25,6 +26,8 @@ export class ExpandableFileActionsComponent implements OnChanges {
expanded = false;
scrollableParentView: ScrollableParentView;
@ViewChild(MatMenuTrigger) matMenu: MatMenuTrigger;
constructor(
private readonly _fileDownloadService: FileDownloadService,
private readonly _toaster: Toaster,
@ -80,4 +83,9 @@ export class ExpandableFileActionsComponent implements OnChanges {
await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId));
this._toaster.info(_('download-status.queued'));
}
onButtonClick(button: Action, $event: MouseEvent) {
button.action($event);
this.matMenu.closeMenu();
}
}

5
apps/red-ui/src/assets/i18n/de.json
View File

@ -786,10 +786,9 @@
"title": "Die ausgewählten Filter treffen auf kein Dossier zu."
},
"quick-filters": {
"member": "",
"my-dossiers": "Meine Dossiers",
"other": "Sonstige",
"to-approve": "Zu Genehmigen",
"to-review": "Zu Überprüfen"
"owner": ""
},
"reanalyse": {
"action": "Gesamtes Dossier analysieren"

5
apps/red-ui/src/assets/i18n/en.json
View File

@ -786,10 +786,9 @@
"title": "No dossiers match your current filters."
},
"quick-filters": {
"member": "Dossier Member",
"my-dossiers": "My Dossiers",
"other": "Other",
"to-approve": "To Approve",
"to-review": "To Review"
"owner": "Dossier Owner"
},
"reanalyse": {
"action": "Analyze entire dossier"

12
apps/red-ui/src/assets/icons/general/pdftron-action-disable-tooltips.svg
View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="90px" version="1.1" viewBox="-10 -10 110 110" width="90px"
xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd" id="Symbols" stroke="none" stroke-width="1">
<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>disable-tooltip</title>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="disable-tooltip">
<rect height="100" id="Rectangle" width="100" x="0" y="0"></rect>
<path
d="M50,0 C75,0 95,20 95,45 C95,45.3345638 94.9964181,45.6682321 94.9892904,46.0009689 L84.9863576,46.0005557 C84.9954332,45.6682544 85,45.3347165 85,45 C85,25.5 69.5,10 50,10 C30.5,10 15,25.5 15,45 C15,53.3152174 17.870983,61.1519376 23.1448539,67.5739706 L23.5,68 L25,69.5 L25,86 L43,79.5 L43.2,79.5 L43.2,89.79 L15,100 L15,73 C8.5,65 5,55.5 5,45 C5,20 25,0 50,0 Z M87.5553391,55 L94.6264069,62.0710678 L80.484,76.213 L94.6264069,90.3553391 L87.5553391,97.4264069 L73.413,83.284 L59.2710678,97.4264069 L52.2,90.3553391 L66.342,76.213 L52.2,62.0710678 L59.2710678,55 L73.413,69.142 L87.5553391,55 Z"
fill="#868E96" fill-rule="nonzero" id="Combined-Shape"></path>
<rect id="Rectangle" x="0" y="0" width="100" height="100"></rect>
<path d="M85,2 C93.5,2 100,8.5 100,17 L100,17 L100,67 C100,75.5 93.5,82 85,82 L85,82 L69,82 L50,98.1819801 L31.9929123,82 L15,82 C6.5,82 0,75.5 0,67 L0,67 L0,17 C0,8.5 6.5,2 15,2 L15,2 Z M85,12 L15,12 C12,12 10,14 10,17 L10,17 L10,67 C10,70 12,72 15,72 L15,72 L34.9929123,72 L50,86.3372421 L66,72 L85,72 C88,72 90,70 90,67 L90,67 L90,17 C90,14 88,12 85,12 L85,12 Z M28.574352,20.6755343 L72.1132333,64.2144156 L68.994543,67.333106 L61.7994543,60.1625739 L60.7680764,59.131196 C57.4529332,60.4572533 53.8185539,61.1939518 50.0122783,61.1939518 C37.73397,61.1939518 27.2482947,53.556844 23,42.7764893 C24.9154161,37.9142792 28.1077763,33.6905412 32.1841746,30.5227376 L32.1841746,30.5227376 L31.0545703,29.3931332 L25.4556617,23.7942246 L28.574352,20.6755343 Z M39.0354707,37.3740337 C38.2251023,39.019327 37.73397,40.8365166 37.73397,42.7764893 C37.73397,49.5541155 43.2346521,55.0547976 50.0122783,55.0547976 C51.952251,55.0547976 53.7694407,54.5636653 55.414734,53.753297 L55.414734,53.753297 L51.6084584,49.9470214 C51.0927694,50.0698045 50.5525239,50.1434743 50.0122783,50.1434743 C45.9358799,50.1434743 42.6452933,46.8528877 42.6452933,42.7764893 C42.6452933,42.2362437 42.7189632,41.6959982 42.8417462,41.1803092 L42.8417462,41.1803092 Z M49.9877217,24.3590268 C62.26603,24.3590268 72.7517053,31.9961346 77,42.7764893 C75.207367,47.34402 72.2851296,51.3467485 68.5770805,54.4408822 L68.5770805,54.4408822 L61.4065484,47.2703502 C61.9713506,45.870623 62.2905866,44.3726694 62.2905866,42.7764893 C62.2905866,35.9988631 56.7899045,30.498181 50.0122783,30.498181 C48.4160982,30.498181 46.9181446,30.817417 45.5184175,31.3822192 L45.5184175,31.3822192 L40.2141883,26.07799 C43.2592087,24.9729422 46.5497954,24.3590268 49.9877217,24.3590268 Z M50.0368349,35.4340609 C54.1132333,35.4340609 57.4038199,38.7246476 57.4038199,42.8010459 L57.4038199,42.8010459 L57.3547067,43.1939518 L49.6193724,35.4586176 Z" id="Combined-Shape" fill="#868E96" fill-rule="nonzero"></path>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

13
apps/red-ui/src/assets/icons/general/pdftron-action-enable-tooltips.svg
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="90px" version="1.1" viewBox="-10 -10 110 110" width="90px"
xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd" id="comments" stroke="none" stroke-width="1">
<path
d="M50,0 C25,0 5,20 5,45 C5,55.5 8.5,65 15,73 L15,100 L44,89.5 C46.5,90 48,90 50,90 C75,90 95,70 95,45 C95,20 75,0 50,0 Z M50,80 C48.5,80 46.5,80 44.5,79.5 L43,79.5 L25,86 L25,69.5 L23.5,68 C18,61.5 15,53.5 15,45 C15,25.5 30.5,10 50,10 C69.5,10 85,25.5 85,45 C85,64.5 69.5,80 50,80 Z"
fill="#868E96" fill-rule="nonzero" id="Shape"></path>
<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>enable tooltip</title>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="enable-tooltip">
<rect id="Rectangle" x="0" y="0" width="100" height="100"></rect>
<path d="M85,1.90900993 C93.5,1.90900993 100,8.40900993 100,16.9090099 L100,16.9090099 L100,66.9090099 C100,75.4090099 93.5,81.9090099 85,81.9090099 L85,81.9090099 L69,81.9090099 L50,98.0909901 L31.9929123,81.9090099 L15,81.9090099 C6.5,81.9090099 0,75.4090099 0,66.9090099 L0,66.9090099 L0,16.9090099 C0,8.40900993 6.5,1.90900993 15,1.90900993 L15,1.90900993 Z M85,11.9090099 L15,11.9090099 C12,11.9090099 10,13.9090099 10,16.9090099 L10,16.9090099 L10,66.9090099 C10,69.9090099 12,71.9090099 15,71.9090099 L15,71.9090099 L34.9929123,71.9090099 L50,86.2462521 L66,71.9090099 L85,71.9090099 C88,71.9090099 90,69.9090099 90,66.9090099 L90,66.9090099 L90,16.9090099 C90,13.9090099 88,11.9090099 85,11.9090099 L85,11.9090099 Z M50,23.9090099 C62.2727273,23.9090099 72.7536364,31.5426463 77,42.3181008 C72.7536364,53.0935554 62.2727273,60.7271918 50,60.7271918 C37.7272727,60.7271918 27.2463636,53.0935554 23,42.3181008 C27.2463636,31.5426463 37.7272727,23.9090099 50,23.9090099 Z M50,30.0453736 C43.2254545,30.0453736 37.7272727,35.5435554 37.7272727,42.3181008 C37.7272727,49.0926463 43.2254545,54.5908281 50,54.5908281 C56.7745455,54.5908281 62.2727273,49.0926463 62.2727273,42.3181008 C62.2727273,35.5435554 56.7745455,30.0453736 50,30.0453736 Z M50,34.9544645 C54.0745455,34.9544645 57.3636364,38.2435554 57.3636364,42.3181008 C57.3636364,46.3926463 54.0745455,49.6817372 50,49.6817372 C45.9254545,49.6817372 42.6363636,46.3926463 42.6363636,42.3181008 C42.6363636,38.2435554 45.9254545,34.9544645 50,34.9544645 Z" id="Combined-Shape" fill="#868E96" fill-rule="nonzero"></path>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 2.0 KiB