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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-09 10:34:27 +01:00
parent ab9f73b621 34a2d48a82
commit c979d9ea7d
32 changed files with 586 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.component.html
+1
View File
@@ -73,6 +73,7 @@
<ion-label>{{att.Name}}</ion-label>
</div>
</div>
<div class="line"></div>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
src/app/shared/agenda/approve-event/approve-event.component.ts
+1 -1
View File
@@ -152,7 +152,7 @@ export class ApproveEventComponent implements OnInit {
this.goToEventsToApprove();
}
else{
this.alertService.presentAlert('Operação cancelada!');
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+3 -1
View File
@@ -1,3 +1,5 @@
<div class="left">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
</div>
src/app/shared/chat/group-messages/group-messages.page.html
+9 -3
View File
@@ -6,7 +6,9 @@
<ion-label class="title">{{room.name.split('-').join(' ')}}</ion-label>
</div>
<div class="right">
<ion-icon (click)="openGroupMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
<button class="btn-no-color" (click)="openGroupMessagesOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
<div (click)="openGroupContactsPage()" class="header-bottom">
@@ -55,7 +57,9 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openSendGroupMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<button class="btn-no-color" (click)="openSendGroupMessageOptions()">
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
@@ -64,7 +68,9 @@
</ion-item>
</div>
<div>
<ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<button class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
</ion-footer>
src/app/shared/chat/messages/messages.page.html
+9 -3
View File
@@ -7,7 +7,9 @@
<span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
</div>
<div class="right">
<ion-icon (click)="_openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
<button class="btn-no-color" (click)="_openMessagesOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
<div hidden class="header-bottom" (click)="addContacts()">
@@ -48,7 +50,9 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openSendMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<button class="btn-no-color" (click)="openSendMessageOptions()">
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
@@ -57,7 +61,9 @@
</ion-item>
</div>
<div>
<ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<button class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
</ion-footer>
src/app/shared/chat/new-group/contacts/contacts.page.html
+3 -1
View File
@@ -3,7 +3,9 @@
<div class="main-header">
<div class="title-content">
<div class="back-icon">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="div-title">
<ion-label class="title">Contactos</ion-label>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+3 -1
View File
@@ -2,7 +2,9 @@
<div class="title width-100">
<div class="title-container">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
<ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="profile">
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+1 -1
View File
@@ -8,7 +8,7 @@
float: right;
margin-right: 20px;
font-size: 30px;
color: #0782c9;
color: #42b9fe;
}
}
.title{
src/app/shared/gabinete-digital/expedients/expedients.page.html
+6 -1
View File
@@ -1,6 +1,11 @@
<ion-header class="ion-no-border">
<div class="title">
<ion-label >Correspondência</ion-label>
<div class="thetitle"><ion-label >Correspondência</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
src/app/shared/gabinete-digital/expedients/expedients.page.scss
+9
View File
@@ -9,6 +9,15 @@
font-size: 25px;
color:#000;
overflow: auto;
.thetitle{
width: fit-content;
float: left;
}
.theicon{
width: fit-content;
float: right;
}
}
.item-list-small{
font-size: 11px;
src/app/shared/popover/chat-popover/chat-popover.page.html
+3 -1
View File
@@ -1,6 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
<button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>