Merge branch 'master' into feature/new-design-test

frontend/src/ts/modules/app/app-routing.module.ts

@@ -34,8 +34,18 @@ const appRoutes: Routes = [
     component: ResetPasswordComponent
   },
   {
-    path: 'my-data',
-    loadChildren: 'generated-sources/page-my-data.module#Pagemy-dataModule',
+    path: 'mydata',
+    loadChildren: 'generated-sources/page-mydata.module#PagemydataModule',
+	  canActivate: [AuthenticationGuard, ConfirmExitGuard],
+  },
+  {
+    path: 'restriction',
+    loadChildren: 'generated-sources/page-restriction.module#PagerestrictionModule',
+	  canActivate: [AuthenticationGuard, ConfirmExitGuard],
+  },
+  {
+    path: 'subpoena',
+    loadChildren: 'generated-sources/page-subpoena.module#PagesubpoenaModule',
 	  canActivate: [AuthenticationGuard, ConfirmExitGuard],
   },
   {

resources/src/main/resources/business-model/LK RP FL/mydata.page

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xmlPage>
-    <id>my-data</id>
+    <id>mydata</id>
     <versions>
         <studioVersion>3.172.3</studioVersion>
         <packageVersions>
@@ -40,10 +40,9 @@
                         <value>
                             <item id="0db8b05f-0f51-454e-b525-84620c1e08b0" removed="false">
 <value>
-    <simple>"link"</simple>
+    <simple>"link-back"</simple>
 </value>
                             </item>
-                            <item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
                         </value>
                     </entry>
                 </properties>

resources/src/main/resources/business-model/LK RP FL/subpoena.page

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xmlPage>
-    <id>a834336d-6f79-42fa-9f43-46b6095eca20</id>
+    <id>subpoena</id>
     <versions>
         <studioVersion>3.172.3</studioVersion>
         <packageVersions>