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 ea082327f..3ba915a0c 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 @@ - + diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index 055833778..cda6ac60b 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -107,13 +107,7 @@ ion-menu{ float: left; } - .label{ - border-radius: 20px; - background: #ffb703; - float: right; - padding: 5px 13.5px 5px 13.5px; - color: #fff; - } + } .location-detail{ @@ -298,4 +292,11 @@ ion-menu{ width: 25%; } } - \ No newline at end of file + + .label{ + border-radius: 20px; + background: #ffb703; + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } \ No newline at end of file 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 401e4462e..f57b304c4 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, PopoverController } from '@ionic/angular'; +import { AlertController, ModalController, PopoverController } from '@ionic/angular'; import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; @@ -9,7 +9,7 @@ import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ProcessesService } from 'src/app/services/processes.service'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { ToastService } from 'src/app/services/toast.service'; import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; import { Location } from '@angular/common' @@ -43,6 +43,7 @@ export class ViewEventPage implements OnInit { dicIndex = 0; isModal = false + header = true constructor( private modalController: ModalController, @@ -72,6 +73,10 @@ export class ViewEventPage implements OnInit { if(params["params"].isModal) { this.isModal = params["params"].isModal } + + if(params["params"].header) { + this.header = params["params"].header + } }); /* this.activatedRoute.queryParams.subscribe(params => { diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 2f085ee99..a5d019f31 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -562,7 +562,8 @@ export class SearchPage implements OnInit { component: ViewEventPage, componentProps:{ eventId: Id, - isModal: true + isModal: true, + header: false }, cssClass: 'modal modal-desktop', }); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 176f6da4a..f816d66ae 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -33,14 +33,16 @@ {{loadedEvent.Location}} -
- {{loadedEvent.CalendarName}} - {{loadedEvent.CalendarName}} -
- -
- {{loadedEvent.CalendarName}} - {{loadedEvent.CalendarName}} +
+
+ {{loadedEvent.CalendarName}} + {{loadedEvent.CalendarName}} +
+ +
+ {{loadedEvent.CalendarName}} + {{loadedEvent.CalendarName}} +
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index ebc943d0a..81059a609 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -116,7 +116,7 @@ ion-content{ float: right !important; padding: 5px 13.5px 5px 13.5px; color: #fff; - } + } } .location-detail{