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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-19 11:32:08 +01:00
parent 724445084a ba9b0a1055
commit b259e9cfc7
30 changed files with 162 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/view-event/view-event.page.ts
-1
View File
@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AuthConnstants } from 'src/app/config/auth-constants';
import { Attachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model';
import { AttachmentsService } from 'src/app/services/attachments.service';
src/app/pages/chat/group-messages/group-messages.page.scss
+5 -1
View File
@@ -22,7 +22,7 @@
.middle{
padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2.5px 0 0 5px;
}
.right{
@@ -60,6 +60,10 @@
.title{
font-size: 25px;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
width: 40px;
src/app/pages/chat/group-messages/group-messages.page.ts
+1
View File
@@ -184,6 +184,7 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
});
return await popover.present();
}
async addContacts(){
console.log(this.members);
src/app/pages/chat/messages/messages.page.html
+2 -2
View File
@@ -75,8 +75,8 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color"> <!-- (click)="openChatOptions()" -->
<ion-icon 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/images/icons-add-new-event.svg"></ion-icon>
</button>
</div>
<div class="width-70">
src/app/pages/chat/messages/messages.page.scss
+7 -4
View File
@@ -29,7 +29,7 @@
.middle{
padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
@@ -70,7 +70,9 @@
.title{
font-size: 25px;
overflow: auto;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
@@ -154,14 +156,15 @@
.container{
justify-content: center;
justify-content: space-evenly;
align-items: center;
}
.chat-icon-options{
display:block !important;
font-size: 25px;
font-size: 35px;
float: right !important;
margin-top: 10px;
margin-top: 5px;
}
.chat-icon-send{
src/app/pages/chat/messages/messages.page.ts
+10 -1
View File
@@ -29,6 +29,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
dmUsers:any;
roomId:string;
el:any;
members:any;
connection = connection
@@ -117,6 +118,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
getChatMembers() {
this.showLoader = true;
this.chatService.getMembers(this.roomId).subscribe(res=> {
this.members = res['members'];
this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
console.log(res);
console.log(this.dmUsers);
@@ -150,11 +152,18 @@ export class MessagesPage implements OnInit, AfterViewChecked {
modal.onDidDismiss();
}
async openChatOptions(ev?: any) {
async openChatOptions(ev?: any) {
console.log(this.members);
const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage,
cssClass: 'chat-options-popover',
event: ev,
componentProps: {
room: this.roomId,
members: this.members,
eventSelectedDate: new Date(),
},
translucent: true
});
return await popover.present();
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+18 -24
View File
@@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { customFullTask, customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
@@ -30,7 +30,7 @@ export class DespachosPrPage implements OnInit {
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
taskList: customTask[] = [];
taskType: string;
serialNumber:string;
@@ -236,7 +236,7 @@ export class DespachosPrPage implements OnInit {
});
}
async openBookMeetingModal(task: any) {
async openBookMeetingModal(task: customFullTask) {
const doc = this.loadedAttachments[ this.dicIndex];
@@ -271,31 +271,25 @@ export class DespachosPrPage implements OnInit {
}
async distartExpedientModal() {
// async distartExpedientModal() {
const doc = this.taskList[ this.dicIndex];
// const modal = await this.modalController.create({
// component: DiscartExpedientModalPage,
// componentProps: {
// action: 'complete',
// },
// cssClass: 'discart-expedient-modal',
// backdropDismiss: false
// });
console.log(doc, this.dicIndex, this.taskList)
// await modal.present();
// modal.onDidDismiss().then(res=>{
// if(res['data']=='close'){
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: doc.serialNumber,
folderId: doc.workflowInstanceDataFields.FolderID,
action: 'complete',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
// }
await modal.present();
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
}
});
}
// });
// }
docIndex(index: number) {
this.dicIndex = index;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+3 -4
View File
@@ -3,10 +3,9 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute } from '@angular/router';
import { Event } from '../../../../models/event.model';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
@@ -17,7 +16,7 @@ import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/d
import { ToastService } from 'src/app/services/toast.service';
import { DespachoService } from 'src/app/Rules/despacho.service'
import { Location } from '@angular/common'
import { customTask, customTaskList, fullTask } from 'src/app/models/dailyworktask.model';
import { fullTask } from 'src/app/models/dailyworktask.model';
@Component({
selector: 'app-despacho',
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
@@ -24,7 +24,7 @@ export class DespachosPage implements OnInit {
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
taskList:customTask[] = [];
taskType: string;
serialNumber:string;
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { customTask, DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { ModalController, NavParams } from '@ionic/angular';
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+3 -3
View File
@@ -1,7 +1,7 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
@@ -19,8 +19,8 @@ export class PedidosPage implements OnInit {
parecerList:any[] = [];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
parecerListResult:customTask[] = [];
deferimentoListResult:customTask[] = [];
deferimentoList:any[] = [];
taskType: string;
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+3 -3
View File
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { customTaskList, DailyWorkTask } from '../../../models/dailyworktask.model';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { AlertService } from 'src/app/services/alert.service';
@@ -84,7 +84,7 @@ export class PendentesPage implements OnInit {
let pendentesList = [];
pendentes.forEach(element => {
let task: customTaskList = this.customTaskPipe.transform(element);
let task: customTask = this.customTaskPipe.transform(element);
pendentesList.push(task);
});
@@ -116,7 +116,7 @@ export class PendentesPage implements OnInit {
}, 2000);
}
async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTaskList) {
async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
if(WorkflowName == 'Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
}