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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-24 11:17:44 +01:00
parent d50d986227 6ed8181a86
commit 567209ed4b
8 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/profile/edit-profile/edit-profile.page.html
+6 -6
View File
@@ -6,7 +6,7 @@
<img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
</div>
</div>
<div class="btn-close d-flex" (click)="close()">
<div class="btn-close d-flex cursor-pointer" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div>
</div>
@@ -36,7 +36,7 @@
<ion-icon slot="start" name="person"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Nome" [(ngModel)]="loggeduser.FullName"></ion-input>
<ion-input disabled placeholder="Nome" [(ngModel)]="loggeduser.FullName"></ion-input>
</div>
</div>
</div>
@@ -47,13 +47,13 @@
<ion-icon slot="start" name="mail"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Email" [(ngModel)]="loggeduser.Email"></ion-input>
<ion-input disabled placeholder="Email" [(ngModel)]="loggeduser.Email"></ion-input>
</div>
</div>
</div>
</div>
<div class="login-preference width-100" (mouseover)="checkState()" (click)="checkState()">
<div hidden class="login-preference width-100" (mouseover)="checkState()" (click)="checkState()">
<div class="preference">Preferência Login</div>
<ion-row>
@@ -73,8 +73,8 @@
</ion-row>
</div>
<div class="d-flex width-100 justify-center mt-10">
<button (click)="addPin()" class="btn-ok buttonSize" fill="clear" color="#fff" >
<div hidden class="d-flex width-100 justify-center mt-10">
<button hidden (click)="addPin()" class="btn-ok buttonSize" fill="clear" color="#fff" >
<ion-label>Alterar PIN</ion-label>
</button>
</div>
src/app/modals/profile/profile.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
</div>
</div>
<div class="btn-close d-flex" (click)="close()">
<div class="btn-close d-flex cursor-pointer" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+1 -1
View File
@@ -5,7 +5,7 @@
</button>
</div>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendarTask()">Adicionar Nota</button>
<button class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
<button class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
<div class="solid"></div>
<button class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+8 -8
View File
@@ -27,7 +27,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Adicionar Nota</ion-label>
<ion-label>Rever</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -77,24 +77,24 @@
</div>
<div class="line"></div>
<div class="d-flex container-div width-100" >
<div class="d-flex container-div width-100" >
<ion-list class="width-100 " >
<h5>Documentos Anexados</h5>
<ion-item class="width-100" *ngFor="let document of loadedAttachments">
<ion-label
<ion-label
(click)="viewDocument(document.SourceId, document.ApplicationId)"
class="width-100 d-block list">
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span>
<span class="app-name" *ngIf="document.ApplicationId == 8"> Correspondencia </span>
<span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
<span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
</p>
</p>
<p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
</ion-content>
<ion-footer>
@@ -122,7 +122,7 @@
</ion-toolbar> -->
<div class="buttons width-100">
<button class="btn-cancel cursor-pointer" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<button class="btn-cancel cursor-pointer" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
<button class="btn-no-color cursor-pointer" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
<button class="btn-cancel cursor-pointer" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
</div>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+2 -2
View File
@@ -93,7 +93,7 @@
<div class="aside-buttons">
<button hidden full class="btn-cancel" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
@@ -105,7 +105,7 @@
<ion-footer class="display-none-true">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
<ion-menu-button (click)="openMenu()" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
src/app/shared/agenda/approve-event/approve-event.page.html
+12 -12
View File
@@ -31,7 +31,7 @@
<div (click)="rejectTask(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
<button class="btn-no-color" >
<ion-icon class="delete" name="trash-sharp"></ion-icon>
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
</div>
@@ -41,18 +41,18 @@
<p>
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;">
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;">
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
@@ -69,7 +69,7 @@
</div>
</div>
<div class="line"></div>
<div class="overflow-y-auto">
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
@@ -87,12 +87,12 @@
<div class="line"></div>
</div>
</div>
<div *ngIf="loadedAttachments" class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding"
*ngFor="let attach of loadedAttachments"
*ngFor="let attach of loadedAttachments"
(click)="viewDocument(attach.SourceId)">
<ion-label>
<p class="attach-title-item d-block">{{attach.SourceName}}</p>
@@ -101,7 +101,7 @@
</ion-item>
</ion-list>
</div>
</div>
</div>
@@ -111,7 +111,7 @@
<div class="aside-buttons">
<button hidden full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
@@ -123,7 +123,7 @@
<ion-footer class="display-none-{{showAside}} ion-no-border">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
</div>
</ion-footer>
src/app/shared/agenda/approve-event/approve-event.page.scss
+10 -11
View File
@@ -32,12 +32,11 @@ ion-menu{
padding: 30px 20px 0 20px !important;
overflow: auto;
width: 100%;
border-right: 1px solid #d8d8d8;
.upper-content{
margin-left: 40px;
font-size: 18px;
.content-location{
margin-top: 0px !important;
width: 100%;
@@ -79,10 +78,10 @@ ion-menu{
font-size: 16px;
}
}
.bottom-content{
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -119,12 +118,12 @@ ion-menu{
.aside-right{
overflow: auto;
padding: 30px 20px 0 20px !important;
.arrow-right{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
/* .arrow-right-icon{
width: 37px;
float: right;
@@ -137,7 +136,7 @@ ion-menu{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
@@ -162,7 +161,7 @@ ion-menu{
justify-content: space-between;
overflow: auto;
padding: 5px;
.button-options {
height: 44px;
--color: #42b9fe;
@@ -202,12 +201,12 @@ ion-menu{
//width: 75%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 25%;
}
} */
.delete{
@@ -216,4 +215,4 @@ ion-menu{
color:#fff;
background: #d30606;
border-radius: 20px;
}
}