From 856e7f130da4b73bf3de6ada1d603cbda9125168 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Thu, 26 Jun 2025 10:17:42 +0200 Subject: [PATCH 1/8] Add copy method and update WorkSchedule types --- src/workSchedules/index.ts | 5 +++++ src/workSchedules/types.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/workSchedules/index.ts b/src/workSchedules/index.ts index 79e8c91b..2fcb9ec0 100644 --- a/src/workSchedules/index.ts +++ b/src/workSchedules/index.ts @@ -19,4 +19,9 @@ export class WorkSchedulesEndpoint extends BaseApi { const response = this._put('update', data, params); return required(response); } + + public copy(data: {id:number}, params?: RequestParams>): Required[]> { + const response = this._post('copy', data, params); + return required(response); + } } diff --git a/src/workSchedules/types.ts b/src/workSchedules/types.ts index 457ad925..c8e706a2 100644 --- a/src/workSchedules/types.ts +++ b/src/workSchedules/types.ts @@ -21,6 +21,7 @@ export type WorkSchedule = { minijobber_absence_credit?: number; active: boolean; overtime_allowance_always_deduct?: number; + assigned_users?:string }; export type WorkScheduleCreate = Omit< @@ -38,7 +39,7 @@ export type WorkScheduleCreate = Omit< | 'active' >; -export type WorkScheduleUpdate = Pick & +export type WorkScheduleUpdate = Pick & Omit< Partial, | 'archived' @@ -51,5 +52,4 @@ export type WorkScheduleUpdate = Pick & | 'law_rest_period_minimum_hours' | 'law_rest_period_minimum_weekly_hours' | 'is_default' - | 'active' >; From 870b275f7c5913664e36211508ae7f75c35642f3 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Thu, 26 Jun 2025 10:18:19 +0200 Subject: [PATCH 2/8] Update package version to 0.0.0-beta for work schedules feature branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e7682ec6..d3d1e37d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@timetac/js-client-library", - "version": "2.102.0", + "version": "0.0.0-beta-", "description": "TimeTac API JS client library", "homepage": "https://github.com/TimeTac/js-client-library#readme", "repository": { From ff72a61e9af9ab30a6896e9e72379f71580cd80e Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Thu, 26 Jun 2025 10:19:59 +0200 Subject: [PATCH 3/8] Bump version to v0.0.0-beta- --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3d1e37d..e6de7303 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@timetac/js-client-library", - "version": "0.0.0-beta-", + "version": "0.0.0-beta-", "description": "TimeTac API JS client library", "homepage": "https://github.com/TimeTac/js-client-library#readme", "repository": { From 0e9e6b066012da188c5876e3cda72228149339c3 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Thu, 26 Jun 2025 10:45:03 +0200 Subject: [PATCH 4/8] Bump version to 0.0.0-beta-work-schedules-featurebranch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6de7303..82d92f63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@timetac/js-client-library", - "version": "0.0.0-beta-", + "version": "0.0.0-beta-work-schedules-featurebranch", "description": "TimeTac API JS client library", "homepage": "https://github.com/TimeTac/js-client-library#readme", "repository": { From ee01f149ce6ead27d11454a28882870ebda5e010 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Thu, 26 Jun 2025 10:48:34 +0200 Subject: [PATCH 5/8] lint fix --- src/workSchedules/index.ts | 2 +- src/workSchedules/types.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/workSchedules/index.ts b/src/workSchedules/index.ts index 2fcb9ec0..2d74ca53 100644 --- a/src/workSchedules/index.ts +++ b/src/workSchedules/index.ts @@ -20,7 +20,7 @@ export class WorkSchedulesEndpoint extends BaseApi { return required(response); } - public copy(data: {id:number}, params?: RequestParams>): Required[]> { + public copy(data: { id: number }, params?: RequestParams>): Required[]> { const response = this._post('copy', data, params); return required(response); } diff --git a/src/workSchedules/types.ts b/src/workSchedules/types.ts index c8e706a2..07397d21 100644 --- a/src/workSchedules/types.ts +++ b/src/workSchedules/types.ts @@ -21,7 +21,7 @@ export type WorkSchedule = { minijobber_absence_credit?: number; active: boolean; overtime_allowance_always_deduct?: number; - assigned_users?:string + assigned_users?: string; }; export type WorkScheduleCreate = Omit< From 4d672a187351da2118567aa0cf16e935e3e4b139 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Mon, 30 Jun 2025 11:28:22 +0200 Subject: [PATCH 6/8] Add readHistory method and extend UserUpdate interface with timesheet_template_id --- src/userTemplateHistory/index.ts | 7 +++++++ src/users/types.ts | 1 + 2 files changed, 8 insertions(+) diff --git a/src/userTemplateHistory/index.ts b/src/userTemplateHistory/index.ts index ab8211bd..25bf1010 100644 --- a/src/userTemplateHistory/index.ts +++ b/src/userTemplateHistory/index.ts @@ -13,4 +13,11 @@ export class UserTemplateHistoryEndpoint extends BaseApi { const response = this._get('view', { params }); return list(response); } + + public readHistory( + params?: RequestParams> + ): Promise[]>> { + const response = this._get('read', { params }); + return list(response); + } } diff --git a/src/users/types.ts b/src/users/types.ts index 477125ae..629e7af2 100644 --- a/src/users/types.ts +++ b/src/users/types.ts @@ -123,6 +123,7 @@ export interface UserReadMe extends UserReadFull { export interface UserUpdate extends Partial { id: number; department_id?: number; + timesheet_template_id?: number; } export interface UserResetPassword { From 4003abbc11cd7007e539325bfefcac160780e6c0 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Mon, 30 Jun 2025 11:29:37 +0200 Subject: [PATCH 7/8] Bump version to 0.0.1-beta-work-schedules-featurebranch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82d92f63..43f40154 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@timetac/js-client-library", - "version": "0.0.0-beta-work-schedules-featurebranch", + "version": "0.0.1-beta-work-schedules-featurebranch", "description": "TimeTac API JS client library", "homepage": "https://github.com/TimeTac/js-client-library#readme", "repository": { From 63a21905242705af52586f436c371c5bed131138 Mon Sep 17 00:00:00 2001 From: amin mansoori Date: Mon, 30 Jun 2025 11:32:24 +0200 Subject: [PATCH 8/8] Refactor readHistory method for improved readability --- src/userTemplateHistory/index.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/userTemplateHistory/index.ts b/src/userTemplateHistory/index.ts index 25bf1010..f93f1055 100644 --- a/src/userTemplateHistory/index.ts +++ b/src/userTemplateHistory/index.ts @@ -14,9 +14,7 @@ export class UserTemplateHistoryEndpoint extends BaseApi { return list(response); } - public readHistory( - params?: RequestParams> - ): Promise[]>> { + public readHistory(params?: RequestParams>): Promise[]>> { const response = this._get('read', { params }); return list(response); }