Merge branch 'developer-c' into mobilefirst

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

@@ -48,6 +48,15 @@ const routes: Routes = [
           },
         ]
       },
+      {
+        path: 'attendees-modal',
+        children: [
+          {
+            path:'',
+            loadChildren: ()=> import('../shared/event/attendee-modal/attendee-modal.module').then(m => m.AttendeeModalPageModule)
+          },
+        ]
+      },
       {
         path: 'login',
         children: [
@@ -103,6 +112,10 @@ const routes: Routes = [
               {
                 path:'events/:eventId/:caller',
                 loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
+              },
+              {
+                path:'expediente-task-modal',
+                loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule),
               }
             ]
           },

src/app/pages/agenda/agenda.page.html

@@ -389,7 +389,6 @@
       <app-attendee-modal
         class="d-flex flex-column height-100"
         *ngIf="mobileComponent.showAttendees"
-        [eventAttendees]="contacts"
         (closeComponent)="GoBackEditOrAdd()"
         (setContact)="setContact($event)"
         [adding]="adding"

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts

@@ -8,6 +8,7 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout
 
 import { ExpedientTaskModalPage } from './expedient-task-modal.page';
 import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
+import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
 
 @NgModule({
   imports: [
@@ -18,7 +19,10 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
   ],
   declarations: [
     ExpedientTaskModalPage,
-    AttendeeModalPage
-  ]
+    AttendeeModalPage,
+    EmptyContainerPage,
+  ],
+  entryComponents: [
+    EmptyContainerPage,]
 })
 export class ExpedientTaskModalPageModule {}

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -62,7 +62,7 @@
               </ion-item>
             </div>
             <div class="add-people">
-              <ion-icon (click)="addParticipants()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon (click)="addParticipants(); showAttendees='true'" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
             </div>
           </div>
         </div>
@@ -83,7 +83,7 @@
               </ion-item>
             </div>
             <div class="add-people">
-              <ion-icon (click)="addParticipantsCc()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon (click)="addParticipantsCc(); showAttendees='true'" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
             </div>
           </div>
         </div>
@@ -114,18 +114,27 @@
         </ion-list>
       </div>
     </div>
-
-    <app-attendee-modal
-      class="aside-right d-flex flex-column height-100"
-      [eventAttendees]="contacts"
-      [adding]="adding"
-      [taskParticipants]="taskParticipants"
-      [taskParticipantsCc]="taskParticipantsCc"
-      (closeComponent)="closeComponent()"
-      (setIntervenient)="setIntervenient($event)"
-      (setIntervenientCC)="setIntervenientCC($event)"
-      (setContact)="setContact($event)"
-    ></app-attendee-modal>
+    
+    <div class="aside-right flex-column height-100">
+      <app-empty-container 
+          [texto]="emptyTextDescription" 
+          *ngIf="!showAttendees" 
+          class="d-flex height-100 flex-column">
+      </app-empty-container>
+      <app-attendee-modal
+      *ngIf="showAttendees"
+        class="d-flex flex-column height-100"
+        [adding]="adding"
+        [taskParticipants]="taskParticipants"
+        [taskParticipantsCc]="taskParticipantsCc"
+        (closeComponent)="closeComponent()"
+        (setIntervenient)="setIntervenient($event)"
+        (setIntervenientCC)="setIntervenientCC($event)"
+        (setContact)="setContact($event)"
+      ></app-attendee-modal>
+  </div>
+    
+  
 
   </div>
 </ion-content>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss

@@ -120,4 +120,9 @@
   justify-content: space-between;
   padding: 20px;
   overflow: auto;
+}
+@media only screen and (min-width: 1024px){
+  .aside-content{
+    display: block;
+  }
 }

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -49,6 +49,9 @@ export class ExpedientTaskModalPage implements OnInit {
   adding: "intervenient" | "CC" = "intervenient";
   profile: string;
 
+  emptyTextDescription = "Sem intervenientes selecionados";
+  showEmptyContainer = true;
+
   constructor(
     private modalController: ModalController,
     private router:Router,
@@ -124,10 +127,7 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         console.log(this.postData);
-      /*   this.processes.postDespatcho(this.postData); */
-      //this.distartExpedientModal();
-      this.modalController.dismiss('openDiscart');
-
+        this.processes.postDespatcho(this.postData);
         break;
       case '1':
         this.postData = {
@@ -139,9 +139,7 @@ export class ExpedientTaskModalPage implements OnInit {
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
-        /* this.processes.postParecer(this.postData); */
-        //this.distartExpedientModal();
-        this.modalController.dismiss();
+        this.processes.postParecer(this.postData);
         break;
       case '2':
         this.postData = {
@@ -154,10 +152,9 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         this.processes.postDeferimento(this.postData);
-        //this.distartExpedientModal();
-        this.close();
         break;
     }
+    this.modalController.dismiss('openDiscart');
     /* this.distartExpedientModal();
     this.close(); */
     

src/app/shared/publication/view-publications/view-publications.page.html

@@ -50,41 +50,9 @@
           </div>
         </div>
       </div>
-      <div *ngIf="!publicationList">
+      <div class="center height-100" *ngIf="!publicationList">
         <p>{{error}}</p>
       </div>
-      <div hidden *ngIf="!publicationList" class="post-item">
-        <div class="post-img">
-          <img src="/assets/icon/icon-no-image.svg" alt="image">
-        </div>
-        <div class="post-content">
-          <div class="post-title-time">
-            <div class="post-title">
-              <ion-label><ion-skeleton-text animated animated style="width: 60%;"></ion-skeleton-text></ion-label>
-            </div>
-            <div class="post-data"><ion-skeleton-text animated style="width: 25%; float: right;"></ion-skeleton-text></div>
-          </div>
-          <div class="post-description">
-            <p><ion-skeleton-text animated></ion-skeleton-text></p>
-            <p><ion-skeleton-text animated></ion-skeleton-text></p>
-          </div>
-        </div>
-        <div class="post-img">
-          <img src="/assets/icon/icon-no-image.svg" alt="image">
-        </div>
-        <div class="post-content">
-          <div class="post-title-time">
-            <div class="post-title">
-              <ion-label><ion-skeleton-text animated animated style="width: 60%;"></ion-skeleton-text></ion-label>
-            </div>
-            <div class="post-data"><ion-skeleton-text animated style="width: 25%; float: right;"></ion-skeleton-text></div>
-          </div>
-          <div class="post-description">
-            <p><ion-skeleton-text animated></ion-skeleton-text></p>
-            <p><ion-skeleton-text animated></ion-skeleton-text></p>
-          </div>
-        </div>
-      </div>
     </ion-list>
   </div>    
 </ion-content>

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -100,8 +100,9 @@ export class ViewPublicationsPage implements OnInit {
     },
     (error)=>{
       if(error.status == '404'){
-        console.log('NOT FOUND');
         this.error = 'Sem publicações disponíveis!';
+        this.publicationList=null;
+        this.showLoader = false;
       }
       
     });