From 2c766015e7df0cacac5ea397b3a5eca149dc7d1d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 18 Mar 2021 16:30:03 +0100 Subject: [PATCH] -style approve entents for desktop finished -style expedient for desktop ongoing --- src/app/app-routing.module.ts | 8 ++ src/app/pages/chat/chat.module.ts | 2 + src/app/pages/chat/chat.page.html | 5 +- src/app/pages/chat/chat.page.ts | 9 +- .../gabinete-digital.module.ts | 13 ++- .../gabinete-digital.page.html | 21 ++-- .../gabinete-digital.page.scss | 26 ++++- .../gabinete-digital/gabinete-digital.page.ts | 31 +++++- .../chat/empty-chat/empty-chat.page.html | 2 +- .../shared/chat/empty-chat/empty-chat.page.ts | 3 +- .../group-messages/group-messages.page.html | 2 +- .../group-messages/group-messages.page.ts | 59 ++++++++-- .../shared/chat/messages/messages.page.html | 4 +- src/app/shared/chat/messages/messages.page.ts | 63 +++++++++++ .../empty-container-routing.module.ts | 17 +++ .../empty-container/empty-container.module.ts | 20 ++++ .../empty-container/empty-container.page.html | 5 + .../empty-container/empty-container.page.scss | 5 + .../empty-container.page.spec.ts | 24 ++++ .../empty-container/empty-container.page.ts | 16 +++ .../events-to-approve-routing.module.ts | 17 +++ .../events-to-approve.module.ts | 20 ++++ .../events-to-approve.page.html | 68 ++++++++++++ .../events-to-approve.page.scss | 92 ++++++++++++++++ .../events-to-approve.page.spec.ts | 24 ++++ .../events-to-approve.page.ts | 104 ++++++++++++++++++ .../expediente/expediente.page.html | 2 +- .../chat-options-popover.page.html | 18 ++- .../chat-options-popover.page.scss | 71 +++++++----- .../chat-options-popover.page.ts | 12 +- .../chat-popover/chat-popover.page.html | 16 --- 31 files changed, 685 insertions(+), 94 deletions(-) create mode 100644 src/app/shared/empty-container/empty-container-routing.module.ts create mode 100644 src/app/shared/empty-container/empty-container.module.ts create mode 100644 src/app/shared/empty-container/empty-container.page.html create mode 100644 src/app/shared/empty-container/empty-container.page.scss create mode 100644 src/app/shared/empty-container/empty-container.page.spec.ts create mode 100644 src/app/shared/empty-container/empty-container.page.ts create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 3dd13aae4..425f2122c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,6 +23,14 @@ const routes: Routes = [ path: 'btn-adicionar', loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, /* { path: 'chat', diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 340239ee6..d3e4021b0 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -32,6 +32,7 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont GroupMessagesPage, NewGroupPage, GroupContactsPage, + EmptyChatPage, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], entryComponents: [ @@ -40,6 +41,7 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont GroupMessagesPage, NewGroupPage, GroupContactsPage, + EmptyChatPage, ] }) export class ChatPageModule {} diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 445dc5297..427672943 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -87,10 +87,7 @@
- - + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index fc9d0e549..d97cbe1ef 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -64,9 +64,11 @@ export class ChatPage implements OnInit { showNewGroup=false; showGroupMessages=false; showGroupContacts=false; + emptyTextDescription = 'Sem conversa selecionada'; @Output() getRoomInfo; + constructor( private http:HttpClient, private chatService: ChatService, @@ -80,11 +82,6 @@ export class ChatPage implements OnInit { /* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn'); this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); */ } - closeAllDesktopComponent(){ - this.desktopComponent = { - showMessages: false, - } - } ngOnInit() { this.segment = "Contactos"; @@ -265,7 +262,7 @@ export class ChatPage implements OnInit { modal.onDidDismiss(); } async openMessagesModal(roomId:any){ - this.closeAllDesktopComponent(); + this.closeAllDesktopComponents(); let classs; if( window.innerWidth <= 1024){ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index c27f2256f..f8eb0f2d4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -10,7 +10,9 @@ import { GabineteDigitalPage } from './gabinete-digital.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component'; -import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page' +import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; +import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; +import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'; /* import { ComponentsModule } from 'src/app/components/components.module'; */ @@ -25,7 +27,14 @@ import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/exped declarations: [ GabineteDigitalPage, EventListComponent, - ExpedientePage + EmptyContainerPage, + EventsToApprovePage, + ExpedientePage, + ], + entryComponents: [ + EmptyContainerPage, + EventsToApprovePage, + ExpedientePage, ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 8146870bd..8db7a198e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -8,15 +8,13 @@ -
+
-
- - -
+ +

Gabinete Digital

-
+
@@ -69,12 +67,11 @@
- -
- - + +
+ + +
-
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index c60877f91..8073fc452 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -107,7 +107,7 @@ ion-content{ padding: 30px 5px 30px 5px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - border: solid 1px #e9e9e9; + //border: solid 1px #e9e9e9; /* --background-color: #ffffff !important; */ background-color: #ffffff !important; float: left; @@ -153,8 +153,9 @@ ion-content{ .main-content{ .aside-wrapper{ - border: 1px solid red; + width: 40%; justify-content: flex-start !important; + border-right: 1px solid #d8d8d8; .aside-title{ font-family: Roboto; font-size: 25px; @@ -162,25 +163,38 @@ ion-content{ } } .aside-content{ + width: 60%; display: flex !important; background-color: white; } } .exp-card{ - margin: 5px auto; + display: flex; + align-items: center; + margin: 0 auto; + margin-bottom: 15px; flex-direction: row !important; width: 100%; - padding-right: 11px; - padding-bottom: 5px; - padding-top: 5px; + padding: 10px 17px 10px 17px; height: unset !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + .exp-card-title{ flex: 1; text-align: left; + margin-top: 0px !important; + } + .exp-card-content{ + margin: 0 !important; } .exp-card-content .title1{ display: none; + margin-top: 0px !important; + } + .exp-card-content .number{ + //display: none; + margin-top: 0px !important; } } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index cc9e51ebc..7c3e2a02f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -31,6 +31,10 @@ export class GabineteDigitalPage implements OnInit { showEventList: false, showExpediente : false } + showEventsToApprove = true; + showEmptyContainer = false; + showExpedients = false; + emptyTextDescription = 'Sem opção selecionada'; constructor( private processesbackend:ProcessesService, @@ -90,6 +94,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{ }); } + closeAllDesktopComponents(){ + this.showEmptyContainer = false; + this.showEventsToApprove = false; + this.showExpedients = false; + this.showExpedients = false; + } + LoadCounts() { this.showLoader = true; this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{ @@ -122,6 +133,16 @@ this.processesbackend.GetActionsList().subscribe(res=>{ notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } + + openEventsToApprovePage(segment:any){ + this.closeAllDesktopComponents(); + if( window.innerWidth <= 1024){ + this.openEventsToApproveList(segment); + } + else{ + this.showEventsToApprove = true; + } + } async openEventsToApproveList(segment:any){ @@ -151,7 +172,15 @@ this.processesbackend.GetActionsList().subscribe(res=>{ //} } - + openExpedientListPage(){ + this.closeAllDesktopComponents(); + if( window.innerWidth <= 1024){ + this.openExpedientList(); + } + else{ + this.showExpedients = true; + } + } async openExpedientList(){ this.closeAllDesktopComponent(); diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.html b/src/app/shared/chat/empty-chat/empty-chat.page.html index b5514095a..1d2bf5d00 100644 --- a/src/app/shared/chat/empty-chat/empty-chat.page.html +++ b/src/app/shared/chat/empty-chat/empty-chat.page.html @@ -1,5 +1,5 @@
-

Sem conversa selecionada

+

{{texto}}

 diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.ts b/src/app/shared/chat/empty-chat/empty-chat.page.ts index fff63b39d..c22d2189c 100644 --- a/src/app/shared/chat/empty-chat/empty-chat.page.ts +++ b/src/app/shared/chat/empty-chat/empty-chat.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; @Component({ selector: 'app-empty-chat', @@ -6,6 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./empty-chat.page.scss'], }) export class EmptyChatPage implements OnInit { + @Input() texto:string; constructor() { } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index c5971d016..789262d29 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -55,7 +55,7 @@
- +
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 7e3823775..3f5445438 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -187,8 +187,19 @@ export class GroupMessagesPage implements OnInit, OnChanges { return await modal.present(); } + openSendGroupMessageOptions(ev: any){ + if(window.innerWidth <= 1024){ + console.log('mobile'); + this.openChatOptions(ev); + } + else{ + console.log('desktop'); + this._openChatOptions(); + } + } - /* async openOptions(ev: any) { + + async openOptions(ev: any) { const popover = await this.popoverController.create({ component: ChatPopoverPage, cssClass: 'chat-popover', @@ -202,10 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { popover.onDidDismiss().then(res=>{ console.log(res); if(res.data){ - this.roomName = res.data.name.split('-').join(' '); - console.log(this.roomName); - - this.load(); + this.getRoomInfo(); //this.modalController.dismiss(); }; @@ -241,10 +249,10 @@ export class GroupMessagesPage implements OnInit, OnChanges { await modal.present(); modal.onDidDismiss().then(()=>{ - this.load(); + this.getRoomInfo(); }); } - */ + /* async actionSheet() { const actionSheet = await this.actionSheetController.create({ cssClass: 'my-custom-class', @@ -271,5 +279,42 @@ export class GroupMessagesPage implements OnInit, OnChanges { } */ + async _openChatOptions() { + + const enterAnimation = (baseEl: any) => { + const backdropAnimation = this.animationController.create() + .addElement(baseEl.querySelector('ion-backdrop')!) + .fromTo('opacity', '0.01', 'var(--backdrop-opacity)'); + + const wrapperAnimation = this.animationController.create() + .addElement(baseEl.querySelector('.modal-wrapper')!) + .keyframes([ + { offset: 0, opacity: '1', right: '-100%' }, + { offset: 1, opacity: '1', right: '0px' } + ]); + + return this.animationController.create() + .addElement(baseEl) + .easing('ease-out') + .duration(500) + .addAnimation([backdropAnimation, wrapperAnimation]); + } + + const leaveAnimation = (baseEl: any) => { + return enterAnimation(baseEl).direction('reverse'); + } + + const modal = await this.modalController.create({ + enterAnimation, + leaveAnimation, + component: ChatOptionsPopoverPage, + cssClass: 'model profile-modal search-submodal', + componentProps: { + roomId: this.roomId, + } + }); + return await modal.present(); + } + } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 0dda497cf..9ac6880fb 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -10,7 +10,7 @@
-
+