diff --git a/src/app/pages/agenda/view-event/options/options.component.html b/src/app/pages/agenda/view-event/options/options.component.html deleted file mode 100644 index 301bb3166..000000000 --- a/src/app/pages/agenda/view-event/options/options.component.html +++ /dev/null @@ -1,17 +0,0 @@ - -
- -
-
- - - - - - -
- -
-
diff --git a/src/app/pages/agenda/view-event/options/options.component.scss b/src/app/pages/agenda/view-event/options/options.component.scss deleted file mode 100644 index 2c7a0cc7f..000000000 --- a/src/app/pages/agenda/view-event/options/options.component.scss +++ /dev/null @@ -1,51 +0,0 @@ -.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; -} -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - display: none; - 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/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/task-options/task-options.component.html b/src/app/pages/agenda/view-event/task-options/task-options.component.html new file mode 100644 index 000000000..b49d08b03 --- /dev/null +++ b/src/app/pages/agenda/view-event/task-options/task-options.component.html @@ -0,0 +1,3 @@ +

+ task-options works! +

diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.scss b/src/app/pages/agenda/view-event/task-options/task-options.component.scss new file mode 100644 index 000000000..e69de29bb 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.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 34604f5f5..7382cda94 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,7 @@ 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'; @Component({ selector: 'app-view-event', @@ -48,6 +49,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,9 +186,6 @@ export class ViewEventPage implements OnInit { }); } - - - async openBookMeetingModal() { const doc = this.loadedAttachments[ this.dicIndex]; @@ -266,8 +265,5 @@ export class ViewEventPage implements OnInit { }); } - docIndex(index: number) { - this.dicIndex = index; - } }