From f5c49cd25f552900668fb298e426cb577034a82d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Jun 2021 08:27:57 +0100 Subject: [PATCH 01/27] Improve --- src/app/modals/create-process/create-process.page.ts | 3 +-- .../view-publications/view-publications.page.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index d2cf3fa16..cf300d0a8 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -351,8 +351,7 @@ export class CreateProcessPage implements OnInit { "ReviewUserComment": '', }, "AttachmentList" :null, - } - + } } try { diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index ca3ec6aee..192700c27 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -28,7 +28,7 @@ export class ViewPublicationsPage implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, ) - { + { this.item = new PublicationFolder(); this.activatedRoute.paramMap.subscribe(params => { console.log(params); @@ -46,6 +46,7 @@ export class ViewPublicationsPage implements OnInit { this.getPublications(); this.getPublicationDetail(); } + doRefresh(event) { this.getPublications(); @@ -55,18 +56,22 @@ export class ViewPublicationsPage implements OnInit { event.target.complete(); }, 3000); } - close(){ + + close() { this.modalController.dismiss(); } - goBack(){ + + goBack() { this.router.navigate(['/home/publications']); } + getPublicationDetail(){ this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{ console.log(res); this.item = res; }); } + getPublications(){ this.showLoader = true; From 0c1e17c25fc963b09e577fc1e95cfc7ee86661a0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Jun 2021 08:28:56 +0100 Subject: [PATCH 02/27] git status --- src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 6b20bd5dc..3121fbde0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -253,7 +253,7 @@ export class PedidoPage implements OnInit { async openExpedientActionsModal(taskAction: any, task: any) { let classs; - if( window.innerWidth <= 800){ + if( window.innerWidth <= 800) { classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' From 74ab4ce7973f23e94bf463790f5e85fc92b75232 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Jun 2021 14:29:49 +0100 Subject: [PATCH 03/27] new inputs --- package-lock.json | 11 +- package.json | 1 + src/app/guards/index.guard.ts | 2 +- src/app/home/home.page.ts | 2 +- .../agenda/new-event/new-event.module.ts | 11 +- .../agenda/new-event/new-event.page.html | 133 +++++++++--------- .../agenda/new-event/new-event.page.scss | 7 +- .../shared/agenda/new-event/new-event.page.ts | 48 ++++--- 8 files changed, 119 insertions(+), 96 deletions(-) diff --git a/package-lock.json b/package-lock.json index 084044dda..31a13ae4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3393,6 +3393,14 @@ } } }, + "@ngx-translate/core": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz", + "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==", + "requires": { + "tslib": "^2.0.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -19108,7 +19116,8 @@ }, "ssri": { "version": "6.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/package.json b/package.json index e7e128530..d2dd5c70a 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "@ionic/storage": "^2.3.1", "@logisticinfotech/ionic4-datepicker": "^1.4.4", "@ng-bootstrap/ng-bootstrap": "^9.1.2", + "@ngx-translate/core": "^13.0.0", "angular-calendar": "^0.28.22", "angular-tag-cloud-module": "^5.2.2", "bootstrap": "^4.5.0", diff --git a/src/app/guards/index.guard.ts b/src/app/guards/index.guard.ts index e7423abbf..e3ffa3eff 100644 --- a/src/app/guards/index.guard.ts +++ b/src/app/guards/index.guard.ts @@ -12,7 +12,7 @@ export class IndexGuard implements CanActivate { public storageService:StorageService, private router:Router ){} - canActivate(): Promise{ + canActivate(): Promise { return new Promise(resolve => { /* this.storageService.get(AuthConnstants.AUTH).then(res => { if(res){ diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 31ae8f960..c3d154bc0 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -65,7 +65,7 @@ export class HomePage implements OnInit { private platform: Platform) { router.events.subscribe((val) => { - // document.querySelectorAll('ion-modal').forEach((e) => e.remove()) + document.querySelectorAll('ion-modal').forEach((e) => e.remove()) }); { diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts index a5c801bb3..e31726946 100644 --- a/src/app/shared/agenda/new-event/new-event.module.ts +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -12,7 +12,6 @@ import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; import { MatNativeDateModule } from '@angular/material/core'; -import { MatMomentDateModule, MomentDateAdapter } from "@angular/material-moment-adapter"; import { NgxMatDatetimePickerModule, @@ -26,6 +25,13 @@ import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { + MAT_MOMENT_DATE_FORMATS, + MomentDateAdapter, + MAT_MOMENT_DATE_ADAPTER_OPTIONS +} from '@angular/material-moment-adapter'; +import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; + @NgModule({ imports: [ CommonModule, @@ -52,6 +58,9 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' ReactiveFormsModule ], declarations: [NewEventPage], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt-br' }, + ], exports: [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 index bb8cc2961..b2c17ac94 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -14,16 +14,7 @@
- - + - - -
@@ -135,18 +126,18 @@
-
- - - +
+ + + + + + +
@@ -157,10 +148,18 @@
- - Não se repete - Repete - + + + + + Não se repete + + + Repete + + + +
diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index 29ce5055c..4116c38e2 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -1,10 +1,12 @@ -ion-content{ + ion-content{ --background:transparent; } + .header-toolbar{ --background:transparent; --opacity: 1; } + .main-header{ width: 100%; /* 400px */ height: 100%; @@ -210,4 +212,5 @@ ion-content{ .close-button { display: block !important; } - } \ No newline at end of file + } + diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 4094b9d08..2f34e9d8e 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -9,27 +9,22 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from "src/app/models/search-document"; import { EventAttachment } from 'src/app/models/attachment.model'; -import { BadRequestPage } from '../../popover/bad-request/bad-request.page'; -import { SuccessMessagePage} from '../../popover/success-message/success-message.page'; + import { ToastService } from 'src/app/services/toast.service'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; - -import {MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS} from '@angular/material-moment-adapter'; -import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; +import {DateAdapter} from '@angular/material/core'; import * as _moment from 'moment'; import * as _rollupMoment from 'moment'; import {FormControl} from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { ThemePalette } from '@angular/material/core'; - import { HttpClient } from '@angular/common/http'; import { NgZone, ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; -import { NgxMatDatetimePickerModule, NgxMatTimepickerModule, NGX_MAT_DATE_FORMATS, NgxMatDateAdapter } from '@angular-material-components/datetime-picker'; - +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; const moment = _rollupMoment || _moment; @@ -50,18 +45,7 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { templateUrl: './new-event.page.html', styleUrls: ['./new-event.page.scss'], providers: [ - // `MomentDateAdapter` can be automatically provided by importing `MomentDateModule` in your - // application's root module. We provide it at the component level here, due to limitations of - // our example generation script. - // { - // provide: DateAdapter, - // useClass: MomentDateAdapter, - // deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS] - // }, - { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, - // { provide: MAT_DATE_LOCALE, useValue: 'pt-br' }, - // { provide: LOCALE_ID, useValue: "en-GB" } ] }) @@ -81,8 +65,8 @@ export class NewEventPage implements OnInit { public minDate: any; public maxDate: any; public stepHour = 1; - public stepMinute = 1; - public stepSecond = 1; + public stepMinute = 5; + public stepSecond = 5; public color: ThemePalette = 'primary'; @@ -108,6 +92,8 @@ export class NewEventPage implements OnInit { loggeduser: User; @ViewChild('picker') picker: any; + @ViewChild('fim') fim: any; + // @ViewChild('inicio') inicio: any; constructor( private modalController: ModalController, @@ -118,7 +104,8 @@ export class NewEventPage implements OnInit { private userService: AuthService, private http: HttpClient, private zone: NgZone, - private dateAdapter: DateAdapter + private dateAdapter: DateAdapter, + // private translate: TranslateService ) { this.dateAdapter.setLocale('pt'); this.loggeduser = userService.ValidatedUser; @@ -248,6 +235,21 @@ export class NewEventPage implements OnInit { this.picker.cancel(); } + openInicio() { + let input: any = document.querySelector('#new-inicio') + if(input) { + console.log(input) + input.click() + } + } + + openFim() { + let input: any = document.querySelector('#new-fim') + if(input) { + input.click() + } + } + private _setMinDate() { const now = new Date(); this.minDate = new Date(); @@ -448,4 +450,4 @@ export class NewEventPage implements OnInit { window['temp.path:/home/agenda/new-event.component.ts'] = {} } -} +} \ No newline at end of file From d652632e2dc2566e7784deae72a437c89bff8615 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 13:31:25 +0100 Subject: [PATCH 04/27] save --- .../gabinete-digital/event-list/event-list.page.html | 4 ++-- .../gabinete-digital/despachos-pr/despachos-pr.page.html | 7 ++----- .../gabinete-digital/despachos-pr/despachos-pr.page.scss | 2 +- .../gabinete-digital/despachos/despachos.page.html | 9 +++------ .../gabinete-digital/despachos/despachos.page.scss | 5 +++-- .../diplomas-assinar/diplomas-assinar.page.html | 4 ++-- .../shared/gabinete-digital/diplomas/diplomas.page.html | 2 +- .../events-to-approve/events-to-approve.page.html | 6 ++++-- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../gabinete-digital/expedients/expedients.page.html | 2 +- .../shared/gabinete-digital/pedidos/pedidos.page.html | 4 ++-- .../gabinete-digital/pendentes/pendentes.page.html | 7 ++----- src/global.scss | 5 +++++ src/style/main.scss | 2 ++ src/theme/variables.scss | 6 ++++++ 15 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 0c5749651..178d48c6b 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -31,7 +31,7 @@ -
+
@@ -52,7 +52,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index c99755369..4108d80ed 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -22,8 +22,7 @@ -
-
+
- -
-
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss index d3ee9e06a..a329d16cc 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -1,5 +1,5 @@ @import '~src/function.scss'; -.main-content{ +.main-container{ padding: 30px 20px 0 20px !important; margin: 0; color:#000; diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 7c63a6baa..a87c2957e 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -18,9 +18,8 @@ -
-
- +
+ - -
-
+
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 58e3a261d..60368b686 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -1,9 +1,10 @@ @import '~src/function.scss'; /* CONTENT */ :host{ - padding: 30px 20px 0 20px !important; - margin: 0; + padding: 30px 20px 0 20px !important; + margin: 0; } + .title{ font-family: Roboto; font-size: 25px; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 583eb6c80..c2bc707aa 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -19,8 +19,8 @@ -
-
+
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index b6bc41fa7..56dd370c9 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -28,7 +28,7 @@ -
+
+
@@ -17,12 +17,14 @@
+ + -
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 6d5181109..2d8f048d2 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -15,7 +15,7 @@ -
+
-
+
-
+
@@ -64,7 +64,7 @@
-
+
-
-
+
- -
-
+
diff --git a/src/global.scss b/src/global.scss index 7144cefa4..e573588a7 100644 --- a/src/global.scss +++ b/src/global.scss @@ -693,6 +693,11 @@ app-header-no-search .ion-toolbar{ margin: 0px auto; } +/* .main-content{ + height: 100% !important; + overflow-y: auto !important; +} */ + body, .blue-background{ background: #0782C9 !important;} diff --git a/src/style/main.scss b/src/style/main.scss index 1549a2300..4ccbb4f2b 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -420,6 +420,8 @@ border-bottom-right-radius: 25px; } + + // system spacing diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 127cba229..c5b42386b 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -559,6 +559,12 @@ $app-theme: mat-light-theme(( } } +/* .main-content{ + width: 100%; + height: 100% !important; + overflow-y: auto; +} */ + /* Importing Bootstrap SCSS file. */ From 2ef12efa54dceb453b3b3d17bd7e3c956de102d2 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 23 Jun 2021 15:39:45 +0100 Subject: [PATCH 05/27] Add angular material inputs --- src/app/app-routing.module.ts | 4 - .../create-process/create-process.module.ts | 35 +++- .../create-process/create-process.page.html | 24 ++- .../create-process/create-process.page.ts | 14 +- .../agenda/edit-event/edit-event.page.html | 8 - .../agenda/edit-event/edit-event.page.ts | 3 - .../expedient-task-modal.module.ts | 31 +++- .../expedient-task-modal.page.html | 19 +++ .../expedient-task-modal.page.ts | 2 +- src/app/services/search.service.ts | 2 +- .../agenda/edit-event/edit-event.module.ts | 36 +++- .../agenda/edit-event/edit-event.page.html | 132 +++++++++------ .../agenda/edit-event/edit-event.page.ts | 98 +++++++++-- .../agenda/new-event/new-event.module.ts | 4 +- .../agenda/new-event/new-event.page.html | 93 +++++----- .../agenda/new-event/new-event.page.scss | 11 +- .../shared/agenda/new-event/new-event.page.ts | 128 +++++++------- .../edit-event.module.ts | 28 ++- .../edit-event.page.html | 69 +++++++- .../edit-event-to-approve/edit-event.page.ts | 159 +++++++----------- src/global.scss | 52 +++++- 21 files changed, 622 insertions(+), 330 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bf502bfda..c4fa38263 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -116,10 +116,6 @@ const routes: Routes = [ path: 'new-event', loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) }, - { - path: 'edit-event', - loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) - }, { path: 'event-list', loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index 7a83ca089..ad164c3ee 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -7,10 +7,25 @@ import { IonicModule } from '@ionic/angular'; import { CreateProcessPageRoutingModule } from './create-process-routing.module'; import { CreateProcessPage } from './create-process.page'; -import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; + +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; +import { MatDialogModule } from '@angular/material/dialog'; + @NgModule({ imports: [ CommonModule, @@ -18,7 +33,23 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att IonicModule, CreateProcessPageRoutingModule, EmptyContainerPageModule, - AttendeeModalPageModule + AttendeeModalPageModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule, + MatDialogModule, + + ], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, ], declarations: [ CreateProcessPage diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index ec66be23f..5bf9dfd31 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -28,12 +28,32 @@
- + + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + + +
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index f7e282c88..b7e87e60b 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; import { AnimationController, ModalController, NavParams } from '@ionic/angular'; import { Despacho } from 'src/app/models/despacho.model'; import { EventPerson } from 'src/app/models/eventperson.model'; @@ -8,19 +7,14 @@ import { Folder } from 'src/app/models/folder.model'; import { AuthService } from 'src/app/services/auth.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { environment } from 'src/environments/environment'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { AlertService } from 'src/app/services/alert.service'; -import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page'; -import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { SearchDocument } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { User } from 'src/app/models/user.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; +import { FormControl } from '@angular/forms'; @Component({ selector: 'app-create-process', @@ -63,14 +57,12 @@ export class CreateProcessPage implements OnInit { documents:SearchDocument[] = []; loggeduser: User; - + + constructor( private modalController: ModalController, - private router:Router, private processes:ProcessesService, - private attachmentsService: AttachmentsService, private navParams: NavParams, - private alertController: AlertService, private authService: AuthService, private userAuth: AuthService, private animationController: AnimationController, diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 9d244ad5d..7019f2e57 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -28,11 +28,6 @@
- - -
@@ -132,9 +127,6 @@
- - -
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 66b4c70c9..3adad43d9 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -3,12 +3,9 @@ import { AlertController, AnimationController, ModalController, NavParams } from import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { ToastService } from 'src/app/services/toast.service'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts index 08212fb16..66a6e0db4 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts @@ -12,6 +12,22 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; + +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; + + @NgModule({ imports: [ CommonModule, @@ -22,7 +38,20 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- AttendeeModalPageModule, EmptyContainerPageModule, BtnModalDismissPageModule, - + // + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule + ], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, ], declarations: [ ExpedientTaskModalPage diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 84f20c6f7..ba0ac9f1f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -34,6 +34,25 @@ Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 741838569..4ca98409d 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -129,7 +129,7 @@ export class ExpedientTaskModalPage implements OnInit { this.getSubjectType(); } - onSelectedTypesChanged(ev:any){ + onSelectedTypesChanged(ev:any) { console.log(ev); if(ev.length > 1){ console.log(ev.filter(data => data != '99999850')); diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 5f3194b90..13b6786cb 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -27,7 +27,7 @@ export class SearchService { } - basicSearch(subject:string, date:string, sender:string, organicEntity:string, docTypeId:string, applicationType:string): Observable{ + basicSearch(subject:string, date:string = null, sender:string = null, organicEntity:string = null, docTypeId:string = null, applicationType:string): Observable{ // Endpoint const geturl = environment.apiURL + 'search'; // store params diff --git a/src/app/shared/agenda/edit-event/edit-event.module.ts b/src/app/shared/agenda/edit-event/edit-event.module.ts index bcd1dc3e4..ec8eff88b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.module.ts +++ b/src/app/shared/agenda/edit-event/edit-event.module.ts @@ -1,19 +1,47 @@ 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'; +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatMenuModule } from '@angular/material/menu'; + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - EditEventPageRoutingModule + EditEventPageRoutingModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule, + MatDialogModule, + ], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, ], declarations: [EditEventPage], exports: [EditEventPage] diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 279ba212d..7e61bcd30 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -6,6 +6,7 @@ Editar Evento
+
@@ -38,14 +39,18 @@
- - Oficial - Pessoal - + + + + + Oficial + + + Pessoal + + + +
@@ -56,16 +61,25 @@
- - Reunião - Viagem - Conferência - Encontro - + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + +
@@ -76,38 +90,54 @@
- - - + + + + + + + +
-
+
- - - + + + + + + + +
@@ -118,14 +148,18 @@
- - Não se repete - Repete - + + + + + Não se repete + + + Repete + + + +
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 61d2b9c57..bb5c06663 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; @@ -9,6 +9,10 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { SearchPage } from 'src/app/pages/search/search.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { Attachment } from 'src/app/models/attachment.model'; +import { ToastService } from 'src/app/services/toast.service'; +import { FormControl } from '@angular/forms'; +import * as moment from 'moment'; + @Component({ selector: 'app-edit-event', templateUrl: './edit-event.page.html', @@ -24,9 +28,21 @@ export class EditEventPage implements OnInit { eventBody: EventBody; segment:string = "true"; eventAttendees: EventPerson[]; - minDate: string; + // minDate: string; loadedEventAttachments: Attachment[]; + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate: any; + public maxDate: any; + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + @Input() taskParticipants: EventPerson[]; @Input() taskParticipantsCc: EventPerson[]; @Input() profile:string; @@ -41,15 +57,41 @@ export class EditEventPage implements OnInit { @Output() setIntervenientCC = new EventEmitter(); @Output() clearPostEvent = new EventEmitter(); + public dateControlStart = new FormControl(moment("DD MM YYYY hh")); + public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + + showLoader = false + + get dateStart () { + return this.dateControlStart.value + } + + get dateEnd () { + return this.dateControlEnd.value + } + + @ViewChild('picker') picker: any; + @ViewChild('fim') fim: any; + @ViewChild('inicio') inicio: any; + @ViewChild('picker1') picker1: any; + + public options = [ + { value: true, label: 'True' }, + { value: false, label: 'False' } + ]; + + public listColors = ['primary', 'accent', 'warn']; + public stepHours = [1, 2, 3, 4, 5]; + public stepMinutes = [1, 5, 10, 15, 20, 25]; + public stepSeconds = [1, 5, 10, 15, 20, 25]; + + constructor( private modalController: ModalController, private eventsService: EventsService, public alertController: AlertController, private attachmentsService: AttachmentsService, - - ) { - - + private toastService: ToastService ) { } ngOnInit() { @@ -94,11 +136,11 @@ export class EditEventPage implements OnInit { this.getAttachments(this.postEvent.EventId); - + this.restoreDatepickerData() } - close(){ + close() { this.closeComponent.emit(); this.setIntervenient.emit([]); this.setIntervenientCC.emit([]); @@ -107,25 +149,30 @@ export class EditEventPage implements OnInit { this.deleteTemporaryData(); } + async save() { - - - async save(){ - + this.getDatepickerData() this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); + this.showLoader = true await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + this.showLoader = false + const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + this.toastService.successMessage() setTimeout(()=>{ alert.dismiss(); }, 1500); + }, + error => { + this.showLoader = false + this.toastService.badRequest() }); this.clearPostEvent.emit(); @@ -157,8 +204,25 @@ export class EditEventPage implements OnInit { } - saveTemporaryData(){ + getDatepickerData() { + if (this.postEvent) { + this.postEvent.StartDate = this.dateStart + this.postEvent.EndDate = this.dateEnd + } + } + + restoreDatepickerData() { + if (this.postEvent) { + this.dateControlStart = new FormControl(moment(this.postEvent.StartDate)); + this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate)); + } + + } + + saveTemporaryData() { + this.getDatepickerData() + window['temp.path:/home/agenda/edit-event.component.ts'] = { postEvent: this.postEvent, eventBody: this.eventBody, @@ -166,8 +230,8 @@ export class EditEventPage implements OnInit { } } - restoreTemporaryData(): boolean{ - + restoreTemporaryData(): boolean { + const restoredData = window['temp.path:/home/agenda/edit-event.component.ts'] if(JSON.stringify(restoredData) != "{}" && undefined != restoredData){ @@ -175,6 +239,8 @@ export class EditEventPage implements OnInit { this.eventBody = restoredData.eventBody this.segment = restoredData.segment + this.restoreDatepickerData() + return true; } else { return false; diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts index e31726946..7e8799db7 100644 --- a/src/app/shared/agenda/new-event/new-event.module.ts +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -19,7 +19,6 @@ import { NgxMatTimepickerModule } from '@angular-material-components/datetime-picker'; - import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; @@ -32,6 +31,7 @@ import { } from '@angular/material-moment-adapter'; import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; + @NgModule({ imports: [ CommonModule, @@ -59,7 +59,7 @@ import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/ ], declarations: [NewEventPage], providers: [ - { provide: MAT_DATE_LOCALE, useValue: 'pt-br' }, + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, ], exports: [NewEventPage] }) diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 6892494a4..ee94ef140 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -6,6 +6,7 @@ Novo Evento
+
@@ -13,24 +14,6 @@
- - - - - - - -
@@ -43,10 +26,6 @@
- -
@@ -55,10 +34,10 @@
-
+
- - + + Oficial @@ -77,10 +56,11 @@
-
+
- - + + + Reunião @@ -99,21 +79,28 @@
-
-
- - - - +
+ + + + + @@ -127,14 +114,22 @@
- - - - + + + + + @@ -147,10 +142,10 @@
-
+
- - + + Não se repete diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index 4116c38e2..ff29b50a3 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -170,17 +170,14 @@ .span-color{ color:red; } - } - - .container-div{ - ion-textarea{ + .container-div { + ion-textarea { height: 81px; } } - .app-name{ background: #42b9f2; border-radius: 18px; @@ -214,3 +211,7 @@ } } + +.materia-top { + padding-top: 7px; +} \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 2f34e9d8e..9bac41b00 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -17,7 +17,7 @@ import { AuthService } from 'src/app/services/auth.service'; import {DateAdapter} from '@angular/material/core'; import * as _moment from 'moment'; import * as _rollupMoment from 'moment'; -import {FormControl} from '@angular/forms'; +import { FormControl } from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { ThemePalette } from '@angular/material/core'; @@ -52,7 +52,6 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { export class NewEventPage implements OnInit { - eventBody: EventBody; segment:string = "true"; @@ -69,7 +68,6 @@ export class NewEventPage implements OnInit { public stepSecond = 5; public color: ThemePalette = 'primary'; - @Input() profile:string; @Input() selectedSegment: string; @Input() selectedDate: Date; @@ -93,7 +91,33 @@ export class NewEventPage implements OnInit { loggeduser: User; @ViewChild('picker') picker: any; @ViewChild('fim') fim: any; - // @ViewChild('inicio') inicio: any; + @ViewChild('inicio') inicio: any; + @ViewChild('picker1') picker1: any; + + + public options = [ + { value: true, label: 'True' }, + { value: false, label: 'False' } + ]; + + public listColors = ['primary', 'accent', 'warn']; + public stepHours = [1, 2, 3, 4, 5]; + public stepMinutes = [1, 5, 10, 15, 20, 25]; + public stepSeconds = [1, 5, 10, 15, 20, 25]; + + public dateControlStart = new FormControl(moment("DD MM YYYY hh")); + public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + + showLoader = false + + get dateStart () { + return this.dateControlStart.value + } + + get dateEnd () { + return this.dateControlEnd.value + } + constructor( private modalController: ModalController, @@ -109,6 +133,9 @@ export class NewEventPage implements OnInit { ) { this.dateAdapter.setLocale('pt'); this.loggeduser = userService.ValidatedUser; + + this.dateControlStart = new FormControl(moment(new Date())); + this.dateControlEnd = new FormControl(moment(new Date())); } ngOnInit() { @@ -136,7 +163,7 @@ export class NewEventPage implements OnInit { Body: this.eventBody, Location: '', CalendarId: '', - CalendarName: '', + CalendarName: 'Oficial', StartDate: selectedStartdDate, EndDate: new Date(selectedEndDate), EventType: 'Reunião', @@ -194,45 +221,7 @@ export class NewEventPage implements OnInit { this.date = new Date(2021,9,4,5,6,7); - } - - - public formGroup = new FormGroup({ - date: new FormControl(null, [Validators.required]), - date2: new FormControl(null, [Validators.required]) - }) - public dateControl = new FormControl(new Date(2021,9,4,5,6,7)); - public dateControlMinMax = new FormControl(new Date()); - - public options = [ - { value: true, label: 'True' }, - { value: false, label: 'False' } - ]; - - public listColors = ['primary', 'accent', 'warn']; - - public stepHours = [1, 2, 3, 4, 5]; - public stepMinutes = [1, 5, 10, 15, 20, 25]; - public stepSeconds = [1, 5, 10, 15, 20, 25]; - - toggleMinDate(evt: any) { - if (evt.checked) { - this._setMinDate(); - } else { - this.minDate = null; - } - } - - toggleMaxDate(evt: any) { - if (evt.checked) { - this._setMaxDate(); - } else { - this.maxDate = null; - } - } - - closePicker() { - this.picker.cancel(); + this.getDatepickerData() } openInicio() { @@ -250,19 +239,6 @@ export class NewEventPage implements OnInit { } } - private _setMinDate() { - const now = new Date(); - this.minDate = new Date(); - this.minDate.setDate(now.getDate() - 1); - } - - - private _setMaxDate() { - const now = new Date(); - this.maxDate = new Date(); - this.maxDate.setDate(now.getDate() + 1); - } - async getDoc(){ const modal = await this.modalController.create({ component: SearchPage, @@ -292,8 +268,25 @@ export class NewEventPage implements OnInit { this.setIntervenientCC.emit([]); } + getDatepickerData() { + if (this.postEvent) { + this.postEvent.StartDate = this.dateStart + this.postEvent.EndDate = this.dateEnd + } + } + + restoreDatepickerData() { + if (this.postEvent) { + this.dateControlStart = new FormControl(moment(this.postEvent.StartDate, "DD MM YYYY hh:mm")); + this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate, "DD MM YYYY hh:mm")); + } + + } + async save(){ - + + this.getDatepickerData() + this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); if(this.documents.length >= 0) { @@ -301,11 +294,16 @@ export class NewEventPage implements OnInit { } if(this.loggeduser.Profile == 'MDGPR') { - console.log('MD - Aqui'); - console.log(this.postEvent); + // console.log('MD - Aqui'); + // console.log(this.postEvent); + + this.showLoader = true + this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe( async (id) => { + this.showLoader = false + const eventId: any = id; const DocumentToSave: EventAttachment[] = this.documents.map((e) => { @@ -341,8 +339,9 @@ export class NewEventPage implements OnInit { }, error => { + this.showLoader = false this.toastService.badRequest('Evento não criado') - }); + }); } else if(this.loggeduser.Profile == 'PR') { console.log('PR - Aqui'); @@ -388,6 +387,7 @@ export class NewEventPage implements OnInit { } afterSave() { + this.getDatepickerData() this.deleteTemporaryData(); this.onAddEvent.emit(this.postEvent); @@ -425,6 +425,7 @@ export class NewEventPage implements OnInit { } saveTemporaryData() { + this.getDatepickerData() window['temp.path:/home/agenda/new-event.component.ts'] = { postEvent: this.postEvent, eventBody: this.eventBody, @@ -433,6 +434,8 @@ export class NewEventPage implements OnInit { } restoreTemporaryData(): boolean { + + const restoredData = window['temp.path:/home/agenda/new-event.component.ts'] if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) { @@ -440,8 +443,11 @@ export class NewEventPage implements OnInit { this.eventBody = restoredData.eventBody this.segment = restoredData.segment + // restore dater for date and hours picker + this.restoreDatepickerData() return true; } else { + return false; } } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts index 4d3a8353c..9d84ebaf9 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts @@ -8,13 +8,39 @@ import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.m import { EditEventToApproveComponent } from './edit-event.page'; import { ComponentsModule } from 'src/app/components/components.module'; + +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, ComponentsModule, - EditEventToApproveComponentRoutingModule + EditEventToApproveComponentRoutingModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule ], declarations: [ EditEventToApproveComponent diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 2b0f5b3e6..699f59c77 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -8,7 +8,7 @@
- Editar Evento Por Aprovar + Editar evento por aprovar
@@ -40,14 +40,30 @@
+ + class="d-block d-md-none" + selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}" + [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" + interface="action-sheet" Cancel-text="Cancelar" + required + > Oficial Pessoal + + + + + + Oficial + + + Pessoal + + + +
@@ -79,8 +95,9 @@
- + + + + + + +
@@ -100,6 +134,7 @@
- + + + + + + + +
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index c2f99bdbf..49cb5faf3 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -1,5 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { FormControl } from '@angular/forms'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular'; +import * as moment from 'moment'; import { Attachment } from 'src/app/models/attachment.model'; import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchDocument } from 'src/app/models/search-document'; @@ -20,6 +22,36 @@ import { SuccessMessagePage} from '../../popover/success-message/success-message }) export class EditEventToApproveComponent implements OnInit { + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate: any; + public maxDate: any; + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + + public dateControlStart = new FormControl(moment("DD MM YYYY hh")); + public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + + showLoader = false + + get dateStart () { + return this.dateControlStart.value + } + + get dateEnd () { + return this.dateControlEnd.value + } + + @ViewChild('picker') picker: any; + @ViewChild('fim') fim: any; + @ViewChild('inicio') inicio: any; + @ViewChild('picker1') picker1: any; + serialNumber: string loadedAttachments: Attachment[]= [] @@ -44,76 +76,6 @@ export class EditEventToApproveComponent implements OnInit { } } - // event ={ - // "serialNumber":"9073_118", - // "originator":{ - // "email":"gilson.manuel@gabinetedigital.local", - // "manager":"", - // "displayName":"", - // "fqn":"K2:GABINETEDIGITAL\\gilson.manuel", - // "username":"GABINETEDIGITAL\\gilson.manuel" - // }, - // "actions":null, - // "workflowInstanceFolio":"Final do sprint", - // "taskStartDate":"4/30/2021 9:06:48 AM", - // "workflowID":4365, - // "workflowInstanceID":9073, - // "workflowName":"MDGPR\\Agenda Oficial MDGPR", - // "workflowDisplayName":"Agenda Oficial MDGPR", - // "formURL":"http://bpmdev.gabinetedigital.local/Runtime/Runtime/Form/Exchange+Calendar+Meeting+Approval/?SerialNo=9073_118", - // "workflowInstanceDataFields": { - // "Body":"Será fechado o sprint 1 - 26 Abr - 30 Abr", - // "Location":"Equilibrium - Sala de reuniões", - // "Subject":"Final do sprint", - // "StartDate":"2021-04-30T15:00:00", - // "EndDate":"2021-04-30T15:30:00", - // "Participants":"gilson.manuel@gabinetedigital.local;tiago.kayaya@gabinetedigital.local;solange.vandunem@gabinetedigital.local", - // "CC":"", - // "ReviewUserComments":"teste", - // "Role":0, - // "MDName":"Paulo Pinto", - // "MDEmail":"paulo.pinto@gabinetedigital.local", - // "PREmail":"", - // "OriginatorComments":"", - // "Status":"Active", - // "TimeZone":"W. Central Africa Standard Time", - // "Agenda":"Oficial", - // "EventType":"Reunião", - // "EventID":"", - // "IsRecurring":false, - // "ParticipantsList":[ - // { - // "$type":null, - // "EmailAddress":"gilson.manuel@gabinetedigital.local", - // "Name":"Gilson Manuel", - // "IsRequired":true - // }, - // { - // "$type":null, - // "EmailAddress":"tiago.kayaya@gabinetedigital.local", - // "Name":"Tiago Kayaya", - // "IsRequired":true - // }, - // { - // "$type":null, - // "EmailAddress":"solange.vandunem@gabinetedigital.local", - // "Name":"Solange Van-Dúnem", - // "IsRequired":true - // } - // ], - // "EventOrganizer":"{\"$type\":\"Gabinete.k2RESTidentifier_EventPerson, Gabinete, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"EmailAddress\":\"agenda.mdgpr@gabinetedigital.local\",\"Name\":\"Agenda do Ministro e Director do Gabinete do PR\",\"IsRequired\":true}", - // "CreateEvent":"", - // "IsAllDayEvent":false, - // "SerializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData[], GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"$values\":[{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}]}", - // "MDwxUserID":261, - // "DeserializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}", - // "Message":"Foi actualizado o", - // "InstanceId":"R0RfR0FCSU5FVEVESUdJVEFMXGdpbHNvbi5tYW51ZWxfMjAyMS0wNC0zMCAwODowNDoyN1o=", - // "For Each Result":"", - // "For Each Index":0 - // } - // } - show = false postEvent: Event; @@ -146,20 +108,23 @@ export class EditEventToApproveComponent implements OnInit { ) { this.serialNumber = this.navParams.get('serialNumber'); - // this.profile = this.navParams.get('profile'); this.isEventEdited = false; - this.getTask() + this.dateControlStart = new FormControl(moment(new Date())); + this.dateControlEnd = new FormControl(moment(new Date())); + } async getTask() { console.log('this.eventProcess', this.eventProcess); const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{ - this.eventProcess = result + this.eventProcess = result + + this.restoreDatepickerData() console.log(this.eventProcess.workflowInstanceDataFields.Subject) @@ -170,22 +135,6 @@ export class EditEventToApproveComponent implements OnInit { this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId this.getAttachments() - - - // attendees - //this.eventProcess.workflowInstanceDataFields.ParticipantsList - // subject - //this.eventProcess.workflowInstanceDataFields.Subject | this.eventProcess.workflowInstanceFolio - // location - //this.eventProcess.workflowInstanceDataFields.Location - // startDate - //this.eventProcess.taskStartDate - // endDate - //this.eventProcess.workflowInstanceDataFields.EndDate - - // this.eventProcess.workflowInstanceDataFields.Agenda - - // eventProcess.workflowInstanceDataFields.IsRecurring if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) { this.isRecurring = "Não se repete"; @@ -202,18 +151,12 @@ export class EditEventToApproveComponent implements OnInit { } }) }) + + } ngOnInit() { - - window.onresize = (event) => { - // if not mobile remove all component - if( window.innerWidth >= 800){ - this.modalController.dismiss(); - } - }; - } close() { @@ -221,6 +164,8 @@ export class EditEventToApproveComponent implements OnInit { } save() { + // set dates to eventProcess object + this.getDatepickerData() this.taskParticipantsCc.forEach(e=>{ e.IsRequired = false @@ -323,7 +268,7 @@ export class EditEventToApproveComponent implements OnInit { this.postEvent.Attendees = data; } - setIntervenientCC(data){ + setIntervenientCC(data) { this.taskParticipantsCc = data; } @@ -360,9 +305,7 @@ export class EditEventToApproveComponent implements OnInit { deleteAttachment(attachment: Attachment, index) { - console.log('index', index) this.loadedAttachments[index]['action'] = 'delete' - } async getDoc() { @@ -409,4 +352,18 @@ export class EditEventToApproveComponent implements OnInit { }); } + restoreDatepickerData() { + + this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate))); + this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate))); + + } + + getDatepickerData() { + + this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart + this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd + + } + } \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 7144cefa4..fe733d99a 100644 --- a/src/global.scss +++ b/src/global.scss @@ -869,4 +869,54 @@ background: rgb(92, 92, 92); .modal { display: flex !important; - } \ No newline at end of file +} + +// calendar +.mat-calendar-body-selected { + background-color: #42b9fe !important; +} + +// select background +// .mat-primary .mat-option.mat-selected:not(.mat-option-disabled), .mat-option-ripple { +// background-color: #fafafa !important; +// } + +.mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-keyboard-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-program-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { + background-color: #42b9fe36 !important; +} + +.mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline { + display: none; +} + +.date-hour-picker { + margin-top: -6px; + + label#mat-form-field-label-7{ + // display: none; + } + + .span.ng-tns-c193-4, .ng-star-inserted { + // display: none; + } + + .ng-star-inserted{ + // display: none; + position: absolute; + width: 447px; + height: 43px; + opacity: 0; + button { + width: 100%; + height: 100%; + } + } +} + +.mat-active span { + color: #0d89d1 !important; +} + +// .ng-star-inserted { +// opacity: 0; +// } \ No newline at end of file From 0f3fb2a602e6c2f247b36011f69660694e65faaa Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 15:42:55 +0100 Subject: [PATCH 06/27] save --- src/app/pages/events/events.page.html | 2 +- src/app/pages/events/events.page.ts | 3 ++- .../despachos/despacho/despacho.page.ts | 7 ++++--- .../gabinete-digital/despachos/despachos.page.ts | 12 ++++++++++-- src/app/services/processes.service.ts | 4 +++- .../despachos-pr/despachos-pr.page.ts | 3 ++- .../gabinete-digital/despachos/despachos.page.ts | 7 ++++++- .../diplomas-assinar/diplomas-assinar.page.ts | 6 ++++-- .../gabinete-digital/diplomas/diplomas.page.ts | 12 ++++++++---- .../shared/gabinete-digital/pedidos/pedidos.page.ts | 4 +++- 10 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 54e6d6ad3..0b3fd939f 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -55,7 +55,7 @@
{{event.Location}}
-
{{event.Subject}}
+
{{event.Subject.substring(0,maxSubjectLength)}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a7f108370..5a14be94a 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -43,7 +43,8 @@ export class EventsPage implements OnInit { public profile:string; currentEvent: any; - eventsList: Event[]; + eventsList: Event[]; + maxSubjectLength = 140; officialeventsList: Event[]; personaleventsList: Event[]; diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index b79c2a7ee..36632cd8e 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -88,8 +88,6 @@ export class DespachoPage implements OnInit { } goBack() { - // window.history.back() - if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/despachos']); } else { @@ -100,7 +98,6 @@ export class DespachoPage implements OnInit { } this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - } @@ -140,12 +137,16 @@ export class DespachoPage implements OnInit { console.log(users); }); + console.log(this.task.FolderId); + this.getDocumentDetails(this.task.FolderId, '361'); }); } getDocumentDetails(forlderId:string, applicationId:string) { + console.log(forlderId); + this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ this.attachments = res.Documents; console.log(res['Documents']); diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index ed82d9461..1ea664a91 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -80,12 +80,15 @@ export class DespachosPage implements OnInit { } async LoadList() { - + console.log('HERE'); + let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); this.despachoList = new Array(); console.log(result); + console.log('OI'); + await result.forEach( (element, index) => { @@ -101,7 +104,7 @@ export class DespachosPage implements OnInit { "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocId, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -110,9 +113,14 @@ export class DespachosPage implements OnInit { }); + console.log(this.despachoList); + + this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { + console.log(element); + // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 6a382fb71..1ec0cd1b6 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -244,11 +244,13 @@ export class ProcessesService { } GetDocumentDetails(DocId:string, FsId:string){ + console.log(DocId); + const geturl = environment.apiURL + 'search/documents'; let params = new HttpParams(); params = params.set("docId", DocId); - params = params.set("applicationid", FsId); + params = params.set("applicationId", FsId); let options = { headers: this.headers, diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 2868d4dc8..ed8b1de8b 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 89031e4d4..fbfb80fbb 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -96,6 +96,8 @@ export class DespachosPage implements OnInit { } async LoadList(){ + console.log('HERE DESK'); + let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); @@ -117,7 +119,8 @@ export class DespachosPage implements OnInit { "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocId, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -129,6 +132,8 @@ export class DespachosPage implements OnInit { this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { + console.log(element['FolderID']); + // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 79a58e660..437e27e36 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -81,7 +81,8 @@ serialNumber:string; "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -100,7 +101,8 @@ serialNumber:string; "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Sender, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 2f5ab780c..3b001438e 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -84,7 +84,8 @@ constructor( "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -103,7 +104,8 @@ constructor( "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -136,7 +138,8 @@ constructor( "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -156,7 +159,8 @@ constructor( "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.DispatchDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 61e31131b..e803456a8 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -95,7 +95,8 @@ export class PedidosPage implements OnInit { "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "DocId": element.workflowInstanceDataFields.ParecerDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } @@ -127,6 +128,7 @@ export class PedidosPage implements OnInit { "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } From d923fe381e041b1e6a0069627e131f46f2ea71bc Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 23 Jun 2021 15:49:44 +0100 Subject: [PATCH 07/27] Improve desktop form --- src/app/modals/create-process/create-process.page.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 5bf9dfd31..c5472c9d1 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -29,14 +29,14 @@
- - - + + +
From b3948b4fb2e40931ce84fa536f906e88c49ca3d5 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 11:07:53 +0100 Subject: [PATCH 08/27] save --- src/app/pages/agenda/agenda.page.scss | 11 +++++++++++ src/app/pages/events/events.page.html | 4 +++- src/app/pages/events/events.page.scss | 9 +++++++++ src/app/pages/events/events.page.ts | 2 +- .../gabinete-digital/event-list/event-list.page.html | 2 +- .../gabinete-digital/pendentes/pendentes.page.html | 2 +- src/app/shared/agenda/event-list/event-list.page.html | 2 +- .../events-to-approve/events-to-approve.page.html | 2 +- .../event-list-event-list-module.js.download | 2 +- 9 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index de08b8a9f..5d1962199 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -460,6 +460,10 @@ td.monthview-primary-with-event { color: #2e2e2e !important; font-size: 13px; } + .EventListBox{ + padding-bottom: 5px; + border-bottom: 1px solid #d8d8d8; + } .content-pr-Oficial, .content-pr-Pessoal, .content-mdgpr-Pessoal, .content-mdgpr-Oficial { width: 100% !important; @@ -508,6 +512,13 @@ td.monthview-primary-with-event { font-weight: bold; color: #0d89d1; } + + .description p{ + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + } .color{ width: 5px; diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 0b3fd939f..8541f9c9e 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -55,7 +55,9 @@
{{event.Location}}
-
{{event.Subject.substring(0,maxSubjectLength)}}
+
+ {{event.Subject}} +
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 27d455055..338bf4ded 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -417,10 +417,15 @@ ion-toolbar{ } .description{ + width: 275px; font-family: Roboto; font-size: 15px; font-weight: bold; color: #0d89d1; + + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; } } .color{ @@ -486,4 +491,8 @@ ion-toolbar{ .schedule{ width: 360px; } +} +ion-title{ + border: 1px solid red; + text-overflow: ellipsis; } \ No newline at end of file diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 5a14be94a..95791e630 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -44,7 +44,7 @@ export class EventsPage implements OnInit { currentEvent: any; eventsList: Event[]; - maxSubjectLength = 140; + maxSubjectLength = 30; officialeventsList: Event[]; personaleventsList: Event[]; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 178d48c6b..f0d9cddf6 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -21,7 +21,7 @@ - Seu calendário + Meu calendário Presidente da República diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 6e7911e1e..80dd5f6e1 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 7d3d6fbb4..c1daf0751 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -6,7 +6,7 @@ - Seu calendário + Meu calendário Presidente da República diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 041d51227..eab46b954 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -9,7 +9,7 @@ - Seu calendário + Meu calendário Presidente da República diff --git a/src/assets/images/Gabinete Digital_files/event-list-event-list-module.js.download b/src/assets/images/Gabinete Digital_files/event-list-event-list-module.js.download index b5b4f4d7e..1af0ffb69 100644 --- a/src/assets/images/Gabinete Digital_files/event-list-event-list-module.js.download +++ b/src/assets/images/Gabinete Digital_files/event-list-event-list-module.js.download @@ -9,7 +9,7 @@ "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony default export */ __webpack_exports__["default"] = ("\n \n \n \n \n Eventos para Aprovação\n \n \n \n \n Seu calendário\n \n \n Presidente da República\n \n \n \n\n\n\n
\n \n
\n \n \n \n
\n
\n

08:30

\n

12:30

\n
\n
\n

Luanda | Palácio Presidencial

\n

Reunião de Conselho de Ministros

\n
\n
\n \n \n \n
\n\n \n \n \n \n
\n
\n

08:30

\n

12:30

\n
\n
\n

Luanda | Palácio Presidencial

\n

Reunião de Conselho de Ministros

\n
\n
\n \n \n \n
\n\n\n"); +/* harmony default export */ __webpack_exports__["default"] = ("\n \n \n \n \n Eventos para Aprovação\n \n \n \n \n Meu calendário\n \n \n Presidente da República\n \n \n \n\n\n\n
\n \n
\n \n \n \n
\n
\n

08:30

\n

12:30

\n
\n
\n

Luanda | Palácio Presidencial

\n

Reunião de Conselho de Ministros

\n
\n
\n \n \n \n
\n\n \n \n \n \n
\n
\n

08:30

\n

12:30

\n
\n
\n

Luanda | Palácio Presidencial

\n

Reunião de Conselho de Ministros

\n
\n
\n \n \n \n
\n\n\n"); /***/ }), From b8a9e3cdb3793bff953569958d3bacbb373ce7f2 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 11:08:17 +0100 Subject: [PATCH 09/27] Add desktop inputs --- src/app/app.component.ts | 24 ++++- src/app/app.module.ts | 10 +- .../create-process/create-process.page.html | 24 +++-- .../create-process/create-process.page.ts | 26 +++++- .../pages/agenda/new-event/new-event.page.ts | 2 - .../book-meeting-modal.module.ts | 47 +++++++++- .../book-meeting-modal.page.html | 91 ++++++++++++++++++- .../book-meeting-modal.page.ts | 64 +++++++++++-- .../expedient-task-modal.module.ts | 16 +++- .../expedient-task-modal.page.html | 39 +++++--- .../expedient-task-modal.page.ts | 31 ++++++- .../agenda/new-event/new-event.module.ts | 2 +- .../edit-event-to-approve/edit-event.page.ts | 4 +- src/app/shared/header/header.page.ts | 2 +- src/global.scss | 31 +++++-- 15 files changed, 353 insertions(+), 60 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 5dab677c6..1c2f4d5fd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,11 +3,33 @@ import { Component } from '@angular/core'; import { Platform } from '@ionic/angular'; /* import { SplashScreen } from '@ionic-native/splash-screen/ngx'; */ import { StatusBar } from '@ionic-native/status-bar/ngx'; +import * as _moment from 'moment'; +import * as _rollupMoment from 'moment'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; +const moment = _rollupMoment || _moment; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; + + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @Component({ selector: 'app-root', templateUrl: 'app.component.html', - styleUrls: ['app.component.scss'] + styleUrls: ['app.component.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class AppComponent { constructor( diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9a1edca10..d8d70e95d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,12 +32,17 @@ import { WebsocketService } from './services/websocket.service' import { ChatService } from './services/chat.service'; import {MatDatepickerModule} from '@angular/material/datepicker'; // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; +import {MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; +import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; + import { NgxMatDatetimePickerModule, NgxMatNativeDateModule, NgxMatTimepickerModule } from '@angular-material-components/datetime-picker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatSelectModule } from '@angular/material/select'; @NgModule({ @@ -61,9 +66,12 @@ import { // NgxMatDatetimePickerModule, NgxMatTimepickerModule, - NgxMatNativeDateModule + NgxMatNativeDateModule, + MatSelectModule, + MatDialogModule ], providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, StatusBar, //SplashScreen, HttpClientModule, diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index c5472c9d1..b3ce63c3f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -29,14 +29,14 @@
- + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) - - +
@@ -63,15 +62,14 @@
- - Tipo de assunto - - {{type.Description}} - - + + + Toppings + + {{topping}} + + +
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 1546c27c7..2aed50f40 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -15,11 +15,30 @@ import { User } from 'src/app/models/user.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl } from '@angular/forms'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; + + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @Component({ selector: 'app-create-process', templateUrl: './create-process.page.html', styleUrls: ['./create-process.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class CreateProcessPage implements OnInit { modalTitle: string[] = [ @@ -58,6 +77,9 @@ export class CreateProcessPage implements OnInit { loggeduser: User; + toppings = new FormControl(); + + toppingList: string[] = ['Economia', 'Saúde', 'Educação', 'Finanças', 'Agricultura']; constructor( private modalController: ModalController, @@ -91,7 +113,6 @@ export class CreateProcessPage implements OnInit { DeadlineType: '', SubjectTypes: this.selectedTypes, NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, - }; this.postData.DispatchFolder = this.dispatchFolder; @@ -117,7 +138,6 @@ export class CreateProcessPage implements OnInit { this.taskDate = new Date(this.task.taskStartDate); } - onSelectedTypesChanged(ev:any){ console.log(ev); if(ev.length > 1){ @@ -129,7 +149,7 @@ export class CreateProcessPage implements OnInit { } } - close(){ + close() { //this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 996c8c96a..9af991193 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -9,8 +9,6 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { AuthService } from 'src/app/services/auth.service'; import { EventsService } from 'src/app/services/events.service'; import { ToastService } from 'src/app/services/toast.service'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts index 743fe38aa..9057bed99 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -11,6 +11,36 @@ import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-c import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; + +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDateFormats, + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule, + NGX_MAT_DATE_FORMATS +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; + + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @NgModule({ imports: [ CommonModule, @@ -23,10 +53,23 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att AttendeeModalPageModule, EmptyContainerPageModule, BtnModalDismissPageModule, - + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule ], declarations: [ BookMeetingModalPage - ] + ], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, + ], }) export class BookMeetingModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index d8b0aea57..23b750348 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -35,10 +35,28 @@
- + Oficial Pessoal + + + + + + Oficial + + + Pessoal + + + +
@@ -50,6 +68,7 @@
- + + + + + + + +
@@ -71,6 +108,7 @@
- + + + + + + +
@@ -91,13 +146,41 @@
- + Não se repete Repete + + + + + + Não se repete + + + Repete + + + +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 63c551f92..773bce4c0 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -1,8 +1,6 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { AnimationController, ModalController, NavParams } from '@ionic/angular'; -import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page'; -import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; import { Event } from 'src/app/models/event.model' import { EventBody } from 'src/app/models/eventbody.model'; import { ProcessesService } from 'src/app/services/processes.service'; @@ -12,21 +10,74 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart import { AttachmentsService } from 'src/app/services/attachments.service'; import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from 'src/app/models/search-document'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; +import { FormControl } from '@angular/forms'; +import * as _moment from 'moment'; +import * as _rollupMoment from 'moment'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; + +const moment = _rollupMoment || _moment; + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @Component({ selector: 'app-book-meeting-modal', templateUrl: './book-meeting-modal.page.html', styleUrls: ['./book-meeting-modal.page.scss'], + providers: [ + // { provide: MAT_DATE_LOCALE, useValue: 'pt' }, + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class BookMeetingModalPage implements OnInit { + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate: any; + public maxDate: any; + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + + public dateControlStart = new FormControl(moment("DD MM YYYY hh")); + public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + + showLoader = false + + get dateStart () { + return this.dateControlStart.value + } + + get dateEnd () { + return this.dateControlEnd.value + } + + @ViewChild('picker') picker: any; + @ViewChild('fim') fim: any; + @ViewChild('inicio') inicio: any; + @ViewChild('picker1') picker1: any; + task: any; taskParticipants: EventPerson[]; @@ -73,9 +124,6 @@ export class BookMeetingModalPage implements OnInit { /* Set + 30minutes to seleted datetime */ let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ - - - } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts index 66a6e0db4..abf872d74 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts @@ -15,9 +15,11 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- import { MatNativeDateModule } from '@angular/material/core'; import { + NgxMatDateFormats, NgxMatDatetimePickerModule, NgxMatNativeDateModule, - NgxMatTimepickerModule + NgxMatTimepickerModule, + NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; @@ -28,6 +30,17 @@ import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} @NgModule({ imports: [ CommonModule, @@ -51,6 +64,7 @@ import { MatInputModule } from '@angular/material/input'; ReactiveFormsModule ], providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, { provide: MAT_DATE_LOCALE, useValue: 'pt' }, ], declarations: [ diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index ba0ac9f1f..91cc3111e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -28,14 +28,21 @@
- + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) - + @@ -62,15 +69,25 @@
- - Tipo de assunto - - {{type.Description}} - - + + Tipo de assunto + + {{type.Description}} + + + + + Toppings + + {{type.Description}} + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index a1f65ca3c..04b74559d 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -20,11 +20,30 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ToastService } from 'src/app/services/toast.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; +import { FormControl } from '@angular/forms'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @Component({ selector: 'app-expedient-task-modal', templateUrl: './expedient-task-modal.page.html', styleUrls: ['./expedient-task-modal.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class ExpedientTaskModalPage implements OnInit { @@ -46,7 +65,7 @@ export class ExpedientTaskModalPage implements OnInit { loadedAttachments:any; documents:SearchDocument[] = []; - subjectTypes:any; + subjectTypes:any[] = []; selectedTypes: string[]=[]; postData: Despacho; @@ -66,6 +85,11 @@ export class ExpedientTaskModalPage implements OnInit { taskResult: any = {} loggeduser: User; + toppings = new FormControl(); + + get toppingsValues() { + return this.toppings.value; + } constructor( private modalController: ModalController, @@ -190,6 +214,11 @@ export class ExpedientTaskModalPage implements OnInit { } }); docs.Attachments = DocumentToSave; + + if (window.innerWidth >= 800) { + this.selectedTypes = this.toppingsValues + } + this.dispatchFolder.SubjectTypes = this.selectedTypes; switch (this.loggeduser.Profile) { diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts index 7e8799db7..c35cd2c00 100644 --- a/src/app/shared/agenda/new-event/new-event.module.ts +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -50,7 +50,7 @@ import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/ NgxMatMomentModule, // BrowserAnimationsModule, - // BrowserModule, + // MatRadioModule, MatSelectModule, //MatRadioModule, //MatCheckboxModule, diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 384d75d50..9df6c755f 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -11,9 +11,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; -import { Event, EventToApproveEdit } from '../../../models/event.model'; -import { BadRequestPage } from '../../popover/bad-request/bad-request.page'; -import { SuccessMessagePage} from '../../popover/success-message/success-message.page'; +import { Event } from '../../../models/event.model'; @Component({ selector: 'app-edit-event', diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index d3eab0f65..33ccdb0d5 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -44,7 +44,7 @@ export class HeaderPage implements OnInit { classs = 'modal modal-width-100 modal-padding-top' showSearchInput = true } else { - classs = 'modal modal-width-100 modal-padding-top modal-desktop-shadow modal-desktop-remove-background' + classs = 'modal modal-desktop desktop-search' showSearchInput = false } diff --git a/src/global.scss b/src/global.scss index 2ccb95bf0..4e012ae94 100644 --- a/src/global.scss +++ b/src/global.scss @@ -363,6 +363,20 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } +.desktop-search { + padding-top: 0px !important; + margin-top: 80px !important; + position: relative !important; + + ion-backdrop { + display: none !important; + } + // margin-top: 86px; + .model-wrapper { + + } +} + .notification-modal { ion-backdrop { display: none; @@ -401,23 +415,24 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .modal-width-100-width-background, .modal-desktop { padding-top: 76px; - .modal-wrapper{ + .modal-wrapper { width: 100% !important; height: 99% !important; position: relative; } } -.modal-padding-top{ - .modal-wrapper{ - height: 99%; - top: 2%; - position: relative; +.modal-padding-top { + margin-top: 87px; + .modal-wrapper { + // height: 99%; + // top: 2%; + // position: relative; } } .modal-top-100-width-background, .modal-desktop { - .modal-wrapper{ + .modal-wrapper { width: 100%; height: 99%; position: relative; @@ -897,7 +912,7 @@ background: rgb(92, 92, 92); .date-hour-picker { margin-top: -6px; - label#mat-form-field-label-7{ + label#mat-form-field-label-7 { // display: none; } From f1b9e79624657f5b6cfef12fe26f292f03124b0a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 11:47:05 +0100 Subject: [PATCH 10/27] save --- src/app/app.module.ts | 9 ++++++++- .../book-meeting-modal/book-meeting-modal.page.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d8d70e95d..6478859fc 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,7 +21,7 @@ import { IonicStorageModule } from '@ionic/storage'; // import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CalendarModule, DateAdapter } from 'angular-calendar'; @@ -43,6 +43,8 @@ import { } from '@angular-material-components/datetime-picker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MatButtonModule } from '@angular/material/button'; @NgModule({ @@ -67,6 +69,11 @@ import { MatSelectModule } from '@angular/material/select'; NgxMatDatetimePickerModule, NgxMatTimepickerModule, NgxMatNativeDateModule, + + NgxMatMomentModule, + MatButtonModule, + ReactiveFormsModule, + MatSelectModule, MatDialogModule ], diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 773bce4c0..02fbf9a41 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -176,8 +176,8 @@ export class BookMeetingModalPage implements OnInit { Location: this.postData.Location, CalendarId: '', CalendarName: this.postData.CalendarName, - StartDate: this.postData.StartDate, - EndDate: this.postData.EndDate, + StartDate: this.dateStart, + EndDate: this.dateEnd, EventType: 'Reunião', Attendees: Attendees, IsMeeting: false, From c85e2a3659dcd78375858edbf7469d8a04a5de9a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 11:50:44 +0100 Subject: [PATCH 11/27] save --- .../pages/gabinete-digital/expediente/expediente.page.html | 4 ++-- src/app/pages/gabinete-digital/expediente/expediente.page.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index c56ae6304..abb682931 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -2,7 +2,7 @@ - + @@ -19,7 +19,7 @@
-
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 6a677e6d0..8379d6e98 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -80,9 +80,10 @@ export class ExpedientePage implements OnInit { }); } - doRefresh() { + doRefresh(event) { this.LoadList(); setTimeout(() => { + event.target.complete(); }, 2000); } From 2f54a7b33b5e8f2a6f2b1bb2a278af3aad94ea14 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 12:31:46 +0100 Subject: [PATCH 12/27] save --- src/app/pages/events/events.page.html | 2 +- src/app/pages/events/events.page.scss | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8541f9c9e..4b978d797 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -56,7 +56,7 @@
{{event.Location}}
- {{event.Subject}} +

{{event.Subject}}

diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 338bf4ded..1343febc9 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -408,7 +408,7 @@ ion-toolbar{ display: flex; flex-wrap: wrap; align-items: center; - width: 100%; + width: 78%; .location{ font-family: Roboto; font-size: 13px; @@ -417,12 +417,13 @@ ion-toolbar{ } .description{ - width: 275px; + width: 100%; font-family: Roboto; font-size: 15px; font-weight: bold; color: #0d89d1; - + } + .description p{ white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; From 0bb3cd7ebb0665e607a82ba01ccf628dac3a14ad Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 12:46:39 +0100 Subject: [PATCH 13/27] save --- src/app/pages/gabinete-digital/event-list/event-list.page.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 8b6826245..3db96034a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -6,8 +6,9 @@ } .content{ padding: 30px 20px 0 20px !important; - margin: 0; + margin: 0 auto; float: left; + overflow: auto; } .header-content{ margin: 0 !important; From d2cb6210a08fde537636e8f4d34d545a675f91f4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 13:52:31 +0100 Subject: [PATCH 14/27] Desktop inputs --- .../edit-event.page.html | 22 ++++++++++++++++++- .../edit-event-to-approve/edit-event.page.ts | 18 +++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 699f59c77..ec1991c86 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -173,7 +173,9 @@
- Não se repete Repete + + + + + Não se repete + + + Repete + + + +
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 9df6c755f..359f8dda9 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -12,11 +12,29 @@ import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; +import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; + + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + @Component({ selector: 'app-edit-event', templateUrl: './edit-event.page.html', styleUrls: ['./edit-event.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class EditEventToApproveComponent implements OnInit { From 1964d15ade0f96ea4222d5700311b61a4b88c5ce Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 14:04:30 +0100 Subject: [PATCH 15/27] Improve --- .../create-process/create-process.page.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index b3ce63c3f..6236dcd44 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -38,17 +38,17 @@ - - Reunião + + Normal - - Viagem + + Urgente - - Conferência + + Muito Urgente - - Encontro + + Urgentíssimo @@ -64,7 +64,6 @@
- Toppings {{topping}} From 887cb85a93560b0eb12179049077c0611ec68017 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 14:20:41 +0100 Subject: [PATCH 16/27] Improve --- .../create-process/create-process.page.html | 7 +++-- .../expedient-task-modal.page.html | 23 +++++----------- .../edit-event.page.html | 26 +------------------ 3 files changed, 12 insertions(+), 44 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 6236dcd44..40169c9a9 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -64,8 +64,11 @@
- - {{topping}} + + Normal + Urgente + Muito Urgente + Urgentíssimo diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 91cc3111e..5fd5f5509 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -42,21 +42,12 @@ Urgentíssimo (8 horas para a execução da tarefa) - - - - - Reunião - - - Viagem - - - Conferência - - - Encontro - + + + Normal + Urgente + Muito Urgente + Urgentíssimo @@ -71,7 +62,6 @@
- Tipo de assunto - Toppings {{type.Description}} diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index ec1991c86..3b8b8d7f7 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -68,26 +68,6 @@
- -
@@ -277,8 +257,7 @@ -
- +
@@ -292,9 +271,6 @@
- - -
From 818328e61c8fdc15583cf44f6487687746b773bb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 14:24:14 +0100 Subject: [PATCH 17/27] Improve --- .../expedient-task-modal/expedient-task-modal.page.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 5fd5f5509..6bea75699 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -44,10 +44,10 @@ - Normal - Urgente - Muito Urgente - Urgentíssimo + Normal (4 dias para a execução da tarefa) + Urgente (2 dias para a execução da tarefa) + Muito Urgente (1 dia para a execução da tarefa) + Urgentíssimo (8 horas para a execução da tarefa) From 4d80054c952ceeb486f1c37b831b5d77f3446d3b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 14:36:59 +0100 Subject: [PATCH 18/27] Improve --- src/app/pages/chat/chat.page.html | 2 +- src/app/shared/agenda/new-event/new-event.page.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 5e529eb78..878fc8ef1 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -90,7 +90,7 @@
- + diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 9bac41b00..7c826ee4c 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -68,6 +68,8 @@ export class NewEventPage implements OnInit { public stepSecond = 5; public color: ThemePalette = 'primary'; + james: any + @Input() profile:string; @Input() selectedSegment: string; @Input() selectedDate: Date; From ad610c5deedccabfec552292c5b610ff08f835d7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 15:03:54 +0100 Subject: [PATCH 19/27] save --- .../pendentes/pendentes.page.html | 24 ++-- .../pendentes/pendentes.page.scss | 130 +++++++++++------- 2 files changed, 92 insertions(+), 62 deletions(-) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 80dd5f6e1..4169b451b 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -6,7 +6,7 @@
-
Pendentes
+
Pendentes MOB
+
+
+ {{task.Senders}} +
+
{{task.WorkflowName}} @@ -54,12 +59,6 @@ {{ task.CreateDate | date: 'dd-MM-yy' }}
- -
-
- {{task.Senders}} -
-
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index d8a14ebcc..0800712e3 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -44,9 +44,6 @@ export class PendentesPage implements OnInit { //Inicializar segment this.segment = "despachos"; this.LoadList(); - this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); } segmentChanged(ev: any) { @@ -71,7 +68,6 @@ export class PendentesPage implements OnInit { } openExpedientDetailPage(data){ - console.log(data); this.openExpedientDetail.emit(data); } @@ -86,6 +82,7 @@ export class PendentesPage implements OnInit { let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise(); let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); + console.log(pendentes); pendentes.forEach(element => { let DocId = element.workflowInstanceDataFields.FolderID; let ApplicationId = element.workflowInstanceDataFields.ApplicationId; @@ -107,6 +104,7 @@ export class PendentesPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, } this.pendentesList.push(task); }, @@ -122,6 +120,7 @@ export class PendentesPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocId, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, } this.pendentesList.push(task); }); @@ -138,7 +137,6 @@ export class PendentesPage implements OnInit { } async viewTaskDetails(serialNumber:string, workflowName:string) { - console.log(this.profile); if(workflowName == 'Despacho'){ this.goToDespacho(serialNumber); } From 9f1ee3a583b8568a79d567d56119892cfffd5b58 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 16:00:31 +0100 Subject: [PATCH 22/27] save --- .../pendentes/pendentes.page.scss | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index 4e4ca4724..ae669ca74 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -123,6 +123,38 @@ ion-item{ /* border-bottom: 1px solid gray; */ margin: 10px auto; } + +.exp-top-detail{ + width: 100%; + float: left; + font-family: Roboto; + font-size: 12pt; + font-weight: 700; + color: #0d89d1; + padding-left: 3px; + + .subject{ + width: 84%; + float: left; + } + + .exp-icon{ + width: fit-content; + float: right; + /* font-size: 13px; */ + margin: 0 !important; + padding: 0 !important; + + ion-icon{ + font-size: 12pt; + color: #42b9fe; + float: left; + } + label{ + font-size: 10pt; + } + } +} .exp-middle-detail, .exp-bottom-detail{ margin-bottom: 5px; @@ -158,40 +190,11 @@ ion-item{ float: right; } } -.exp-top-detail{ - width: 100%; - float: left; - font-family: Roboto; - font-size: 12pt; - font-weight: 700; - color: #0d89d1; - - .subject{ - width: 84%; - float: left; - } - - .exp-icon{ - width: fit-content; - float: right; - /* font-size: 13px; */ - margin: 0 !important; - padding: 0 !important; - - ion-icon{ - font-size: 12pt; - color: #42b9fe; - float: left; - } - label{ - font-size: 10pt; - } - } -} .exp-bottom-detail{ font-size: 8pt; width: 100%; overflow: auto; + padding-left: 3px; .exp-remetente{ //width: 200px; From c542d0728e6c81dfa7ae6d5571a164b443b1e8c2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 16:15:53 +0100 Subject: [PATCH 23/27] save --- .../expediente-detail.page.ts | 54 ++++++++++++------- .../pedidos/pedido/pedido.page.ts | 33 +++++++++--- 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 9d9dc654c..887f46844 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -97,27 +97,42 @@ export class ExpedienteDetailPage implements OnInit { } goBack() { - this.activatedRoute.paramMap.subscribe(params => { - switch (params["params"].caller) { - case 'events': - this.router.navigate(['/home',params["params"].caller]); - break; - - case 'gabinete-digital': - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes": true, + if(this.task.Status == "Pending"){ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pendentes']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pendentes": true, } - } - if( window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/expediente']); - } else { - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } - break; - + } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - }); + } + else{ + this.activatedRoute.paramMap.subscribe(params => { + switch (params["params"].caller) { + case 'events': + this.router.navigate(['/home',params["params"].caller]); + break; + + case 'gabinete-digital': + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes": true, + } + } + if( window.innerWidth < 801) { + this.router.navigate(['/home/gabinete-digital/expediente']); + } else { + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + break; + + } + }); + } } sendExpedienteToPending() { @@ -149,6 +164,7 @@ export class ExpedienteDetailPage implements OnInit { "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocID, "WorkflowName": res.workflowDisplayName, + "Status": res.workflowInstanceDataFields.Status, } //console.log('task', this.task); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 8102f6c3c..78ef5944b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -102,6 +102,7 @@ export class PedidoPage implements OnInit { "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "activityInstanceName": res.activityInstanceName, + "Status": res.workflowInstanceDataFields.Status, } console.log(this.task); } @@ -126,6 +127,7 @@ export class PedidoPage implements OnInit { "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "activityInstanceName": res.activityInstanceName, + "Status": res.workflowInstanceDataFields.Status, } console.log(this.task); } @@ -443,17 +445,32 @@ export class PedidoPage implements OnInit { } goBack() { - if (window.innerWidth <= 800) { - this.router.navigate(['/home/gabinete-digital/pedidos']); - } else { - let navigationExtras: NavigationExtras = { - queryParams: { - "pedidos": true, + if(this.task.Status == "Pending"){ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pendentes']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pendentes": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } + else{ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pedidos']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } + } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - } } From 7daedfce90f6c03d9494fbde20bf08e823fe4b20 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 24 Jun 2021 16:32:12 +0100 Subject: [PATCH 24/27] save --- src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index e692465fd..87e9d322c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -17,6 +17,7 @@ font-size: 18px !important; } .main-header{ + display: flex; font-family: Roboto; background-color: #fff; overflow:auto; From 67e62cce30e64bf2fd3d55be89bbd5fbc99c7737 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 24 Jun 2021 16:34:27 +0100 Subject: [PATCH 25/27] Improve agenda --- src/app/pages/agenda/agenda.page.html | 6 +++--- src/app/pages/agenda/agenda.page.scss | 2 +- src/app/pages/agenda/agenda.page.ts | 13 +++++++++++++ src/app/shared/agenda/new-event/new-event.page.ts | 2 -- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 23740de68..4973e22ce 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -226,7 +226,7 @@
+ *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
{{event.event.StartDate | date: 'HH:mm'}}
@@ -266,7 +266,7 @@
+ *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
{{event.event.StartDate | date: 'HH:mm'}}
@@ -308,7 +308,7 @@
+ *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
{{event.event.StartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 5d1962199..fca0b5083 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -460,7 +460,7 @@ td.monthview-primary-with-event { color: #2e2e2e !important; font-size: 13px; } - .EventListBox{ + .EventListBoxBorder{ padding-bottom: 5px; border-bottom: 1px solid #d8d8d8; } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 89ee25930..cf150eef7 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1309,6 +1309,19 @@ export class AgendaPage implements OnInit { this.timelineFilterState = segments } this.showTimelineFilterState = false; + + + + setTimeout(()=>{ + document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{ + if(e.childElementCount == 0) { + e.parentElement.style.display = 'none' + } else { + e.parentElement.style.display = 'block' + } + }) + }, 10) + } } \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 7c826ee4c..9bac41b00 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -68,8 +68,6 @@ export class NewEventPage implements OnInit { public stepSecond = 5; public color: ThemePalette = 'primary'; - james: any - @Input() profile:string; @Input() selectedSegment: string; @Input() selectedDate: Date; From 5a36179d47143604fffefa9917586f6d3b53edd3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 25 Jun 2021 08:28:39 +0100 Subject: [PATCH 26/27] save --- src/app/pages/gabinete-digital/pendentes/pendentes.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 81110398c..cf7806367 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - + From c80c92312a9d6dd0f577321206248f084ac53998 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 25 Jun 2021 09:05:15 +0100 Subject: [PATCH 27/27] save --- .../expediente/book-meeting-modal/book-meeting-modal.page.ts | 2 +- src/app/pages/gabinete-digital/pendentes/pendentes.page.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 02fbf9a41..a1428427a 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -197,7 +197,7 @@ export class BookMeetingModalPage implements OnInit { try { switch (this.loggeduser.Profile) { case 'MDGPR': - //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); break; case 'PR': diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index ae669ca74..fda425ff4 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -141,7 +141,7 @@ ion-item{ .exp-icon{ width: fit-content; float: right; - /* font-size: 13px; */ + /* font-size: 13px; */ margin: 0 !important; padding: 0 !important;