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-12 10:03:01 +01:00
parent eba5b0497d aeb0d7bef3
commit a27f500404
13 changed files with 412 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.component.ts
+2 -3
View File
@@ -95,13 +95,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>