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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-06 12:29:08 +01:00
parent 766897332c 578165f258
commit c90b278d53
6 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-detail/document-detail.page.html
+2 -2
View File
@@ -53,8 +53,8 @@
<div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
<div class="buttons">
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar Despacho</button>
<button *ngIf="!p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
<button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar para Despacho</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -102,7 +102,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<!-- <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button> -->
<!-- <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button> -->
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
</div>
src/app/shared/header/header.page.html
+1 -1
View File
@@ -77,7 +77,7 @@
<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>
<ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
</div>
</div>
</div>
src/app/shared/header/header.page.ts
+10
View File
@@ -142,4 +142,14 @@ export class HeaderPage implements OnInit {
async basicSearch() {
window['searchTriger']()
}
profileLabel(text) {
if (text == 'MDGPR') {
return 'MD'
} else if (text == 'PR') {
return text
} else {
return 'UN'
}
}
}
src/app/shared/headers/header-no-search/header-no-search.page.html
+1 -1
View File
@@ -58,7 +58,7 @@
<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>
<ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
</div>
</div>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.ts
+12
View File
@@ -72,4 +72,16 @@ export class HeaderNoSearchPage implements OnInit {
locationPathname(): string {
return window.location.pathname
}
profileLabel(text) {
if (text == 'MDGPR') {
return 'MD'
} else if (text=='PR') {
return text
} else {
return 'UN'
}
}
}