diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a64d4988d..4ff1bdf49 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -139,6 +139,10 @@ const routes: Routes = [ path: 'edit-event-to-approve', loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) }, + { + path: 'actions-options', + loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) + }, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 73fdf8642..799d4b299 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -417,7 +417,7 @@ > - +
-
-
- -
-
-

De {{viagem.DateBegin}} a {{viagem.DateEnd}}

-

{{viagem.Description}}

-

{{viagem.Detail}}

-
+
+
+ +
+
+

De {{viagem.DateBegin}} a {{viagem.DateEnd}}

+

{{viagem.Description}}

+

{{viagem.Detail}}

+
+
+ +
-
+

{{evento.DateBegin}}

{{evento.Description}}
+
+ +
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index f161f91d4..80e4c2259 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -104,44 +104,64 @@ ion-toolbar{ width: 100% !important; padding: 0 0px 0 0px !important; border-bottom: 1px solid #ebebeb; + align-items: center; + justify-content: space-between; + flex-direction: row; + + .item-icon{ + //margin-top: 28px; + width: 45px; + float: left; + font-size: 40px; + + .item-icon ion-icon{ + color: #061b52; + } + } + .item-icon2{ + //margin-top: 23px; + width: 45px; + float: left; + font-size: 40px; + } + + .item-content{ + width: 100%; + padding: 15px 0 15px 10px; + overflow: auto; + + p{ + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + + .item-content-date{ + color: #797979; + font-size: 13px; + margin: 0 !important; + padding: 0 !important; + } + .item-content-title{ + color: #0d89d1; + font-size: 15px; + margin: 0 !important; + padding: 0 !important; + } + .item-content-detail{ + color: #000000; + font-size: 13px; + margin: 0 !important; + padding: 0 !important; + } + } + + .item-options{ + width: 25px; + font-size: 20px; + } } - .item-icon{ - margin-top: 28px; - width: 45px; - float: left; - font-size: 40px; - } - .item-icon2{ - margin-top: 23px; - width: 45px; - float: left; - font-size: 40px; - } - .item-icon ion-icon{ - color: #061b52; - } - .item-content{ - float: left; - padding: 15px 0 15px 10px; - } - .item-content-date{ - color: #797979; - font-size: 13px; - margin: 0 !important; - padding: 0 !important; - } - .item-content-title{ - color: #0d89d1; - font-size: 15px; - margin: 0 !important; - padding: 0 !important; - } - .item-content-detail{ - color: #000000; - font-size: 13px; - margin: 0 !important; - padding: 0 !important; - } + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 096bb77eb..d678eb14f 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router, NavigationEnd } from '@angular/router'; -import { ModalController } from '@ionic/angular'; +import { ModalController, PopoverController } from '@ionic/angular'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { ProcessesService } from 'src/app/services/processes.service'; import { PublicationsService } from 'src/app/services/publications.service'; @@ -11,6 +11,7 @@ import { Animation, AnimationController } from '@ionic/angular'; import { LoadingController } from '@ionic/angular'; import { LoadingService } from 'src/app/services/loading.service'; import { Publication } from 'src/app/models/publication'; +import { ActionsOptionsPage } from 'src/app/shared/popover/actions-options/actions-options.page'; @Component({ @@ -56,6 +57,7 @@ export class PublicationsPage implements OnInit { private animationController: AnimationController, private loading: LoadingService, private publications: PublicationsService, + private popoverController:PopoverController, ) { this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; @@ -275,4 +277,20 @@ export class PublicationsPage implements OnInit { } } + async openOptions(taskAction?: any) { + + const popover = await this.modalController.create({ + component: ActionsOptionsPage, + cssClass: 'model aside-modal', + componentProps: { + /* task: this.task, + fulltask: this.fulltask, */ + taskAction: taskAction, + showEnviarPendentes: false + }, + //translucent: true + }); + return await popover.present(); + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 5a3de6de5..dc8895e20 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -55,7 +55,6 @@ export class ApproveEventPage implements OnInit { this.getTask(); this.getAttachments(); - // console.log(this.showAside); } notImplemented() { @@ -79,7 +78,7 @@ export class ApproveEventPage implements OnInit { }) } - async approveTask(serialNumber:string){ + async approveTask(serialNumber:string) { let body = { "serialNumber": serialNumber, "action": "Aprovar" } try { @@ -101,8 +100,6 @@ export class ApproveEventPage implements OnInit { }); */ } - - async rejectTask(serialNumber:string) { let body = { "serialNumber": serialNumber, "action": "Rejeitar" } @@ -117,13 +114,13 @@ export class ApproveEventPage implements OnInit { } } - - async getAttachments(){ + + async getAttachments() { this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); } - viewDocument(sourceId){ + viewDocument(sourceId) { this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ /* console.log(res); */ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); @@ -143,7 +140,7 @@ export class ApproveEventPage implements OnInit { return await popover.present(); } - async emendTask(serialNumber:string){ + async emendTask(serialNumber:string) { console.log('Desktop'); const modal = await this.modalController.create({ @@ -186,7 +183,7 @@ export class ApproveEventPage implements OnInit { //this.goBack(); } - goToEventsToApprove(){ + goToEventsToApprove() { let navigationExtras: NavigationExtras = { queryParams: { "eventos": true, @@ -196,32 +193,10 @@ export class ApproveEventPage implements OnInit { } + /** @description edit event to aprove */ async editar(serialNumber: string) { - if(window.innerWidth > 800){ - console.log('DESTOP'); - - this.EditApproveEventDismiss.emit(); - } - else{ - /* const modal = await this.modalController.create({ - component: EditEventToApproveComponent, - componentProps: { - serialNumber: serialNumber, - InstanceId:this.InstanceId - }, - cssClass: 'modal modal-desktop', - // backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then(res => { - this.getTask(); - this.getAttachments(); - }); */ - } + + this.EditApproveEventDismiss.emit(); } - - - - } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 00b8d3014..224242d9f 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -13,7 +13,7 @@ - +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 687e93447..c7df52414 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -41,7 +41,6 @@ export class EditEventToApprovePage implements OnInit { public stepHour = 1; public stepMinute = 5; public stepSecond = 5; - public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); @@ -88,7 +87,6 @@ export class EditEventToApprovePage implements OnInit { show = false isRecurring:string; isEventEdited: boolean; - segment:string = "true"; profile:string; eventAttendees: EventPerson[]; @@ -101,7 +99,7 @@ export class EditEventToApprovePage implements OnInit { showAttendees = false; - InstanceId: string + InstanceId: string; @Output() openAttendeesComponent = new EventEmitter(); @Output() clearContact = new EventEmitter(); @@ -109,6 +107,8 @@ export class EditEventToApprovePage implements OnInit { @Output() setIntervenientCC = new EventEmitter(); @Output() closeComponent = new EventEmitter(); + @Input() saveData: any; + constructor( private modalController: ModalController, private eventsService: EventsService, @@ -117,9 +117,6 @@ export class EditEventToApprovePage implements OnInit { private processes:ProcessesService, private toastService: ToastService, ) { - - /* this.serialNumber = this.navParams.get('serialNumber'); */ - this.isEventEdited = false; } @@ -127,8 +124,6 @@ export class EditEventToApprovePage implements OnInit { ngOnInit() { if(!this.restoreTemporaryData()){ - - } else { alert('restore!!') } @@ -223,7 +218,6 @@ export class EditEventToApprovePage implements OnInit { ReviewUserComment: '' } - console.log(event); this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ this.toastService.successMessage('Evento editado'); @@ -231,7 +225,6 @@ export class EditEventToApprovePage implements OnInit { this.toastService.badRequest('Evento não editado'); }) - this.loadedAttachments.forEach((document:any)=>{ if(document['action'] == 'add') { delete document.action @@ -251,7 +244,6 @@ export class EditEventToApprovePage implements OnInit { }) - this.modalController.dismiss(); } @@ -283,21 +275,21 @@ export class EditEventToApprovePage implements OnInit { } - async addParticipants() { + // async addParticipants() { - //this.saveTemporaryData(); + // //this.saveTemporaryData(); - this.openAttendeesComponent.emit({ - type: "intervenient" - }); + // this.openAttendeesComponent.emit({ + // type: "intervenient" + // }); - this.clearContact.emit(); - } + // this.clearContact.emit(); + // } async addParticipantsCC() { - //this.saveTemporaryData(); + // //this.saveTemporaryData(); this.openAttendeesComponent.emit({ type: "CC" @@ -333,6 +325,8 @@ export class EditEventToApprovePage implements OnInit { } + // this.clearContact.emit(); + // } async getAttachments() { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 82437eff7..9d133d599 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -20,7 +20,6 @@ import * as moment from 'moment'; }) export class EditEventPage implements OnInit { - stEvent: Event; isRecurring:string; isEventEdited: boolean; @@ -86,7 +85,6 @@ export class EditEventPage implements OnInit { public stepMinutes = [1, 5, 10, 15, 20, 25]; public stepSeconds = [1, 5, 10, 15, 20, 25]; - constructor( private modalController: ModalController, private eventsService: EventsService, @@ -96,12 +94,11 @@ export class EditEventPage implements OnInit { } ngOnInit() { - - if(!this.restoreTemporaryData()){ + if(!this.restoreTemporaryData()) { // clear - if(this.postEvent){ + if(this.postEvent) { if( this.postEvent.Body){ if(typeof(this.postEvent.Body.Text) == 'string'){ this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); @@ -128,7 +125,7 @@ export class EditEventPage implements OnInit { this.isEventEdited = false; - if(this.postEvent.IsRecurring == false){ + if(this.postEvent.IsRecurring == false) { this.isRecurring = "Não se repete"; } else{ @@ -139,7 +136,6 @@ export class EditEventPage implements OnInit { this.getAttachments(this.postEvent.EventId); this.restoreDatepickerData() - } close() { @@ -190,7 +186,6 @@ export class EditEventPage implements OnInit { this.clearContact.emit(); } - async addParticipantsCc() { this.saveTemporaryData(); @@ -245,7 +240,6 @@ export class EditEventPage implements OnInit { return false; } - } deleteTemporaryData(){ diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 4fad35895..15ec45d77 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -15,8 +15,8 @@ export class EventListPage implements OnInit { // [desktop] event list to approve showLoader: boolean; - eventsPRList: any; - eventsMDGPRList: any; + eventsPRList: any = [] + eventsMDGPRList: any = [] eventPerson: EventPerson; eventBody: EventBody; categories: string[]; diff --git a/src/app/shared/popover/actions-options/actions-options-routing.module.ts b/src/app/shared/popover/actions-options/actions-options-routing.module.ts new file mode 100644 index 000000000..d1a4cec4f --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ActionsOptionsPage } from './actions-options.page'; + +const routes: Routes = [ + { + path: '', + component: ActionsOptionsPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ActionsOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/actions-options/actions-options.module.ts b/src/app/shared/popover/actions-options/actions-options.module.ts new file mode 100644 index 000000000..f26b358d9 --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ActionsOptionsPageRoutingModule } from './actions-options-routing.module'; + +import { ActionsOptionsPage } from './actions-options.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ActionsOptionsPageRoutingModule + ], + declarations: [ActionsOptionsPage] +}) +export class ActionsOptionsPageModule {} diff --git a/src/app/shared/popover/actions-options/actions-options.page.html b/src/app/shared/popover/actions-options/actions-options.page.html new file mode 100644 index 000000000..efc6d9a54 --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options.page.html @@ -0,0 +1,14 @@ + +
+ +
+ +
+ +
+ +
+ + diff --git a/src/app/shared/popover/actions-options/actions-options.page.scss b/src/app/shared/popover/actions-options/actions-options.page.scss new file mode 100644 index 000000000..37e90de2f --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options.page.scss @@ -0,0 +1,59 @@ +.container{ + --padding-top:20px !important; + --padding-bottom:20px !important; + --padding-start:20px !important; + --padding-end:20px !important; +} +.arrow-right { + display: none; + margin-bottom: 20px; + .arrow-right-icon { + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } +} +.buttons { + display: flex; + flex-wrap: wrap; + justify-content: space-around; +} +.solid { + display: none; + width: 90%; + border-top: 1px solid #bbb; + margin: 0 auto !important; + } + .btn-ok, .btn-cancel{ + //width: 50% !important; + margin-bottom: 5px !important; + margin-top: 5px !important; +} +.btn-cancel:hover, .btn-delete:hover{ + color: #ffffff !important; + background-color: #42b9fe; +} +@media only screen and (max-width: 800px) { + .btn-ok, .btn-cancel, .btn-delete{ + width: 47% !important; + } +} +@media only screen and (min-width: 1024px) { + .arrow-right{ + display: flex; + justify-content: flex-end; + } + .btn-cancel{ + width: 100% !important; + margin-bottom: 10px !important; + } + .btn-delete, .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; + } + .solid{ + display: block; + } +} \ No newline at end of file diff --git a/src/app/shared/popover/actions-options/actions-options.page.spec.ts b/src/app/shared/popover/actions-options/actions-options.page.spec.ts new file mode 100644 index 000000000..5a95938d6 --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ActionsOptionsPage } from './actions-options.page'; + +describe('ActionsOptionsPage', () => { + let component: ActionsOptionsPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ActionsOptionsPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ActionsOptionsPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/popover/actions-options/actions-options.page.ts b/src/app/shared/popover/actions-options/actions-options.page.ts new file mode 100644 index 000000000..0bef4bc5e --- /dev/null +++ b/src/app/shared/popover/actions-options/actions-options.page.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController, PopoverController } from '@ionic/angular'; + +@Component({ + selector: 'app-actions-options', + templateUrl: './actions-options.page.html', + styleUrls: ['./actions-options.page.scss'], +}) +export class ActionsOptionsPage implements OnInit { + + constructor( + private popoverController: PopoverController, + private modalController: ModalController, + ) { } + + ngOnInit() { + } + + close () { + this.modalController.dismiss(); + } + + editAction(){} + + deleteAction(){ + + } + +}