diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 51efa7332..f0d73ed20 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -220,8 +220,8 @@ - - + + Cancelar diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 2879f6af0..c0cf6f573 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -18,7 +18,6 @@ ion-content{ transform: translate3d(0, 1px, 0); .title-content{ - padding: 0px 20px; margin: 0px auto; overflow: auto; background: #fff; diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 98156e5cf..769e3b367 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -5,6 +5,7 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { AttendeesPage } from '../../events/attendees/attendees.page'; +import { SearchPage } from '../../search/search.page'; @Component({ selector: 'app-new-event', @@ -43,7 +44,7 @@ export class NewEventPage implements OnInit { ngOnInit() { - console.log(this.profile); +/* console.log(this.profile); */ let selectedStartdDate = this.selectedDate; let selectedEndDate = new Date(this.selectedDate); @@ -118,6 +119,8 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(this.postEvent); } + + async openAttendees() { const modal = await this.modalController.create({ component: AttendeesPage, diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html index 84045ca5d..20e71cf0b 100644 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.html +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.html @@ -10,7 +10,7 @@ - +

{{ attendee.Name }}

diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 9e483b5f6..9de3907e3 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -4,7 +4,7 @@
- +
- + +
@@ -140,20 +141,20 @@
    -
  • +
  • - - -
    {{ searchDocument.Assunto}} - {{ searchDocument.appName}} + {{ searchDocument.appName}}
    {{ searchDocument.EntidadeOrganicaNome }} diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index d165c7b1f..f3a3a3293 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; import { SearchService } from "../../services/search.service"; import { SearchCategory } from "src/app/models/search-category"; import { SearchDocument } from "src/app/models/search-document"; @@ -9,8 +9,9 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e import WordCloud from 'src/plugin/wordcloud2.js'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page'; -import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page'; + + @Component({ selector: 'app-search', templateUrl: './search.page.html', @@ -51,13 +52,47 @@ export class SearchPage implements OnInit { windowWidth: number; + type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda"; + select = false; + constructor(private modalController: ModalController, private search: SearchService, - private modalCtrl: ModalController,) { + private modalCtrl: ModalController, + private navParams: NavParams) { this.ordinance = "recent"; - this.currentPath= window.location.pathname; + + this.type = this.navParams.get('type'); + + + if(this.type == null || this.type == undefined) { + + this.select = true; + + if(this.currentPath == '/home/agenda') { + this.type = "Agenda" + } else if (this.currentPath =='/home/gabinete-digital') { + this.type = "AccoesPresidenciais & ArquivoDespachoElect" + + } else if (this.currentPath == '/home/publications') { + this.type = "AccoesPresidenciais" + } else { + this.select = false + } + } else { + this.select = true; + } + + + } + + selectItem(item: SearchDocument) { + if(this.select){ + this.modalController.dismiss({ + selected: item + }); } + } ngOnInit() { @@ -172,9 +207,9 @@ export class SearchPage implements OnInit { /** * @description Basic search */ - basicSearch(){ + basicSearch(){ - if(window.location.pathname == '/home/agenda'){ + if(this.type == "Agenda" ){ this.showLoader = true; @@ -205,7 +240,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); - } else if (window.location.pathname =='/home/gabinete-digital'){ + } else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){ this.showLoader = true; @@ -267,7 +302,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); - } else if (window.location.pathname == '/home/publications'){ + } else if (this.type == "AccoesPresidenciais"){ this.showLoader = true; @@ -297,7 +332,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); } - + } /** @@ -424,7 +459,7 @@ export class SearchPage implements OnInit { itemIcons(): string{ - return window.location.pathname + return this.type } viewDocument(){ @@ -437,27 +472,28 @@ export class SearchPage implements OnInit { async viewDetail(id:any) { console.log(id); - - if(window.location.pathname == '/home/agenda'){ + if(!this.selectItem){ + if(window.location.pathname == '/home/agenda'){ - const modal = await this.modalCtrl.create({ - component: ViewEventPage, - componentProps:{ - eventId: id - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{}); - - } else if(window.location.pathname == '/home/publications'){ + const modal = await this.modalCtrl.create({ + component: ViewEventPage, + componentProps:{ + eventId: id + }, + cssClass: 'modal modal-desktop', + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{}); - this.viewPublicationDetail(id); - } - else if(window.location.pathname == '/home/gabinete-digital'){ - console.log('OPEN DOC'); - this.viewDocumentDetail(id,''); - + } else if(window.location.pathname == '/home/publications'){ + + this.viewPublicationDetail(id); + } + else if(window.location.pathname == '/home/gabinete-digital'){ + console.log('OPEN DOC'); + this.viewDocumentDetail(id,''); + + } } } @@ -480,7 +516,7 @@ export class SearchPage implements OnInit { async viewDocumentDetail(docId:string, applicationId:string) { let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 0f584a9de..122039e85 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -6,6 +6,7 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { AlertController } from '@ionic/angular'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' +import { SearchPage } from 'src/app/pages/search/search.page'; @Component({ selector: 'app-edit-event', templateUrl: './edit-event.component.html', @@ -90,6 +91,9 @@ export class EditEventComponent implements OnInit { this.deleteTemporaryData(); } + + + async save(){ this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); @@ -120,6 +124,7 @@ export class EditEventComponent implements OnInit { this.clearContact.emit(); } + async addParticipantsCc() { this.saveTemporaryData(); diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.component.ts index ba845ab01..c5ef3efe1 100644 --- a/src/app/shared/agenda/event-list/event-list.component.ts +++ b/src/app/shared/agenda/event-list/event-list.component.ts @@ -44,11 +44,11 @@ export class EventListComponent implements OnInit { this.profile = 'PR' } - this.LoadToApproveEvents(); + // this.LoadToApproveEvents(); this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.LoadToApproveEvents(); + // this.LoadToApproveEvents(); } }); } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index d7d90b844..4ecbfdaed 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -183,26 +183,26 @@
    -