diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index b71e1fa79..2a9b58dd0 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -294,7 +294,7 @@ sendMsg() { async selectContact(){ const modal = await this.modalController.create({ component: ContactsPage, - cssClass: 'contacts', + cssClass: 'modal modal-desktop', }); await modal.present(); modal.onDidDismiss(); @@ -303,7 +303,7 @@ sendMsg() { async newGroup(){ const modal = await this.modalController.create({ component: NewGroupPage, - cssClass: 'new-group', + cssClass: 'modal modal-desktop', }); await modal.present(); modal.onDidDismiss(); @@ -312,7 +312,7 @@ sendMsg() { async editGroup(roomId){ const modal = await this.modalController.create({ component: EditGroupPage, - cssClass: 'edit-group', + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, @@ -327,17 +327,11 @@ sendMsg() { async openMessagesModal(roomId:any){ this.closeAllDesktopComponents(); - let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' - } else { - classs = 'chat-mobile-modal-to-Desktop' - } console.log(roomId); const modal = await this.modalController.create({ component: MessagesPage, - cssClass: classs, + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, @@ -347,17 +341,12 @@ sendMsg() { } async openGroupMessagesModal(roomId:any){ - let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' - } else { - classs = 'chat-mobile-modal-to-Desktop' - } + console.log(roomId); const modal = await this.modalController.create({ component: GroupMessagesPage, - cssClass: classs, + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index 7879b0cae..70b621dbb 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -26,7 +26,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index f94b3c8e6..4d9f6849f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -16,8 +16,6 @@ transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; - margin: 0px auto; overflow: auto; padding: 0 !important; background: #fff; @@ -36,7 +34,7 @@ } } .header-bottom{ - width: 310px; + padding-left: 10px; overflow: auto; margin: 0 auto; diff --git a/src/app/pages/chat/messages/contacts/contacts.page.scss b/src/app/pages/chat/messages/contacts/contacts.page.scss index 1eb104bdb..a50120cba 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.scss +++ b/src/app/pages/chat/messages/contacts/contacts.page.scss @@ -27,7 +27,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss index 1a67bbcda..496cd70a0 100644 --- a/src/app/pages/chat/messages/messages.page.scss +++ b/src/app/pages/chat/messages/messages.page.scss @@ -16,7 +16,6 @@ transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/pages/chat/new-group/contacts/contacts.page.scss index c97008f82..54523dbf8 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.scss +++ b/src/app/pages/chat/new-group/contacts/contacts.page.scss @@ -27,7 +27,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss index 428f62e08..a5420829d 100644 --- a/src/app/pages/chat/new-group/new-group.page.scss +++ b/src/app/pages/chat/new-group/new-group.page.scss @@ -47,7 +47,6 @@ ion-content{ transform: translate3d(0, 1px, 0); .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -101,7 +100,6 @@ ion-content{ padding: 15px 20px 0 20px; .item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; diff --git a/src/app/pages/chat/newchat/newchat.page.scss b/src/app/pages/chat/newchat/newchat.page.scss index 11d380dea..87a747b8a 100644 --- a/src/app/pages/chat/newchat/newchat.page.scss +++ b/src/app/pages/chat/newchat/newchat.page.scss @@ -29,7 +29,6 @@ ion-content{ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 06a651622..8c8bf1543 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -94,7 +94,6 @@ ion-card{ } .header-content{ - width: 360px; overflow: auto; margin: 0 auto; padding-top: 25px; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 6f8adcaa7..96bbb9bb4 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,13 +1,16 @@ - +
-
Despachos Presidenciais
+
+ Despachos Presidenciais + Despachos +
-

Presidente da República

+

Presidente da República

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 280bb7821..a4d063809 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { AuthService } from 'src/app/services/auth.service'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-despachos-pr', @@ -44,18 +45,23 @@ export class DespachosPrPage implements OnInit { dicIndex = 0; inicial = false + loggeduser: User; + constructor ( private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, private authService: AuthService, - private navParams: NavParams + private navParams: NavParams, ) { + this.loggeduser = authService.ValidatedUser; this.profile = this.navParams.get('profile') || 'mdgpr'; + } ngOnInit() { + //Inicializar segment this.segment = "despachos"; this.LoadList(); diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss index 860c052db..aa0789549 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -20,7 +20,6 @@ color:#000; transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index cc00ed241..c6b5dc001 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -1,4 +1,4 @@ - +
Despachos
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss index 860c052db..aa0789549 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -20,7 +20,6 @@ color:#000; transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 4a567fa41..c13ea6381 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -74,7 +74,8 @@
-

Expediente Presidente

+

Expediente Presidente

+

Expediente

- Documentos

@@ -84,7 +85,7 @@

Despacho do Presidente da República

Despacho

-

{{ count_de_pr }} Documentos

+

{{ count_de_pr }} Documentos

@@ -93,7 +94,8 @@
-

Expediente Presidente

+

Expediente Presidente

+

Expediente

- Documentos

@@ -106,7 +108,7 @@

Despacho do Presidente da República

-

{{ count_de_pr }} Documentos

+

{{ count_de_pr }} Documentos

@@ -115,16 +117,18 @@
-

Diplomas por Validar

-

{{count_dip_pv}} Documentos

+

Diplomas por Validar

+

Diplomas por Assinar

+

{{count_dip_pv}} Documentos

-

Diplomas assinados PR

-

- Documentos

+

Diplomas assinados PR

+

Diplomas

+

{{count_dip_Signed}} Documentos

diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 1d85d1b84..ef6818ff2 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - +
Pendentes
diff --git a/src/app/pages/publications/gallery/gallery.page.scss b/src/app/pages/publications/gallery/gallery.page.scss index ed2df3683..468d9e462 100644 --- a/src/app/pages/publications/gallery/gallery.page.scss +++ b/src/app/pages/publications/gallery/gallery.page.scss @@ -60,7 +60,6 @@ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss index ea263aad8..719348ea6 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss @@ -1,5 +1,5 @@ :host{ - background: #0782c9; + } ion-content{ --background: transparent; diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 1d3a14713..77fcebb70 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -12,8 +12,7 @@ //transform: translate3d(0, 1px, 0); .header-top{ - //width: 360px; - margin: 0px auto; + width: 100%; overflow: auto; padding: 0 !important; background: #fff; diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.scss b/src/app/shared/chat/new-group/contacts/contacts.page.scss index c97008f82..54523dbf8 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.scss +++ b/src/app/shared/chat/new-group/contacts/contacts.page.scss @@ -27,7 +27,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index a1e09c72f..271a16af0 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,13 +1,16 @@ - +
-
Despachos Presidenciais
+
+ Despachos Presidenciais + Despachos +
-

Presidente da República

+

Presidente da República

diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.scss b/src/app/shared/gabinete-digital/expediente/expediente.page.scss index b906a9f52..b14a6c4e2 100644 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/shared/gabinete-digital/expediente/expediente.page.scss @@ -16,7 +16,6 @@ transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 4b7190d65..d02769421 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -7,7 +7,7 @@
- + Expediente diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 21e5f15e6..0ea5b16bb 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -9,6 +9,8 @@ import { LoadingService } from 'src/app/services/loading.service'; import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-expedientes-pr', @@ -24,6 +26,8 @@ export class ExpedientesPrPage implements OnInit { taskslist:DailyWorkTask[]; serialNumber:string; + loggeduser: User; + @Input() profile:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -31,8 +35,10 @@ export class ExpedientesPrPage implements OnInit { private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, + private authService: AuthService, ) { this.profile = 'mdgpr'; + this.loggeduser = authService.ValidatedUser; } ngOnInit() { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 346fda517..57758dff2 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -1,4 +1,4 @@ - +
Pedidos
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 62a1a68f3..4fc84cb0a 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - +
Pendentes
diff --git a/src/app/shared/headers/header-no-search/profile/profile.component.html b/src/app/shared/headers/header-no-search/profile/profile.component.html index 883feecf4..68d4c6269 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.component.html +++ b/src/app/shared/headers/header-no-search/profile/profile.component.html @@ -24,8 +24,8 @@
Dados Perfil
-
Ministro e Director do Gabinete do Presidente da Rep.
- +
{{loggeduser.RoleDescription}}
+
diff --git a/src/app/shared/headers/header-no-search/profile/profile.component.ts b/src/app/shared/headers/header-no-search/profile/profile.component.ts index 167fba49a..f9a966148 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.component.ts +++ b/src/app/shared/headers/header-no-search/profile/profile.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-profile', @@ -8,7 +10,14 @@ import { ModalController } from '@ionic/angular'; }) export class ProfileComponent implements OnInit { - constructor(private modalController:ModalController) { } + loggeduser: User; + + constructor(private modalController:ModalController, + private authService: AuthService) { + this.loggeduser = authService.ValidatedUser; + + console.log(this.loggeduser.RoleDescription) + } ngOnInit() {}