diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index ca4f1a414..6745c2ff8 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', diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index ba96f9c9a..0db4dacf8 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -9,8 +9,6 @@ import { EventsService } from 'src/app/services/events.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { AlertService } from 'src/app/services/alert.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 { ToastService } from 'src/app/services/toast.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { SearchDocument } from 'src/app/models/search-document'; diff --git a/src/app/models/Excludetask.ts b/src/app/models/Excludetask.ts index af4410828..1be8935ae 100644 --- a/src/app/models/Excludetask.ts +++ b/src/app/models/Excludetask.ts @@ -1,10 +1,19 @@ -export class Excludetask{ - serialNumber: any; +export interface Attachment { + SourceId: string; + ApplicationId: number; +} +export interface AttachmentList { + ProcessInstanceID?: string; + Attachments?: Attachment[]; +} +export interface Excludetask { + serialNumber: string; action: string; - ActionTypeId: any; + ActionTypeId?: number; dataFields: { ReviewUserComment?: string, Note?: any } - AttachmentList?: any + FolderId?: number; + AttachmentList?: AttachmentList | any; } \ No newline at end of file diff --git a/src/app/models/search-document.ts b/src/app/models/search-document.ts index 63e2c22c1..bbe04514c 100644 --- a/src/app/models/search-document.ts +++ b/src/app/models/search-document.ts @@ -18,6 +18,8 @@ export class Attachments { ApplicationId: number | string } + +// details export class FromSearchDocument { ApplicationId: number ApplicationID: number @@ -28,7 +30,7 @@ export class FromSearchDocument { SenderId: number } - +// details export class SearchFolder { ApplicationID: number ApplicationId: number @@ -51,5 +53,4 @@ export class SearchFolder { SenderId: null | string Status: string folderId: number -} - +} \ 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 7b9766ba3..7ecc22101 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -17,6 +17,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { DespachoService } from 'src/app/Rules/despacho.service' import { Location } from '@angular/common' import { fullTask } from 'src/app/models/dailyworktask.model'; +import { Attachment, AttachmentList } from 'src/app/models/Excludetask'; @Component({ selector: 'app-despacho', @@ -190,7 +191,7 @@ export class DespachoPage implements OnInit { } } - async arquivar(note:string, documents:any) { + async arquivar(note:string, documents: AttachmentList) { let body = { "serialNumber": this.serialnumber, "action": "Arquivo", diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 470476d95..f32dd8e9b 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -159,7 +159,7 @@ export class DiplomaAssinarPage implements OnInit { "dataFields": { "ReviewUserComment": '', }, - "AttachmentList": [], + "AttachmentList": {}, } const loader = this.toastService.loading() diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 3781913e8..b2aa6169a 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -18,6 +18,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from 'src/app/models/search-document'; import { Location } from '@angular/common'; +import { AttachmentList } from 'src/app/models/Excludetask'; @Component({ selector: 'app-expediente-pr', @@ -340,14 +341,14 @@ export class ExpedientePrPage implements OnInit { modal.onDidDismiss().then(res => { console.log(res); if(res.data){ - const DocumentToSave = res.data.documents.map((e) => { + const DocumentToSave = res.data.documents.map((e:SearchDocument) => { return { ApplicationId: e.ApplicationType, SourceId: e.Id, } }); - let docs = { + let docs: AttachmentList = { ProcessInstanceID: "", Attachments: DocumentToSave, } 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 78c93aa72..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 @@ -90,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit { const modal = await this.modalController.create({ component: AddNotePage, componentProps:{ + showAttachmentBtn: false, }, cssClass: classs, backdropDismiss: true 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