diff --git a/src/app/models/CallMeeting.ts b/src/app/models/CallMeeting.ts index d568b9e6f..00d12719c 100644 --- a/src/app/models/CallMeeting.ts +++ b/src/app/models/CallMeeting.ts @@ -1,6 +1,6 @@ -export class CallMeeting{ +export class CallMeeting { Message: string; - Attachment: { + Attachment: { Source: number, SourceId: string, SourceName: string, diff --git a/src/app/models/Excludetask.ts b/src/app/models/Excludetask.ts new file mode 100644 index 000000000..af4410828 --- /dev/null +++ b/src/app/models/Excludetask.ts @@ -0,0 +1,10 @@ +export class Excludetask{ + serialNumber: any; + action: string; + ActionTypeId: any; + dataFields: { + ReviewUserComment?: string, + Note?: any + } + AttachmentList?: any +} \ No newline at end of file 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 573c588e3..305839981 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -15,7 +15,7 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page'; import { ToastService } from 'src/app/services/toast.service'; - +import { DespachoMdService } from 'src/app/Rules/despacho-md.service' @Component({ selector: 'app-despacho', templateUrl: './despacho.page.html', @@ -50,6 +50,7 @@ export class DespachoPage implements OnInit { private router: Router, private animationController: AnimationController, private toastService: ToastService, + private despachoMdService: DespachoMdService ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -188,21 +189,12 @@ export class DespachoPage implements OnInit { this.modalController.dismiss(); } - async executado(note:string, documents:any){ - let body = { - "serialNumber": this.serialnumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } + async executado(note:string, documents:any) { const loader = this.toastService.loading() try { - await this.processes.CompleteTask(body).toPromise() + await this.despachoMdService.executado(note, documents, this.serialnumber) this.toastService.successMessage('Processo criado') this.close(); } catch(error) { @@ -213,7 +205,7 @@ export class DespachoPage implements OnInit { } } - async arquivar(note:string, documents:any){ + async arquivar(note:string, documents:any) { let body = { "serialNumber": this.serialnumber, "action": "Arquivo", @@ -236,6 +228,7 @@ export class DespachoPage implements OnInit { loader.remove() } + } async reencaminhar(note:string, documents:any) { diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0c8c1b51b..b9b1d21b1 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -6,6 +6,7 @@ import { User } from '../models/user.model'; import { environment } from 'src/environments/environment'; import { Observable } from 'rxjs'; import { CallMeeting } from '../models/CallMeeting'; +import { Excludetask } from '../models/Excludetask'; @Injectable({ providedIn: 'root' @@ -156,7 +157,7 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } - CompleteTask(body:any){ + CompleteTask(body:Excludetask) { const geturl = environment.apiURL + 'Tasks/CompleteTask'; let options = {