commit e53f63477ee4441c714101bc6dbfc824d1d28ab3
author Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 12:35:05 2020 +0100
committer Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 12:35:05 2020 +0100
tree e275c48e98119ceda190f5c9308c9a326d113c70
parent 39e9f62bc2fbab3e7cf2f661f2d26d238a8f4b6a

Test master

src/app/app-routing.module.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 3fb2b17..8a2e149 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -25,11 +25,7 @@
     loadChildren: './pages/company/company.module#CompanyModule',
   },
   {
-    path: `${Globals.PATH.PERSONS}-${Globals.PATH.INTERNAL}`,
-    loadChildren: './pages/persons/persons.module#PersonsModule',
-  },
-  {
-    path: `${Globals.PATH.PERSONS}-${Globals.PATH.EXTERNAL}`,
+    path: `${Globals.PATH.PERSONS}${Globals.PATH.EXTERNAL}`,
     loadChildren: './pages/persons/persons.module#PersonsModule',
   },
   {

src/app/pages/contacts/contacts-list/contacts-list.component.ts

diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.ts b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
index aa5f16d..a6abc9a 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.ts
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
@@ -117,10 +117,10 @@
     let route;
     switch (event.data.contactType) {
       case Globals.CONTACT_TYPE_ID.EXTERNAL_PERSON:
-        route = `/${Globals.PATH.PERSONS}-${Globals.PATH.EXTERNAL}/`;
+        route = `/${Globals.PATH.PERSONS}${Globals.PATH.EXTERNAL}/`;
         break;
       case Globals.CONTACT_TYPE_ID.INTERNAL_PERSON:
-        route = `/${Globals.PATH.PERSONS}-${Globals.PATH.INTERNAL}/`;
+        route = `/${Globals.PATH.PERSONS}${Globals.PATH.INTERNAL}/`;
         break;
       case Globals.CONTACT_TYPE_ID.CONTACT_PERSON:
         route = `/${Globals.PATH.COMPANY}/${event.data.companyId}/${Globals.PATH.CONTACT_PERSON}/`;

src/app/pages/persons/persons.routing.module.ts

diff --git a/src/app/pages/persons/persons.routing.module.ts b/src/app/pages/persons/persons.routing.module.ts
index afad7a4..78aebf3 100644
--- a/src/app/pages/persons/persons.routing.module.ts
+++ b/src/app/pages/persons/persons.routing.module.ts
@@ -20,12 +20,12 @@
 
 const PATH = Globals.PATH;
 export function isInternal(url: UrlSegment[], group: UrlSegmentGroup) {
-  console.log(url[0].path);
-  console.log(group);
-  return group.segments[0].path.endsWith(`${Globals.PATH.PERSONS}-${Globals.PATH.INTERNAL}`) ? { consumed: url, posParams: { contactId: url[0] } } : null;
+  return group.segments[0].path.endsWith(`${Globals.PATH.PERSONS}${Globals.PATH.INTERNAL}`) ? { consumed: url, posParams: { contactId: url[0] } } : null;
 }
 export function isExternal(url: UrlSegment[], group: UrlSegmentGroup) {
-  return group.segments[0].path.endsWith(`${Globals.PATH.PERSONS}-${Globals.PATH.EXTERNAL}`) ? { consumed: url, posParams: { contactId: url[0] } } : null;
+  console.log(url[0].path);
+  console.log(group);
+  return group.segments[0].path.endsWith(`${Globals.PATH.PERSONS}${Globals.PATH.EXTERNAL}`) ? { consumed: url, posParams: { contactId: url[0] } } : null;
 }
 const editPersonRoutes: Routes = [
   {