peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-29 15:51:42 +01:00
parent ae2319bbf3
commit 0af240c8f7
5 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.ts
-4
View File
@@ -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
src/app/shared/header/header.page.html
+4 -4
View File
@@ -55,7 +55,7 @@
</div>
<div class="d-flex">
<div class="header-btns d-flex">
<div class="mr-10 d-flex align-center cursor-pointer">
<button (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="btn-no-color">
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
@@ -79,9 +79,9 @@
</div>
</div>
<div class="div-profile justify-end d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>
</div>
src/app/shared/header/header.page.scss
+30 -1
View File
@@ -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;
}
}
}
src/app/shared/headers/header-no-search/header-no-search.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
</div> -->
<div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-default-profile.svg'></ion-icon>
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>
src/assets/images/icons-profile.svg
+8 -22
View File
@@ -1,23 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="45" height="45" viewBox="0 0 45 45">
<defs>
<circle id="2dw772hiwa" cx="22.5" cy="22.5" r="22.5"/>
</defs>
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g transform="translate(-335 -26) translate(0 23) translate(335 3)">
<rect width="45" height="45" fill="#FFF" fill-opacity=".6" rx="22.5"/>
<g>
<mask id="xjc01mgdzb" fill="#fff">
<use xlink:href="#2dw772hiwa"/>
</mask>
<path fill="#42B9FE" fill-opacity=".7" d="M22.5 10.5c5.799 0 10.5 5.037 10.5 11.25 0 3.902-1.854 7.34-4.67 9.358C34.565 33.57 39 39.868 39 47.25c0 9.527-7.387 17.25-16.5 17.25S6 56.777 6 47.25c0-7.381 4.435-13.68 10.67-16.142C13.854 29.09 12 25.652 12 21.75c0-6.213 4.701-11.25 10.5-11.25z" mask="url(#xjc01mgdzb)"/>
</g>
<text fill="#FFF" fill-opacity=".7" font-family="Roboto-Light, Roboto" font-size="20" font-weight="300">
<tspan x="7.3" y="27">MD</tspan>
</text>
</g>
</g>
</g>
</g>
<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45C34.9264 45 45 34.9264 45 22.5Z" fill="white" fill-opacity="0.6"/>
<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="45" height="45">
<path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="white"/>
</mask>
<g mask="url(#mask0)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M22.5 10.5C28.299 10.5 33 15.537 33 21.75C33 25.652 31.146 29.09 28.33 31.108C34.565 33.57 39 39.868 39 47.25C39 56.777 31.613 64.5 22.5 64.5C13.387 64.5 6 56.777 6 47.25C6 39.869 10.435 33.57 16.67 31.108C13.854 29.09 12 25.652 12 21.75C12 15.537 16.701 10.5 22.5 10.5Z" fill="#42B9FE" fill-opacity="0.7"/>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 911 B