diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 34837370e..bdc264272 100644 --- a/src/app/home/home-routing.module.ts +++ b/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), } ] }, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 544b9d503..374bdb8cf 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -392,7 +392,6 @@
- +
@@ -83,7 +83,7 @@
- +
@@ -115,16 +115,25 @@ - + +
+ + + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 948d72596..b5b6273c7 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/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; + } } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index f0f9587d7..5e759b6a8 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/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, @@ -122,10 +125,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 = { @@ -137,9 +137,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 = { @@ -152,9 +150,11 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, } this.processes.postDeferimento(this.postData); - this.close(); break; } + this.modalController.dismiss('openDiscart'); + /* this.distartExpedientModal(); + this.close(); */ } getAttachments(){ diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 77f5ea369..fa98de30e 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -72,29 +72,36 @@ export class AttendeeModalPage implements OnInit { filterSearchList(itm: EventPerson): boolean { - if(this.adding == "intervenient"){ - const result = this.taskParticipants.find((contact, index)=>{ - - if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){ - index = index; - return contact; - } - }); - return undefined == result; - - } else if (this.adding == "CC") { - - const result = this.taskParticipantsCc.find((contact, index)=>{ - + const result1 = this.taskParticipants.find((contact, index)=>{ + if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){ - index = index; - return contact; - } - }); + index = index; + return contact; + } + }); - return undefined == result; + // if to show + if(undefined != result1){ + return false; } + + const result2 = this.taskParticipantsCc.find((contact, index)=>{ + + if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){ + index = index; + return contact; + } + }); + + // if to show + if(undefined != result2){ + return false; + } + + // don't show + return true; + } remove(itm: EventPerson){ diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 366ba96ec..98c7fbad7 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -50,41 +50,9 @@ -
+

{{error}}

-
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 64ab0580f..e300cf42c 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/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; } });