diff --git a/src/app/pages/agenda/agenda-routing.module.ts b/src/app/pages/agenda/agenda-routing.module.ts index aee0ef75e..1c094ab95 100644 --- a/src/app/pages/agenda/agenda-routing.module.ts +++ b/src/app/pages/agenda/agenda-routing.module.ts @@ -18,6 +18,18 @@ const routes: Routes = [ { path: 'emend-message-modal', loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule) + }, + { + path: 'new-event', + loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule) + }, + { + path: 'edit-event', + loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule) + }, + { + path: 'view-event', + loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule) } ]; diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 34b6cecdb..bb91aff5c 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -15,6 +15,7 @@ import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; import { CalendarComponent } from 'src/app/components/calendar/calendar.component'; +import { SharedModule } from 'src/app/shared/shared.module'; registerLocaleData(localeDe); @NgModule({ @@ -22,7 +23,7 @@ registerLocaleData(localeDe); CommonModule, FormsModule, IonicModule, - /* ComponentsModule, */ + SharedModule, AgendaPageRoutingModule, NgCalendarModule, CalModalPageModule, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 39b78f4a1..150bbc0b1 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -1,3 +1,6 @@ + + +
@@ -209,7 +212,7 @@
- + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 8da456b1e..36557f625 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -7,6 +7,8 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd } from '@angular/router'; import { AlertService } from 'src/app/services/alert.service'; +import { NewEventPage } from './new-event/new-event.page'; +import { ViewEventPage } from './view-event/view-event.page'; @Component({ selector: 'app-agenda', @@ -95,7 +97,8 @@ export class AgendaPage implements OnInit { } //Show information of the event async onEventSelected(ev: { event: Event}){ - this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); + this.viewEventDetail(); + /* this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */ } onCurrentChanged = (ev: Date) => { @@ -292,5 +295,30 @@ export class AgendaPage implements OnInit { } } + async openAddEvent() { + const modal = await this.modalCtrl.create({ + component: NewEventPage, + componentProps:{ + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + async viewEventDetail() { + const modal = await this.modalCtrl.create({ + component: ViewEventPage, + componentProps:{ + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + } diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss index 88b854402..e2bd9995d 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss @@ -37,48 +37,52 @@ ion-menu{ margin-left: 50px; overflow: auto; font-size: 18px; -} -.content-location{ - width: 360px; - margin: 0 auto; - padding: 0; - overflow: auto; -} -.location-detail{ - width: 210px; - font-weight: 700; - font-size: 18px; - float: left; - margin: 5px 5px 5px 0px; -} -.button-calendar-type{ - width: 91px; - --border-radius: 12.5px; - --background: #ffb703; - margin-left: 5px; + .content-location{ + width: 360px; + margin: 0 auto; + padding: 0; + overflow: auto; + } + + .location-detail{ + width: 210px; + font-weight: 700; + font-size: 18px; float: left; -} -.button-calendar-type ion-button{ - height: 25px; -} -.button-edit-event { - width: 140px; - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color:#061b52; + margin: 5px 5px 5px 0px; + } + .button-calendar-type{ + width: 91px; + --border-radius: 12.5px; + --background: #ffb703; + margin-left: 5px; + float: left; + } + .button-calendar-type ion-button{ + height: 25px; + } + .button-edit-event { + width: 140px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color:#061b52; } .content-details p{ - font-size: 16px; + font-size: 16px; } +} +.middle-conten{ .middle-content h3, .middle-content p{ font-size: 16px; } - .bottom-content{ - width: 360px; - margin: 0 auto; - } +} + +.bottom-content{ + width: 360px; + margin: 0 auto; + .bottom-content h3{ font-size: 16px; margin: 0 0 0 10px; @@ -110,6 +114,8 @@ ion-menu{ float: right; font-size: 13px; } +} + .buttons{ width: 360px; margin: 0 auto; diff --git a/src/app/pages/agenda/edit-event/edit-event-routing.module.ts b/src/app/pages/agenda/edit-event/edit-event-routing.module.ts new file mode 100644 index 000000000..3616b2106 --- /dev/null +++ b/src/app/pages/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/pages/agenda/edit-event/edit-event.module.ts b/src/app/pages/agenda/edit-event/edit-event.module.ts new file mode 100644 index 000000000..0c4e3f88c --- /dev/null +++ b/src/app/pages/agenda/edit-event/edit-event.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 { EditEventPageRoutingModule } from './edit-event-routing.module'; + +import { EditEventPage } from './edit-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EditEventPageRoutingModule + ], + declarations: [EditEventPage] +}) +export class EditEventPageModule {} diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html new file mode 100644 index 000000000..6a3ed8d9c --- /dev/null +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -0,0 +1,211 @@ + + +
+
+
+ Editar Evento +
+
+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+
+ + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+ +
+
+
+ +
+
+ + Reunião + Viagem + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + Com conhecimento + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + + +
+ + + + + + Cancelar + + + + + + Gravar + + + + diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss new file mode 100644 index 000000000..1515a515b --- /dev/null +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -0,0 +1,177 @@ +ion-content{ + --background:transparent; +} +.header-toolbar{ + --background:transparent; + --opacity: 1; +} + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 221px; + margin: 2.5px 0 0 5px; + } + } + + .title{ + font-size: 25px; + } + + } + .main-content{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + margin: 0 auto; + background-color: #fff; + overflow:auto; + padding: 15px 20px 0 20px; + + .ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-class-2{ + width: 360px; + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: 315px; + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + + } \ No newline at end of file diff --git a/src/app/pages/agenda/edit-event/edit-event.page.spec.ts b/src/app/pages/agenda/edit-event/edit-event.page.spec.ts new file mode 100644 index 000000000..509415955 --- /dev/null +++ b/src/app/pages/agenda/edit-event/edit-event.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EditEventPage } from './edit-event.page'; + +describe('EditEventPage', () => { + let component: EditEventPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditEventPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EditEventPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts new file mode 100644 index 000000000..9371d203e --- /dev/null +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-edit-event', + templateUrl: './edit-event.page.html', + styleUrls: ['./edit-event.page.scss'], +}) +export class EditEventPage implements OnInit { + + constructor( + private modalController: ModalController, + ) { } + + ngOnInit() { + } + close(){ + this.modalController.dismiss(null); + } + save(){ + + } + +} diff --git a/src/app/pages/search/filter/filter-routing.module.ts b/src/app/pages/agenda/new-event/new-event-routing.module.ts similarity index 66% rename from src/app/pages/search/filter/filter-routing.module.ts rename to src/app/pages/agenda/new-event/new-event-routing.module.ts index 0c4b39cdb..1b0103232 100644 --- a/src/app/pages/search/filter/filter-routing.module.ts +++ b/src/app/pages/agenda/new-event/new-event-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { FilterPage } from './filter.page'; +import { NewEventPage } from './new-event.page'; const routes: Routes = [ { path: '', - component: FilterPage + component: NewEventPage } ]; @@ -14,4 +14,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class FilterPageRoutingModule {} +export class NewEventPageRoutingModule {} diff --git a/src/app/pages/search/filter/filter.module.ts b/src/app/pages/agenda/new-event/new-event.module.ts similarity index 55% rename from src/app/pages/search/filter/filter.module.ts rename to src/app/pages/agenda/new-event/new-event.module.ts index d0da9ea85..f5d90c691 100644 --- a/src/app/pages/search/filter/filter.module.ts +++ b/src/app/pages/agenda/new-event/new-event.module.ts @@ -4,17 +4,17 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; -import { FilterPageRoutingModule } from './filter-routing.module'; +import { NewEventPageRoutingModule } from './new-event-routing.module'; -import { FilterPage } from './filter.page'; +import { NewEventPage } from './new-event.page'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - FilterPageRoutingModule + NewEventPageRoutingModule ], - declarations: [FilterPage] + declarations: [NewEventPage] }) -export class FilterPageModule {} +export class NewEventPageModule {} diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html new file mode 100644 index 000000000..0eb113e65 --- /dev/null +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -0,0 +1,211 @@ + + +
+
+
+ Novo Evento +
+
+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+
+ + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+ +
+
+
+ +
+
+ + Reunião + Viagem + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + Com conhecimento + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + + +
+ + + + + + Cancelar + + + + + + Gravar + + + + \ No newline at end of file diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss new file mode 100644 index 000000000..b3bfead35 --- /dev/null +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -0,0 +1,178 @@ +ion-content{ + --background:transparent; +} +.header-toolbar{ + --background:transparent; + --opacity: 1; +} + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 221px; + margin: 2.5px 0 0 5px; + } + } + + .title{ + font-size: 25px; + } + + } + .main-content{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + margin: 0 auto; + background-color: #fff; + overflow:auto; + padding: 15px 20px 0 20px; + + .ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-class-2{ + width: 360px; + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: 315px; + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + + } + diff --git a/src/app/pages/search/filter/filter.page.spec.ts b/src/app/pages/agenda/new-event/new-event.page.spec.ts similarity index 62% rename from src/app/pages/search/filter/filter.page.spec.ts rename to src/app/pages/agenda/new-event/new-event.page.spec.ts index ea8b41dfb..9a2a8ec1b 100644 --- a/src/app/pages/search/filter/filter.page.spec.ts +++ b/src/app/pages/agenda/new-event/new-event.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { FilterPage } from './filter.page'; +import { NewEventPage } from './new-event.page'; -describe('FilterPage', () => { - let component: FilterPage; - let fixture: ComponentFixture; +describe('NewEventPage', () => { + let component: NewEventPage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FilterPage ], + declarations: [ NewEventPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(FilterPage); + fixture = TestBed.createComponent(NewEventPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts new file mode 100644 index 000000000..674101e13 --- /dev/null +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-new-event', + templateUrl: './new-event.page.html', + styleUrls: ['./new-event.page.scss'], +}) +export class NewEventPage implements OnInit { + + constructor( + private modalController: ModalController, + ) { } + + ngOnInit() { + } + close(){ + this.modalController.dismiss(); + } + save(){ + + } + +} diff --git a/src/app/pages/agenda/view-event/view-event-routing.module.ts b/src/app/pages/agenda/view-event/view-event-routing.module.ts new file mode 100644 index 000000000..37a7a0172 --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ViewEventPage } from './view-event.page'; + +const routes: Routes = [ + { + path: '', + component: ViewEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ViewEventPageRoutingModule {} diff --git a/src/app/pages/agenda/view-event/view-event.module.ts b/src/app/pages/agenda/view-event/view-event.module.ts new file mode 100644 index 000000000..b2e97a22b --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ViewEventPageRoutingModule } from './view-event-routing.module'; + +import { ViewEventPage } from './view-event.page'; +import { SharedModule } from 'src/app/shared/shared.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SharedModule, + ViewEventPageRoutingModule + ], + declarations: [ViewEventPage] +}) +export class ViewEventPageModule {} diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html new file mode 100644 index 000000000..0548ab179 --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -0,0 +1,64 @@ + + +
+
+ +
+ Ver Evento +
+
+ +
+
+
+ + + + +
+
+
+
+ Texto +
+
+ Texto +
+
+
+ +

Texto

+

das Texto às Texto

+

(Não se repete)

+

Repete

+ +
+
+
+ + +

Intervenientes

+

Texto

+ + + + +

Detalhes

+

Texto

+ + +
+ +
+ +

Documentos Anexados

+ + +

Receita por Natureza

+

Texto

+ + + +
+
+ \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss new file mode 100644 index 000000000..05e6c0eb0 --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -0,0 +1,144 @@ +ion-content{ + --background:transparent; + --padding-top:0px; + --padding-start: 20px; + --padding-end: 20px; + font-size: 18px; +} +ion-menu{ + --height: 225px; + } +.header-toolbar{ + --background:transparent; + --opacity: 1; +} + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 0px 0px 0px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + + .middle{ + width: 270px; + padding: 0!important; + float: left; + margin: 2.5px 0 0 0; + } + .header-icon-right{ + width: 45px; + font-size: 45px; + float: right; + overflow: auto; + } + } + + .title{ + font-size: 25px; + } + + } + .main-content{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + margin: 0 auto; + background-color: #fff; + overflow:auto; + padding: 15px 0px 0 0px; + + .upper-content{ + margin-left: 50px; + overflow: auto; + font-size: 18px; + + .content-location{ + width: 100%; + margin: 0 auto; + padding: 0; + overflow: auto; + } + + .location-detail{ + width: 210px; + font-weight: 700; + font-size: 18px; + float: left; + margin: 5px 5px 5px 0px; + } + .button-calendar-type{ + width: 91px; + --border-radius: 12.5px; + --background: #ffb703; + margin-left: 5px; + float: left; + } + .button-calendar-type ion-button{ + height: 25px; + } + .button-edit-event { + width: 140px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color:#061b52; + } + .content-details p{ + font-size: 16px; + } + } + .middle-conten{ + .middle-content h3, .middle-content p{ + font-size: 16px; + } + } + + .bottom-content{ + width: 360px; + margin: 0 auto; + + .bottom-content h3{ + font-size: 16px; + margin: 0 0 0 10px; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + } + } \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.spec.ts b/src/app/pages/agenda/view-event/view-event.page.spec.ts new file mode 100644 index 000000000..d13628ede --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ViewEventPage } from './view-event.page'; + +describe('ViewEventPage', () => { + let component: ViewEventPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ViewEventPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ViewEventPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts new file mode 100644 index 000000000..613e27819 --- /dev/null +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-view-event', + templateUrl: './view-event.page.html', + styleUrls: ['./view-event.page.scss'], +}) +export class ViewEventPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 8045276c1..213236ce7 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -17,10 +17,7 @@ ion-content{ --padding-start: 15px; --padding-end: 20px; } -.container-div{ - margin-bottom: 15px; - overflow: auto; -} + .ion-item-container{ width: 360px; margin: 15px auto; @@ -34,6 +31,10 @@ ion-content{ padding: 0 !important; overflow: auto; } +.container-div{ + margin-bottom: 15px; + overflow: auto; +} .ion-item-class-2{ width: 360px; margin: 0px auto; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index a1525d969..0a466bead 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.module'; import { GabineteDigitalPage } from './gabinete-digital.page'; +import { SharedModule } from 'src/app/shared/shared.module'; /* import { ComponentsModule } from 'src/app/components/components.module'; */ @NgModule({ @@ -14,7 +15,7 @@ import { GabineteDigitalPage } from './gabinete-digital.page'; CommonModule, FormsModule, IonicModule, - /* ComponentsModule, */ + SharedModule, GabineteDigitalPageRoutingModule ], declarations: [GabineteDigitalPage], diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e9bd9cc21..e243f5c28 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,4 +1,21 @@ - + + + + + +
+
+
+ Gabinete Digital +
+
+ +
+
+
+ + + + + + + +
-
-
- Gabinete Digital -
-
- -
- - - - - -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index f5c0b77b4..5aec5c1aa 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -12,24 +12,24 @@ ion-content{ text-align: center; } -ion-card{ - background-color: #d4d5ca; - border-radius: 20px; -} -ion-item{ - --ion-background-color:#dae3f3; - margin-bottom: 10px; - border-radius: 5px; -} -ion-button{ - color: #000; - --background:none; - --border-color: none; - --box-shadow:none; -} -ion-label{ - padding: 10px; -} + ion-card{ + background-color: #d4d5ca; + border-radius: 20px; + } + ion-item{ + --ion-background-color:#dae3f3; + margin-bottom: 10px; + border-radius: 5px; + } + ion-button{ + color: #000; + --background:none; + --border-color: none; + --box-shadow:none; + } + ion-label{ + padding: 10px; + } } .ion-item-change-color{ --ion-background-color:#fff2cc !important; @@ -65,14 +65,51 @@ ion-label{ } } +.main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #ecf8ff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #ecf8ff; + } + .div-title{ + padding: 0!important; + float: left; + } + .title{ + font-size: 25px; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } + .div-icon ion-icon{ + float: right; + padding-left: 20px; + } +} + /* NEW CSS */ .main-content{ width: 100%; /* 400px */ height: 100%; font-family: Roboto; margin: 0 auto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; background:#ecf8ff;; overflow:auto; padding: 25px 15px 15px 15px; diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 70e30b792..8845cf2ac 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -1,21 +1,6 @@ -
@@ -26,7 +11,6 @@
-
diff --git a/src/app/pages/search/filter/filter.page.html b/src/app/pages/search/filter/filter.page.html deleted file mode 100644 index fae9472e5..000000000 --- a/src/app/pages/search/filter/filter.page.html +++ /dev/null @@ -1,7 +0,0 @@ - - Ionic - - - - - \ No newline at end of file diff --git a/src/app/pages/search/filter/filter.page.scss b/src/app/pages/search/filter/filter.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/search/filter/filter.page.ts b/src/app/pages/search/filter/filter.page.ts deleted file mode 100644 index 64f0350ac..000000000 --- a/src/app/pages/search/filter/filter.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-filter', - templateUrl: './filter.page.html', - styleUrls: ['./filter.page.scss'], -}) -export class FilterPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/pages/search/search-routing.module.ts b/src/app/pages/search/search-routing.module.ts index b12bf9b5b..e8b0f207c 100644 --- a/src/app/pages/search/search-routing.module.ts +++ b/src/app/pages/search/search-routing.module.ts @@ -12,10 +12,6 @@ const routes: Routes = [ path: 'sender', loadChildren: () => import('./sender/sender.module').then( m => m.SenderPageModule) }, - { - path: 'filter', - loadChildren: () => import('./filter/filter.module').then( m => m.FilterPageModule) - }, { path: 'organic-entity', loadChildren: () => import('./organic-entity/organic-entity.module').then( m => m.OrganicEntityPageModule) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 6e7fc3d46..39a3adb87 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -263,7 +263,7 @@ padding: 25px; background: rgba(51, 51, 51, 0.3); } -.newchat, .new-group, .contacts, .group-messages, .custom-modal{ +.modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{ padding-top: 93px; --border-radius: 25px 25px 0 0; --border-width:0px;