RED-5875: Material upgrade - buttons: circle button

This commit is contained in:
Adina Țeudan 2023-05-30 23:28:06 +03:00
parent d630c29916
commit 3e09243c27
5 changed files with 26 additions and 30 deletions

View File

@ -1,5 +1,3 @@
@use 'variables';
::ng-deep .notifications-backdrop + .cdk-overlay-connected-position-bounding-box {
right: 0 !important;
@ -67,7 +65,7 @@
}
&.unread {
background-color: rgba(variables.$primary, 0.1);
background-color: rgba(var(--iqser-primary-rgb), 0.1);
.dot {
background-color: var(--iqser-primary);

View File

@ -12,12 +12,12 @@
<iqser-dynamic-input
*ngFor="let attr of customAttributes"
[canEditInput]="!disabled"
[classList]="'w-full'"
[formControlName]="attr.id"
[id]="attr.id"
[label]="attr.label"
[type]="attr.type"
[canEditInput]="!disabled"
></iqser-dynamic-input>
</div>
@ -39,32 +39,30 @@
[class.displayed-preview]="currentAttrValue(attr)"
class="iqser-input-group image-attribute"
>
<div>
<img *ngIf="currentAttrValue(attr)" [alt]="attr.label" [src]="currentAttrValue(attr)" />
<img *ngIf="currentAttrValue(attr)" [alt]="attr.label" [src]="currentAttrValue(attr)" />
<label>{{ attr.label }}</label>
<label>{{ attr.label }}</label>
<iqser-icon-button
(action)="fileInputClick(attr)"
*ngIf="!currentAttrValue(attr)"
[disabled]="disabled"
[label]="'edit-dossier-dialog.attributes.upload-image' | translate"
[type]="iconButtonTypes.dark"
class="upload-button"
icon="iqser:upload"
></iqser-icon-button>
<iqser-icon-button
(action)="fileInputClick(attr)"
*ngIf="!currentAttrValue(attr)"
[disabled]="disabled"
[label]="'edit-dossier-dialog.attributes.upload-image' | translate"
[type]="iconButtonTypes.dark"
class="upload-button"
icon="iqser:upload"
></iqser-icon-button>
<input
#fileInput
(change)="uploadImage($event, attr)"
[id]="attr.id"
[name]="attr.id"
accept="image/jpg, image/jpeg, image/png"
class="file-upload-input"
hidden
type="file"
/>
</div>
<input
#fileInput
(change)="uploadImage($event, attr)"
[id]="attr.id"
[name]="attr.id"
accept="image/jpg, image/jpeg, image/png"
class="file-upload-input"
hidden
type="file"
/>
<div *ngIf="currentAttrValue(attr) && !disabled">
<iqser-circle-button

View File

@ -20,12 +20,12 @@
<iqser-circle-button
(action)="openEditDossierDialog()"
*allow="roles.dossiers.edit; if: currentUser.isManager && canAdd"
[attr.help-mode-key]="'edit_dossier_members'"
[class.large-spacing]="largeSpacing"
[icon]="'iqser:plus'"
[size]="32"
[tooltip]="'dossier-details.assign-members' | translate"
[type]="circleButtonTypes.primary"
[attr.help-mode-key]="'edit_dossier_members'"
class="member"
></iqser-circle-button>
</div>

View File

@ -394,7 +394,7 @@ export class PermissionsService {
private _canEnableAutoAnalysis(file: File, dossier: Dossier): boolean {
return (
dossier.isActive && !!file.lastProcessed && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved
dossier.isActive && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved && !!file.lastProcessed
);
}

@ -1 +1 @@
Subproject commit 471485653184e6489f112d11b0792c3a10643c65
Subproject commit a71a09463f092eea0ccbb4d21ca2f0f9416c4c6f