spawntree
/
matsen-tool-fe
2
0
Çatalla 0
Kod Konular 0 Değişiklik İstekleri 0 Sürümler 0 Wiki Aktivite
Kaynağa Gözat

imported data

master
Daniel 1 yıl önce
ebeveyn
c5c00ac9e4
işleme
380ad430f5
15 değiştirilmiş dosya ile 452 ekleme ve 19 silme
Görünümü Böl
Diff Seçenekleri
İstatistikleri Göster Yama Dosyasını İndir Diff Dosyasını İndir
  1. +1
    -1
      matsen-tool/openapi.json
  2. +270
    -0
      matsen-tool/openapi.yaml
  3. +20
    -1
      matsen-tool/src/app/_components/list/list.component.ts
  4. +66
    -0
      matsen-tool/src/app/_forms/apiForms.ts
  5. +17
    -10
      matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html
  6. +3
    -0
      matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts
  7. +1
    -1
      matsen-tool/src/app/_views/posts/new-post/new-post.component.html
  8. +5
    -5
      matsen-tool/src/app/_views/products/products-detail/products-detail.component.html
  9. +12
    -0
      matsen-tool/src/app/core/api/v1/model/partner.ts
  10. +12
    -0
      matsen-tool/src/app/core/api/v1/model/partnerJsonhal.ts
  11. +12
    -0
      matsen-tool/src/app/core/api/v1/model/partnerJsonld.ts
  12. +10
    -0
      matsen-tool/src/app/core/api/v1/model/product.ts
  13. +10
    -0
      matsen-tool/src/app/core/api/v1/model/productJsonhal.ts
  14. +10
    -0
      matsen-tool/src/app/core/api/v1/model/productJsonld.ts
  15. +3
    -1
      matsen-tool/src/assets/i18n/de.json

+ 1
- 1
matsen-tool/openapi.json
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 270
- 0
matsen-tool/openapi.yaml Dosyayı Görüntüle

@@ -5376,6 +5376,14 @@ components:
properties:
name:
type: string
navisionId:
type:
- integer
- 'null'
nameAddition:
type:
- string
- 'null'
partnerType:
type: string
enum:
@@ -5390,6 +5398,10 @@ components:
type:
- string
- 'null'
addressAddition:
type:
- string
- 'null'
streetNo:
type:
- string
@@ -5406,6 +5418,42 @@ components:
type:
- string
- 'null'
phone:
type:
- string
- 'null'
language:
type:
- string
- 'null'
currency:
type:
- string
- 'null'
paymentCondition:
type:
- string
- 'null'
deliveryCondition:
type:
- string
- 'null'
businessGroup:
type:
- string
- 'null'
vatBusinessGroup:
type:
- string
- 'null'
creditLimit:
type:
- integer
- 'null'
routePoint:
type:
- string
- 'null'
website:
type:
- string
@@ -5453,6 +5501,14 @@ components:
format: iri-reference
name:
type: string
navisionId:
type:
- integer
- 'null'
nameAddition:
type:
- string
- 'null'
partnerType:
type: string
enum:
@@ -5467,6 +5523,10 @@ components:
type:
- string
- 'null'
addressAddition:
type:
- string
- 'null'
streetNo:
type:
- string
@@ -5483,6 +5543,42 @@ components:
type:
- string
- 'null'
phone:
type:
- string
- 'null'
language:
type:
- string
- 'null'
currency:
type:
- string
- 'null'
paymentCondition:
type:
- string
- 'null'
deliveryCondition:
type:
- string
- 'null'
businessGroup:
type:
- string
- 'null'
vatBusinessGroup:
type:
- string
- 'null'
creditLimit:
type:
- integer
- 'null'
routePoint:
type:
- string
- 'null'
website:
type:
- string
@@ -5544,6 +5640,14 @@ components:
type: string
name:
type: string
navisionId:
type:
- integer
- 'null'
nameAddition:
type:
- string
- 'null'
partnerType:
type: string
enum:
@@ -5558,6 +5662,10 @@ components:
type:
- string
- 'null'
addressAddition:
type:
- string
- 'null'
streetNo:
type:
- string
@@ -5574,6 +5682,42 @@ components:
type:
- string
- 'null'
phone:
type:
- string
- 'null'
language:
type:
- string
- 'null'
currency:
type:
- string
- 'null'
paymentCondition:
type:
- string
- 'null'
deliveryCondition:
type:
- string
- 'null'
businessGroup:
type:
- string
- 'null'
vatBusinessGroup:
type:
- string
- 'null'
creditLimit:
type:
- integer
- 'null'
routePoint:
type:
- string
- 'null'
website:
type:
- string
@@ -6272,6 +6416,8 @@ components:
deprecated: false
required:
- name
- blocked
- inventory
properties:
name:
type: string
@@ -6279,6 +6425,46 @@ components:
type:
- string
- 'null'
blocked:
type:
- boolean
- 'null'
inventory:
type:
- number
- 'null'
baseUnit:
type:
- string
- 'null'
buyUnit:
type:
- string
- 'null'
sellUnit:
type:
- string
- 'null'
trackingCode:
type:
- string
- 'null'
productGroup:
type:
- string
- 'null'
customsPosition:
type:
- string
- 'null'
productBookingGroup:
type:
- string
- 'null'
vatProductBookingGroup:
type:
- string
- 'null'
image:
type:
- string
@@ -6305,6 +6491,8 @@ components:
deprecated: false
required:
- name
- blocked
- inventory
properties:
_links:
type: object
@@ -6321,6 +6509,46 @@ components:
type:
- string
- 'null'
blocked:
type:
- boolean
- 'null'
inventory:
type:
- number
- 'null'
baseUnit:
type:
- string
- 'null'
buyUnit:
type:
- string
- 'null'
sellUnit:
type:
- string
- 'null'
trackingCode:
type:
- string
- 'null'
productGroup:
type:
- string
- 'null'
customsPosition:
type:
- string
- 'null'
productBookingGroup:
type:
- string
- 'null'
vatProductBookingGroup:
type:
- string
- 'null'
image:
type:
- string
@@ -6347,6 +6575,8 @@ components:
deprecated: false
required:
- name
- blocked
- inventory
properties:
'@context':
readOnly: true
@@ -6377,6 +6607,46 @@ components:
type:
- string
- 'null'
blocked:
type:
- boolean
- 'null'
inventory:
type:
- number
- 'null'
baseUnit:
type:
- string
- 'null'
buyUnit:
type:
- string
- 'null'
sellUnit:
type:
- string
- 'null'
trackingCode:
type:
- string
- 'null'
productGroup:
type:
- string
- 'null'
customsPosition:
type:
- string
- 'null'
productBookingGroup:
type:
- string
- 'null'
vatProductBookingGroup:
type:
- string
- 'null'
image:
type:
- string


+ 20
- 1
matsen-tool/src/app/_components/list/list.component.ts Dosyayı Görüntüle

@@ -168,7 +168,26 @@ export class ListComponent implements OnInit, AfterViewInit {
}
if (column.address !== undefined) {
const field = column.address;
return `${element[field.street]} ${element[field.streetNo]}<br/> ${element[field.zip]} ${element[field.city]} <br/> ${element[field.country]}`;
let addressString = '';
if (element[field.street] !== undefined && element[field.street] !== null) {
addressString += `${element[field.street].trim()} `;
}
if (element[field.streetNo] !== undefined && element[field.streetNo] !== null) {
addressString += `${element[field.streetNo].trim()} `;
}
addressString += ' <br/> ';
if (element[field.zip] !== undefined && element[field.zip] !== null) {
addressString += `${element[field.zip].trim()} `;
}
if (element[field.city] !== undefined && element[field.city] !== null) {
addressString += `${element[field.city].trim()}`;
}
addressString += ' <br/> ';

if (element[field.country] !== undefined && element[field.country] !== null) {
addressString += `${element[field.country].trim()}`;
}
return addressString;
}
return null;
}


+ 66
- 0
matsen-tool/src/app/_forms/apiForms.ts Dosyayı Görüntüle

@@ -167,13 +167,25 @@ export const mediaObjectJsonldMediaObjectReadForm = new FormGroup({

export const partnerForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
navisionId: new FormControl(null, []),
nameAddition: new FormControl(null, []),
partnerType: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
street: new FormControl(null, []),
addressAddition: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
city: new FormControl(null, []),
country: new FormControl(null, []),
phone: new FormControl(null, []),
language: new FormControl(null, []),
currency: new FormControl(null, []),
paymentCondition: new FormControl(null, []),
deliveryCondition: new FormControl(null, []),
businessGroup: new FormControl(null, []),
vatBusinessGroup: new FormControl(null, []),
creditLimit: new FormControl(null, []),
routePoint: new FormControl(null, []),
website: new FormControl(null, []),
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
@@ -184,13 +196,25 @@ export const partnerForm = new FormGroup({
export const partnerJsonhalForm = new FormGroup({
_links: new FormControl(null, []),
name: new FormControl(null, [Validators.required]),
navisionId: new FormControl(null, []),
nameAddition: new FormControl(null, []),
partnerType: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
street: new FormControl(null, []),
addressAddition: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
city: new FormControl(null, []),
country: new FormControl(null, []),
phone: new FormControl(null, []),
language: new FormControl(null, []),
currency: new FormControl(null, []),
paymentCondition: new FormControl(null, []),
deliveryCondition: new FormControl(null, []),
businessGroup: new FormControl(null, []),
vatBusinessGroup: new FormControl(null, []),
creditLimit: new FormControl(null, []),
routePoint: new FormControl(null, []),
website: new FormControl(null, []),
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
@@ -200,13 +224,25 @@ export const partnerJsonhalForm = new FormGroup({

export const partnerJsonldForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
navisionId: new FormControl(null, []),
nameAddition: new FormControl(null, []),
partnerType: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
street: new FormControl(null, []),
addressAddition: new FormControl(null, []),
streetNo: new FormControl(null, []),
zip: new FormControl(null, []),
city: new FormControl(null, []),
country: new FormControl(null, []),
phone: new FormControl(null, []),
language: new FormControl(null, []),
currency: new FormControl(null, []),
paymentCondition: new FormControl(null, []),
deliveryCondition: new FormControl(null, []),
businessGroup: new FormControl(null, []),
vatBusinessGroup: new FormControl(null, []),
creditLimit: new FormControl(null, []),
routePoint: new FormControl(null, []),
website: new FormControl(null, []),
logo: new FormControl(null, []),
logoUrl: new FormControl(null, []),
@@ -349,6 +385,16 @@ export const postJsonldPostingCreateForm = new FormGroup({
export const productForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
blocked: new FormControl(null, [Validators.required]),
inventory: new FormControl(null, [Validators.required]),
baseUnit: new FormControl(null, []),
buyUnit: new FormControl(null, []),
sellUnit: new FormControl(null, []),
trackingCode: new FormControl(null, []),
productGroup: new FormControl(null, []),
customsPosition: new FormControl(null, []),
productBookingGroup: new FormControl(null, []),
vatProductBookingGroup: new FormControl(null, []),
image: new FormControl(null, []),
imageUrl: new FormControl(null, []),
createdBy: new FormControl(null, []),
@@ -359,6 +405,16 @@ export const productJsonhalForm = new FormGroup({
_links: new FormControl(null, []),
name: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
blocked: new FormControl(null, [Validators.required]),
inventory: new FormControl(null, [Validators.required]),
baseUnit: new FormControl(null, []),
buyUnit: new FormControl(null, []),
sellUnit: new FormControl(null, []),
trackingCode: new FormControl(null, []),
productGroup: new FormControl(null, []),
customsPosition: new FormControl(null, []),
productBookingGroup: new FormControl(null, []),
vatProductBookingGroup: new FormControl(null, []),
image: new FormControl(null, []),
imageUrl: new FormControl(null, []),
createdBy: new FormControl(null, []),
@@ -368,6 +424,16 @@ export const productJsonhalForm = new FormGroup({
export const productJsonldForm = new FormGroup({
name: new FormControl(null, [Validators.required]),
description: new FormControl(null, []),
blocked: new FormControl(null, [Validators.required]),
inventory: new FormControl(null, [Validators.required]),
baseUnit: new FormControl(null, []),
buyUnit: new FormControl(null, []),
sellUnit: new FormControl(null, []),
trackingCode: new FormControl(null, []),
productGroup: new FormControl(null, []),
customsPosition: new FormControl(null, []),
productBookingGroup: new FormControl(null, []),
vatProductBookingGroup: new FormControl(null, []),
image: new FormControl(null, []),
imageUrl: new FormControl(null, []),
createdBy: new FormControl(null, []),


+ 17
- 10
matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html Dosyayı Görüntüle

@@ -4,27 +4,34 @@
<div class="spt-col col-12 col-sm-6 col-lg-8">
<div class="row">
<div class="col-12 col-lg-6">
<h1>{{ partner.name }}</h1>
<h1>{{ partner.name }} - {{partner.nameAddition}}</h1>
<p>{{ partner.street }} {{ partner.streetNo }}<br/>
{{ partner.zip }} {{ partner.city }}<br/>
{{ partner.country }}</p>
<p>Sprache: Deutsch</p>
<p>Sprache: {{ partner.language }}</p>
</div>
<div class="col-12 col-lg-6">
<h2>10002</h2>
<h2>Navision id: {{ partner?.navisionId !== undefined ? partner?.navisionId : '-' }}</h2>
<dl>
<dt>Telefon:</dt>
<dd>0177 289 23 02</dd>
<dd>{{ partner.phone }}</dd>
<dt>Website:</dt>
<dd><a href="{{partner.website}}" target="_blank">{{ partner.website }}</a></dd>
<dt>Streckenpunkt:</dt>
<dd>AT-Salzburg</dd>
<dt>Geschäftsbuchungsgruppe:</dt>
<dd>DE-EU</dd>
<dd>{{partner.businessGroup}}</dd>
<dt>MwSt.-Geschäftsbuchungsgruppe:</dt>
<dd>DE-DE</dd>
<dt>Kreditlimit:</dt>
<dd>50.000 €</dd>
<dd>{{partner.vatBusinessGroup}}</dd>
<ng-container *ngIf="partner.partnerType === PartnerJsonld.PartnerTypeEnum.Customer">
<dt>Lieferbedingungscode:</dt>
<dd>{{partner.deliveryCondition}}</dd>
</ng-container>
<ng-container *ngIf="partner.partnerType === PartnerJsonld.PartnerTypeEnum.Supplier">
<dt>Kreditlimit:</dt>
<dd>{{partner.creditLimit}}</dd>
<dt>Streckenpunkt:</dt>
<dd>{{partner.routePoint}}</dd>
</ng-container>

</dl>
</div>
</div>


+ 3
- 0
matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts Dosyayı Görüntüle

@@ -128,4 +128,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
openModalEditPartner() {
this.appHelperService.openModal(NewPartnerComponent, {'partner': this.partner}, this.getData);
}

protected readonly PartnerJsonld = PartnerJsonld;

}

+ 1
- 1
matsen-tool/src/app/_views/posts/new-post/new-post.component.html Dosyayı Görüntüle

@@ -12,7 +12,7 @@

<div class="mb-3">
<label for="partner" class="form-label">{{ 'form.partner' | translate }}:</label>
<input type="text" class="form-control" value="{{partner.name}}" id="partner" disabled/>
<input type="text" class="form-control" value="{{partner?.name}}" id="partner" disabled/>
</div>

<div class="mb-3">


+ 5
- 5
matsen-tool/src/app/_views/products/products-detail/products-detail.component.html Dosyayı Görüntüle

@@ -6,15 +6,15 @@
<p>{{ product.description }}</p>
<dl>
<dt>Lagerbestand:</dt>
<dd>376512 KG</dd>
<dd>{{ product.inventory }} {{ product.baseUnit }}</dd>
<dt>Gesperrt:</dt>
<dd>Nein</dd>
<dd>{{ product.blocked ? ('basic.yes' | translate) : ('basic.no' | translate) }}</dd>
<dt>Einkaufseinheitencode:</dt>
<dd>Dose</dd>
<dd>{{ product.buyUnit }}</dd>
<dt>Verkaufseinkaufseinheitencode:</dt>
<dd>Dose</dd>
<dd>{{ product.sellUnit }}</dd>
<dt>Zollposition:</dt>
<dd>234856372</dd>
<dd>{{ product.customsPosition }}</dd>
</dl>
</div>
<div class="col-12 col-sm-6 col-lg-4 has-image">


+ 12
- 0
matsen-tool/src/app/core/api/v1/model/partner.ts Dosyayı Görüntüle

@@ -16,13 +16,25 @@
*/
export interface Partner {
name: string;
navisionId?: number | null;
nameAddition?: string | null;
partnerType: Partner.PartnerTypeEnum;
description?: string | null;
street?: string | null;
addressAddition?: string | null;
streetNo?: string | null;
zip?: string | null;
city?: string | null;
country?: string | null;
phone?: string | null;
language?: string | null;
currency?: string | null;
paymentCondition?: string | null;
deliveryCondition?: string | null;
businessGroup?: string | null;
vatBusinessGroup?: string | null;
creditLimit?: number | null;
routePoint?: string | null;
website?: string | null;
logo?: string | null;
readonly logoUrl?: string | null;


+ 12
- 0
matsen-tool/src/app/core/api/v1/model/partnerJsonhal.ts Dosyayı Görüntüle

@@ -18,13 +18,25 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
export interface PartnerJsonhal {
_links?: CommentJsonhalLinks;
name: string;
navisionId?: number | null;
nameAddition?: string | null;
partnerType: PartnerJsonhal.PartnerTypeEnum;
description?: string | null;
street?: string | null;
addressAddition?: string | null;
streetNo?: string | null;
zip?: string | null;
city?: string | null;
country?: string | null;
phone?: string | null;
language?: string | null;
currency?: string | null;
paymentCondition?: string | null;
deliveryCondition?: string | null;
businessGroup?: string | null;
vatBusinessGroup?: string | null;
creditLimit?: number | null;
routePoint?: string | null;
website?: string | null;
logo?: string | null;
readonly logoUrl?: string | null;


+ 12
- 0
matsen-tool/src/app/core/api/v1/model/partnerJsonld.ts Dosyayı Görüntüle

@@ -20,13 +20,25 @@ export interface PartnerJsonld {
readonly id?: string;
readonly type?: string;
name: string;
navisionId?: number | null;
nameAddition?: string | null;
partnerType: PartnerJsonld.PartnerTypeEnum;
description?: string | null;
street?: string | null;
addressAddition?: string | null;
streetNo?: string | null;
zip?: string | null;
city?: string | null;
country?: string | null;
phone?: string | null;
language?: string | null;
currency?: string | null;
paymentCondition?: string | null;
deliveryCondition?: string | null;
businessGroup?: string | null;
vatBusinessGroup?: string | null;
creditLimit?: number | null;
routePoint?: string | null;
website?: string | null;
logo?: string | null;
readonly logoUrl?: string | null;


+ 10
- 0
matsen-tool/src/app/core/api/v1/model/product.ts Dosyayı Görüntüle

@@ -18,6 +18,16 @@ import { User } from './user';
export interface Product {
name: string;
description?: string | null;
blocked: boolean | null;
inventory: number | null;
baseUnit?: string | null;
buyUnit?: string | null;
sellUnit?: string | null;
trackingCode?: string | null;
productGroup?: string | null;
customsPosition?: string | null;
productBookingGroup?: string | null;
vatProductBookingGroup?: string | null;
image?: string | null;
readonly imageUrl?: string | null;
/**


+ 10
- 0
matsen-tool/src/app/core/api/v1/model/productJsonhal.ts Dosyayı Görüntüle

@@ -20,6 +20,16 @@ export interface ProductJsonhal {
_links?: CommentJsonhalLinks;
name: string;
description?: string | null;
blocked: boolean | null;
inventory: number | null;
baseUnit?: string | null;
buyUnit?: string | null;
sellUnit?: string | null;
trackingCode?: string | null;
productGroup?: string | null;
customsPosition?: string | null;
productBookingGroup?: string | null;
vatProductBookingGroup?: string | null;
image?: string | null;
readonly imageUrl?: string | null;
/**


+ 10
- 0
matsen-tool/src/app/core/api/v1/model/productJsonld.ts Dosyayı Görüntüle

@@ -22,6 +22,16 @@ export interface ProductJsonld {
readonly type?: string;
name: string;
description?: string | null;
blocked: boolean | null;
inventory: number | null;
baseUnit?: string | null;
buyUnit?: string | null;
sellUnit?: string | null;
trackingCode?: string | null;
productGroup?: string | null;
customsPosition?: string | null;
productBookingGroup?: string | null;
vatProductBookingGroup?: string | null;
image?: string | null;
readonly imageUrl?: string | null;
/**


+ 3
- 1
matsen-tool/src/assets/i18n/de.json Dosyayı Görüntüle

@@ -54,7 +54,9 @@
"comment-it": "Kommentieren",
"show-comments": "Kommentare anzeigen",
"hide-comments": "Kommentare ausblenden",
"back": "Zurück"
"back": "Zurück",
"yes": "Ja",
"no": "Nein"
},
"user":
{


Yaz Önizleme
Yükleniyor…
İptal
Kaydet