From 94550db0eb0e6ed67006ae038badf3f56792cae2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 10 Nov 2021 11:32:36 +0100 Subject: [PATCH] save --- package.json | 4 +-- .../pedidos/pedido/pedido.page.html | 5 ++- .../pedidos/pedido/pedido.page.ts | 31 ++++++++++++++++++- src/app/shared/header/header.page.html | 2 +- src/app/shared/header/header.page.ts | 2 +- .../request-options/request-options.page.html | 3 ++ .../request-options/request-options.page.ts | 31 ++++++++++++++++++- 7 files changed, 71 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f11eabe0a..503a89ac7 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "@capacitor/app": "^1.0.5", "@capacitor/camera": "^1.2.0", "@capacitor/core": "^3.3.0", + "@capacitor/filesystem": "^1.0.6", "@capacitor/haptics": "^1.1.2", + "@capacitor/ios": "3.3.0", "@capacitor/keyboard": "^1.1.2", "@capacitor/network": "^1.0.6", - "@capacitor/filesystem": "^1.0.6", - "@capacitor/ios": "3.3.0", "@capacitor/push-notifications": "^1.0.7", "@fortawesome/angular-fontawesome": "^0.9.0", "@fortawesome/fontawesome-free": "^5.15.3", diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index b83ec04b7..286865bd8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -63,7 +63,7 @@
Documentos Anexados
- Marcar Reunião
+
+ +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index a3bd8e8f7..0bc8b92a9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -26,6 +26,8 @@ import { BackgroundService } from 'src/app/services/background.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' +import { DataService } from 'src/app/services/data.service'; +import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; @Component({ @@ -66,7 +68,8 @@ export class PedidoPage implements OnInit { private sqliteservice: SqliteService, private backgroundservices: BackgroundService, private platform: Platform, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private dataService: DataService, ) { this.loggeduser = authService.ValidatedUser; @@ -477,6 +480,32 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } + openNewGroupPage(){ + this.router.navigate(['/home/chat']); + this.dataService.set("newGroup", true); + + if( window.innerWidth < 801){ + this.newGroup(); + } + else{ + this.dataService.set("newGroup", true); + /* this.closeAllDesktopComponents(); + this.showNewGroup=true; */ + } + } + + async newGroup(){ + const modal = await this.modalController.create({ + component: NewGroupPage, + cssClass: 'modal modal-desktop', + componentProps: { + name: this.task.Folio, + }, + }); + await modal.present(); + modal.onDidDismiss(); + } + // async viewEventDetail(eventId: any) { // const modal = await this.modalController.create({ diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index abe6a5226..ad92feb8b 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -20,7 +20,7 @@ - {{loggeduser.Profile}} + diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 9633211b2..3a7671340 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -51,7 +51,7 @@ export class HeaderPage implements OnInit { ngOnInit() { this.hideSearch(); this.update() - /* this.notificationLengthData(); + /* this.notificationLengthData(); this.eventrigger.getObservable().subscribe(async (data) => { if (data.notification === "delete" || "recive") { await this.notificationLengthData(); diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 31045eda0..7105f2577 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -54,5 +54,8 @@ +
+ +
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index ed59e7c99..5cc63ba03 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -10,6 +10,8 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { PedidoService } from 'src/app/Rules/pedido.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { DataService } from 'src/app/services/data.service'; +import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; @Component({ @@ -34,7 +36,8 @@ export class RequestOptionsPage implements OnInit { private toastService: ToastService, private router: Router, public p: PermissionService, - private pedidoService: PedidoService + private pedidoService: PedidoService, + private dataService: DataService, ) { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); @@ -109,6 +112,32 @@ export class RequestOptionsPage implements OnInit { modal.onDidDismiss(); } + openNewGroupPage(){ + this.router.navigate(['/home/chat']); + this.dataService.set("newGroup", true); + + if( window.innerWidth < 801){ + this.newGroup(); + } + else{ + this.dataService.set("newGroup", true); + /* this.closeAllDesktopComponents(); + this.showNewGroup=true; */ + } + } + + async newGroup(){ + const modal = await this.modalController.create({ + component: NewGroupPage, + cssClass: 'modal modal-desktop', + componentProps: { + name: this.task.Folio, + }, + }); + await modal.present(); + modal.onDidDismiss(); + } + async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss();