diff --git a/src/app/shared/agenda/approve-event/approve-event-routing.module.ts b/src/app/shared/agenda/approve-event/approve-event-routing.module.ts new file mode 100644 index 000000000..db3724c21 --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ApproveEventPage } from './approve-event.page'; + +const routes: Routes = [ + { + path: '', + component: ApproveEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ApproveEventPageRoutingModule {} diff --git a/src/app/shared/agenda/approve-event/approve-event.component.spec.ts b/src/app/shared/agenda/approve-event/approve-event.component.spec.ts deleted file mode 100644 index 961d67648..000000000 --- a/src/app/shared/agenda/approve-event/approve-event.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ApproveEventComponent } from './approve-event.component'; - -describe('ApproveEventComponent', () => { - let component: ApproveEventComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ApproveEventComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ApproveEventComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/approve-event/approve-event.module.ts b/src/app/shared/agenda/approve-event/approve-event.module.ts new file mode 100644 index 000000000..ce95c4925 --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ApproveEventPageRoutingModule } from './approve-event-routing.module'; + +import { ApproveEventPage } from './approve-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ApproveEventPageRoutingModule + ], + declarations: [ApproveEventPage], + exports: [ApproveEventPage] +}) +export class ApproveEventPageModule {} diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.page.html similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.component.html rename to src/app/shared/agenda/approve-event/approve-event.page.html diff --git a/src/app/shared/agenda/approve-event/approve-event.component.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss similarity index 99% rename from src/app/shared/agenda/approve-event/approve-event.component.scss rename to src/app/shared/agenda/approve-event/approve-event.page.scss index 22ed80b8d..699b4287a 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -1,4 +1,4 @@ - ion-menu{ +ion-menu{ --height: 225px; } .display-none-true{ diff --git a/src/app/shared/agenda/approve-event/approve-event.page.spec.ts b/src/app/shared/agenda/approve-event/approve-event.page.spec.ts new file mode 100644 index 000000000..6f853d63a --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ApproveEventPage } from './approve-event.page'; + +describe('ApproveEventPage', () => { + let component: ApproveEventPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ApproveEventPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ApproveEventPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts similarity index 97% rename from src/app/shared/agenda/approve-event/approve-event.component.ts rename to src/app/shared/agenda/approve-event/approve-event.page.ts index 62476bc00..57f76257d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -15,10 +15,10 @@ import { SuccessMessageComponent } from '../../popover/success-message/success-m @Component({ selector: 'app-approve-event', - templateUrl: './approve-event.component.html', - styleUrls: ['./approve-event.component.scss'], + templateUrl: './approve-event.page.html', + styleUrls: ['./approve-event.page.scss'], }) -export class ApproveEventComponent implements OnInit { +export class ApproveEventPage implements OnInit { event: Event; loadedEvent:any; @@ -267,4 +267,5 @@ export class ApproveEventComponent implements OnInit { modal.dismiss() },3000) } + } diff --git a/src/app/shared/agenda/edit-event/edit-event-routing.module.ts b/src/app/shared/agenda/edit-event/edit-event-routing.module.ts new file mode 100644 index 000000000..3616b2106 --- /dev/null +++ b/src/app/shared/agenda/edit-event/edit-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EditEventPage } from './edit-event.page'; + +const routes: Routes = [ + { + path: '', + component: EditEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EditEventPageRoutingModule {} diff --git a/src/app/shared/agenda/edit-event/edit-event.component.spec.ts b/src/app/shared/agenda/edit-event/edit-event.component.spec.ts deleted file mode 100644 index f0db40f8a..000000000 --- a/src/app/shared/agenda/edit-event/edit-event.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { EditEventComponent } from './edit-event.component'; - -describe('EditEventComponent', () => { - let component: EditEventComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EditEventComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(EditEventComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/edit-event/edit-event.module.ts b/src/app/shared/agenda/edit-event/edit-event.module.ts new file mode 100644 index 000000000..bcd1dc3e4 --- /dev/null +++ b/src/app/shared/agenda/edit-event/edit-event.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EditEventPageRoutingModule } from './edit-event-routing.module'; + +import { EditEventPage } from './edit-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EditEventPageRoutingModule + ], + declarations: [EditEventPage], + exports: [EditEventPage] +}) +export class EditEventPageModule {} diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.page.html similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.component.html rename to src/app/shared/agenda/edit-event/edit-event.page.html diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.component.scss rename to src/app/shared/agenda/edit-event/edit-event.page.scss diff --git a/src/app/shared/agenda/view-event/options/options.component.spec.ts b/src/app/shared/agenda/edit-event/edit-event.page.spec.ts similarity index 60% rename from src/app/shared/agenda/view-event/options/options.component.spec.ts rename to src/app/shared/agenda/edit-event/edit-event.page.spec.ts index 370263b60..4a219c892 100644 --- a/src/app/shared/agenda/view-event/options/options.component.spec.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.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 { EditEventPage } from './edit-event.page'; -describe('OptionsComponent', () => { - let component: OptionsComponent; - let fixture: ComponentFixture; +describe('EditEventPage', () => { + let component: EditEventPage; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ OptionsComponent ], + declarations: [ EditEventPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(OptionsComponent); + fixture = TestBed.createComponent(EditEventPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts similarity index 97% rename from src/app/shared/agenda/edit-event/edit-event.component.ts rename to src/app/shared/agenda/edit-event/edit-event.page.ts index 0e9fbd9e6..61d2b9c57 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -11,10 +11,11 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { Attachment } from 'src/app/models/attachment.model'; @Component({ selector: 'app-edit-event', - templateUrl: './edit-event.component.html', - styleUrls: ['./edit-event.component.scss'], + templateUrl: './edit-event.page.html', + styleUrls: ['./edit-event.page.scss'], }) -export class EditEventComponent implements OnInit { +export class EditEventPage implements OnInit { + stEvent: Event; isRecurring:string; diff --git a/src/app/shared/agenda/event-list/event-list-routing.module.ts b/src/app/shared/agenda/event-list/event-list-routing.module.ts new file mode 100644 index 000000000..ee54ce56a --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EventListPage } from './event-list.page'; + +const routes: Routes = [ + { + path: '', + component: EventListPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EventListPageRoutingModule {} diff --git a/src/app/shared/agenda/event-list/event-list.component.scss b/src/app/shared/agenda/event-list/event-list.component.scss deleted file mode 100644 index 90dbde141..000000000 --- a/src/app/shared/agenda/event-list/event-list.component.scss +++ /dev/null @@ -1,96 +0,0 @@ -:host{ - padding: 30px 20px 0 20px !important; - margin: 0; -} -.header-content{ - overflow: auto; - margin: 0 auto; - } - .header-icon-left{ - font-size: 33px; - color: #42b9fe; - float: left; - } - .header-title{ - font-family: Roboto; - font-size: 25px; - padding: 0; - color:#000; - float: left; - } - .main-content{ - margin-top: 20px; - .item{ - --inner-padding-end: 0 !important; - --inner-padding-top: 10px; - --inner-padding-bottom:10px; - } - .event-pr-Oficial{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #99e47b; - overflow: auto; - } - .event-pr-Pessoal{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #958bfc; - overflow: auto; - } - .event-mdgpr-Oficial{ - border-radius: 5px; - border-right: 5px solid #ffb703; - overflow: auto; - } - .event-mdgpr-Pessoal{ - border-radius: 5px; - border-right: 5px solid #f05d5e; - overflow: auto; - } - .approve-event-time{ - float: left; - } - .approve-event-time p{ - width: 33px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--Antartic-grey); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail{ - float: left; - margin-left: 10px; - } - .approve-event-detail p{ - //width: 250px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--black); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail h3{ - width: 250px; - font-family: Roboto; - font-size: 15px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #0d89d1; - margin: 0; - padding: 0; - } -} \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.component.spec.ts b/src/app/shared/agenda/event-list/event-list.component.spec.ts deleted file mode 100644 index e054b909d..000000000 --- a/src/app/shared/agenda/event-list/event-list.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { EventListComponent } from './event-list.component'; - -describe('EventListComponent', () => { - let component: EventListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EventListComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(EventListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/shared/agenda/event-list/event-list.module.ts new file mode 100644 index 000000000..bc23c444f --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.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 { EventListPageRoutingModule } from './event-list-routing.module'; + +import { EventListPage } from './event-list.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EventListPageRoutingModule + ], + declarations: [EventListPage] +}) +export class EventListPageModule {} diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.page.html similarity index 100% rename from src/app/shared/agenda/event-list/event-list.component.html rename to src/app/shared/agenda/event-list/event-list.page.html diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss new file mode 100644 index 000000000..58df3afb0 --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -0,0 +1,96 @@ +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; + } + .header-content{ + overflow: auto; + margin: 0 auto; + } + .header-icon-left{ + font-size: 33px; + color: #42b9fe; + float: left; + } + .header-title{ + font-family: Roboto; + font-size: 25px; + padding: 0; + color:#000; + float: left; + } + .main-content{ + margin-top: 20px; + .item{ + --inner-padding-end: 0 !important; + --inner-padding-top: 10px; + --inner-padding-bottom:10px; + } + .event-pr-Oficial{ + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #99e47b; + overflow: auto; + } + .event-pr-Pessoal{ + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #958bfc; + overflow: auto; + } + .event-mdgpr-Oficial{ + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; + } + .event-mdgpr-Pessoal{ + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; + } + .approve-event-time{ + float: left; + } + .approve-event-time p{ + width: 33px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--Antartic-grey); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail{ + float: left; + margin-left: 10px; + } + .approve-event-detail p{ + //width: 250px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail h3{ + width: 250px; + font-family: Roboto; + font-size: 15px; + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #0d89d1; + margin: 0; + padding: 0; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.page.spec.ts b/src/app/shared/agenda/event-list/event-list.page.spec.ts new file mode 100644 index 000000000..3f1ddf69a --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventListPage } from './event-list.page'; + +describe('EventListPage', () => { + let component: EventListPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ EventListPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventListPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.page.ts similarity index 90% rename from src/app/shared/agenda/event-list/event-list.component.ts rename to src/app/shared/agenda/event-list/event-list.page.ts index ba845ab01..9096aa845 100644 --- a/src/app/shared/agenda/event-list/event-list.component.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -4,15 +4,15 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController, NavParams } from '@ionic/angular'; -import { ApproveEventModalPage } from 'src/app/pages/agenda/approve-event-modal/approve-event-modal.page'; import { NavigationEnd, Router } from '@angular/router'; @Component({ selector: 'app-event-list', - templateUrl: './event-list.component.html', - styleUrls: ['./event-list.component.scss'], + templateUrl: './event-list.page.html', + styleUrls: ['./event-list.page.scss'], }) -export class EventListComponent implements OnInit { +export class EventListPage implements OnInit { + showLoader: boolean; eventsPRList: any; @@ -93,5 +93,5 @@ export class EventListComponent implements OnInit { this.cloneAllmobileComponent.emit(); } - } - \ No newline at end of file + +} diff --git a/src/app/shared/agenda/view-event/options/options.component.html b/src/app/shared/agenda/view-event/options/options.component.html deleted file mode 100644 index c3e4ba0b5..000000000 --- a/src/app/shared/agenda/view-event/options/options.component.html +++ /dev/null @@ -1,14 +0,0 @@ - -
- -
-
- - -
- - -
-
diff --git a/src/app/shared/agenda/view-event/options/options.component.scss b/src/app/shared/agenda/view-event/options/options.component.scss deleted file mode 100644 index 308751df6..000000000 --- a/src/app/shared/agenda/view-event/options/options.component.scss +++ /dev/null @@ -1,54 +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; - } - @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-ok{ - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - .solid{ - display: block; - } - .mobile-only{ - display: none !important; - } - } - \ No newline at end of file diff --git a/src/app/shared/agenda/view-event/options/options.component.ts b/src/app/shared/agenda/view-event/options/options.component.ts deleted file mode 100644 index b4280a4ec..000000000 --- a/src/app/shared/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() {} - -}