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 feature/calendar

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-13 14:58:20 +01:00
parent ef38247479 879c1199a0
commit e12ffebe5b
28 changed files with 642 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.component.ts
+2 -2
View File
@@ -95,12 +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
+3 -1
View File
@@ -65,7 +65,9 @@
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
<ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
<button class="btn-no-color" (click)="notImplemented()">
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
</button>
</ion-item>
</div>
<div>
src/app/shared/chat/group-messages/group-messages.page.ts
+6
View File
@@ -1,5 +1,6 @@
import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core';
import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -35,6 +36,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
private chatService: ChatService,
private authService: AuthService,
private animationController: AnimationController,
private alertService: AlertService,
) {
this.isGroupCreated = true;
}
@@ -51,6 +53,10 @@ export class GroupMessagesPage implements OnInit, OnChanges {
console.log(this.roomId);
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openGroupContactsPage(){
this.openGroupContacts.emit(this.roomId);
}
src/app/shared/chat/messages/messages.page.html
+3 -1
View File
@@ -57,7 +57,9 @@
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
<ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
<button class="btn-no-color" (click)="notImplemented()">
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
</button>
</ion-item>
</div>
<div>
src/app/shared/chat/messages/messages.page.ts
+7
View File
@@ -1,6 +1,7 @@
import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Status } from 'src/app/models/chat/status.model';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -35,6 +36,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
private chatService: ChatService,
private authService: AuthService,
private animationController: AnimationController,
private alertService: AlertService,
) {
/* this.dm = this.navParams.get('dm'); */
}
@@ -61,6 +63,11 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
load(){
this.loadMessages();
this.getChatMembers();
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -12,7 +12,7 @@
<ion-segment-button value="expediente">
Expediente
</ion-segment-button>
<ion-segment-button value="pendentes">
<ion-segment-button value="pendentes" (click)="notImplemented()">
Pendentes
</ion-segment-button>
</ion-segment>
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+6
View File
@@ -8,6 +8,7 @@ import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
@Component({
selector: 'app-expedients',
@@ -29,6 +30,7 @@ export class ExpedientsPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
) {
this.profile = 'mdgpr';
}
@@ -39,6 +41,10 @@ export class ExpedientsPage implements OnInit {
this.LoadList();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+7 -5
View File
@@ -1,12 +1,14 @@
<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 full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button class="btn-ok" shape="round" >Digitalizar Documento</button>
<button full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button class="btn-ok" shape="round" >Anexar Documento</button>
<button (click)="notImplemented()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button (click)="notImplemented()" class="btn-ok" shape="round" >Digitalizar Documento</button>
<button (click)="notImplemented()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button (click)="notImplemented()" class="btn-ok" shape="round" >Anexar Documento</button>
<div class="solid"></div>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
</div>
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+6
View File
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
@Component({
selector: 'app-chat-options-popover',
@@ -11,11 +12,16 @@ export class ChatOptionsPopoverPage implements OnInit {
constructor(
private popoverController: PopoverController,
private modalController: ModalController,
private alertService: AlertService,
) { }
ngOnInit() {
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
close(){
if( window.innerWidth <= 1024){
this.popoverController.dismiss();
src/app/shared/popover/messages-options/messages-options.page.html
+4 -2
View File
@@ -1,6 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<ion-icon slot="end" class="arrow-right-icon" (click)="close()" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<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)="close()" full class="btn-cancel" shape="round" >Cancelar</button>