diff --git a/src/app/shared/agenda/new-event/new-event-routing.module.ts b/src/app/shared/agenda/new-event/new-event-routing.module.ts new file mode 100644 index 000000000..1b0103232 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { NewEventPage } from './new-event.page'; + +const routes: Routes = [ + { + path: '', + component: NewEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class NewEventPageRoutingModule {} diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html deleted file mode 100644 index 30169bfa0..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - Novo Evento - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Oficial - Pessoal - - - - - - - - - - - - - Reunião - Viagem - Conferência - Encontro - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Não se repete - Repete - - - - - - - - - - - - - - - - Adicionar intervenientes - {{participant.Name}} - - - - - - - - - - - - - - - - - - - - - - Com conhecimento - {{participant.Name}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adicionar documentos - - - - - - - - - - {{document.Assunto}} - {{document.appName}} - - - - - {{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}} - - - - - - - - - - - - Cancelar - - - - - - Gravar - - - - \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.scss b/src/app/shared/agenda/new-event/new-event.component.scss deleted file mode 100644 index 1497762a9..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.scss +++ /dev/null @@ -1,213 +0,0 @@ -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{ - 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{ - 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; - } - .ion-item-class-2{ - 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{ - 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; - } - -} - - -.container-div{ - ion-textarea{ - height: 81px; - } -} - - -.app-name{ - background: #42b9f2; - border-radius: 18px; - text-align: center; - display: flex; - align-items: center; - padding: 0px 5px; - color: white; - font-size: 9pt; - font-weight: 500; - height: 19px; - -webkit-border-radius: 18px; - -moz-border-radius: 18px; - -ms-border-radius: 18px; - -o-border-radius: 18px; -} - - -.close-button { - display: none; -} - -.list:hover { - - .app-name { - display: none; - } - - .close-button { - display: block !important; - } -} \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts new file mode 100644 index 000000000..f5d90c691 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-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 { NewEventPageRoutingModule } from './new-event-routing.module'; + +import { NewEventPage } from './new-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + NewEventPageRoutingModule + ], + declarations: [NewEventPage] +}) +export class NewEventPageModule {} diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html new file mode 100644 index 000000000..626888e59 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -0,0 +1,9 @@ + + + NewEvent + + + + + + diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss new file mode 100644 index 000000000..29ce5055c --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -0,0 +1,213 @@ +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{ + 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{ + 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; + } + .ion-item-class-2{ + 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{ + 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; + } + + } + + + .container-div{ + ion-textarea{ + height: 81px; + } + } + + + .app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; + } + + + .close-button { + display: none; + } + + .list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.spec.ts b/src/app/shared/agenda/new-event/new-event.page.spec.ts similarity index 75% rename from src/app/shared/agenda/new-event/new-event.component.spec.ts rename to src/app/shared/agenda/new-event/new-event.page.spec.ts index 2930af086..ca95e3857 100644 --- a/src/app/shared/agenda/new-event/new-event.component.spec.ts +++ b/src/app/shared/agenda/new-event/new-event.page.spec.ts @@ -1,13 +1,13 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { NewEventPage } from './new-event.component'; +import { NewEventPage } from './new-event.page'; describe('NewEventPage', () => { let component: NewEventPage; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ NewEventPage ], imports: [IonicModule.forRoot()] diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.page.ts similarity index 99% rename from src/app/shared/agenda/new-event/new-event.component.ts rename to src/app/shared/agenda/new-event/new-event.page.ts index 20d667c51..74acd2072 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -11,14 +11,16 @@ import { SearchDocument } from "src/app/models/search-document"; import { EventAttachment } from 'src/app/models/attachment.model'; import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; + + @Component({ selector: 'app-new-event', - templateUrl: './new-event.component.html', - styleUrls: ['./new-event.component.scss'], + templateUrl: './new-event.page.html', + styleUrls: ['./new-event.page.scss'], }) - export class NewEventPage implements OnInit { + eventBody: EventBody; segment:string = "true"; @@ -345,4 +347,5 @@ export class NewEventPage implements OnInit { },3000) } + }
- {{document.Assunto}} - {{document.appName}} - - - -
{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}