Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/matsen-tool-fe

matsen-tool/openapi.yaml

@@ -1584,6 +1584,51 @@ paths:
           style: form
           explode: true
           allowReserved: false
+        -
+          name: 'order[partner.name]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[partner.city]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[partner.website]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
       deprecated: false
     post:
       operationId: api_partner_follows_post
@@ -1869,6 +1914,18 @@ paths:
           style: form
           explode: true
           allowReserved: false
+        -
+          name: excludeContactId
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+          style: form
+          explode: false
+          allowReserved: false
         -
           name: 'order[product.name]'
           in: query
@@ -1885,7 +1942,37 @@ paths:
           explode: false
           allowReserved: false
         -
-          name: excludeContactId
+          name: 'order[partner.name]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[partner.city]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[partner.website]'
           in: query
           description: ''
           required: false
@@ -1893,6 +1980,9 @@ paths:
           allowEmptyValue: true
           schema:
             type: string
+            enum:
+              - asc
+              - desc
           style: form
           explode: false
           allowReserved: false
@@ -3144,6 +3234,96 @@ paths:
           style: form
           explode: true
           allowReserved: false
+        -
+          name: 'order[owner.lastName]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[partner.name]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[product.name]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[turnover]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[profit]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[createdAt]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
       deprecated: false
     post:
       operationId: api_sales_post
@@ -4158,6 +4338,36 @@ paths:
           style: form
           explode: false
           allowReserved: false
+        -
+          name: 'order[firstName]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'order[lastName]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          style: form
+          explode: false
+          allowReserved: false
       deprecated: false
     post:
       operationId: api_users_post

matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts

@@ -146,7 +146,11 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
             term,
             this.user.id,
             undefined,
-            this.partnerType
+            this.partnerType,
+            undefined,
+            this.nameOrderFilter,
+            this.cityOrderFilter,
+            this.websiteOrderFilter
         );
     }
 
@@ -161,6 +165,11 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
             undefined,
             undefined,
             this.partnerType,
+            undefined,
+            undefined,
+            this.nameOrderFilter,
+            this.cityOrderFilter,
+            this.websiteOrderFilter
         );
     }
 

matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts

@@ -70,8 +70,7 @@ export class AssignProductComponent implements OnInit, AfterViewInit {
             term,
             undefined,
             undefined,
-            undefined,
-            this.appHelperService.extractId(this.contactPartnerProduct.contactIri)
+            this.appHelperService.extractId(this.contactPartnerProduct.contactIri),
         );
     }
 

matsen-tool/src/app/_views/products/product-list/product-list.component.ts

@@ -133,6 +133,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
             term,
             undefined,
             undefined,
+            undefined,
             this.nameOrderFilter,
         );
     }
@@ -149,13 +150,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
     }
 
     onSortChange = (sortState: Sort) => {
-        let order: OrderFilter;
-        if (sortState.direction === "") {
-            order = OrderFilter.Undefined;
-        } else {
-            order = sortState.direction;
-        }
-        this.nameOrderFilter = order;
+        this.nameOrderFilter = sortState.direction as OrderFilter;
     }
 
     navigateToProductDetails = (element: any, column?: any) => {

matsen-tool/src/app/_views/sales/sale-list/sale-list.component.ts

@@ -21,6 +21,12 @@ export class SaleListComponent implements OnInit, AfterViewInit {
     @Input() public partner!: PartnerJsonld;
     @ViewChild("listComponent", {static: false}) listComponent!: ListComponent;
 
+    protected ownerOrderFilter: OrderFilter;
+    protected partnerOrderFilter: OrderFilter;
+    protected productOrderFilter: OrderFilter;
+    protected turnoverOrderFilter: OrderFilter;
+    protected profitOrderFilter: OrderFilter;
+    protected createdAtOrderFilter: OrderFilter;
     protected listColDefinitions!: ListColDefinition[];
 
     constructor(
@@ -29,9 +35,16 @@ export class SaleListComponent implements OnInit, AfterViewInit {
         protected appHelperService: AppHelperService,
         protected accountService: AccountService,
     ) {
+        this.ownerOrderFilter = OrderFilter.Asc;
+        this.partnerOrderFilter = OrderFilter.Asc;
+        this.productOrderFilter = OrderFilter.Asc;
+        this.turnoverOrderFilter = OrderFilter.Asc;
+        this.profitOrderFilter = OrderFilter.Asc;
+        this.createdAtOrderFilter = OrderFilter.Asc;
+
         this.listColDefinitions = [
             {
-                name: 'user',
+                name: 'owner',
                 text: 'overview.sale-user',
                 type: ListComponent.COLUMN_TYPE_TEXT_LINKED,
                 field: 'fullName',
@@ -94,18 +107,43 @@ export class SaleListComponent implements OnInit, AfterViewInit {
             this.partner !== undefined ? this.partner.id : undefined,
             undefined,
             this.product !== undefined ? this.product.id : undefined,
+            undefined,
+            this.ownerOrderFilter,
+            this.partnerOrderFilter,
+            this.productOrderFilter,
+            this.turnoverOrderFilter,
+            this.profitOrderFilter,
+            this.createdAtOrderFilter,
         );
     }
 
     onSortChange = (sortState: Sort) => {
-        // Reset page index to first page
-        let order: OrderFilter;
-        if (sortState.direction === "") {
-            order = OrderFilter.Undefined;
-        } else {
-            order = sortState.direction;
+        this.ownerOrderFilter = OrderFilter.Undefined;
+        this.partnerOrderFilter = OrderFilter.Undefined;
+        this.productOrderFilter = OrderFilter.Undefined;
+        this.turnoverOrderFilter = OrderFilter.Undefined;
+        this.profitOrderFilter = OrderFilter.Undefined;
+        this.createdAtOrderFilter = OrderFilter.Undefined;
+        switch (sortState.active) {
+            case "owner":
+                this.ownerOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "partner":
+                this.partnerOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "product":
+                this.productOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "turnover":
+                this.turnoverOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "profit":
+                this.profitOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "createdAt":
+                this.createdAtOrderFilter = sortState.direction as OrderFilter;
+                break;
         }
-
     }
 
     navigateToSaleDetails = (element: any) => {

matsen-tool/src/app/_views/user/user-list/user-list.component.ts

@@ -17,6 +17,8 @@ export class UserListComponent implements OnInit, AfterViewInit {
 
     @ViewChild("listComponent", {static: false}) listComponent!: ListComponent;
 
+    protected firstNameOrderFilter: OrderFilter;
+    protected lastNameOrderFilter: OrderFilter;
     protected listColDefinitions!: ListColDefinition[];
 
     constructor(
@@ -24,6 +26,9 @@ export class UserListComponent implements OnInit, AfterViewInit {
         private router: Router,
         protected appHelperService: AppHelperService,
     ) {
+        this.firstNameOrderFilter = OrderFilter.Undefined;
+        this.lastNameOrderFilter = OrderFilter.Asc;
+
         this.listColDefinitions = [
             {
                 name: 'image',
@@ -50,7 +55,6 @@ export class UserListComponent implements OnInit, AfterViewInit {
                 text: 'overview.email',
                 type: ListComponent.COLUMN_TYPE_EMAIL,
                 field: 'email',
-                sortable: false,
             } as ListColDefinition,
         ];
     }
@@ -69,16 +73,22 @@ export class UserListComponent implements OnInit, AfterViewInit {
             pageSize,
             undefined,
             undefined,
-            term
+            term,
+            this.firstNameOrderFilter,
+            this.lastNameOrderFilter
         );
     }
 
     onSortChange = (sortState: Sort) => {
-        let order: OrderFilter;
-        if (sortState.direction === "") {
-            order = OrderFilter.Undefined;
-        } else {
-            order = sortState.direction;
+        this.firstNameOrderFilter = OrderFilter.Undefined;
+        this.lastNameOrderFilter = OrderFilter.Undefined;
+        switch (sortState.active) {
+            case "firstName":
+                this.firstNameOrderFilter = sortState.direction as OrderFilter;
+                break;
+            case "lastName":
+                this.lastNameOrderFilter = sortState.direction as OrderFilter;
+                break;
         }
     }
 

matsen-tool/src/app/core/api/v1/api/partnerFollow.service.ts

@@ -111,13 +111,16 @@ export class PartnerFollowService {
      * @param user2 
      * @param partnerType 
      * @param partnerType2 
+     * @param orderPartnerName 
+     * @param orderPartnerCity 
+     * @param orderPartnerWebsite 
      * @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.
      */
-    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiPartnerFollowsGetCollection200Response>;
-    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiPartnerFollowsGetCollection200Response>>;
-    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiPartnerFollowsGetCollection200Response>>;
-    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiPartnerFollowsGetCollection200Response>;
+    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiPartnerFollowsGetCollection200Response>>;
+    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiPartnerFollowsGetCollection200Response>>;
+    public partnerFollowsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, user?: string, user2?: Array<string>, partnerType?: string, partnerType2?: Array<string>, orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
         if (page !== undefined && page !== null) {
@@ -162,6 +165,18 @@ export class PartnerFollowService {
                   <any>element, 'partner.type[]');
             })
         }
+        if (orderPartnerName !== undefined && orderPartnerName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerName, 'order[partner.name]');
+        }
+        if (orderPartnerCity !== undefined && orderPartnerCity !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerCity, 'order[partner.city]');
+        }
+        if (orderPartnerWebsite !== undefined && orderPartnerWebsite !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerWebsite, 'order[partner.website]');
+        }
 
         let localVarHeaders = this.defaultHeaders;
 

matsen-tool/src/app/core/api/v1/api/partnerProduct.service.ts

@@ -112,15 +112,18 @@ export class PartnerProductService {
      * @param productName 
      * @param partnerType 
      * @param partnerType2 
-     * @param orderProductName 
      * @param excludeContactId 
+     * @param orderProductName 
+     * @param orderPartnerName 
+     * @param orderPartnerCity 
+     * @param orderPartnerWebsite 
      * @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.
      */
-    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, orderProductName?: 'asc' | 'desc', excludeContactId?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiPartnerProductsGetCollection200Response>;
-    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, orderProductName?: 'asc' | 'desc', excludeContactId?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiPartnerProductsGetCollection200Response>>;
-    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, orderProductName?: 'asc' | 'desc', excludeContactId?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiPartnerProductsGetCollection200Response>>;
-    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, orderProductName?: 'asc' | 'desc', excludeContactId?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, excludeContactId?: string, orderProductName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiPartnerProductsGetCollection200Response>;
+    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, excludeContactId?: string, orderProductName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiPartnerProductsGetCollection200Response>>;
+    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, excludeContactId?: string, orderProductName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiPartnerProductsGetCollection200Response>>;
+    public partnerProductsGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, partnerName?: string, product?: string, product2?: Array<string>, productName?: string, partnerType?: string, partnerType2?: Array<string>, excludeContactId?: string, orderProductName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderPartnerCity?: 'asc' | 'desc', orderPartnerWebsite?: 'asc' | 'desc', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
         if (page !== undefined && page !== null) {
@@ -169,13 +172,25 @@ export class PartnerProductService {
                   <any>element, 'partner.type[]');
             })
         }
+        if (excludeContactId !== undefined && excludeContactId !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>excludeContactId, 'excludeContactId');
+        }
         if (orderProductName !== undefined && orderProductName !== null) {
           localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
             <any>orderProductName, 'order[product.name]');
         }
-        if (excludeContactId !== undefined && excludeContactId !== null) {
+        if (orderPartnerName !== undefined && orderPartnerName !== null) {
           localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>excludeContactId, 'excludeContactId');
+            <any>orderPartnerName, 'order[partner.name]');
+        }
+        if (orderPartnerCity !== undefined && orderPartnerCity !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerCity, 'order[partner.city]');
+        }
+        if (orderPartnerWebsite !== undefined && orderPartnerWebsite !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerWebsite, 'order[partner.website]');
         }
 
         let localVarHeaders = this.defaultHeaders;

matsen-tool/src/app/core/api/v1/api/sale.service.ts

@@ -110,13 +110,19 @@ export class SaleService {
      * @param partner2 
      * @param product 
      * @param product2 
+     * @param orderOwnerLastName 
+     * @param orderPartnerName 
+     * @param orderProductName 
+     * @param orderTurnover 
+     * @param orderProfit 
+     * @param orderCreatedAt 
      * @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.
      */
-    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiSalesGetCollection200Response>;
-    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiSalesGetCollection200Response>>;
-    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiSalesGetCollection200Response>>;
-    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, orderOwnerLastName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderProductName?: 'asc' | 'desc', orderTurnover?: 'asc' | 'desc', orderProfit?: 'asc' | 'desc', orderCreatedAt?: 'asc' | 'desc', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiSalesGetCollection200Response>;
+    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, orderOwnerLastName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderProductName?: 'asc' | 'desc', orderTurnover?: 'asc' | 'desc', orderProfit?: 'asc' | 'desc', orderCreatedAt?: 'asc' | 'desc', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiSalesGetCollection200Response>>;
+    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, orderOwnerLastName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderProductName?: 'asc' | 'desc', orderTurnover?: 'asc' | 'desc', orderProfit?: 'asc' | 'desc', orderCreatedAt?: 'asc' | 'desc', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiSalesGetCollection200Response>>;
+    public salesGetCollection(page?: number, itemsPerPage?: number, owner?: string, owner2?: Array<string>, partner?: string, partner2?: Array<string>, product?: string, product2?: Array<string>, orderOwnerLastName?: 'asc' | 'desc', orderPartnerName?: 'asc' | 'desc', orderProductName?: 'asc' | 'desc', orderTurnover?: 'asc' | 'desc', orderProfit?: 'asc' | 'desc', orderCreatedAt?: 'asc' | 'desc', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
         if (page !== undefined && page !== null) {
@@ -157,6 +163,30 @@ export class SaleService {
                   <any>element, 'product[]');
             })
         }
+        if (orderOwnerLastName !== undefined && orderOwnerLastName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderOwnerLastName, 'order[owner.lastName]');
+        }
+        if (orderPartnerName !== undefined && orderPartnerName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderPartnerName, 'order[partner.name]');
+        }
+        if (orderProductName !== undefined && orderProductName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderProductName, 'order[product.name]');
+        }
+        if (orderTurnover !== undefined && orderTurnover !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderTurnover, 'order[turnover]');
+        }
+        if (orderProfit !== undefined && orderProfit !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderProfit, 'order[profit]');
+        }
+        if (orderCreatedAt !== undefined && orderCreatedAt !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderCreatedAt, 'order[createdAt]');
+        }
 
         let localVarHeaders = this.defaultHeaders;
 

matsen-tool/src/app/core/api/v1/api/user.service.ts

@@ -107,13 +107,15 @@ export class UserService {
      * @param firstName 
      * @param lastName 
      * @param nameSearch 
+     * @param orderFirstName 
+     * @param orderLastName 
      * @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.
      */
-    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiUsersGetCollection200Response>;
-    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiUsersGetCollection200Response>>;
-    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiUsersGetCollection200Response>>;
-    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, orderFirstName?: 'asc' | 'desc', orderLastName?: 'asc' | 'desc', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiUsersGetCollection200Response>;
+    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, orderFirstName?: 'asc' | 'desc', orderLastName?: 'asc' | 'desc', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiUsersGetCollection200Response>>;
+    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, orderFirstName?: 'asc' | 'desc', orderLastName?: 'asc' | 'desc', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiUsersGetCollection200Response>>;
+    public usersGetCollection(page?: number, itemsPerPage?: number, firstName?: string, lastName?: string, nameSearch?: string, orderFirstName?: 'asc' | 'desc', orderLastName?: 'asc' | 'desc', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
         if (page !== undefined && page !== null) {
@@ -136,6 +138,14 @@ export class UserService {
           localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
             <any>nameSearch, 'nameSearch');
         }
+        if (orderFirstName !== undefined && orderFirstName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderFirstName, 'order[firstName]');
+        }
+        if (orderLastName !== undefined && orderLastName !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>orderLastName, 'order[lastName]');
+        }
 
         let localVarHeaders = this.defaultHeaders;