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' into feature/PushNotification_Cordova

Browse Source
This commit is contained in:
Eudes Inácio
2021-04-09 09:49:56 +01:00
parent 0c91f108e2 c91d56ff2d
commit bbaee91cd6
19 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-detail/document-detail.page.html
+4 -4
View File
@@ -38,8 +38,8 @@
</div>
<ion-content>
<div class="main-content d-flex">
<div *ngIf="LoadedDocument" class="content d-flex flex-column" >
<div class="main-content d-flex height-100">
<div *ngIf="LoadedDocument" class="content d-flex flex-column">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
@@ -89,7 +89,7 @@
</div>
</div>
<div class="aside-right flex-column height-100">
<div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="notImplemented()" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Descartar</button>
@@ -105,7 +105,7 @@
</div>
</div>
<div>
<div hidden>
<ion-list>
<ion-list-header>
<ion-label>
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+1 -1
View File
@@ -135,7 +135,7 @@ export class ApproveEventModalPage implements OnInit {
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else{
this.alertService.presentAlert('Operação cancelada!');
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
src/app/pages/agenda/view-event/view-event.page.html
+3 -1
View File
@@ -23,7 +23,9 @@
<div class="main-header">
<div class="title-content">
<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>
<div class="middle">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
src/app/pages/chat/chat.page.html
+9 -2
View File
@@ -17,8 +17,15 @@
<ion-label class="title">Chat</ion-label>
</div>
<div class="div-icon">
<ion-icon slot="end" (click)="openNewGroupPage()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
<ion-icon slot="end" (click)="openContactsPage()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
<button class="btn-no-color" (click)="openContactsPage()">
<ion-icon slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="openNewGroupPage()">
<ion-icon slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
</button>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<ion-toolbar>
src/app/pages/chat/chat.page.scss
+3 -1
View File
@@ -19,11 +19,13 @@ ion-content{
font-size: 25px;
}
.div-icon{
width: 60%;
display: flex;
width: 50%;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
justify-content: flex-end;
}
.div-icon ion-icon{
float: right;
src/app/pages/chat/group-messages/group-messages.page.html
+10 -3
View File
@@ -7,7 +7,9 @@
<ion-label class="title">{{roomName}}</ion-label>
</div>
<div class="right">
<ion-icon (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
<button class="btn-no-color" (click)="openOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
<div (click)="addContacts()" class="header-bottom">
@@ -77,7 +79,10 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<button class="btn-no-color" (click)="openChatOptions()">
<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">
@@ -86,7 +91,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/pages/chat/messages/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">Nova Conversa</ion-label>
src/app/pages/chat/messages/messages.page.html
+6 -2
View File
@@ -71,7 +71,9 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
<div class="width-70">
<ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
@@ -80,7 +82,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/pages/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/pages/events/events.page.html
+7 -7
View File
@@ -46,13 +46,13 @@
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
<div class="text">A sua Agenda</div>
</div>
<ion-icon
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
[routerLink]="['/home/agenda']"
></ion-icon>
<button class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
</div>
<div class="content">
<ion-list>
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+1 -1
View File
@@ -148,7 +148,7 @@ export class ApproveEventModalPage implements OnInit {
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else{
this.alertService.presentAlert('Operação cancelada!');
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+1 -1
View File
@@ -143,7 +143,7 @@ export class ApproveEventPage implements OnInit {
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else {
this.alertService.presentAlert('Operação cancelada!');
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+1 -1
View File
@@ -116,7 +116,7 @@
</div>
<div class="aside-right flex-column height-100">
<div *ngIf="postData" class="aside-right flex-column height-100">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+5 -7
View File
@@ -44,7 +44,7 @@
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item disabled>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
@@ -56,7 +56,7 @@
</div>
<ion-content>
<div class="main-content d-flex">
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content">
@@ -154,11 +154,9 @@
<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 class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div class="solid"></div>
<button class="btn-cancel" shape="round" >Executar</button>
<button class="btn-cancel" shape="round" >Delegar</button>
<button class="btn-cancel" shape="round" >Arquivar</button>
<button hidden class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div>
</div>
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/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/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>