${startHours.toString().padStart(2, '0')}:${startMinutos.toString().padStart(2, '0')}${eventlocation}
@@ -888,32 +885,34 @@ export class AgendaPage implements OnInit {
setTimeout(()=>{
- if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')) {
- let sortedDate = this.eventSource.sort((a,b) =>{
- return (b.startTime) -(a.startTime);
- });
-
-
- let filterDate = sortedDate.filter((e) => {
- return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
- });
-
- console.log('Event -- ',filterDate[filterDate.length - 1]);
- const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
+ let sortedDate = this.eventSource.sort((a,b) =>{
+ return (b.startTime) -(a.startTime);
+ });
- console.log('firstEventStartHours-- ', firstEventStartHours)
-
+
+ let filterDate = sortedDate.filter((e) => {
+ console.log( e.startTime.toLocaleDateString('en-US'),' == ',this.eventSelectedDate.toLocaleDateString('en-US'));
+ return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
+ });
+
+ console.log('Event -- ',filterDate[filterDate.length - 1], filterDate['startTime']);
+
+ const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
+
+ console.log('firstEventStartHours-- ', firstEventStartHours)
+
+ if(firstEventStartHours) {
const scrollContainer = document.querySelector('.timeline-wrapper');
-
+
scrollContainer.scroll({
top: firstEventStartHours*60,
left: 0,
behavior: 'smooth'
})
-
+
}
-
+
}, 500);
}
@@ -926,6 +925,7 @@ export class AgendaPage implements OnInit {
ev.target.complete();
}, 250)
}
+
showAlert(){
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
}
diff --git a/src/app/pages/agenda/view-event/options/options.component.ts b/src/app/pages/agenda/view-event/options/options.component.ts
deleted file mode 100644
index b4280a4ec..000000000
--- a/src/app/pages/agenda/view-event/options/options.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-options',
- templateUrl: './options.component.html',
- styleUrls: ['./options.component.scss'],
-})
-export class OptionsComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {}
-
-}
diff --git a/src/app/pages/agenda/view-event/options/options.component.html b/src/app/pages/agenda/view-event/task-options/task-options.component.html
similarity index 75%
rename from src/app/pages/agenda/view-event/options/options.component.html
rename to src/app/pages/agenda/view-event/task-options/task-options.component.html
index 301bb3166..78d6d3599 100644
--- a/src/app/pages/agenda/view-event/options/options.component.html
+++ b/src/app/pages/agenda/view-event/task-options/task-options.component.html
@@ -1,5 +1,5 @@
-
+
@@ -10,8 +10,8 @@
-
+
-
+
diff --git a/src/app/pages/agenda/view-event/options/options.component.scss b/src/app/pages/agenda/view-event/task-options/task-options.component.scss
similarity index 100%
rename from src/app/pages/agenda/view-event/options/options.component.scss
rename to src/app/pages/agenda/view-event/task-options/task-options.component.scss
diff --git a/src/app/pages/agenda/view-event/options/options.component.spec.ts b/src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts
similarity index 58%
rename from src/app/pages/agenda/view-event/options/options.component.spec.ts
rename to src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts
index 370263b60..7aa133d7e 100644
--- a/src/app/pages/agenda/view-event/options/options.component.spec.ts
+++ b/src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts
@@ -1,19 +1,19 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
-import { OptionsComponent } from './options.component';
+import { TaskOptionsComponent } from './task-options.component';
-describe('OptionsComponent', () => {
- let component: OptionsComponent;
- let fixture: ComponentFixture
;
+describe('TaskOptionsComponent', () => {
+ let component: TaskOptionsComponent;
+ let fixture: ComponentFixture;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [ OptionsComponent ],
+ declarations: [ TaskOptionsComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
- fixture = TestBed.createComponent(OptionsComponent);
+ fixture = TestBed.createComponent(TaskOptionsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.ts b/src/app/pages/agenda/view-event/task-options/task-options.component.ts
new file mode 100644
index 000000000..4680abe44
--- /dev/null
+++ b/src/app/pages/agenda/view-event/task-options/task-options.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-task-options',
+ templateUrl: './task-options.component.html',
+ styleUrls: ['./task-options.component.scss'],
+})
+export class TaskOptionsComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index f59e148b5..3e60b4e57 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -1,4 +1,4 @@
-
+
-
+
@@ -106,9 +102,9 @@
{{ attach.CreateDate | date: 'dd-MM-yy' }}
-
-
-
+
+
+
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 34604f5f5..c92f115bc 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
-import { AlertController, ModalController, NavParams } from '@ionic/angular';
+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';
@@ -11,6 +11,8 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { TaskOptionsComponent } from './task-options/task-options.component';
@Component({
selector: 'app-view-event',
@@ -48,6 +50,7 @@ export class ViewEventPage implements OnInit {
public alertController: AlertController,
private iab: InAppBrowser,
private processes: ProcessesService,
+ public popoverController: PopoverController
)
{
this.profile = this.navParams.get('profile');
@@ -184,55 +187,89 @@ export class ViewEventPage implements OnInit {
});
}
+ // async openBookMeetingModal() {
+ // const doc = this.loadedAttachments[ this.dicIndex];
-
- async openBookMeetingModal() {
-
- const doc = this.loadedAttachments[ this.dicIndex];
-
- let task = {
- serialNumber: doc.SourceId,
- taskStartDate: doc.CreateDate,
- isEvent: true,
- workflowInstanceDataFields: {
- FsId: doc.ApplicationId,
- FolderID: null,
- DocId: doc.SourceId,
- Subject: doc.SourceName
- },
- }
+ // let task = {
+ // serialNumber: doc.SourceId,
+ // taskStartDate: doc.CreateDate,
+ // isEvent: true,
+ // workflowInstanceDataFields: {
+ // FsId: doc.ApplicationId,
+ // FolderID: null,
+ // DocId: doc.SourceId,
+ // Subject: doc.SourceName
+ // },
+ // }
- let classs;
- if( window.innerWidth <= 800){
- classs = 'book-meeting-modal modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
- const modal = await this.modalController.create({
- component: BookMeetingModalPage,
- componentProps: {
- task: task,
- },
- cssClass: classs,
- backdropDismiss: false
- });
- await modal.present();
- modal.onDidDismiss();
- }
+ // let classs;
+ // if( window.innerWidth <= 800){
+ // classs = 'book-meeting-modal modal modal-desktop'
+ // } else {
+ // classs = 'modal modal-desktop showAsideOptions'
+ // }
+ // const modal = await this.modalController.create({
+ // component: BookMeetingModalPage,
+ // componentProps: {
+ // task: task,
+ // },
+ // cssClass: classs,
+ // backdropDismiss: false
+ // });
+ // await modal.present();
+ // modal.onDidDismiss();
+ // }
- async openExpedientActionsModal(taskAction: any) {
- //this.modalController.dismiss();
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
+ // async openExpedientActionsModal(taskAction: any) {
+ // //this.modalController.dismiss();
+ // let classs;
+ // if( window.innerWidth <= 800){
+ // classs = 'modal modal-desktop'
+ // } else {
+ // classs = 'modal modal-desktop showAsideOptions'
+ // }
+
+ // const doc = this.loadedAttachments[ this.dicIndex];
+
+ // let task = {
+ // serialNumber: doc.SourceId,
+ // taskStartDate: doc.CreateDate,
+ // isEvent: true,
+ // workflowInstanceDataFields: {
+ // FsId: doc.ApplicationId,
+ // FolderID: null,
+ // DocId: doc.SourceId,
+ // Subject: doc.SourceName
+ // },
+ // }
+
+ // const modal = await this.modalController.create({
+ // component: ExpedientTaskModalPage,
+ // componentProps: {
+ // taskAction: taskAction,
+ // task: task,
+ // profile: this.profile,
+ // },
+ // cssClass: classs,
+ // });
+ // await modal.present();
+ // modal.onDidDismiss().then(res=>{
+ // console.log(res['data']);
+ // if(res['data']=='openDiscart'){
+ // console.log('open discart');
+ // // this.distartExpedientModal();
+ // }
+
+ // });
+ // }
+
+
+ async openTaskOptions() {
const doc = this.loadedAttachments[ this.dicIndex];
- let task = {
+ let customTask = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
@@ -244,30 +281,21 @@ export class ViewEventPage implements OnInit {
},
}
- const modal = await this.modalController.create({
- component: ExpedientTaskModalPage,
+ const popover = await this.popoverController.create({
+ component: OptsExpedientePage,
+ cssClass: 'exp-options',
componentProps: {
- taskAction: taskAction,
- task: task,
- profile: this.profile,
+ fulltask: customTask,
+ task: customTask
},
- cssClass: classs,
- });
- await modal.present();
- modal.onDidDismiss().then(res=>{
- console.log(res['data']);
- if(res['data']=='openDiscart'){
- console.log('open discart');
-
- // this.distartExpedientModal();
-
- }
-
+ translucent: true
});
+ return await popover.present();
}
- docIndex(index: number) {
- this.dicIndex = index;
+
+ docIndex(index: number){
+ this.dicIndex = index
}
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index bd695f49d..5319c4c3c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -28,7 +28,7 @@
{{count_ev_md+count_ev_pr}} Documentos