Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #8286

Merged
merged 21 commits into from
Sep 29, 2024
Merged

Release #8286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
45966e7
[Bug] Roles / Permissions: Pre-Selected Toggle Buttons Not Retaining …
samuelmbabhazi Sep 27, 2024
fb73b6b
[Bug] "End Work" Status: Inactive User/Employee Record Not Updated
samuelmbabhazi Sep 27, 2024
3285b11
remove comment
samuelmbabhazi Sep 27, 2024
7c77f76
Update users.component.ts
evereq Sep 27, 2024
29cad2b
Merge branch 'develop' into fix/8217-user-status
rahul-rocket Sep 28, 2024
a3744b9
fix: terminate service for specific organization
rahul-rocket Sep 28, 2024
73989ce
Merge branch 'develop' into fix/#8216-role-permissions-preselect-togg…
rahul-rocket Sep 28, 2024
545f9e0
fix: role permissions API filter for specific role
rahul-rocket Sep 28, 2024
4171330
fix(deepscan): missing variable types
rahul-rocket Sep 28, 2024
1edb7ca
Merge pull request #8277 from ever-co/fix/#8216-role-permissions-pres…
rahul-rocket Sep 28, 2024
cae9228
fix: packages build
rahul-rocket Sep 28, 2024
81160d0
Merge pull request #8276 from ever-co/fix/8217-user-status
rahul-rocket Sep 28, 2024
f099c8e
[FEATURE] Add Online/Offline Status Indicator to User Avatar
samuelmbabhazi Sep 29, 2024
ee4bc8e
[FEATURE] Add Online/Offline Status Indicator to User Avatar
samuelmbabhazi Sep 29, 2024
06b28d1
Limit TODO && Add Tooltip
samuelmbabhazi Sep 29, 2024
29bed8f
Merge pull request #8284 from ever-co/fix/#8266-align-fields
rahul-rocket Sep 29, 2024
b7d1661
Merge branch 'develop' into feature/#8282-online-offline-status
rahul-rocket Sep 29, 2024
5d0809a
fix: don't be use API to call employee
rahul-rocket Sep 29, 2024
43e9067
Merge pull request #8283 from ever-co/feature/#8282-online-offline-st…
rahul-rocket Sep 29, 2024
3968519
[Fix] Issue with Changing Task on Running Timer (#8281)
adkif Sep 29, 2024
b6c9f55
Update server-api-stage.yml
evereq Sep 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/server-api-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@
ChocolateyInstall: ''
ChromeWebDriver: ''
COBERTURA_HOME: ''
# COMPUTERNAME: ''

Check warning on line 214 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (COMPUTERNAME)
# COMSPEC: ''

Check warning on line 215 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (COMSPEC)
# CONDA: ''
# DEPLOYMENT_BASEPATH: ''

Check warning on line 217 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (BASEPATH)
SBT_HOME: ''
SELENIUM_JAR_PATH: ''
STATS_BLT: ''
Expand Down Expand Up @@ -276,8 +276,8 @@
GOROOT_1_21_X64: ''
GOROOT_1_22_X64: ''
GRADLE_HOME: ''
# HOMEDRIVE: ''

Check warning on line 279 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (HOMEDRIVE)
# HOMEPATH: ''

Check warning on line 280 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (HOMEPATH)
IEWebDriver: ''
ImageOS: ''
ImageVersion: ''
Expand All @@ -286,8 +286,8 @@
JAVA_HOME_17_X64: ''
JAVA_HOME_21_X64: ''
JAVA_HOME_8_X64: ''
# LOCALAPPDATA: ''

Check warning on line 289 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (LOCALAPPDATA)
# LOGONSERVER: ''

Check warning on line 290 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (LOGONSERVER)
M2: ''
M2_REPO: ''
MAVEN_OPTS: ''
Expand All @@ -295,7 +295,7 @@
# npm_config_prefix: ''
# NUMBER_OF_PROCESSORS: ''
# OS: ''
# PATHEXT: ''

Check warning on line 298 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (PATHEXT)
# PERFLOG_LOCATION_SETTING: ''
PGBIN: ''
PGDATA: ''
Expand All @@ -313,7 +313,7 @@
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\'

Check warning on line 316 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (hostedtoolcache)

Check warning on line 316 in .github/workflows/server-api-stage.yml

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (hostedtoolcache)
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading
Loading