Merge pull request #8286 from ever-co/develop

Release
ever-co · Sep 29, 2024 · ecfbb0c · ecfbb0c
2 parents 1ac0d3c + b6c9f55
commit ecfbb0c
Show file tree

Hide file tree

Showing 21 changed files with 560 additions and 472 deletions.
diff --git a/.github/workflows/server-api-stage.yml b/.github/workflows/server-api-stage.yml
@@ -313,7 +313,7 @@ jobs:
           PROCESSOR_REVISION: ''
           PSModuleAnalysisCachePath: ''
           PSModulePath: ''
-          Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
+          Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
           DOTNET_MULTILEVEL_LOOKUP: ''
           DOTNET_NOLOGO: ''
           DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''

diff --git a/apps/gauzy/src/app/pages/dashboard/time-tracking/time-tracking.component.html b/apps/gauzy/src/app/pages/dashboard/time-tracking/time-tracking.component.html
@@ -224,13 +224,14 @@ <h4>
 							<div class="hour-label mb-3">
 								<ng-template [ngxPermissionsOnly]="PermissionsEnum.CHANGE_SELECTED_EMPLOYEE">
 									<ngx-avatar
-										size="sm"
 										class="avatar-dashboard activity"
+										[size]="'sm'"
 										[name]="employee?.user?.name"
 										[src]="employee?.user?.imageUrl"
 										[appendCaption]="'TIMESHEET.LAST_WORKED' | translate"
 										[caption]="(employee?.timeSlots)[0]?.startedAt | utcToLocal | dateFormat"
 										[id]="employee?.id"
+										[employee]="employee"
 									></ngx-avatar>
 								</ng-template>
 								<div></div>

diff --git a/apps/gauzy/src/app/pages/employees/timesheet/daily/daily/daily.component.html b/apps/gauzy/src/app/pages/employees/timesheet/daily/daily/daily.component.html
@@ -92,8 +92,8 @@
 											</span>
 										</ng-template>
 										<div class="mt-2 small">
-											<span *ngIf="log?.task; else noToDo">
-												<strong> {{ 'TIMESHEET.TODO' | translate }} : </strong>
+											<span *ngIf="log?.task; else noToDo" [nbTooltip]="log?.task?.title">
+												<strong>{{ 'TIMESHEET.TODO' | translate }}:</strong>
 												{{ log?.task?.title | truncate : 50 }}
 											</span>
 											<ng-template #noToDo>

diff --git a/apps/gauzy/src/app/pages/settings/roles-permissions/roles-permissions.component.html b/apps/gauzy/src/app/pages/settings/roles-permissions/roles-permissions.component.html
@@ -27,10 +27,7 @@ <h4>
 							></nb-icon>
 						</button>
 					</nb-form-field>
-					<nb-autocomplete
-						#autocomplete
-						(selectedChange)="onSelectionChange($event)"
-					>
+					<nb-autocomplete #autocomplete (selectedChange)="onSelectionChange($event)">
 						<nb-option
 							*ngFor="let role of roles$ | async"
 							[value]="role.name"
@@ -41,10 +38,7 @@ <h4>
 					</nb-autocomplete>
 				</div>
 			</div>
-			<div
-				class="col-6"
-				*ngxPermissionsOnly="['CHANGE_ROLES_PERMISSIONS']"
-			>
+			<div class="col-6" *ngxPermissionsOnly="['CHANGE_ROLES_PERMISSIONS']">
 				<ng-container *ngIf="isWantToCreate">
 					<div class="actions create">
 						<button
@@ -59,9 +53,7 @@ <h4>
 						{{ 'BUTTONS.CREATE_NEW_ROLE' | translate : { name: input.value } }}
 					</div>
 				</ng-container>
-				<ng-container
-					*ngIf="role && role.isSystem === false && !isWantToCreate"
-				>
+				<ng-container *ngIf="role && role.isSystem === false && !isWantToCreate">
 					<div class="actions delete">
 						<button
 							nbButton
@@ -71,10 +63,7 @@ <h4>
 							size="small"
 							[nbTooltip]="'BUTTONS.DELETE' | translate"
 						>
-							<nb-icon
-								status="danger"
-								icon="trash-2-outline"
-							></nb-icon>
+							<nb-icon status="danger" icon="trash-2-outline"></nb-icon>
 						</button>
 						{{ 'BUTTONS.DELETE_EXISTING_ROLE' | translate : { name: role.name } }}
 					</div>
@@ -85,35 +74,20 @@ <h4>
 			<div class="col-12 col-xl-6">
 				<nb-card>
 					<nb-card-header>
-						{{
-							'ORGANIZATIONS_PAGE.PERMISSIONS.GROUPS.GENERAL'
-								| translate
-						}}
+						{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.GROUPS.GENERAL' | translate }}
 					</nb-card-header>
 					<nb-card-body class="permission-items-col">
 						<nb-toggle
 							*ngFor="let permission of permissionGroups.GENERAL"
 							[(checked)]="enabledPermissions[permission]"
-							(checkedChange)="
-								permissionChanged(
-									permission,
-									$event,
-									!isDisabledGeneralPermissions()
-								)
-							"
+							(checkedChange)="permissionChanged(permission, $event, !isDisabledGeneralPermissions())"
 							labelPosition="start"
 							status="basic"
 							[disabled]="isDisabledGeneralPermissions()"
 						>
 							<div class="custom-permission-view">
-								<strong>{{
-									'ORGANIZATIONS_PAGE.PERMISSIONS.' +
-										permission | translate
-								}}</strong>
-								<small>{{
-									'ORGANIZATIONS_PAGE.PERMISSIONS.' +
-										permission | translate
-								}}</small>
+								<strong>{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.' + permission | translate }}</strong>
+								<small>{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.' + permission | translate }}</small>
 							</div>
 						</nb-toggle>
 					</nb-card-body>
@@ -122,46 +96,28 @@ <h4>
 			<div class="col-12 col-xl-6">
 				<nb-card>
 					<nb-card-header
-						>{{
-							'ORGANIZATIONS_PAGE.PERMISSIONS.GROUPS.ADMINISTRATION'
-								| translate
-						}}
+						>{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.GROUPS.ADMINISTRATION' | translate }}
 						<nb-icon
-							[nbTooltip]="
-								'ORGANIZATIONS_PAGE.PERMISSIONS.ONLY_ADMIN'
-									| translate
-							"
+							[nbTooltip]="'ORGANIZATIONS_PAGE.PERMISSIONS.ONLY_ADMIN' | translate"
 							icon="question-mark-circle-outline"
 							size="tiny"
 						>
 						</nb-icon>
 					</nb-card-header>
 					<nb-card-body class="permission-items-col">
 						<nb-toggle
-							*ngFor="
-								let permission of getAdministrationPermissions()
-							"
+							*ngFor="let permission of getAdministrationPermissions()"
 							[(checked)]="enabledPermissions[permission]"
 							(checkedChange)="
-								permissionChanged(
-									permission,
-									$event,
-									!isDisabledAdministrationPermissions()
-								)
+								permissionChanged(permission, $event, !isDisabledAdministrationPermissions())
 							"
 							labelPosition="start"
 							status="basic"
 							[disabled]="isDisabledAdministrationPermissions()"
 						>
 							<div class="custom-permission-view">
-								<strong>{{
-									'ORGANIZATIONS_PAGE.PERMISSIONS.' +
-										permission | translate
-								}}</strong>
-								<small>{{
-									'ORGANIZATIONS_PAGE.PERMISSIONS.' +
-										permission | translate
-								}}</small>
+								<strong>{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.' + permission | translate }}</strong>
+								<small>{{ 'ORGANIZATIONS_PAGE.PERMISSIONS.' + permission | translate }}</small>
 							</div>
 						</nb-toggle>
 					</nb-card-body>