@saritasa/crm-delmar-core-sdk 0.2.148 → 0.2.152

package/README.md

@@ -1,5 +1,5 @@
-# @@saritasa/crm-delmar-core-sdk@0.2.148
+# @@saritasa/crm-delmar-core-sdk@0.2.152
 
 ```bash
-npm install @saritasa/crm-delmar-core-sdk@0.2.148 --save
+npm install @saritasa/crm-delmar-core-sdk@0.2.152 --save
 ```

package/api/clients-api.serviceInterface.d.ts

@@ -94,6 +94,8 @@ export interface ClientsMarginReportRetrieveRequestParams {
     accountManagerIn?: Array<number>;
     idIn?: Array<number>;
     includeHostedProjects?: boolean;
+    jobsBranchIn?: Array<number>;
+    jobsWorkTypeIn?: Array<number>;
     ordering?: string;
     projectsBillingType?: "fixed" | "hourly" | "investment" | "sla";
     projectsBillingTypeIn?: Array<string>;

package/api/departments-api.service.d.ts

@@ -1,10 +1,11 @@
 import { HttpClient, HttpResponse, HttpEvent, HttpContext } from "@angular/common/http";
 import { Observable } from "rxjs";
+import { CompanyJobsDepartmentsDataDto } from "../model/company-jobs-departments-data.dto";
 import { DepartmentDto } from "../model/department.dto";
 import { PaginatedDepartmentListDto } from "../model/paginated-department-list.dto";
 import { Configuration } from "../configuration";
 import { BaseService } from "../api.base.service";
-import { DepartmentsApiServiceInterface, DepartmentsChangeActiveStatusCreateRequestParams, DepartmentsCreateRequestParams, DepartmentsListRequestParams, DepartmentsRetrieveRequestParams, DepartmentsUpdateRequestParams } from "./departments-api.serviceInterface";
+import { DepartmentsApiServiceInterface, DepartmentsChangeActiveStatusCreateRequestParams, DepartmentsCompanyJobsReportRetrieveRequestParams, DepartmentsCreateRequestParams, DepartmentsListRequestParams, DepartmentsRetrieveRequestParams, DepartmentsUpdateRequestParams } from "./departments-api.serviceInterface";
 import * as i0 from "@angular/core";
 export declare class DepartmentsApiService extends BaseService implements DepartmentsApiServiceInterface {
     protected httpClient: HttpClient;
@@ -31,6 +32,28 @@ export declare class DepartmentsApiService extends BaseService implements Depart
         context?: HttpContext;
         transferCache?: boolean;
     }): Observable<HttpEvent<DepartmentDto>>;
+    /**
+     * Get company jobs report.
+     * @endpoint get /api/v1/departments/company-jobs-report/
+     * @param requestParameters
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    departmentsCompanyJobsReportRetrieve(requestParameters: DepartmentsCompanyJobsReportRetrieveRequestParams, observe?: "body", reportProgress?: boolean, options?: {
+        httpHeaderAccept?: "application/json";
+        context?: HttpContext;
+        transferCache?: boolean;
+    }): Observable<CompanyJobsDepartmentsDataDto>;
+    departmentsCompanyJobsReportRetrieve(requestParameters: DepartmentsCompanyJobsReportRetrieveRequestParams, observe?: "response", reportProgress?: boolean, options?: {
+        httpHeaderAccept?: "application/json";
+        context?: HttpContext;
+        transferCache?: boolean;
+    }): Observable<HttpResponse<CompanyJobsDepartmentsDataDto>>;
+    departmentsCompanyJobsReportRetrieve(requestParameters: DepartmentsCompanyJobsReportRetrieveRequestParams, observe?: "events", reportProgress?: boolean, options?: {
+        httpHeaderAccept?: "application/json";
+        context?: HttpContext;
+        transferCache?: boolean;
+    }): Observable<HttpEvent<CompanyJobsDepartmentsDataDto>>;
     /**
      * ViewSet for Department model.
      * @endpoint post /api/v1/departments/

package/api/departments-api.serviceInterface.d.ts

@@ -9,6 +9,7 @@
  */
 import { HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
+import { CompanyJobsDepartmentsDataDto } from "../model/models";
 import { DepartmentChangeStateRequestDto } from "../model/models";
 import { DepartmentDto } from "../model/models";
 import { DepartmentRequestDto } from "../model/models";
@@ -18,6 +19,15 @@ export interface DepartmentsChangeActiveStatusCreateRequestParams {
     id: number;
     departmentChangeStateRequestDto?: DepartmentChangeStateRequestDto;
 }
+export interface DepartmentsCompanyJobsReportRetrieveRequestParams {
+    period: string;
+    id?: number;
+    idIn?: Array<number>;
+    jobsBranchIn?: Array<number>;
+    jobsWorkTypeIn?: Array<number>;
+    ordering?: string;
+    reportType?: "admin" | "billable" | "in_house" | "over_budget" | "unbillable" | "unutilized";
+}
 export interface DepartmentsCreateRequestParams {
     departmentRequestDto: DepartmentRequestDto;
 }
@@ -54,6 +64,13 @@ export interface DepartmentsApiServiceInterface {
      * @param requestParameters
      */
     departmentsChangeActiveStatusCreate(requestParameters: DepartmentsChangeActiveStatusCreateRequestParams, extraHttpRequestParams?: any): Observable<DepartmentDto>;
+    /**
+     *
+     * Get company jobs report.
+     * @endpoint get /api/v1/departments/company-jobs-report/
+     * @param requestParameters
+     */
+    departmentsCompanyJobsReportRetrieve(requestParameters: DepartmentsCompanyJobsReportRetrieveRequestParams, extraHttpRequestParams?: any): Observable<CompanyJobsDepartmentsDataDto>;
     /**
      *
      * ViewSet for Department model.

package/api/export-margin-report-api.serviceInterface.d.ts

@@ -32,6 +32,8 @@ export interface ExportMarginReportStartCreateRequestParams {
     accountManagerIn?: Array<number>;
     idIn?: Array<number>;
     includeHostedProjects?: boolean;
+    jobsBranchIn?: Array<number>;
+    jobsWorkTypeIn?: Array<number>;
     ordering?: string;
     projectOrdering?: string;
     projectsBillingType?: "fixed" | "hourly" | "investment" | "sla";

package/api/projects-api.serviceInterface.d.ts

@@ -53,6 +53,8 @@ export interface ProjectsMarginReportListRequestParams {
     idIn?: Array<number>;
     includeHostedProjects?: boolean;
     isUtilized?: boolean;
+    jobsBranchIn?: Array<number>;
+    jobsWorkTypeIn?: Array<number>;
     limit?: number;
     offset?: number;
     ordering?: string;

package/api/users-api.service.d.ts

@@ -1,10 +1,10 @@
 import { HttpClient, HttpResponse, HttpEvent, HttpContext } from "@angular/common/http";
 import { Observable } from "rxjs";
+import { CompanyJobsUsersDataDto } from "../model/company-jobs-users-data.dto";
 import { PaginatedUserListDto } from "../model/paginated-user-list.dto";
 import { PaginatedUserScoreStatListDto } from "../model/paginated-user-score-stat-list.dto";
 import { S3FileDto } from "../model/s3-file.dto";
 import { SimpleUserDto } from "../model/simple-user.dto";
-import { UserCompanyJobsReportDto } from "../model/user-company-jobs-report.dto";
 import { UserDailyTabularReportDto } from "../model/user-daily-tabular-report.dto";
 import { UserDto } from "../model/user.dto";
 import { UserUtilizationReportDto } from "../model/user-utilization-report.dto";
@@ -27,17 +27,17 @@ export declare class UsersApiService extends BaseService implements UsersApiServ
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<UserCompanyJobsReportDto>;
+    }): Observable<CompanyJobsUsersDataDto>;
     usersCompanyJobsReportRetrieve(requestParameters: UsersCompanyJobsReportRetrieveRequestParams, observe?: "response", reportProgress?: boolean, options?: {
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<HttpResponse<UserCompanyJobsReportDto>>;
+    }): Observable<HttpResponse<CompanyJobsUsersDataDto>>;
     usersCompanyJobsReportRetrieve(requestParameters: UsersCompanyJobsReportRetrieveRequestParams, observe?: "events", reportProgress?: boolean, options?: {
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<HttpEvent<UserCompanyJobsReportDto>>;
+    }): Observable<HttpEvent<CompanyJobsUsersDataDto>>;
     /**
      * ViewSet for viewing accounts.
      * @endpoint post /api/v1/users/

package/api/users-api.serviceInterface.d.ts

@@ -9,12 +9,12 @@
  */
 import { HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
+import { CompanyJobsUsersDataDto } from "../model/models";
 import { PaginatedUserListDto } from "../model/models";
 import { PaginatedUserScoreStatListDto } from "../model/models";
 import { PatchedPatchUserRequestDto } from "../model/models";
 import { S3FileDto } from "../model/models";
 import { SimpleUserDto } from "../model/models";
-import { UserCompanyJobsReportDto } from "../model/models";
 import { UserDailyTabularReportDto } from "../model/models";
 import { UserDto } from "../model/models";
 import { UserRequestDto } from "../model/models";
@@ -23,16 +23,14 @@ import { UtilizationChartPointDto } from "../model/models";
 import { Configuration } from "../configuration";
 export interface UsersCompanyJobsReportRetrieveRequestParams {
     period: string;
-    branch?: number;
-    branchIn?: Array<number>;
     id?: number;
     idIn?: Array<number>;
+    jobsBranchIn?: Array<number>;
+    jobsWorkTypeIn?: Array<number>;
     ordering?: string;
     reportType?: "admin" | "billable" | "in_house" | "over_budget" | "unbillable" | "unutilized";
     showSupervised?: boolean;
     showUtilized?: boolean;
-    workType?: number;
-    workTypeIn?: Array<number>;
 }
 export interface UsersCreateRequestParams {
     userRequestDto: UserRequestDto;
@@ -162,7 +160,7 @@ export interface UsersApiServiceInterface {
      * @endpoint get /api/v1/users/company-jobs-report/
      * @param requestParameters
      */
-    usersCompanyJobsReportRetrieve(requestParameters: UsersCompanyJobsReportRetrieveRequestParams, extraHttpRequestParams?: any): Observable<UserCompanyJobsReportDto>;
+    usersCompanyJobsReportRetrieve(requestParameters: UsersCompanyJobsReportRetrieveRequestParams, extraHttpRequestParams?: any): Observable<CompanyJobsUsersDataDto>;
     /**
      *
      * ViewSet for viewing accounts.

package/fesm2022/saritasa-crm-delmar-core-sdk.mjs

@@ -1633,6 +1633,8 @@ class ClientsApiService extends BaseService {
         const accountManagerIn = requestParameters?.accountManagerIn;
         const idIn = requestParameters?.idIn;
         const includeHostedProjects = requestParameters?.includeHostedProjects;
+        const jobsBranchIn = requestParameters?.jobsBranchIn;
+        const jobsWorkTypeIn = requestParameters?.jobsWorkTypeIn;
         const ordering = requestParameters?.ordering;
         const projectsBillingType = requestParameters?.projectsBillingType;
         const projectsBillingTypeIn = requestParameters?.projectsBillingTypeIn;
@@ -1648,6 +1650,12 @@ class ClientsApiService extends BaseService {
             localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...idIn].join(COLLECTION_FORMATS["csv"]), "id__in");
         }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, includeHostedProjects, "include_hosted_projects");
+        if (jobsBranchIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsBranchIn].join(COLLECTION_FORMATS["csv"]), "jobs__branch__in");
+        }
+        if (jobsWorkTypeIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsWorkTypeIn].join(COLLECTION_FORMATS["csv"]), "jobs__work_type__in");
+        }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, ordering, "ordering");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, period, "period");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, projectsBillingType, "projects__billing_type");
@@ -2326,6 +2334,69 @@ class DepartmentsApiService extends BaseService {
             reportProgress: reportProgress,
         });
     }
+    departmentsCompanyJobsReportRetrieve(requestParameters, observe = "body", reportProgress = false, options) {
+        const period = requestParameters?.period;
+        if (period === null || period === undefined) {
+            throw new Error("Required parameter period was null or undefined when calling departmentsCompanyJobsReportRetrieve.");
+        }
+        const id = requestParameters?.id;
+        const idIn = requestParameters?.idIn;
+        const jobsBranchIn = requestParameters?.jobsBranchIn;
+        const jobsWorkTypeIn = requestParameters?.jobsWorkTypeIn;
+        const ordering = requestParameters?.ordering;
+        const reportType = requestParameters?.reportType;
+        let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
+        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, id, "id");
+        if (idIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...idIn].join(COLLECTION_FORMATS["csv"]), "id__in");
+        }
+        if (jobsBranchIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsBranchIn].join(COLLECTION_FORMATS["csv"]), "jobs__branch__in");
+        }
+        if (jobsWorkTypeIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsWorkTypeIn].join(COLLECTION_FORMATS["csv"]), "jobs__work_type__in");
+        }
+        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, ordering, "ordering");
+        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, period, "period");
+        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, reportType, "report_type");
+        let localVarHeaders = this.defaultHeaders;
+        // authentication (cookieAuth) required
+        // authentication (jwtAuth) required
+        localVarHeaders = this.configuration.addCredentialToHeaders("jwtAuth", "Authorization", localVarHeaders, "Bearer ");
+        const localVarHttpHeaderAcceptSelected = options?.httpHeaderAccept ??
+            this.configuration.selectHeaderAccept(["application/json"]);
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set("Accept", localVarHttpHeaderAcceptSelected);
+        }
+        const localVarHttpContext = options?.context ?? new HttpContext();
+        const localVarTransferCache = options?.transferCache ?? true;
+        let responseType_ = "json";
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith("text")) {
+                responseType_ = "text";
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = "json";
+            }
+            else {
+                responseType_ = "blob";
+            }
+        }
+        let localVarPath = `/api/v1/departments/company-jobs-report/`;
+        const { basePath, withCredentials } = this.configuration;
+        return this.httpClient.request("get", `${basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            params: localVarQueryParameters,
+            responseType: responseType_,
+            ...(withCredentials ? { withCredentials } : {}),
+            headers: localVarHeaders,
+            observe: observe,
+            ...(localVarTransferCache !== undefined
+                ? { transferCache: localVarTransferCache }
+                : {}),
+            reportProgress: reportProgress,
+        });
+    }
     departmentsCreate(requestParameters, observe = "body", reportProgress = false, options) {
         const departmentRequestDto = requestParameters?.departmentRequestDto;
         if (departmentRequestDto === null || departmentRequestDto === undefined) {
@@ -6400,6 +6471,8 @@ class ExportMarginReportApiService extends BaseService {
         const accountManagerIn = requestParameters?.accountManagerIn;
         const idIn = requestParameters?.idIn;
         const includeHostedProjects = requestParameters?.includeHostedProjects;
+        const jobsBranchIn = requestParameters?.jobsBranchIn;
+        const jobsWorkTypeIn = requestParameters?.jobsWorkTypeIn;
         const ordering = requestParameters?.ordering;
         const projectOrdering = requestParameters?.projectOrdering;
         const projectsBillingType = requestParameters?.projectsBillingType;
@@ -6416,6 +6489,12 @@ class ExportMarginReportApiService extends BaseService {
             localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...idIn].join(COLLECTION_FORMATS["csv"]), "id__in");
         }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, includeHostedProjects, "include_hosted_projects");
+        if (jobsBranchIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsBranchIn].join(COLLECTION_FORMATS["csv"]), "jobs__branch__in");
+        }
+        if (jobsWorkTypeIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsWorkTypeIn].join(COLLECTION_FORMATS["csv"]), "jobs__work_type__in");
+        }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, ordering, "ordering");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, period, "period");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, projectOrdering, "project_ordering");
@@ -14719,6 +14798,8 @@ class ProjectsApiService extends BaseService {
         const idIn = requestParameters?.idIn;
         const includeHostedProjects = requestParameters?.includeHostedProjects;
         const isUtilized = requestParameters?.isUtilized;
+        const jobsBranchIn = requestParameters?.jobsBranchIn;
+        const jobsWorkTypeIn = requestParameters?.jobsWorkTypeIn;
         const limit = requestParameters?.limit;
         const offset = requestParameters?.offset;
         const ordering = requestParameters?.ordering;
@@ -14743,6 +14824,12 @@ class ProjectsApiService extends BaseService {
         }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, includeHostedProjects, "include_hosted_projects");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, isUtilized, "is_utilized");
+        if (jobsBranchIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsBranchIn].join(COLLECTION_FORMATS["csv"]), "jobs__branch__in");
+        }
+        if (jobsWorkTypeIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsWorkTypeIn].join(COLLECTION_FORMATS["csv"]), "jobs__work_type__in");
+        }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, limit, "limit");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, offset, "offset");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, ordering, "ordering");
@@ -18412,34 +18499,30 @@ class UsersApiService extends BaseService {
         if (period === null || period === undefined) {
             throw new Error("Required parameter period was null or undefined when calling usersCompanyJobsReportRetrieve.");
         }
-        const branch = requestParameters?.branch;
-        const branchIn = requestParameters?.branchIn;
         const id = requestParameters?.id;
         const idIn = requestParameters?.idIn;
+        const jobsBranchIn = requestParameters?.jobsBranchIn;
+        const jobsWorkTypeIn = requestParameters?.jobsWorkTypeIn;
         const ordering = requestParameters?.ordering;
         const reportType = requestParameters?.reportType;
         const showSupervised = requestParameters?.showSupervised;
         const showUtilized = requestParameters?.showUtilized;
-        const workType = requestParameters?.workType;
-        const workTypeIn = requestParameters?.workTypeIn;
         let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
-        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, branch, "branch");
-        if (branchIn) {
-            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...branchIn].join(COLLECTION_FORMATS["csv"]), "branch__in");
-        }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, id, "id");
         if (idIn) {
             localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...idIn].join(COLLECTION_FORMATS["csv"]), "id__in");
         }
+        if (jobsBranchIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsBranchIn].join(COLLECTION_FORMATS["csv"]), "jobs__branch__in");
+        }
+        if (jobsWorkTypeIn) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...jobsWorkTypeIn].join(COLLECTION_FORMATS["csv"]), "jobs__work_type__in");
+        }
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, ordering, "ordering");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, period, "period");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, reportType, "report_type");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, showSupervised, "show_supervised");
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, showUtilized, "show_utilized");
-        localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, workType, "work_type");
-        if (workTypeIn) {
-            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, [...workTypeIn].join(COLLECTION_FORMATS["csv"]), "work_type__in");
-        }
         let localVarHeaders = this.defaultHeaders;
         // authentication (cookieAuth) required
         // authentication (jwtAuth) required
@@ -20160,6 +20243,16 @@ var ClientStatusEnumDto;
     ClientStatusEnumDto["Cancelled"] = "cancelled";
 })(ClientStatusEnumDto || (ClientStatusEnumDto = {}));
 
+/**
+ * Delmar Api
+ *
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
 /**
  * Delmar Api
  *
@@ -20990,16 +21083,6 @@ var PriorityEnumDto;
  * Do not edit the class manually.
  */
 
-/**
- * Delmar Api
- *
- *
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
 /**
  * Delmar Api
  *