diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 6fa4760af..18d1e9761 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -76,16 +76,12 @@ export class EventListPage implements OnInit {
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventaprovacaostore.resetmd(this.eventsMDGPRList);
- console.log(this.eventsMDGPRList);
-
}
else if(this.segment == 'PR'){
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventaprovacaostore.resetpr(this.eventsPRList);
- console.log(this.eventsMDGPRList);
-
}
this.showLoader = false;
this.skeletonLoader = false
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index b9f2a1250..661c018a5 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -55,7 +55,7 @@
-
+
-
-
-
+
+
+ {{loggeduser.Profile}}
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index 4fef9fe3e..af78e2e72 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -18,6 +18,35 @@
margin: 0px auto;
}
+.header-btns{
+ justify-content: center;
+ align-items: center;
+}
+
+.div-profile{
+ width: 90px;
+ height: fit-content;
+ font-size: 45px;
+ justify-content: flex-end;
+ display: flex;
+ background-color: transparent;
+ justify-content: center;
+ align-items: center;
+ overflow: auto;
+
+ .icon{
+ position: relative;
+ border: none !important;
+ }
+
+ .profile-text{
+ font-size: 20px;
+ font-weight: 300;
+ width: fit-content;
+ position: absolute;
+ }
+}
+
.desktop{
display: none;
@@ -64,4 +93,4 @@
.icon-z{
width: 20px;
}
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 80c979097..502ae26cb 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
import { ProfileComponent } from '../headers/header-no-search/profile/profile.page';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
+import { ProfilePage } from 'src/app/modals/profile/profile.page';
@Component({
selector: 'app-header',
@@ -16,7 +17,7 @@ export class HeaderPage implements OnInit {
searchSubject: string = '';
showSearch=false;
loggeduser: User;
-
+
constructor(
private router: Router,
private modalController: ModalController,
@@ -100,12 +101,12 @@ export class HeaderPage implements OnInit {
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
-
+
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
- component: ProfileComponent,
+ component: ProfilePage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
}
@@ -133,4 +134,4 @@ export class HeaderPage implements OnInit {
async basicSearch(){
window['searchTriger']()
}
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html
index 123b7daf0..74a519cd3 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.html
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.html
@@ -57,7 +57,7 @@
-->
-
+
{{loggeduser.Profile}}
diff --git a/src/assets/images/icons-profile.svg b/src/assets/images/icons-profile.svg
index daf172ec5..ce1b61ab6 100644
--- a/src/assets/images/icons-profile.svg
+++ b/src/assets/images/icons-profile.svg
@@ -1,23 +1,9 @@
-