diff --git a/config.xml b/config.xml index fc70cef4e..e9aeeda7b 100644 --- a/config.xml +++ b/config.xml @@ -23,6 +23,7 @@ + diff --git a/package-lock.json b/package-lock.json index 3b138e97a..d45050ded 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2111,6 +2111,11 @@ "@types/cordova": "^0.0.34" } }, + "@ionic-native/fingerprint-aio": { + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@ionic-native/fingerprint-aio/-/fingerprint-aio-4.20.0.tgz", + "integrity": "sha512-DhdXVG7gdBtCwYHDAsNazIcMlyt6X968ilA/5Rt8uFd+xN4Un5gZteOJCVn9xWDC/ZqhO/QAq2M0BIGyEhzW0g==" + }, "@ionic-native/http": { "version": "5.31.1", "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.31.1.tgz", @@ -4570,16 +4575,30 @@ } }, "browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001230", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", + "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==", + "dev": true + }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "dev": true + } } }, "browserstack": { @@ -5833,6 +5852,12 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-filepath/-/cordova-plugin-filepath-1.5.8.tgz", "integrity": "sha512-DhMVM9lkndPWQ+lI8Um0Yq648MBKWpNe/3PW057g4wuFrnAz/9nR8Qs4bjYt/yxwxMX/VMZC59qXOcksd2JYuw==" }, + "cordova-plugin-fingerprint-aio": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-fingerprint-aio/-/cordova-plugin-fingerprint-aio-4.0.2.tgz", + "integrity": "sha512-Mmm/Ee85s4JH7qL3yikQ2J2I2vY2XbNi1fttoEK2kI++YHr/WeqPHWGREFL7bmFYjZTph/JovhfWHPGV924WjQ==", + "dev": true + }, "cordova-plugin-globalization": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz", @@ -7635,6 +7660,11 @@ "randomfill": "^1.0.3" } }, + "crypto-js": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz", + "integrity": "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==" + }, "css": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz", @@ -8396,9 +8426,9 @@ "dev": true }, "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", + "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", "dev": true, "requires": { "ip": "^1.1.0", @@ -8513,9 +8543,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.672", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz", - "integrity": "sha512-gFQe7HBb0lbOMqK2GAS5/1F+B0IMdYiAgB9OT/w1F4M7lgJK2aNOMNOM622aEax+nS1cTMytkiT0uMOkbtFmHw==", + "version": "1.3.741", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz", + "integrity": "sha512-4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA==", "dev": true }, "elementtree": { @@ -12541,9 +12571,9 @@ } }, "node-releases": { - "version": "1.1.70", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz", - "integrity": "sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==", + "version": "1.1.72", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", "dev": true }, "noop-logger": { @@ -18849,8 +18879,7 @@ }, "ssri": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "resolved": "", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/package.json b/package.json index f935c76b4..b0ce55e7a 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "@ionic-native/core": "^5.0.7", "@ionic-native/file": "^5.30.0", "@ionic-native/file-path": "^5.30.0", + "@ionic-native/fingerprint-aio": "^4.20.0", "@ionic-native/http": "^5.31.1", "@ionic-native/in-app-browser": "^5.28.0", "@ionic-native/ionic-webview": "^5.30.0", @@ -49,6 +50,7 @@ "cordova-plugin-okhttp": "^2.0.0", "cordova-res": "^0.15.3", "cordova-sqlite-storage": "^5.1.0", + "crypto-js": "^4.0.0", "date-fns": "^2.17.0", "ionic-angular": "^3.9.10", "ionic-selectable": "^4.7.1", @@ -88,6 +90,7 @@ "cordova-plugin-dialogs": "^2.0.2", "cordova-plugin-fcm-with-dependecy-updated": "^7.2.0", "cordova-plugin-file": "^6.0.2", + "cordova-plugin-fingerprint-aio": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", "cordova-plugin-inappbrowser": "^4.0.0", "cordova-plugin-ionic-keyboard": "^2.2.0", @@ -132,7 +135,8 @@ "ANDROID_GRADLE_TOOLS_VERSION": "3.5.3", "ANDROID_GOOGLE_SERVICES_VERSION": "4.3.3", "ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher" - } + }, + "cordova-plugin-fingerprint-aio": {} }, "platforms": [ "browser", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f8ec312ff..8c082f7db 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,17 +1,18 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { path: 'empty-chat', loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) }, @@ -47,6 +48,10 @@ const routes: Routes = [ path: 'pedidos', loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, { path: 'despachos', loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) @@ -87,17 +92,45 @@ const routes: Routes = [ path: 'expedientes-pr', loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, - /* { - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts new file mode 100644 index 000000000..090dc2d19 --- /dev/null +++ b/src/app/components/components.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HeaderPage } from '../shared/header/header.page'; +import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page'; +import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page'; +import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; +import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; +import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; +import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; + + + +@NgModule({ + declarations: [], + exports: [ + HeaderPage, + HeaderNoSearchPage, + BtnSeguintePage, + BtnModalDismissPage, + EmptyChatPage, + BtnCriarPage, + BtnAdicionarPage, + ], + imports: [ + CommonModule + ] +}) +export class ComponentsModule { } diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 2bc75c478..5c636ea0e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -120,7 +120,7 @@ const routes: Routes = [ { path:'expediente-task-modal', loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule), - } + }, ] }, { @@ -186,6 +186,10 @@ const routes: Routes = [ path:'new-publication', loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule) }, + { + path: 'request-options', + loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule) + }, ] }, { diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 51c35d4f1..7a1a71376 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -9,6 +9,7 @@ import { HomePageRoutingModule } from './home-routing.module'; import { HomePage } from './home.page'; /* import { IonicSelectableModule } from 'ionic-selectable'; */ import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from '../components/components.module'; @NgModule({ imports: [ @@ -16,7 +17,7 @@ import { SharedModule } from 'src/app/shared/shared.module'; FormsModule, IonicModule, HomePageRoutingModule, - SharedModule + ComponentsModule ], declarations: [HomePage] }) diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index 2544e0731..b3bb75e3d 100644 --- a/src/app/modals/add-note/add-note.page.ts +++ b/src/app/modals/add-note/add-note.page.ts @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { SearchDocument } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; @Component({ selector: 'app-add-note', @@ -32,7 +34,8 @@ export class AddNotePage implements OnInit { this.modalController.dismiss(body); } - async getDoc(){ + async getDoc() { + const modal = await this.modalController.create({ component: SearchPage, cssClass: 'modal-width-100-width-background modal', @@ -49,12 +52,46 @@ export class AddNotePage implements OnInit { this.documents.push(data.selected); } }); + } removeAttachment(index: number){ this.documents = this.documents.filter( (e, i) => index != i); + } + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) } } \ No newline at end of file diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 41bc90eb1..dde835def 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -133,6 +133,7 @@ 0) { + switch (this.taskType) { + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log('this.postData', this.postData, this.taskType); + + try { + await this.processes.postDespatcho(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + await this.processes.postParecer(this.postData).toPromise() + + try { + await this.processes.postParecer(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + case '2': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + + try { + await this.processes.postDeferimento(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + } + this.executado(); + this.modalController.dismiss(); + } + else { + this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); + } + + break; + + case 'PR': + switch (this.taskType) { + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log('this.postData', this.postData, this.taskType); + + try { + await this.processes.postDespatcho(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + await this.processes.postParecer(this.postData).toPromise() + + try { + await this.processes.postParecer(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + case '2': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + + try { + await this.processes.postDeferimento(this.postData).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + + break; + } + this.executado(); + this.modalController.dismiss(); + break; + } - if(this.taskParticipants.length > 0) { - switch (this.taskType) { - case '0': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log('this.postData', this.postData, this.taskType); - this.processes.postDespatcho(this.postData); - break; - case '1': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log(this.postData); - this.processes.postParecer(this.postData); - break; - case '2': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log(this.postData); - this.processes.postDeferimento(this.postData); - break; - } - this.executado(); - this.modalController.dismiss(); - } - else { - this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); - } + } - executado(){ + async executado(){ let body = { "serialNumber": this.task.serialNumber, "action": "Conhecimento", "ActionTypeId": 104, "dataFields": { - "ReviewUserComent": '', + "ReviewUserComment": '', }, "AttachmentList" :null, } - this.processes.CompleteTask(body); - } + try { + await this.processes.CompleteTask(body).toPromise() + this.successMessage() + } catch (error) { + this.badRequest() + } + - getAttachments() { - this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); } async addParticipants() { /* console.log('HERES'); */ - this.adding = "intervenient"; this.contacts = this.taskParticipants; @@ -412,4 +502,39 @@ export class CreateProcessPage implements OnInit { } + + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + } \ No newline at end of file diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index e50180fc5..dbb72b4b1 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -3,6 +3,8 @@ import { ModalController, NavParams } from '@ionic/angular'; import { SearchDocument } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; import { ProcessesService } from 'src/app/services/processes.service'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; @Component({ selector: 'app-dar-parecer', @@ -34,7 +36,8 @@ export class DarParecerPage implements OnInit { this.modalController.dismiss(); } - save(){ + async save() { + const DocumentToSave = this.documents.map((e) => { return { ApplicationId: e.ApplicationType, @@ -43,23 +46,30 @@ export class DarParecerPage implements OnInit { }); let docs = { - ProcessInstanceID: this.instanceId, + ProcessInstanceID: "", Attachments: DocumentToSave, } - let body = { "serialNumber": this.serialNumber, "action": "Registar", "ActionTypeId": 104, "dataFields": { - "ReviewUserComent": this.note, + "ReviewUserComment": this.note, }, "AttachmentList": docs, } console.log(body); - this.processes.CompleteTask(body); - this.modalController.dismiss(); + + try { + await this.processes.CompleteTask(body).toPromise() + this.modalController.dismiss(); + this.successMessage() + } catch (error) { + this.badRequest() + } + + } removeAttachment(index: number){ @@ -84,4 +94,40 @@ export class DarParecerPage implements OnInit { } }); } + + + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest() { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: 'hello', + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },1000) + } + } diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 6a6fca364..00f97ee0b 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -71,6 +71,7 @@
{ console.log(res); + this.successMessage('Processo delegado') + }, + (error)=>{ + this.badRequest() }); this.close(); } @@ -164,4 +170,38 @@ export class DelegarPage implements OnInit { this.taskParticipants = taskParticipants; } + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + } \ No newline at end of file diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts index 78eb44eb1..2a8cd73f5 100644 --- a/src/app/modals/document-detail/document-detail.module.ts +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -8,13 +8,14 @@ import { DocumentDetailPageRoutingModule } from './document-detail-routing.modul import { DocumentDetailPage } from './document-detail.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, DocumentDetailPageRoutingModule ], declarations: [ diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 88f0f0b86..16cdcd2a7 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -7,10 +7,12 @@ export class DailyWorkTask{ Remetente:string; DocumentsQty:any; WorkflowName:string; + activityInstanceName: string; } export class tasksList{ actions: null; + activityInstanceName: string; formURL: string; originator: { displayName: string, @@ -38,7 +40,7 @@ export class tasksList{ InstanceID: string, InstanceIDNew: string, NewSerialNumber: string, - ReviewUserComent: string, + ReviewUserComment: string, ReviewUserEmail: string, ReviewUserName: string, SourceID: number, diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index 0c82e912f..da5aab8bf 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -7,4 +7,5 @@ export class Folder{ SourceId:string; DeadlineType: string; SubjectTypes: string[]; + NumberPDPP:string; } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index f0e7dabda..58553b839 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -27,6 +27,7 @@ registerLocaleData(localeDe); import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, @@ -37,7 +38,7 @@ import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-a provide: DateAdapter, useFactory: adapterFactory }), - SharedModule, + ComponentsModule, AgendaPageRoutingModule, NgCalendarModule, CalModalPageModule, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index e131e74f5..d21e793c8 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -290,6 +290,7 @@ { // calendar @@ -576,7 +576,7 @@ export class AgendaPage implements OnInit { this.timelineBoxCorrectHeight(500); this.centralizeTimeline(500); - }); + }); } else { @@ -627,7 +627,7 @@ export class AgendaPage implements OnInit { case "Pessoal": //Inicializa o array eventSource - if(this.loggeduser.Profile == 'MDGPR') { + if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { this.eventSource=[]; @@ -703,7 +703,7 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventsListOficial = []; - if(this.loggeduser.Profile == 'MDGPR') { + if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { this.eventSource=[]; this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 039847646..e46534965 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model'; import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { ProcessesService } from 'src/app/services/processes.service'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page'; import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page'; @@ -69,29 +71,51 @@ export class ApproveEventModalPage implements OnInit { }) } - approveTask(serialNumber:string){ + async approveTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Aprovar" } - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + try { + await this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + } - emendTask(serialNumber:string){ - this.menu.close(); - this.openEmendMessageModal(serialNumber); - this.modalController.dismiss(null); + async emendTask(serialNumber:string){ + + try { + await this.openEmendMessageModal(serialNumber); + this.modalController.dismiss(null); + this.menu.close(); + } catch (error) { + + } + + } - rejectTask(serialNumber:string){ + async rejectTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + try { + await this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + } + getAttachments(){ this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{ this.loadedAttachments = res; @@ -108,36 +132,79 @@ export class ApproveEventModalPage implements OnInit { }); return await popover.present(); } + openMenu() { this.menu.open(); - } - async openEmendMessageModal(serialNumber:string) { - const modal = await this.modalController.create({ - component: EmendMessageModalPage, - componentProps:{ - - }, - cssClass: 'emend-message-modal', - backdropDismiss: false - }); + } - await modal.present(); + async openEmendMessageModal(serialNumber:string) { + const modal = await this.modalController.create({ + component: EmendMessageModalPage, + componentProps:{ + + }, + cssClass: 'emend-message-modal', + backdropDismiss: false + }); - modal.onDidDismiss().then(res => { - if(res.data !== ''){ - let body = { "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewerUseComment": res.data, - } - } - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - } - else{ - //this.alertService.presentAlert('Operação cancelada!'); - } - }); -} + await modal.present(); + + modal.onDidDismiss().then(res => { + if(res.data !== '') { + let body = { "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewerUseComment": res.data, + } + } + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.successMessage() + } catch (error) { + this.badRequest() + } + } + else{ + //this.alertService.presentAlert('Operação cancelada!'); + } + }); + } + + + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } } 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 f965a8b52..8f0c03c87 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -219,9 +219,11 @@ 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 1085550c6..d62a3d958 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -6,6 +6,8 @@ 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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { Event } from '../../../models/event.model'; import { AttendeesPage } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; @@ -101,16 +103,27 @@ export class EditEventPage implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) - this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - /* const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Evento actualizado', - buttons: ['OK'] + try{ + this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + /* const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Evento actualizado', + buttons: ['OK'] + }); + await alert.present(); */ + + this.successMessage() + }, error => { + this.badRequest() }); - await alert.present(); */ - }); - this.isEventEdited = true; - this.modalController.dismiss(this.isEventEdited); + + this.isEventEdited = true; + this.modalController.dismiss(this.isEventEdited); + + } catch (error) { + this.badRequest() + } + } async openAttendees() { @@ -220,4 +233,38 @@ export class EditEventPage implements OnInit { }); } + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest() { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: 'Processo não realizado com sucesso', + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + } \ No newline at end of file diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index 76f285bd8..929cb675c 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -1,15 +1,14 @@ - - -

- Adicionar Nota -

-

- Aprovar -

- - -

- Rejeitar -

- - + +
+ +
+
+ + +
+ + +
+ diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss index c8693464f..b3c5d2f6f 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss @@ -1,24 +1,58 @@ -.button-edit-event { - /* width: 140px; */ - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color:#061b52; +.container{ + --padding-top:20px !important; + --padding-bottom:20px !important; + --padding-start:20px !important; + --padding-end:20px !important; } -.button-options { - height: 44px; - --color: #42b9fe; +.arrow-right{ + display: none; + margin-bottom: 20px; + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } } -.button-approve { - /* width: 140px; */ - height: 44px; - border-radius: 22.5px; - --background: #42b9fe; +.buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-around; + align-items: center; } -.button-discart-event { - /* width: 140px; */ - height: 44px; - border-radius: 22.5px; - --background: #d30a0a; - --color:#fff; +.solid { + display: none; + width: 90%; + border-top: 5px solid #bbb; + margin: 0 auto !important; + } + .btn-ok, .btn-cancel{ + //width: 50% !important; + justify-content: center; + margin-bottom: 10px !important; + margin-top: 10px !important; +} +@media only screen and (max-width: 800px) { + .btn-ok, .btn-cancel, .btn-delete{ + width: 47% !important; + } +} +@media only screen and (min-width: 1024px) { + .arrow-right{ + display: flex; + justify-content: flex-end; + } + .btn-cancel{ + display: none; + width: 100% !important; + margin-bottom: 10px !important; + } + .btn-delete, .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; + } + /* .solid{ + display: block; + } */ } \ No newline at end of file diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index bb3f2c5e0..70e16386e 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ProcessesService } from 'src/app/services/processes.service'; +import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; @Component({ selector: 'app-event-actions-popover', @@ -9,16 +12,25 @@ import { ProcessesService } from 'src/app/services/processes.service'; styleUrls: ['./event-actions-popover.page.scss'], }) export class EventActionsPopoverPage implements OnInit { + serialNumber:string; + instanceId: string; - constructor(private navParams: NavParams, + constructor( + private navParams: NavParams, private processes:ProcessesService, private router:Router, private modalController: ModalController, private popoverController: PopoverController,) { - /* this.serialNumber = this.navParams.get('serialNumber'); */ + this.serialNumber = this.navParams.get('serialNumber'); + this.instanceId = this.navParams.get('InstanceId'); } ngOnInit() { + window.onresize = (event) => { + if( window.innerWidth >= 800){ + this.popoverController.dismiss(); + } + }; } closePopover(){ this.popoverController.dismiss(); @@ -26,20 +38,92 @@ export class EventActionsPopoverPage implements OnInit { approveTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + } emendarTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + + } deleteTask(){ } + async editTask() { + console.log(this.serialNumber); + console.log(this.instanceId); + const modal = await this.modalController.create({ + component: EditEventToApproveComponent, + componentProps: { + serialNumber: this.serialNumber, + InstanceId: this.instanceId + }, + cssClass: 'modal modal-desktop', + // backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + }); + + } + + + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + } 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 f302bc868..50db84145 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -6,6 +6,8 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchDocument } from 'src/app/models/search-document'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { Event } from '../../../models/event.model'; import { AttendeesPage } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; @@ -50,7 +52,7 @@ export class NewEventPage implements OnInit { ngOnInit() { -/* console.log(this.profile); */ + /* console.log(this.profile); */ let selectedStartdDate = this.selectedDate; let selectedEndDate = new Date(this.selectedDate); @@ -112,6 +114,7 @@ export class NewEventPage implements OnInit { close(){ this.modalController.dismiss(); } + async save() { /* console.log(this.postEvent); console.log(this.profile); */ @@ -121,37 +124,83 @@ export class NewEventPage implements OnInit { } let eventId: string; - - if(this.profile=='mdgpr'){ - eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise(); - } - else if(this.profile=='pr'){ - eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise(); + + try { + + if(this.profile=='mdgpr') { + eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise(); + } + else if(this.profile=='pr'){ + eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise(); + } + + const DocumentToSave: EventAttachment[] = this.documents.map((e) => { + return { + SourceTitle: e.Assunto, + ParentId: eventId, + Source: '1', + SourceId: e.Id, + ApplicationId: e.ApplicationType.toString(), + Id: '', + Link: '', + SerialNumber: '' + }; + }); + + await DocumentToSave.forEach( async (attachments, i) => { + try { + await this.attachmentsService.setEventAttachmentById(attachments).toPromise(); + } catch(error) { + alert('document error') + } + + }); + + + this.successMessage() + this.modalController.dismiss(this.postEvent); + + + } catch (error) { + this.badRequest() } - const DocumentToSave: EventAttachment[] = this.documents.map((e) => { - return { - SourceTitle: e.Assunto, - ParentId: eventId, - Source: '1', - SourceId: e.Id, - ApplicationId: e.ApplicationType.toString(), - Id: '', - Link: '', - SerialNumber: '' - }; - }); - - - await DocumentToSave.forEach( async (attachments, i) => { - this.attachmentsService.setEventAttachmentById(attachments).toPromise(); - }); - - - this.modalController.dismiss(this.postEvent); } + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest() { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: 'Processo não realizado com sucesso', + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } async openAttendees() { @@ -202,7 +251,6 @@ export class NewEventPage implements OnInit { } - async getDoc(){ const modal = await this.modalController.create({ component: SearchPage, @@ -227,6 +275,4 @@ export class NewEventPage implements OnInit { this.documents = this.documents.filter( (e, i) => index != i); } - - } \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.module.ts b/src/app/pages/agenda/view-event/view-event.module.ts index b2e97a22b..2b835acb4 100644 --- a/src/app/pages/agenda/view-event/view-event.module.ts +++ b/src/app/pages/agenda/view-event/view-event.module.ts @@ -8,13 +8,14 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module'; import { ViewEventPage } from './view-event.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, ViewEventPageRoutingModule ], declarations: [ViewEventPage] diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 52cbac45d..a185b7cfe 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -17,13 +17,14 @@ import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page'; import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page'; import { PipesModule } from 'src/app/pipes/pipes.module'; import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, PipesModule, ChatPageRoutingModule, RouterModule, diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 5d5d9ff0d..e68af0924 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -38,16 +38,16 @@ -
+
-
+
-
+
@@ -69,11 +69,11 @@ -
+
-
+
{{group.name.split('-').join(' ')}} diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 0a59be5a5..09db58932 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -79,7 +79,6 @@ ion-content{ } .item-content{ width: 317px; - margin: 0 auto; float:right } .item-title-time{ diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index b71e1fa79..2a9b58dd0 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -294,7 +294,7 @@ sendMsg() { async selectContact(){ const modal = await this.modalController.create({ component: ContactsPage, - cssClass: 'contacts', + cssClass: 'modal modal-desktop', }); await modal.present(); modal.onDidDismiss(); @@ -303,7 +303,7 @@ sendMsg() { async newGroup(){ const modal = await this.modalController.create({ component: NewGroupPage, - cssClass: 'new-group', + cssClass: 'modal modal-desktop', }); await modal.present(); modal.onDidDismiss(); @@ -312,7 +312,7 @@ sendMsg() { async editGroup(roomId){ const modal = await this.modalController.create({ component: EditGroupPage, - cssClass: 'edit-group', + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, @@ -327,17 +327,11 @@ sendMsg() { async openMessagesModal(roomId:any){ this.closeAllDesktopComponents(); - let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' - } else { - classs = 'chat-mobile-modal-to-Desktop' - } console.log(roomId); const modal = await this.modalController.create({ component: MessagesPage, - cssClass: classs, + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, @@ -347,17 +341,12 @@ sendMsg() { } async openGroupMessagesModal(roomId:any){ - let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' - } else { - classs = 'chat-mobile-modal-to-Desktop' - } + console.log(roomId); const modal = await this.modalController.create({ component: GroupMessagesPage, - cssClass: classs, + cssClass: 'modal modal-desktop', componentProps: { roomId: roomId, }, diff --git a/src/app/pages/chat/edit-group/edit-group.module.ts b/src/app/pages/chat/edit-group/edit-group.module.ts index f5cbe4eae..ba9c5fb3a 100644 --- a/src/app/pages/chat/edit-group/edit-group.module.ts +++ b/src/app/pages/chat/edit-group/edit-group.module.ts @@ -8,13 +8,14 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module'; import { EditGroupPage } from './edit-group.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, EditGroupPageRoutingModule ], declarations: [EditGroupPage] diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts index 1828ecb73..589bc4509 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts @@ -9,13 +9,14 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module' import { GroupContactsPage } from './group-contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { PipesModule } from 'src/app/pipes/pipes.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, PipesModule, GroupContactsPageRoutingModule ], diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index 7879b0cae..70b621dbb 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -26,7 +26,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index 89e729973..f4c0fca1c 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -8,8 +8,8 @@ import { IonicModule } from '@ionic/angular'; import { GroupMessagesPageRoutingModule } from './group-messages-routing.module'; import { GroupMessagesPage } from './group-messages.page'; -import { SharedModule } from 'src/app/shared/shared.module'; import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ @@ -17,7 +17,7 @@ import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modul BrowserModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, PopoverModule, GroupMessagesPageRoutingModule ], diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index f94b3c8e6..4d9f6849f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -16,8 +16,6 @@ transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; - margin: 0px auto; overflow: auto; padding: 0 !important; background: #fff; @@ -36,7 +34,7 @@ } } .header-bottom{ - width: 310px; + padding-left: 10px; overflow: auto; margin: 0 auto; diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 2dfd18a20..220b8a71a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -129,6 +129,9 @@ export class GroupMessagesPage implements OnInit { this.chatService.sendMessage(body).subscribe(res=> { this.getRoomInfo(); + + },(error) => { + }); this.message = ""; } diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/pages/chat/messages/contacts/contacts.module.ts index 8284984be..887da2a94 100644 --- a/src/app/pages/chat/messages/contacts/contacts.module.ts +++ b/src/app/pages/chat/messages/contacts/contacts.module.ts @@ -9,13 +9,14 @@ import { ContactsPageRoutingModule } from './contacts-routing.module'; import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { PipesModule } from 'src/app/pipes/pipes.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, PipesModule, ContactsPageRoutingModule ], diff --git a/src/app/pages/chat/messages/contacts/contacts.page.scss b/src/app/pages/chat/messages/contacts/contacts.page.scss index 1eb104bdb..a50120cba 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.scss +++ b/src/app/pages/chat/messages/contacts/contacts.page.scss @@ -27,7 +27,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/pages/chat/messages/messages.module.ts index 57d7b6f77..94397377a 100644 --- a/src/app/pages/chat/messages/messages.module.ts +++ b/src/app/pages/chat/messages/messages.module.ts @@ -9,15 +9,16 @@ import { MessagesPageRoutingModule } from './messages-routing.module'; import { MessagesPage } from './messages.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, MessagesPageRoutingModule ], - declarations: [MessagesPage, SharedModule] + declarations: [MessagesPage] }) export class MessagesPageModule {} diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss index 1a67bbcda..496cd70a0 100644 --- a/src/app/pages/chat/messages/messages.page.scss +++ b/src/app/pages/chat/messages/messages.page.scss @@ -16,7 +16,6 @@ transform: translate3d(0, 1px, 0); .header-top{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/new-group/contacts/contacts.module.ts b/src/app/pages/chat/new-group/contacts/contacts.module.ts index 13749fd57..92557bb61 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.module.ts +++ b/src/app/pages/chat/new-group/contacts/contacts.module.ts @@ -8,13 +8,14 @@ import { ContactsPageRoutingModule } from './contacts-routing.module'; import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, ContactsPageRoutingModule ], declarations: [ContactsPage] diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/pages/chat/new-group/contacts/contacts.page.scss index c97008f82..54523dbf8 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.scss +++ b/src/app/pages/chat/new-group/contacts/contacts.page.scss @@ -27,7 +27,6 @@ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts index a86458890..e976a36ec 100644 --- a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts @@ -8,13 +8,14 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module'; import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, GroupChatPageRoutingModule ], declarations: [GroupChatPage] diff --git a/src/app/pages/chat/new-group/new-group.module.ts b/src/app/pages/chat/new-group/new-group.module.ts index 97006324c..c72df1781 100644 --- a/src/app/pages/chat/new-group/new-group.module.ts +++ b/src/app/pages/chat/new-group/new-group.module.ts @@ -8,13 +8,14 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module'; import { NewGroupPage } from './new-group.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, NewGroupPageRoutingModule ], declarations: [NewGroupPage] diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss index 428f62e08..a5420829d 100644 --- a/src/app/pages/chat/new-group/new-group.page.scss +++ b/src/app/pages/chat/new-group/new-group.page.scss @@ -47,7 +47,6 @@ ion-content{ transform: translate3d(0, 1px, 0); .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -101,7 +100,6 @@ ion-content{ padding: 15px 20px 0 20px; .item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; diff --git a/src/app/pages/chat/newchat/newchat.page.scss b/src/app/pages/chat/newchat/newchat.page.scss index 11d380dea..87a747b8a 100644 --- a/src/app/pages/chat/newchat/newchat.page.scss +++ b/src/app/pages/chat/newchat/newchat.page.scss @@ -29,7 +29,6 @@ ion-content{ padding-left: 20px; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 06a651622..8c8bf1543 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -94,7 +94,6 @@ ion-card{ } .header-content{ - width: 360px; overflow: auto; margin: 0 auto; padding-top: 25px; diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index d88c468df..34b04023e 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -8,13 +8,14 @@ import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SharedModule, + ComponentsModule, EventsPageRoutingModule ], declarations: [EventsPage], diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8439fbbd6..98555ec78 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -97,7 +97,7 @@
+ (click)="goToExpediente(task.serialNumber)">
{{task.taskStartDate | date: 'dd-MM-yy'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 5168dfa7f..eda18087c 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -18,6 +18,7 @@ import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente- import { EventEditPage } from './edit-event/edit-event.component'; import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; import { EditEventPage } from '../agenda/edit-event/edit-event.page'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-events', @@ -63,6 +64,8 @@ export class EventsPage implements OnInit { @Output() openExpedientListPage:EventEmitter = new EventEmitter(); + loggeduser: User; + constructor(private eventService: EventsService, private router: Router, private storageService:StorageService, @@ -72,6 +75,9 @@ export class EventsPage implements OnInit { private processes:ProcessesService, /* private gabineteService: GabineteDigitalPage, */ private modalController:ModalController) { + + this.loggeduser = authService.ValidatedUser; + this.prEventList = null; // list @@ -86,10 +92,6 @@ export class EventsPage implements OnInit { this.profile = "mdgpr"; /* console.log(this.profile); */ - /* this.storageService.get(AuthConnstants.USER).then(res=>{ - console.log(res); - }); */ - this.showGreeting(); this.router.events.forEach((event) => { @@ -98,10 +100,6 @@ export class EventsPage implements OnInit { this.LoadList(); } }); - /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{ - this.profile = res; - }); */ - } @@ -127,7 +125,7 @@ export class EventsPage implements OnInit { switch (this.segment) { case "Combinada": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.eventsList = res; @@ -158,7 +156,7 @@ export class EventsPage implements OnInit { break; case "Pessoal": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); this.showLoader = false; @@ -172,7 +170,7 @@ export class EventsPage implements OnInit { break; case "Oficial": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; this.showLoader = false; @@ -249,10 +247,24 @@ export class EventsPage implements OnInit { } LoadList(){ - this.processes.GetTasksList("Expediente", false).subscribe(result => { - this.expedientList = result.reverse(); - console.log(this.expedientList); - }); + switch (this.loggeduser.Profile) { + case 'MDGPR': + this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.expedientList = result.reverse(); + console.log(this.expedientList); + }); + break; + case 'PR': + this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { + this.expedientList = result.reverse(); + console.log(this.expedientList); + }); + break; + + default: + break; + } + } sortArrayISODate(myArray: any){ @@ -314,6 +326,15 @@ export class EventsPage implements OnInit { }); } + goToExpediente(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + } + async viewExpedientDetail(serialNumber:any) { let classs; if( window.innerWidth <= 800){ @@ -344,12 +365,7 @@ export class EventsPage implements OnInit { this.openExpedientList(); } else{ - console.log('ttt'); - let navigationExtras: NavigationExtras = { - queryParams: { - "show": true, - } - }; + let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,} }; this.router.navigate(['/home/gabinete-digital'], navigationExtras); } } diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.html b/src/app/pages/gabinete-digital/create-task/create-task.component.html index e2489f74b..cb43c5d46 100644 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.html +++ b/src/app/pages/gabinete-digital/create-task/create-task.component.html @@ -195,7 +195,7 @@