@saritasa/crm-delmar-core-sdk 0.1.20 → 0.1.21

package/README.md

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

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

@@ -88,6 +88,7 @@ export interface ClientsListRequestParams {
 }
 export interface ClientsMarginReportRetrieveRequestParams {
     period: string;
+    accountManagerIn?: Array<number>;
     idIn?: Array<number>;
     isBillable?: boolean;
     ordering?: string;

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

@@ -29,9 +29,11 @@ export interface ExportMarginReportStartCreateRequestParams {
     period: string;
     roundingType: "none" | "round_half" | "round_zero";
     marginReportResourceCreateExportJobRequestDto: MarginReportResourceCreateExportJobRequestDto;
+    accountManagerIn?: Array<number>;
     idIn?: Array<number>;
     isBillable?: boolean;
     ordering?: string;
+    projectOrdering?: string;
     taskProjectBillingType?: "fixed" | "hourly" | "investment" | "sla";
     taskProjectIsUtilized?: boolean;
     taskProjectProjectManagersIn?: Array<number>;

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

@@ -1,16 +1,16 @@
 import { HttpClient, HttpResponse, HttpEvent, HttpContext } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { PaginatedProjectListDto } from "../model/paginated-project-list.dto";
+import { PaginatedProjectMarginReportListDto } from "../model/paginated-project-margin-report-list.dto";
 import { PaginatedProjectSerializerWithStatsListDto } from "../model/paginated-project-serializer-with-stats-list.dto";
 import { PaginatedProjectStatusReportListDto } from "../model/paginated-project-status-report-list.dto";
 import { PaginatedSimpleProjectListDto } from "../model/paginated-simple-project-list.dto";
 import { ProjectDto } from "../model/project.dto";
-import { ProjectMarginReportDto } from "../model/project-margin-report.dto";
 import { ProjectSerializerWithMonthStatsDto } from "../model/project-serializer-with-month-stats.dto";
 import { ProjectSerializerWithStatsDto } from "../model/project-serializer-with-stats.dto";
 import { Configuration } from "../configuration";
 import { BaseService } from "../api.base.service";
-import { ProjectsApiServiceInterface, ProjectsCreateRequestParams, ProjectsListRequestParams, ProjectsMarginReportRetrieveRequestParams, ProjectsRetrieveRequestParams, ProjectsStatusReportListRequestParams, ProjectsUpdateRequestParams, ProjectsWithMonthStatsRetrieveRequestParams, ProjectsWithStatsListRequestParams, ProjectsWithStatsRetrieveRequestParams, ProjectsWorkedOnListRequestParams } from "./projects-api.serviceInterface";
+import { ProjectsApiServiceInterface, ProjectsCreateRequestParams, ProjectsListRequestParams, ProjectsMarginReportListRequestParams, ProjectsRetrieveRequestParams, ProjectsStatusReportListRequestParams, ProjectsUpdateRequestParams, ProjectsWithMonthStatsRetrieveRequestParams, ProjectsWithStatsListRequestParams, ProjectsWithStatsRetrieveRequestParams, ProjectsWorkedOnListRequestParams } from "./projects-api.serviceInterface";
 import * as i0 from "@angular/core";
 export declare class ProjectsApiService extends BaseService implements ProjectsApiServiceInterface {
     protected httpClient: HttpClient;
@@ -63,21 +63,21 @@ export declare class ProjectsApiService extends BaseService implements ProjectsA
      * @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.
      */
-    projectsMarginReportRetrieve(requestParameters: ProjectsMarginReportRetrieveRequestParams, observe?: "body", reportProgress?: boolean, options?: {
+    projectsMarginReportList(requestParameters: ProjectsMarginReportListRequestParams, observe?: "body", reportProgress?: boolean, options?: {
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<ProjectMarginReportDto>;
-    projectsMarginReportRetrieve(requestParameters: ProjectsMarginReportRetrieveRequestParams, observe?: "response", reportProgress?: boolean, options?: {
+    }): Observable<PaginatedProjectMarginReportListDto>;
+    projectsMarginReportList(requestParameters: ProjectsMarginReportListRequestParams, observe?: "response", reportProgress?: boolean, options?: {
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<HttpResponse<ProjectMarginReportDto>>;
-    projectsMarginReportRetrieve(requestParameters: ProjectsMarginReportRetrieveRequestParams, observe?: "events", reportProgress?: boolean, options?: {
+    }): Observable<HttpResponse<PaginatedProjectMarginReportListDto>>;
+    projectsMarginReportList(requestParameters: ProjectsMarginReportListRequestParams, observe?: "events", reportProgress?: boolean, options?: {
         httpHeaderAccept?: "application/json";
         context?: HttpContext;
         transferCache?: boolean;
-    }): Observable<HttpEvent<ProjectMarginReportDto>>;
+    }): Observable<HttpEvent<PaginatedProjectMarginReportListDto>>;
     /**
      * Api viewset for Project model.
      * @param requestParameters

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

@@ -10,11 +10,11 @@
 import { HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { PaginatedProjectListDto } from "../model/models";
+import { PaginatedProjectMarginReportListDto } from "../model/models";
 import { PaginatedProjectSerializerWithStatsListDto } from "../model/models";
 import { PaginatedProjectStatusReportListDto } from "../model/models";
 import { PaginatedSimpleProjectListDto } from "../model/models";
 import { ProjectDto } from "../model/models";
-import { ProjectMarginReportDto } from "../model/models";
 import { ProjectRequestDto } from "../model/models";
 import { ProjectSerializerWithMonthStatsDto } from "../model/models";
 import { ProjectSerializerWithStatsDto } from "../model/models";
@@ -44,7 +44,7 @@ export interface ProjectsListRequestParams {
     status?: "active" | "bug_fixing" | "cancelled" | "completed" | "maintenance" | "on_hold" | "pre_sale";
     statusIn?: Array<string>;
 }
-export interface ProjectsMarginReportRetrieveRequestParams {
+export interface ProjectsMarginReportListRequestParams {
     period: string;
     billingType?: "fixed" | "hourly" | "investment" | "sla";
     billingTypeIn?: Array<string>;
@@ -54,6 +54,10 @@ export interface ProjectsMarginReportRetrieveRequestParams {
     clientIn?: Array<number>;
     idIn?: Array<number>;
     isUtilized?: boolean;
+    jobsIsBillable?: boolean;
+    limit?: number;
+    offset?: number;
+    ordering?: string;
     projectManagers?: Array<number>;
     projectManagersIn?: Array<number>;
 }
@@ -163,7 +167,7 @@ export interface ProjectsApiServiceInterface {
      * Get margin report.
      * @param requestParameters
      */
-    projectsMarginReportRetrieve(requestParameters: ProjectsMarginReportRetrieveRequestParams, extraHttpRequestParams?: any): Observable<ProjectMarginReportDto>;
+    projectsMarginReportList(requestParameters: ProjectsMarginReportListRequestParams, extraHttpRequestParams?: any): Observable<PaginatedProjectMarginReportListDto>;
     /**
      *
      * Api viewset for Project model.