diff --git a/package-lock.json b/package-lock.json index ba73cd00a..77fd2bac4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.48.0", + "version": "1.48.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4ce60d342..13383bf0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.48.0", + "version": "1.48.1", "scripts": { "preinstall": "npx npm-force-resolutions", "ng": "ng", diff --git a/src/app/modules/shared/utils/project-storage.util.ts b/src/app/modules/shared/utils/project-storage.util.ts index 4e4ee75c5..b0ce15b8a 100644 --- a/src/app/modules/shared/utils/project-storage.util.ts +++ b/src/app/modules/shared/utils/project-storage.util.ts @@ -4,6 +4,7 @@ import { isEmpty } from 'lodash'; export function updateProjectStorage(serverProjects: Project[]): void { const storageProjects: Project[] = getProjectsOnStorage(projectsKey); + const isServerProjectsEmpty = isEmpty(serverProjects); const updatedStorageProjects: Project[] = []; @@ -12,7 +13,7 @@ export function updateProjectStorage(serverProjects: Project[]): void { const project = serverProjects.find((serverProject) => serverProject.id === storageProject.id); if (project) { - updatedStorageProjects.push(project); + updatedStorageProjects.push(storageProject); } }); diff --git a/src/app/modules/time-entries/components/calendar/calendar.component.html b/src/app/modules/time-entries/components/calendar/calendar.component.html index 58d4e2fea..3be76abcc 100644 --- a/src/app/modules/time-entries/components/calendar/calendar.component.html +++ b/src/app/modules/time-entries/components/calendar/calendar.component.html @@ -144,6 +144,7 @@ [viewDate]="currentDate" [events]="timeEntriesAsEvent" [cellTemplate]="timeEntriesInsideMonthCalendarTemplate" + [weekStartsOn]="WEEK_START_DAY" > ; diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts index 07d3687ea..52c4b4976 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -39,7 +39,6 @@ export class TimeEntriesComponent implements OnInit, OnDestroy { selectedMonthAsText: string; isActiveEntryOverlapping = false; readonly NO_DATA_MESSAGE: string = 'No data available in table'; - timeEntry: DataSource; constructor( private store: Store, private toastrService: ToastrService, diff --git a/src/styles.scss b/src/styles.scss index 97e5bc7b8..514ed1fbb 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -43,3 +43,21 @@ Overwritten calendar style .cal-today:hover { background-color: darken($background-calendar-cell, 7%) !important; } + +.cal-week-view .cal-day-headers { + position: sticky; + top: 0; + z-index: 10; + background: $background-calendar-cell; +} + +.cal-month-view .cal-header { + position: sticky; + top: 0; + z-index: 10; + background: $background-calendar-cell; +} + +.cal-header .cal-cell { + border: 0.1px solid lighten($primary-text, 30%); +}