peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +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-12 08:36:55 +01:00
parent a187d3055b d6485546be
commit 8340e7e620
12 changed files with 368 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+2 -2
View File
@@ -90,12 +90,12 @@ export class EditEventPage implements OnInit {
this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
const alert = await this.alertController.create({
/* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
});
await alert.present();
await alert.present(); */
});
this.isEventEdited = true;
this.modalController.dismiss(this.isEventEdited);
src/app/pages/chat/group-messages/group-messages.page.html
+8 -5
View File
@@ -52,7 +52,8 @@
</div>
</div>
<!-- </ion-content>
</ion-content>
<!--
<ion-footer>
<ion-toolbar>
<ion-row align-items-center class="row">
@@ -79,10 +80,9 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<button class="btn-no-color" (click)="openOptions()">
<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">
@@ -91,8 +91,11 @@
</ion-item>
</div>
<div>
<button class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
src/app/pages/chat/messages/messages.page.html
+11 -4
View File
@@ -3,14 +3,18 @@
<div class="main-header">
<div class="header-top">
<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" *ngFor="let users of dmUsers">
<ion-label class="title">{{users.name}}</ion-label>
<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()">
@@ -82,8 +86,11 @@
</ion-item>
</div>
<div>
<button class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
src/app/pages/chat/messages/messages.page.ts
-2
View File
@@ -75,14 +75,12 @@ export class MessagesPage implements OnInit, AfterViewChecked {
}
sendMessage(){
let body = {
"message":
{
"rid": this.roomId, "msg": this.message
}
}
this.chatService.sendMessage(body).subscribe(res=> {
this.loadMessages();
});
src/app/pages/gabinete-digital/gabinete-digital.page.html
+39 -11
View File
@@ -11,22 +11,23 @@
<div class="main-content d-flex height-100">
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
<div class="aside-wrapper d-flex flex-column justify-center width-md-40 ">
<div class="title-container">
<span class="text-center mt-0 aside-title px-20">Gabinete Digital</span>
<ion-label class="title">Gabinete Digital</ion-label>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
<div class="aside overflow-y-auto d-flex d-md-block flex-wrap justify-center width-100 px-20">
<div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
<div class="aside overflow-y-auto d-flex flex-wrap width-100">
<div class="exp-card d-flex flex-column" (click)="openEventsToApprovePage('MDGPR')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação</p>
<p class="text-center exp-card-content">{{count_ev_md+count_ev_pr}} <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="openExpedientListPage()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-correspondencia.svg"></ion-icon>
@@ -34,6 +35,7 @@
<p class="text-center exp-card-title ">Correspondencia</p>
<p class="text-center exp-card-content">{{count_exp_dailywork}} <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-pendente.svg"></ion-icon>
@@ -56,13 +58,6 @@
<p class="text-center exp-card-title ">Pedidos de Deferimento</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-despacho.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despachos</p>
<p class="text-center exp-card-content"> <span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-diploma.svg"></ion-icon>
@@ -70,6 +65,39 @@
<p class="text-center exp-card-title ">Diplomas por Validar</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
<div class="exp-card-long justify-center width-100" (click)="notImplemented()">
<div class="center-div">
<div class="exp-card-icon">
<ion-icon src="assets/images/icons-expediente-presidente.svg"></ion-icon>
</div>
<div class="exp-card-text">
<p class="exp-card-title ">Expediente Presidente</p>
<p class="exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
</div>
</div>
<div class="exp-card-long width-100" (click)="notImplemented()">
<div class="center-div">
<div class="exp-card-icon">
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
<div class="exp-card-text">
<p class="text-center exp-card-title">Despacho do Presidente da República</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
</div>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Diplomas assinaldos PR</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
</div>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+134 -44
View File
@@ -12,6 +12,7 @@ ion-content{
text-align: center;
}
.title-container{
padding: 30px 20px 0 20px !important;
margin-bottom: 15px;
.btn-no-color{
display: flex;
@@ -87,10 +88,95 @@ ion-content{
margin: 0 auto;
background:#ecf8ff;
overflow:auto;
padding: 0 !important;
margin: 0 !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
.aside{
//display: flex;
align-items: center;
justify-content: center;
.exp-card{
width: 173px;
height: 200px;
margin: 7px;
//margin: 8px;
padding: 30px 5px 30px 5px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//border: solid 1px #e9e9e9;
/* --background-color: #ffffff !important; */
background-color: #ffffff !important;
float: left;
//border: 1px solid red;
//justify-content: center;
}
.exp-card-long{
width: 100%;
margin: 7px 20px;
border-radius: 15px;
background-color: #ffffff !important;
padding: 7px;
.center-div{
width: fit-content;
margin: 0 auto;
overflow: auto;
.exp-card-title{
margin: 0 !important;
}
}
.exp-card-icon{
width: fit-content;
font-size: 48px;
float: left !important;
}
.exp-card-text{
padding: 0 !important;
margin: 0 !important;
width: fit-content;
float: left !important;
}
}
.exp-card-icon{
margin: 0 auto;
}
.exp-card ion-icon{
font-size: 48px;
}
.exp-card-title{
font-size: 15px;
color: #0d89d1;
font-family: Roboto;
font-weight: bold;
font-stretch: normal;
font-style: normal;
color: #0d89d1;
margin: 15px 0 0 10px;
text-align: center;
}
.exp-card-title p{
text-align: center;
}
.exp-card-content{
font-size: 13px;
color: #797979;
margin: 11px 0 0;
font-family: Roboto;
font-weight: 700;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
}
}
}
@@ -113,51 +199,7 @@ ion-content{
font-size: 35px;
overflow: auto;
}
.exp-card{
width: 174px;
height: 200px;
margin: 8px;
padding: 30px 5px 30px 5px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//border: solid 1px #e9e9e9;
/* --background-color: #ffffff !important; */
background-color: #ffffff !important;
float: left;
}
.exp-card-icon{
margin: 0 auto;
}
.exp-card ion-icon{
font-size: 48px;
}
.exp-card-title{
font-size: 15px;
color: #0d89d1;
font-family: Roboto;
font-weight: bold;
font-stretch: normal;
font-style: normal;
color: #0d89d1;
margin: 15px 0 0 10px;
text-align: center;
}
.exp-card-title p{
text-align: center;
}
.exp-card-content{
font-size: 13px;
color: #797979;
margin: 11px 0 0;
font-family: Roboto;
font-weight: 700;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
}
@@ -166,14 +208,62 @@ ion-content{
.main-content{
.aside-wrapper{
display: flex;
width: 35%;
justify-content: flex-start !important;
border-right: 1px solid #d8d8d8;
.aside{
background:transparent;
}
.aside-title{
font-family: Roboto;
font-size: 25px;
text-align: left;
}
.exp-card{
width: 90% !important;
justify-content: flex-start !important;
padding: 10px !important;
.exp-card-title{
text-align: left !important;
}
}
.exp-card-long{
width: 100% !important;
.center-div{
display: flex;
justify-content: center;
width: 100%;
margin: 0 !important;
.exp-card-text{
width: calc(100% - 50px);
}
}
.title1{
display: none !important;
}
.exp-card-title {
flex: 1;
float: left !important;
text-align: left;
padding-left: 10px;
}
.exp-card-content{
width: fit-content;
float: right;
}
.exp-card-text{
display: flex;
align-items: center;
justify-content: center;
}
}
}
.aside-content{
width: 65%;
src/app/shared/agenda/edit-event/edit-event.component.ts
+2 -3
View File
@@ -96,13 +96,12 @@ export class EditEventComponent implements OnInit {
this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
const alert = await this.alertController.create({
/* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
});
await alert.present();
await alert.present(); */
});
src/app/shared/chat/group-messages/group-messages.page.html
+6 -2
View File
@@ -54,6 +54,7 @@
</div>
</ion-content>
<ion-footer>
<div class="container width-100 d-flex">
<div>
@@ -68,8 +69,11 @@
</ion-item>
</div>
<div>
<button class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
src/app/shared/chat/messages/messages.page.html
+4 -1
View File
@@ -61,7 +61,10 @@
</ion-item>
</div>
<div>
<button class="btn-no-color" (click)="sendMessage()">
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
</button>
</div>