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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-02-24 13:35:54 +01:00
parent 89db65390d
commit 9e14fb0fce
12 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+14 -2
View File
@@ -14,8 +14,21 @@
<ion-content id="main-content">
<div class="main-content d-flex height-100" *ngIf="loadedEvent">
<div class="main-content d-flex flex-column height-100" *ngIf="loadedEvent">
<div class="pl-20 pr-20 text-center d-flex justify-center align-center" style="width:100%; height: 30px; background-color: var(--Event-approve-header-color); border-top-right-radius: 25px;">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons font-28" src="assets/images/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov'" class="right-icons font-28" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
<!-- <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event-selected.svg"></ion-icon> -->
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons font-28" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
<div style="color: white;">
Evento Pendente de Aprovação
</div>
</div>
<div class="content d-flex flex-column">
<div class="header-content width-100 d-flex justify-space-between">
<div (click)="close()" class="header-icon-left cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
@@ -111,7 +124,6 @@
</div>
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
<div class="aside-buttons">
<button hidden full class="btn-ok" shape="round" >Editar evento</button>
src/app/shared/agenda/event-list/event-list.page.ts
+2 -2
View File
@@ -70,7 +70,7 @@ export class EventListPage implements OnInit {
async LoadToApproveEvents() {
this.showLoader = true;
console.log(this.segment);
if(this.segment == 'MDGPR'){
if(this.segment == 'MDGPR') {
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
@@ -80,7 +80,7 @@ export class EventListPage implements OnInit {
}
this.showLoader = false;
}
else if(this.segment == 'PR'){
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial.concat(prEventsPessoal);
src/app/shared/chat/group-messages/group-messages.page.html
+2
View File
@@ -203,6 +203,8 @@
</ion-content>
<ion-footer>
<div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div>
<div class="container width-100 d-flex">
<div>
<!-- <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
src/app/shared/chat/group-messages/group-messages.page.scss
+9
View File
@@ -272,3 +272,12 @@
}
}
.typing {
position: relative;
top: -34px;
height: 0px;
left: 0px;
margin-left: 22px;
}
src/app/shared/chat/messages/messages.page.html
+4 -1
View File
@@ -197,6 +197,9 @@
<ion-footer>
<div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >A escrever...</div>
<div class="container width-100 d-flex">
<div>
<!-- <button class="btn-no-color" (click)="openSendMessageOptions()">
@@ -231,7 +234,7 @@
<ion-item class="ion-no-padding type-message" lines="none">
<ion-textarea (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem"
class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
<button hidden class="btn-no-color" (click)="notImplemented()">
<button hidden class="btn-no-color" >
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
</button>
</ion-item>
src/app/shared/chat/messages/messages.page.scss
+8
View File
@@ -312,4 +312,12 @@ display: block;
.float-status-all {
font-size: 10pt !important;
}
.typing {
position: relative;
top: -34px;
height: 0px;
left: 0px;
margin-left: 22px;
}