diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index fe4331186..ea75cb4e8 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -42,10 +42,7 @@ - - +
diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index ca44440fc..be8f8d3e7 100644 --- a/src/app/modals/add-note/add-note.page.ts +++ b/src/app/modals/add-note/add-note.page.ts @@ -2,8 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { AnimationController, ModalController, NavParams } from '@ionic/angular'; 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'; @Component({ selector: 'app-add-note', @@ -12,7 +10,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe }) export class AddNotePage implements OnInit { note: string = ''; - documents:SearchDocument[] = []; + documents: SearchDocument[] = []; loadedAttachments:any; hideThisFeature: boolean = true; @@ -32,11 +30,11 @@ export class AddNotePage implements OnInit { } - close(){ + close() { this.modalController.dismiss(''); } - save(){ + save() { let body = { "note":this.note, "documents":this.documents, diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 27330b355..e9d137b75 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -101,6 +101,10 @@ export class CreateProcessPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); + if (this.task.SerialNumber) { + this.task.serialNumber = this.task.SerialNumber + } + this.taskType = this.navParams.get('taskAction'); diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 6e87a29e2..fea6be656 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -41,8 +41,8 @@
-
- -
- + + + - -
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index d5a6d8a26..30982220e 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -1,11 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { EventsService } from 'src/app/services/events.service'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { ModalController, PopoverController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; @@ -25,7 +21,7 @@ export class DespachosPrOptionsPage implements OnInit { task: any; fulltask: any; - serialnumber: string; + serialNumber: string; profile: string constructor(private activateRoute: ActivatedRoute, @@ -45,10 +41,17 @@ export class DespachosPrOptionsPage implements OnInit { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { - this.serialnumber = params["serialNumber"]; + this.serialNumber = params["serialNumber"]; console.log(params["serialNumber"]); } }); + + if(this.task.serialNumber) { + this.serialNumber = this.task.serialNumber + } else if(this.task.SerialNumber) { + this.serialNumber = this.task.SerialNumber + } + } close () { @@ -90,7 +93,7 @@ export class DespachosPrOptionsPage implements OnInit { } sendExpedienteToPending() { - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ console.log(res); this.close(); },()=>{ @@ -169,7 +172,7 @@ export class DespachosPrOptionsPage implements OnInit { async generateDiploma(note:string, documents:any) { let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reencaminhar", "ActionTypeId": 99999839, "dataFields": { @@ -202,7 +205,8 @@ export class DespachosPrOptionsPage implements OnInit { } const modal = await this.modalController.create({ component: AddNotePage, - componentProps:{ + componentProps: { + showAttachmentBtn: true }, cssClass: classs, backdropDismiss: true @@ -250,7 +254,7 @@ export class DespachosPrOptionsPage implements OnInit { async arquivar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { @@ -276,7 +280,7 @@ export class DespachosPrOptionsPage implements OnInit { async executado(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Conhecimento", "ActionTypeId": 104, "dataFields": { @@ -302,7 +306,7 @@ export class DespachosPrOptionsPage implements OnInit { async reexecutar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reexecutar", "ActionTypeId": 100000010, "dataFields": { @@ -326,7 +330,6 @@ export class DespachosPrOptionsPage implements OnInit { goBack() { this.location.back() - this.cancle() } cancle() { diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 2e8d618a4..33fb9e37e 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -61,6 +61,10 @@ export class OptsExpedientePrPage implements OnInit { if(this.task.Status != 'Pending'){ this.showEnviarPendentes = true; } + + + console.log('OptsExpedientePrPage ---- ', this.task); + } ngOnInit() { @@ -86,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit { const modal = await this.modalController.create({ component: AddNotePage, componentProps:{ + showAttachmentBtn: false, }, cssClass: classs, backdropDismiss: true @@ -271,7 +276,6 @@ export class OptsExpedientePrPage implements OnInit { task: task, profile: this.profile, fulltask: this.fulltask, - aplicationId: 361 }, cssClass: classs, }); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 82401fab4..8216eac95 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { customTask, expedienteTask, fullTask } from 'src/app/models/dailyworktask.model'; import { SearchDocument } from 'src/app/models/search-document'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; @@ -19,7 +20,8 @@ import { ToastService } from 'src/app/services/toast.service'; styleUrls: ['./opts-expediente.page.scss'], }) export class OptsExpedientePage implements OnInit { - task:any; + + task: expedienteTask fulltask: any; profile:string; caller:string; @@ -42,7 +44,7 @@ export class OptsExpedientePage implements OnInit { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); - if(this.task.Status != 'Pending'){ + if(this.task.Status != 'Pending') { this.showEnviarPendentes = true; } } @@ -214,7 +216,7 @@ export class OptsExpedientePage implements OnInit { async sendToReview(note:string, documents:any) { let body = { - "serialNumber": this.task.serialnumber || this.task.SerialNumber, + "serialNumber": this.task.SerialNumber, "action": "Retificar", "ActionTypeId": 99999877, "dataFields": { @@ -248,7 +250,7 @@ export class OptsExpedientePage implements OnInit { async approve(note:string, documents:any){ let body = { - "serialNumber": this.task.serialnumber || this.task.SerialNumber, + "serialNumber": this.task.SerialNumber, "action": "Aprovar", "ActionTypeId": 100000004 , "dataFields": { diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 8f88ee8de..4213a7996 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -38,7 +38,8 @@ -
+ +
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 46684831e..59a4d6dd1 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -196,6 +196,7 @@ export class RequestOptionsPage implements OnInit { const modal = await this.modalController.create({ component: AddNotePage, componentProps:{ + showAttachmentBtn: true, }, cssClass: classs, backdropDismiss: true diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts index dbdda1bc1..f8b237e14 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts @@ -1,12 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page'; -import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { PermissionService } from 'src/app/OtherService/permission.service'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-searched-document-options', diff --git a/src/app/store/chat-message.service.spec.ts b/src/app/store/chat-message.service.spec.ts new file mode 100644 index 000000000..3f2176442 --- /dev/null +++ b/src/app/store/chat-message.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ChatMessageService } from './chat-message.service'; + +describe('ChatMessageService', () => { + let service: ChatMessageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ChatMessageService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/chat-message.service.ts b/src/app/store/chat-message.service.ts new file mode 100644 index 000000000..8cc1be0b1 --- /dev/null +++ b/src/app/store/chat-message.service.ts @@ -0,0 +1,42 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class ChatMessageService { + + private _message = [] + // local storage keyName + private keyName: string; + + constructor() { + + this.keyName = (SHA1(this.constructor.name)).toString() + + setTimeout(()=> { + let restore = localstoreService.get(this.keyName, {}) + this._message = restore.message || {} + }, 10) + + } + + getMessages(roomId) { + return this._message[roomId] || [] + } + + add(roomId, message) { + this._message[roomId] = message + + setTimeout(()=> { + localstoreService.set(this.keyName, { + message: this._message + }) + }, 5000) + } + +} + + +export const ChatMessageStore = new ChatMessageService() \ No newline at end of file diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index 72cc56608..25e0ecc8a 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -59,6 +59,8 @@ export class LocalstoreService { export const localstoreService = new LocalstoreService() +// console.log( AES.encrypt( 'peter', 'v14-dba29fd8bdbf24ffe4840b0f778f70f6a163d424').toString()) + // // Create WebSocket connection. // const socket = new WebSocket('ws://localhost:8080');