Merge branch 'developer' into developer_mobilefirst

src/app/home/home-routing.module.ts

@@ -7,6 +7,7 @@ import { GroupMessagesPage } from '../pages/chat/group-messages/group-messages.p
 import { MessagesPage } from '../pages/chat/messages/messages.page';
 import { ProcessesResolverService } from '../resolvers/processes-resolver.service';
 import { UserDataResolver } from '../resolvers/userData.resolver';
+import { DiplomasPage } from '../shared/gabinete-digital/diplomas/diplomas.page';
 
 import { HomePage } from './home.page';
 
@@ -15,7 +16,7 @@ const routes: Routes = [
     path: 'home',
     component: HomePage,
     resolve: {
-      userData: UserDataResolver
+      userData: UserDataResolver,
     },
     children: [
       {
@@ -141,6 +142,9 @@ const routes: Routes = [
       },
       {
         path: 'gabinete-digital',
+        resolve: {
+          diplomas: ProcessesResolverService
+        },
         children: [
           {
             path:'',
@@ -216,7 +220,6 @@ const routes: Routes = [
               {
                 path: '',
                 loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diplomas.module').then(m => m.DiplomasPageModule),
-               /*  resolve { diplomas: ProcessesResolverService}, */
               },
               {
                 path:':SerialNumber/:caller',

src/app/home/home.module.ts

@@ -8,7 +8,6 @@ import { HomePageRoutingModule } from './home-routing.module';
 
 import { HomePage } from './home.page';
 /* import { IonicSelectableModule } from 'ionic-selectable'; */
-import { SharedModule } from 'src/app/shared/shared.module';
 import { ComponentsModule } from '../components/components.module';
 
 @NgModule({
@@ -19,6 +18,6 @@ import { ComponentsModule } from '../components/components.module';
     HomePageRoutingModule,
     ComponentsModule
   ],
-  declarations: [HomePage]
+  declarations: [HomePage],
 })
 export class HomePageModule {}