Florian Eisenmenger 2 лет назад
Родитель
Сommit
77d5db7e76
20 измененных файлов: 308 добавлений и 75 удалений
  1. +1
    -1
      matsen-tool/openapi.json
  2. +145
    -12
      matsen-tool/openapi.yaml
  3. +18
    -3
      matsen-tool/src/app/_forms/apiForms.ts
  4. +1
    -1
      matsen-tool/src/app/contacts/new-contact/new-contact.component.ts
  5. +2
    -3
      matsen-tool/src/app/core/api/v1/.openapi-generator/FILES
  6. +25
    -25
      matsen-tool/src/app/core/api/v1/api/media.service.ts
  7. +28
    -4
      matsen-tool/src/app/core/api/v1/api/task.service.ts
  8. +23
    -0
      matsen-tool/src/app/core/api/v1/model/apiMediasGetCollection200Response.ts
  9. +22
    -0
      matsen-tool/src/app/core/api/v1/model/apiMediasGetCollection200Response1.ts
  10. +2
    -2
      matsen-tool/src/app/core/api/v1/model/models.ts
  11. +7
    -6
      matsen-tool/src/app/core/api/v1/model/partner.ts
  12. +7
    -6
      matsen-tool/src/app/core/api/v1/model/partnerJsonhal.ts
  13. +8
    -6
      matsen-tool/src/app/core/api/v1/model/partnerJsonld.ts
  14. +4
    -0
      matsen-tool/src/app/core/api/v1/model/task.ts
  15. +4
    -0
      matsen-tool/src/app/core/api/v1/model/taskJsonhal.ts
  16. +4
    -0
      matsen-tool/src/app/core/api/v1/model/taskJsonld.ts
  17. +1
    -1
      matsen-tool/src/app/partners/new-partner/new-partner.component.ts
  18. +4
    -3
      matsen-tool/src/app/partners/partners.component.ts
  19. +1
    -1
      matsen-tool/src/app/products/new-product/new-product.component.ts
  20. +1
    -1
      matsen-tool/src/app/tasks/new-task/new-task.component.ts

+ 1
- 1
matsen-tool/openapi.json
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 145
- 12
matsen-tool/openapi.yaml Просмотреть файл

@@ -500,9 +500,9 @@ paths:
required: true
deprecated: false
parameters: []
/api/media:
/api/medias:
get:
operationId: api_media_get_collection
operationId: api_medias_get_collection
tags:
- Media
responses:
@@ -573,7 +573,7 @@ paths:
allowReserved: false
deprecated: false
post:
operationId: api_media_post
operationId: api_medias_post
tags:
- Media
responses:
@@ -613,9 +613,9 @@ paths:
required: false
deprecated: false
parameters: []
'/api/media/{id}':
'/api/medias/{id}':
get:
operationId: api_media_id_get
operationId: api_medias_id_get
tags:
- Media
responses:
@@ -653,7 +653,7 @@ paths:
allowReserved: false
deprecated: false
delete:
operationId: api_media_id_delete
operationId: api_medias_id_delete
tags:
- Media
responses:
@@ -1586,6 +1586,58 @@ paths:
style: form
explode: false
allowReserved: false
-
name: partner
in: query
description: ''
required: false
deprecated: false
allowEmptyValue: true
schema:
type: string
style: form
explode: false
allowReserved: false
-
name: 'partner[]'
in: query
description: ''
required: false
deprecated: false
allowEmptyValue: true
schema:
type: array
items:
type: string
style: form
explode: true
allowReserved: false
-
name: contact
in: query
description: ''
required: false
deprecated: false
allowEmptyValue: true
schema:
type: string
style: form
explode: false
allowReserved: false
-
name: 'contact[]'
in: query
description: ''
required: false
deprecated: false
allowEmptyValue: true
schema:
type: array
items:
type: string
style: form
explode: true
allowReserved: false
deprecated: false
post:
operationId: api_tasks_post
@@ -2450,11 +2502,11 @@ components:
deprecated: false
required:
- name
- type
- partnerType
properties:
name:
type: string
type:
partnerType:
type: string
enum:
- customer
@@ -2502,6 +2554,13 @@ components:
- string
- 'null'
format: date-time
posts:
readOnly: true
type: array
items:
type: string
format: iri-reference
example: 'https://example.com/'
contacts:
readOnly: true
type: array
@@ -2515,7 +2574,7 @@ components:
deprecated: false
required:
- name
- type
- partnerType
properties:
_links:
type: object
@@ -2528,7 +2587,7 @@ components:
format: iri-reference
name:
type: string
type:
partnerType:
type: string
enum:
- customer
@@ -2576,6 +2635,13 @@ components:
- string
- 'null'
format: date-time
posts:
readOnly: true
type: array
items:
type: string
format: iri-reference
example: 'https://example.com/'
contacts:
readOnly: true
type: array
@@ -2589,7 +2655,7 @@ components:
deprecated: false
required:
- name
- type
- partnerType
properties:
'@context':
readOnly: true
@@ -2616,7 +2682,7 @@ components:
type: string
name:
type: string
type:
partnerType:
type: string
enum:
- customer
@@ -2664,6 +2730,13 @@ components:
- string
- 'null'
format: date-time
posts:
readOnly: true
type: array
items:
type: string
format: iri-reference
example: 'https://example.com/'
contacts:
readOnly: true
type: array
@@ -3129,6 +3202,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
createdByName:
readOnly: true
type:
- string
- 'null'
assignedTo:
'owl:maxCardinality': 1
type:
@@ -3136,6 +3214,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
assignedToName:
readOnly: true
type:
- string
- 'null'
dueAt:
type:
- string
@@ -3148,6 +3231,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
partnerName:
readOnly: true
type:
- string
- 'null'
contact:
'owl:maxCardinality': 1
type:
@@ -3155,6 +3243,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
contactName:
readOnly: true
type:
- string
- 'null'
prio:
type: string
enum:
@@ -3207,6 +3300,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
createdByName:
readOnly: true
type:
- string
- 'null'
assignedTo:
'owl:maxCardinality': 1
type:
@@ -3214,6 +3312,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
assignedToName:
readOnly: true
type:
- string
- 'null'
dueAt:
type:
- string
@@ -3226,6 +3329,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
partnerName:
readOnly: true
type:
- string
- 'null'
contact:
'owl:maxCardinality': 1
type:
@@ -3233,6 +3341,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
contactName:
readOnly: true
type:
- string
- 'null'
prio:
type: string
enum:
@@ -3299,6 +3412,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
createdByName:
readOnly: true
type:
- string
- 'null'
assignedTo:
'owl:maxCardinality': 1
type:
@@ -3306,6 +3424,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
assignedToName:
readOnly: true
type:
- string
- 'null'
dueAt:
type:
- string
@@ -3318,6 +3441,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
partnerName:
readOnly: true
type:
- string
- 'null'
contact:
'owl:maxCardinality': 1
type:
@@ -3325,6 +3453,11 @@ components:
- 'null'
format: iri-reference
example: 'https://example.com/'
contactName:
readOnly: true
type:
- string
- 'null'
prio:
type: string
enum:


+ 18
- 3
matsen-tool/src/app/_forms/apiForms.ts Просмотреть файл

@@ -83,7 +83,7 @@ export const mediaJsonldMediaObjectReadForm = new FormGroup({

export const partnerForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
type: new FormControl(null, [Validators.required]),
partnerType: new FormControl(null, [Validators.required]),
street: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
@@ -93,13 +93,14 @@ export const partnerForm = new FormGroup({
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
createdAt: new FormControl(null, []),
posts: new FormControl(null, []),
contacts: new FormControl(null, [])
});

export const partnerJsonhalForm = new FormGroup({
_links: new FormControl(null, []),
name: new FormControl(null, [Validators.required]),
type: new FormControl(null, [Validators.required]),
partnerType: new FormControl(null, [Validators.required]),
street: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
@@ -109,12 +110,13 @@ export const partnerJsonhalForm = new FormGroup({
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
createdAt: new FormControl(null, []),
posts: new FormControl(null, []),
contacts: new FormControl(null, [])
});

export const partnerJsonldForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
type: new FormControl(null, [Validators.required]),
partnerType: new FormControl(null, [Validators.required]),
street: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
@@ -124,6 +126,7 @@ export const partnerJsonldForm = new FormGroup({
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
createdAt: new FormControl(null, []),
posts: new FormControl(null, []),
contacts: new FormControl(null, [])
});

@@ -217,10 +220,14 @@ export const taskForm = new FormGroup({
headline: new FormControl(null, [Validators.required]),
description: new FormControl(null, [Validators.required]),
createdBy: new FormControl(null, []),
createdByName: new FormControl(null, []),
assignedTo: new FormControl(null, [Validators.required]),
assignedToName: new FormControl(null, []),
dueAt: new FormControl(null, [Validators.required]),
partner: new FormControl(null, []),
partnerName: new FormControl(null, []),
contact: new FormControl(null, []),
contactName: new FormControl(null, []),
prio: new FormControl(null, [Validators.required]),
completed: new FormControl(null, []),
createdAt: new FormControl(null, [])
@@ -231,10 +238,14 @@ export const taskJsonhalForm = new FormGroup({
headline: new FormControl(null, [Validators.required]),
description: new FormControl(null, [Validators.required]),
createdBy: new FormControl(null, []),
createdByName: new FormControl(null, []),
assignedTo: new FormControl(null, [Validators.required]),
assignedToName: new FormControl(null, []),
dueAt: new FormControl(null, [Validators.required]),
partner: new FormControl(null, []),
partnerName: new FormControl(null, []),
contact: new FormControl(null, []),
contactName: new FormControl(null, []),
prio: new FormControl(null, [Validators.required]),
completed: new FormControl(null, []),
createdAt: new FormControl(null, [])
@@ -244,10 +255,14 @@ export const taskJsonldForm = new FormGroup({
headline: new FormControl(null, [Validators.required]),
description: new FormControl(null, [Validators.required]),
createdBy: new FormControl(null, []),
createdByName: new FormControl(null, []),
assignedTo: new FormControl(null, [Validators.required]),
assignedToName: new FormControl(null, []),
dueAt: new FormControl(null, [Validators.required]),
partner: new FormControl(null, []),
partnerName: new FormControl(null, []),
contact: new FormControl(null, []),
contactName: new FormControl(null, []),
prio: new FormControl(null, [Validators.required]),
completed: new FormControl(null, []),
createdAt: new FormControl(null, [])


+ 1
- 1
matsen-tool/src/app/contacts/new-contact/new-contact.component.ts Просмотреть файл

@@ -43,7 +43,7 @@ export class NewContactComponent implements OnInit {
// On submit form: Check if image is set
onSubmit() {
if (this.selectedImage !== null) {
this.mediaSub = this.mediaService.mediaPost(
this.mediaSub = this.mediaService.mediasPost(
this.selectedImage
).subscribe(
data => {


+ 2
- 3
matsen-tool/src/app/core/api/v1/.openapi-generator/FILES Просмотреть файл

@@ -1,5 +1,4 @@
.gitignore
.openapi-generator-ignore
README.md
api.module.ts
api/api.ts
@@ -25,8 +24,8 @@ model/apiCommentsGetCollection200ResponseHydraSearchHydraMappingInner.ts
model/apiCommentsGetCollection200ResponseHydraView.ts
model/apiContactsGetCollection200Response.ts
model/apiContactsGetCollection200Response1.ts
model/apiMediaGetCollection200Response.ts
model/apiMediaGetCollection200Response1.ts
model/apiMediasGetCollection200Response.ts
model/apiMediasGetCollection200Response1.ts
model/apiPartnersGetCollection200Response.ts
model/apiPartnersGetCollection200Response1.ts
model/apiPostsGetCollection200Response.ts


+ 25
- 25
matsen-tool/src/app/core/api/v1/api/media.service.ts Просмотреть файл

@@ -19,9 +19,9 @@ import { CustomHttpParameterCodec } from '../encoder';
import { Observable } from 'rxjs';

// @ts-ignore
import { ApiMediaGetCollection200Response } from '../model/apiMediaGetCollection200Response';
import { ApiMediasGetCollection200Response } from '../model/apiMediasGetCollection200Response';
// @ts-ignore
import { ApiMediaGetCollection200Response1 } from '../model/apiMediaGetCollection200Response1';
import { ApiMediasGetCollection200Response1 } from '../model/apiMediasGetCollection200Response1';
// @ts-ignore
import { MediaJsonhalMediaObjectRead } from '../model/mediaJsonhalMediaObjectRead';
// @ts-ignore
@@ -120,10 +120,10 @@ export class MediaService {
* @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 mediaGetCollection(page?: number, itemsPerPage?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiMediaGetCollection200Response>;
public mediaGetCollection(page?: number, itemsPerPage?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiMediaGetCollection200Response>>;
public mediaGetCollection(page?: number, itemsPerPage?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiMediaGetCollection200Response>>;
public mediaGetCollection(page?: number, itemsPerPage?: number, 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 mediasGetCollection(page?: number, itemsPerPage?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiMediasGetCollection200Response>;
public mediasGetCollection(page?: number, itemsPerPage?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiMediasGetCollection200Response>>;
public mediasGetCollection(page?: number, itemsPerPage?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiMediasGetCollection200Response>>;
public mediasGetCollection(page?: number, itemsPerPage?: number, 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) {
@@ -181,8 +181,8 @@ export class MediaService {
}
}

let localVarPath = `/api/media`;
return this.httpClient.request<ApiMediaGetCollection200Response>('get', `${this.configuration.basePath}${localVarPath}`,
let localVarPath = `/api/medias`;
return this.httpClient.request<ApiMediasGetCollection200Response>('get', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
params: localVarQueryParameters,
@@ -203,12 +203,12 @@ export class MediaService {
* @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 mediaIdDelete(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any>;
public mediaIdDelete(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<any>>;
public mediaIdDelete(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<any>>;
public mediaIdDelete(id: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any> {
public mediasIdDelete(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any>;
public mediasIdDelete(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<any>>;
public mediasIdDelete(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<any>>;
public mediasIdDelete(id: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any> {
if (id === null || id === undefined) {
throw new Error('Required parameter id was null or undefined when calling mediaIdDelete.');
throw new Error('Required parameter id was null or undefined when calling mediasIdDelete.');
}

let localVarHeaders = this.defaultHeaders;
@@ -253,7 +253,7 @@ export class MediaService {
}
}

let localVarPath = `/api/media/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
let localVarPath = `/api/medias/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
return this.httpClient.request<any>('delete', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
@@ -274,12 +274,12 @@ export class MediaService {
* @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 mediaIdGet(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<MediaJsonldMediaObjectRead>;
public mediaIdGet(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<MediaJsonldMediaObjectRead>>;
public mediaIdGet(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<MediaJsonldMediaObjectRead>>;
public mediaIdGet(id: 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 mediasIdGet(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<MediaJsonldMediaObjectRead>;
public mediasIdGet(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<MediaJsonldMediaObjectRead>>;
public mediasIdGet(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<MediaJsonldMediaObjectRead>>;
public mediasIdGet(id: 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> {
if (id === null || id === undefined) {
throw new Error('Required parameter id was null or undefined when calling mediaIdGet.');
throw new Error('Required parameter id was null or undefined when calling mediasIdGet.');
}

let localVarHeaders = this.defaultHeaders;
@@ -328,7 +328,7 @@ export class MediaService {
}
}

let localVarPath = `/api/media/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
let localVarPath = `/api/medias/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
return this.httpClient.request<MediaJsonldMediaObjectRead>('get', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
@@ -349,10 +349,10 @@ export class MediaService {
* @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 mediaPost(file?: Blob, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<MediaJsonldMediaObjectRead>;
public mediaPost(file?: Blob, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<MediaJsonldMediaObjectRead>>;
public mediaPost(file?: Blob, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<MediaJsonldMediaObjectRead>>;
public mediaPost(file?: Blob, 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 mediasPost(file?: Blob, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<MediaJsonldMediaObjectRead>;
public mediasPost(file?: Blob, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<MediaJsonldMediaObjectRead>>;
public mediasPost(file?: Blob, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<MediaJsonldMediaObjectRead>>;
public mediasPost(file?: Blob, 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 localVarHeaders = this.defaultHeaders;

@@ -422,7 +422,7 @@ export class MediaService {
}
}

let localVarPath = `/api/media`;
let localVarPath = `/api/medias`;
return this.httpClient.request<MediaJsonldMediaObjectRead>('post', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,


+ 28
- 4
matsen-tool/src/app/core/api/v1/api/task.service.ts Просмотреть файл

@@ -104,13 +104,17 @@ export class TaskService {
* Retrieves the collection of Task resources.
* @param page The collection page number
* @param itemsPerPage The number of items per page
* @param partner
* @param partner2
* @param contact
* @param contact2
* @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 tasksGetCollection(page?: number, itemsPerPage?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiTasksGetCollection200Response>;
public tasksGetCollection(page?: number, itemsPerPage?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiTasksGetCollection200Response>>;
public tasksGetCollection(page?: number, itemsPerPage?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiTasksGetCollection200Response>>;
public tasksGetCollection(page?: number, itemsPerPage?: number, 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 tasksGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, contact?: string, contact2?: Array<string>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiTasksGetCollection200Response>;
public tasksGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, contact?: string, contact2?: Array<string>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiTasksGetCollection200Response>>;
public tasksGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, contact?: string, contact2?: Array<string>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json' | 'application/json' | 'text/html' | 'application/hal+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiTasksGetCollection200Response>>;
public tasksGetCollection(page?: number, itemsPerPage?: number, partner?: string, partner2?: Array<string>, contact?: string, contact2?: 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> {

let localVarQueryParameters = new HttpParams({encoder: this.encoder});
if (page !== undefined && page !== null) {
@@ -121,6 +125,26 @@ export class TaskService {
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>itemsPerPage, 'itemsPerPage');
}
if (partner !== undefined && partner !== null) {
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>partner, 'partner');
}
if (partner2) {
partner2.forEach((element) => {
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>element, 'partner[]');
})
}
if (contact !== undefined && contact !== null) {
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>contact, 'contact');
}
if (contact2) {
contact2.forEach((element) => {
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>element, 'contact[]');
})
}

let localVarHeaders = this.defaultHeaders;



+ 23
- 0
matsen-tool/src/app/core/api/v1/model/apiMediasGetCollection200Response.ts Просмотреть файл

@@ -0,0 +1,23 @@
/**
* Matsen API Platform
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 1.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/
import { MediaJsonldMediaObjectRead } from './mediaJsonldMediaObjectRead';
import { ApiCommentsGetCollection200ResponseHydraSearch } from './apiCommentsGetCollection200ResponseHydraSearch';
import { ApiCommentsGetCollection200ResponseHydraView } from './apiCommentsGetCollection200ResponseHydraView';


export interface ApiMediasGetCollection200Response {
'hydra:member': Array<MediaJsonldMediaObjectRead>;
'hydra:totalItems'?: number;
'hydra:view'?: ApiCommentsGetCollection200ResponseHydraView;
'hydra:search'?: ApiCommentsGetCollection200ResponseHydraSearch;
}


+ 22
- 0
matsen-tool/src/app/core/api/v1/model/apiMediasGetCollection200Response1.ts Просмотреть файл

@@ -0,0 +1,22 @@
/**
* Matsen API Platform
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 1.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/
import { MediaJsonhalMediaObjectRead } from './mediaJsonhalMediaObjectRead';
import { ApiCommentsGetCollection200Response1Links } from './apiCommentsGetCollection200Response1Links';


export interface ApiMediasGetCollection200Response1 {
_embedded: Array<MediaJsonhalMediaObjectRead>;
totalItems?: number;
itemsPerPage?: number;
_links: ApiCommentsGetCollection200Response1Links;
}


+ 2
- 2
matsen-tool/src/app/core/api/v1/model/models.ts Просмотреть файл

@@ -7,8 +7,8 @@ export * from './apiCommentsGetCollection200ResponseHydraSearchHydraMappingInner
export * from './apiCommentsGetCollection200ResponseHydraView';
export * from './apiContactsGetCollection200Response';
export * from './apiContactsGetCollection200Response1';
export * from './apiMediaGetCollection200Response';
export * from './apiMediaGetCollection200Response1';
export * from './apiMediasGetCollection200Response';
export * from './apiMediasGetCollection200Response1';
export * from './apiPartnersGetCollection200Response';
export * from './apiPartnersGetCollection200Response1';
export * from './apiPostsGetCollection200Response';


+ 7
- 6
matsen-tool/src/app/core/api/v1/model/partner.ts Просмотреть файл

@@ -16,7 +16,7 @@
*/
export interface Partner {
name: string;
type: Partner.TypeEnum;
partnerType: Partner.PartnerTypeEnum;
street?: string | null;
streetNo?: string | null;
zip?: string | null;
@@ -26,14 +26,15 @@ export interface Partner {
logo?: string | null;
readonly logoUrl?: string | null;
readonly createdAt?: string | null;
posts?: Array<string>;
contacts?: Array<string>;
}
export namespace Partner {
export type TypeEnum = 'customer' | 'supplier' | 'service';
export const TypeEnum = {
Customer: 'customer' as TypeEnum,
Supplier: 'supplier' as TypeEnum,
Service: 'service' as TypeEnum
export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
export const PartnerTypeEnum = {
Customer: 'customer' as PartnerTypeEnum,
Supplier: 'supplier' as PartnerTypeEnum,
Service: 'service' as PartnerTypeEnum
};
}



+ 7
- 6
matsen-tool/src/app/core/api/v1/model/partnerJsonhal.ts Просмотреть файл

@@ -18,7 +18,7 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
export interface PartnerJsonhal {
_links?: CommentJsonhalLinks;
name: string;
type: PartnerJsonhal.TypeEnum;
partnerType: PartnerJsonhal.PartnerTypeEnum;
street?: string | null;
streetNo?: string | null;
zip?: string | null;
@@ -28,14 +28,15 @@ export interface PartnerJsonhal {
logo?: string | null;
readonly logoUrl?: string | null;
readonly createdAt?: string | null;
posts?: Array<string>;
contacts?: Array<string>;
}
export namespace PartnerJsonhal {
export type TypeEnum = 'customer' | 'supplier' | 'service';
export const TypeEnum = {
Customer: 'customer' as TypeEnum,
Supplier: 'supplier' as TypeEnum,
Service: 'service' as TypeEnum
export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
export const PartnerTypeEnum = {
Customer: 'customer' as PartnerTypeEnum,
Supplier: 'supplier' as PartnerTypeEnum,
Service: 'service' as PartnerTypeEnum
};
}



+ 8
- 6
matsen-tool/src/app/core/api/v1/model/partnerJsonld.ts Просмотреть файл

@@ -18,8 +18,9 @@ import { CommentJsonldContext } from './commentJsonldContext';
export interface PartnerJsonld {
context?: CommentJsonldContext;
readonly id?: string;
readonly type?: string;
name: string;
type: PartnerJsonld.TypeEnum;
partnerType: PartnerJsonld.PartnerTypeEnum;
street?: string | null;
streetNo?: string | null;
zip?: string | null;
@@ -29,14 +30,15 @@ export interface PartnerJsonld {
logo?: string | null;
readonly logoUrl?: string | null;
readonly createdAt?: string | null;
posts?: Array<string>;
contacts?: Array<string>;
}
export namespace PartnerJsonld {
export type TypeEnum = 'customer' | 'supplier' | 'service';
export const TypeEnum = {
Customer: 'customer' as TypeEnum,
Supplier: 'supplier' as TypeEnum,
Service: 'service' as TypeEnum
export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
export const PartnerTypeEnum = {
Customer: 'customer' as PartnerTypeEnum,
Supplier: 'supplier' as PartnerTypeEnum,
Service: 'service' as PartnerTypeEnum
};
}



+ 4
- 0
matsen-tool/src/app/core/api/v1/model/task.ts Просмотреть файл

@@ -18,10 +18,14 @@ export interface Task {
headline: string | null;
description: string | null;
readonly createdBy?: string | null;
readonly createdByName?: string | null;
assignedTo: string | null;
readonly assignedToName?: string | null;
dueAt: string | null;
partner?: string | null;
readonly partnerName?: string | null;
contact?: string | null;
readonly contactName?: string | null;
prio: Task.PrioEnum;
completed?: boolean | null;
readonly createdAt?: string | null;


+ 4
- 0
matsen-tool/src/app/core/api/v1/model/taskJsonhal.ts Просмотреть файл

@@ -20,10 +20,14 @@ export interface TaskJsonhal {
headline: string | null;
description: string | null;
readonly createdBy?: string | null;
readonly createdByName?: string | null;
assignedTo: string | null;
readonly assignedToName?: string | null;
dueAt: string | null;
partner?: string | null;
readonly partnerName?: string | null;
contact?: string | null;
readonly contactName?: string | null;
prio: TaskJsonhal.PrioEnum;
completed?: boolean | null;
readonly createdAt?: string | null;


+ 4
- 0
matsen-tool/src/app/core/api/v1/model/taskJsonld.ts Просмотреть файл

@@ -22,10 +22,14 @@ export interface TaskJsonld {
headline: string | null;
description: string | null;
readonly createdBy?: string | null;
readonly createdByName?: string | null;
assignedTo: string | null;
readonly assignedToName?: string | null;
dueAt: string | null;
partner?: string | null;
readonly partnerName?: string | null;
contact?: string | null;
readonly contactName?: string | null;
prio: TaskJsonld.PrioEnum;
completed?: boolean | null;
readonly createdAt?: string | null;


+ 1
- 1
matsen-tool/src/app/partners/new-partner/new-partner.component.ts Просмотреть файл

@@ -48,7 +48,7 @@ export class NewPartnerComponent implements OnInit {
// On submit form: Check if image is set
onSubmit() {
if (this.selectedImage !== null) {
this.mediaSub = this.mediaService.mediaPost(
this.mediaSub = this.mediaService.mediasPost(
this.selectedImage
).subscribe(
data => {


+ 4
- 3
matsen-tool/src/app/partners/partners.component.ts Просмотреть файл

@@ -12,7 +12,7 @@ import {NgbModal, NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
import {NewPartnerComponent} from "@app/partners/new-partner/new-partner.component";
import {TranslateModule, TranslateService} from "@ngx-translate/core";
import {ModalStatus} from "@app/_helpers/modal.states";
import TypeEnum = PartnerJsonld.TypeEnum;
import TypeEnum = PartnerJsonld.PartnerTypeEnum;

@Component({
selector: 'app-partners',
@@ -151,13 +151,14 @@ export class PartnersComponent implements OnInit, AfterViewInit {

navigateToPartnerDetails(element: any) {
const partner: PartnerJsonld = element as PartnerJsonld;
this.router.navigate(['/' + partner.type, ApiConverter.extractId(partner.id)]);
console.log(partner);
this.router.navigate(['/' + partner.partnerType, ApiConverter.extractId(partner.id)]);
}

openModalNewPartner() {
const modalRefContact = this.modalService.open(NewPartnerComponent, this.modalOptions);
let partner: PartnerJsonld = {} as PartnerJsonld;
partner.type = this.dataType as TypeEnum;
partner.partnerType = this.dataType as TypeEnum;
modalRefContact.componentInstance.partner = partner;
modalRefContact.componentInstance.submit.subscribe((modalStatus: ModalStatus) => {
if (modalStatus === ModalStatus.Submitted) {


+ 1
- 1
matsen-tool/src/app/products/new-product/new-product.component.ts Просмотреть файл

@@ -41,7 +41,7 @@ export class NewProductComponent implements OnInit {

onSubmit() {
if (this.selectedImage !== null) {
this.mediaSub = this.mediaService.mediaPost(
this.mediaSub = this.mediaService.mediasPost(
this.selectedImage
).subscribe(
data => {


+ 1
- 1
matsen-tool/src/app/tasks/new-task/new-task.component.ts Просмотреть файл

@@ -19,7 +19,7 @@ export class NewTaskComponent implements OnInit {
protected taskSub: Subscription;

constructor(
) {
this.taskForm = taskForm;
this.taskSub = new Subscription();


Загрузка…
Отмена
Сохранить