Merge remote-tracking branch 'origin/master'

src/app/graphqlOperations/fragments/provider.graphql

@@ -7,6 +7,9 @@ fragment ProviderFieldsGeneral on Provider {
   organisation {
     id
     name
+    address {
+      ...AddressFields
+    }
     contactInformation {
       ...ContactInformationFieldsGeneral
     }

src/app/pages/dataPages/bike/bike.component.ts

@@ -209,6 +209,10 @@ export class BikeComponent implements OnInit {
           dataPath: 'provider.organisation.address.zip',
           translation: 'Postleitzahl',
         },
+        {
+          dataPath: 'provider.organisation.address.city',
+          translation: 'Ort',
+        },
       ],
     },
     {

src/app/pages/tables/bikes/bikes.component.ts

@@ -101,16 +101,42 @@ export class BikesComponent implements OnInit {
       dataPath: 'taxes.organisationArea',
       translation: 'Steuern Vereinsbereich',
     },
-    { dataPath: 'provider.id', translation: '' },
+    { dataPath: 'provider.formName', translation: 'Anbieter Formular Name' },
-    { dataPath: 'provider.formName', translation: '' },
-    { dataPath: 'provider.privatePerson.id', translation: '' },
-    { dataPath: 'provider.privatePerson.person.id', translation: '' },
-    { dataPath: 'provider.privatePerson.person.name', translation: '' },
-    { dataPath: 'provider.privatePerson.person.firstName', translation: '' },
     {
-      dataPath: 'provider.privatePerson.person.contactInformation.email',
+      dataPath: 'provider.privatePerson.person.firstName',
-      translation: '',
+      translation: 'Anbieter (Person) Vorname',
     },
+    {
+      dataPath: 'provider.privatePerson.person.name',
+      translation: 'Anbieter (Person) Nachname',
+      link: (data) => {
+        return '/provider/' + data['provider.id'];
+      },
+    },
+    {
+      dataPath: 'provider.organisation.name',
+      translation: 'Anbieter (Organisation) Name',
+      link: (data) => {
+        return '/provider/' + data['provider.id'];
+      },
+    },
+    {
+      dataPath: 'provider.organisation.address.street',
+      translation: 'Straße',
+    },
+    {
+      dataPath: 'provider.organisation.address.number', 
+      translation: 'Hausnummer',
+    },
+    {
+      dataPath: 'provider.organisation.address.zip',
+      translation: 'Postleitzahl',
+    },
+    {
+      dataPath: 'provider.organisation.address.city',
+      translation: 'Ort',
+    },
+
     {
       dataPath: 'lendingStation.name',
       translation: 'Standort',

src/generated/graphql.ts

@@ -2490,7 +2490,10 @@ export type PersonFieldsForPageFragment = (
 export type ProviderFieldsGeneralFragment = { __typename?: 'Provider', id: string, formName?: Maybe<string>, privatePerson?: Maybe<(
     { __typename?: 'ContactInformation' }
     & ContactInformationFieldsGeneralFragment
-  )>, organisation?: Maybe<{ __typename?: 'Organisation', id: string, name: string, contactInformation?: Maybe<(
+  )>, organisation?: Maybe<{ __typename?: 'Organisation', id: string, name: string, address?: Maybe<(
+      { __typename?: 'Address' }
+      & AddressFieldsFragment
+    )>, contactInformation?: Maybe<(
       { __typename?: 'ContactInformation' }
       & ContactInformationFieldsGeneralFragment
     )> }> };
@@ -3136,6 +3139,14 @@ export const ContactInformationFieldsGeneralFragmentDoc = gql`
   note
 }
     ${PersonFieldsGeneralFragmentDoc}`;
+export const AddressFieldsFragmentDoc = gql`
+    fragment AddressFields on Address {
+  street
+  number
+  zip
+  city
+}
+    `;
 export const ProviderFieldsGeneralFragmentDoc = gql`
     fragment ProviderFieldsGeneral on Provider {
   id
@@ -3146,20 +3157,16 @@ export const ProviderFieldsGeneralFragmentDoc = gql`
   organisation {
     id
     name
+    address {
+      ...AddressFields
+    }
     contactInformation {
       ...ContactInformationFieldsGeneral
     }
   }
 }
-    ${ContactInformationFieldsGeneralFragmentDoc}`;
+    ${ContactInformationFieldsGeneralFragmentDoc}
-export const AddressFieldsFragmentDoc = gql`
+${AddressFieldsFragmentDoc}`;
-    fragment AddressFields on Address {
-  street
-  number
-  zip
-  city
-}
-    `;
 export const OrganisationFieldsGeneralFragmentDoc = gql`
     fragment OrganisationFieldsGeneral on Organisation {
   id