mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
add
This commit is contained in:
@@ -2,8 +2,6 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
import { AnimationController, ModalController, NavParams } from '@ionic/angular';
|
import { AnimationController, ModalController, NavParams } from '@ionic/angular';
|
||||||
import { SearchDocument } from 'src/app/models/search-document';
|
import { SearchDocument } from 'src/app/models/search-document';
|
||||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
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({
|
@Component({
|
||||||
selector: 'app-add-note',
|
selector: 'app-add-note',
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ import { EventsService } from 'src/app/services/events.service';
|
|||||||
import { AttachmentsService } from 'src/app/services/attachments.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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
|
||||||
import { AlertService } from 'src/app/services/alert.service';
|
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 { ToastService } from 'src/app/services/toast.service';
|
||||||
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
||||||
import { SearchDocument } from 'src/app/models/search-document';
|
import { SearchDocument } from 'src/app/models/search-document';
|
||||||
|
|||||||
@@ -1,10 +1,19 @@
|
|||||||
export class Excludetask{
|
export interface Attachment {
|
||||||
serialNumber: any;
|
SourceId: string;
|
||||||
|
ApplicationId: number;
|
||||||
|
}
|
||||||
|
export interface AttachmentList {
|
||||||
|
ProcessInstanceID?: string;
|
||||||
|
Attachments?: Attachment[];
|
||||||
|
}
|
||||||
|
export interface Excludetask {
|
||||||
|
serialNumber: string;
|
||||||
action: string;
|
action: string;
|
||||||
ActionTypeId: any;
|
ActionTypeId?: number;
|
||||||
dataFields: {
|
dataFields: {
|
||||||
ReviewUserComment?: string,
|
ReviewUserComment?: string,
|
||||||
Note?: any
|
Note?: any
|
||||||
}
|
}
|
||||||
AttachmentList?: any
|
FolderId?: number;
|
||||||
|
AttachmentList?: AttachmentList | any;
|
||||||
}
|
}
|
||||||
@@ -18,6 +18,8 @@ export class Attachments {
|
|||||||
ApplicationId: number | string
|
ApplicationId: number | string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// details
|
||||||
export class FromSearchDocument {
|
export class FromSearchDocument {
|
||||||
ApplicationId: number
|
ApplicationId: number
|
||||||
ApplicationID: number
|
ApplicationID: number
|
||||||
@@ -28,7 +30,7 @@ export class FromSearchDocument {
|
|||||||
SenderId: number
|
SenderId: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// details
|
||||||
export class SearchFolder {
|
export class SearchFolder {
|
||||||
ApplicationID: number
|
ApplicationID: number
|
||||||
ApplicationId: number
|
ApplicationId: number
|
||||||
@@ -51,5 +53,4 @@ export class SearchFolder {
|
|||||||
SenderId: null | string
|
SenderId: null | string
|
||||||
Status: string
|
Status: string
|
||||||
folderId: number
|
folderId: number
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17,6 +17,7 @@ import { ToastService } from 'src/app/services/toast.service';
|
|||||||
import { DespachoService } from 'src/app/Rules/despacho.service'
|
import { DespachoService } from 'src/app/Rules/despacho.service'
|
||||||
import { Location } from '@angular/common'
|
import { Location } from '@angular/common'
|
||||||
import { fullTask } from 'src/app/models/dailyworktask.model';
|
import { fullTask } from 'src/app/models/dailyworktask.model';
|
||||||
|
import { Attachment, AttachmentList } from 'src/app/models/Excludetask';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-despacho',
|
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 = {
|
let body = {
|
||||||
"serialNumber": this.serialnumber,
|
"serialNumber": this.serialnumber,
|
||||||
"action": "Arquivo",
|
"action": "Arquivo",
|
||||||
|
|||||||
+1
-1
@@ -159,7 +159,7 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
"dataFields": {
|
"dataFields": {
|
||||||
"ReviewUserComment": '',
|
"ReviewUserComment": '',
|
||||||
},
|
},
|
||||||
"AttachmentList": [],
|
"AttachmentList": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
const loader = this.toastService.loading()
|
const loader = this.toastService.loading()
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
|
|||||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||||
import { SearchDocument } from 'src/app/models/search-document';
|
import { SearchDocument } from 'src/app/models/search-document';
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
|
import { AttachmentList } from 'src/app/models/Excludetask';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-expediente-pr',
|
selector: 'app-expediente-pr',
|
||||||
@@ -340,14 +341,14 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
modal.onDidDismiss().then(res => {
|
modal.onDidDismiss().then(res => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
if(res.data){
|
if(res.data){
|
||||||
const DocumentToSave = res.data.documents.map((e) => {
|
const DocumentToSave = res.data.documents.map((e:SearchDocument) => {
|
||||||
return {
|
return {
|
||||||
ApplicationId: e.ApplicationType,
|
ApplicationId: e.ApplicationType,
|
||||||
SourceId: e.Id,
|
SourceId: e.Id,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let docs = {
|
let docs: AttachmentList = {
|
||||||
ProcessInstanceID: "",
|
ProcessInstanceID: "",
|
||||||
Attachments: DocumentToSave,
|
Attachments: DocumentToSave,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit {
|
|||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: AddNotePage,
|
component: AddNotePage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
|
showAttachmentBtn: false,
|
||||||
},
|
},
|
||||||
cssClass: classs,
|
cssClass: classs,
|
||||||
backdropDismiss: true
|
backdropDismiss: true
|
||||||
|
|||||||
@@ -196,6 +196,7 @@ export class RequestOptionsPage implements OnInit {
|
|||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: AddNotePage,
|
component: AddNotePage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
|
showAttachmentBtn: true,
|
||||||
},
|
},
|
||||||
cssClass: classs,
|
cssClass: classs,
|
||||||
backdropDismiss: true
|
backdropDismiss: true
|
||||||
|
|||||||
Reference in New Issue
Block a user