This commit is contained in:
Peter Maquiran
2021-08-19 15:40:21 +01:00
parent e08a0a2388
commit dc7796cacf
16 changed files with 93 additions and 117 deletions
@@ -125,26 +125,19 @@ export class ExpedientTaskModalPage implements OnInit {
Nad: 30,
Subject: '',
Message: '',
SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
SourceSecFsId: this.task.workflowInstanceDataFields.SourceSecFsID, //361
SourceType: this.task.workflowInstanceDataFields.SourceType, //FOLDER
SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
DeadlineType: '',
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
console.log('task 123123', this.task)
console.log('this.aplicationId', this.aplicationId)
if(this.aplicationId == 361) {
this.dispatchFolder.SourceType = 'FOLDER'
this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.FolderID
} else if(this.aplicationId == 8) {
this.dispatchFolder.SourceType = 'DOC'
this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId
}
this.postData.DispatchFolder = this.dispatchFolder;
this.postData.UsersSelected = this.participants;
/* By Default TypeDeadline should be 'Normal' */
@@ -152,6 +145,8 @@ export class ExpedientTaskModalPage implements OnInit {
/* Initialize 'Subject' with the title of the expedient */
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
this.profile = this.navParams.get('profile');
console.log(this.postData);
}
async setAdding(type: "intervenient" | "CC") {
@@ -159,7 +154,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
ngOnInit() {
console.log(this.postData);
this.taskDate = new Date(this.task.taskStartDate);
if(!this.task.hasOwnProperty('isEvent')) {
@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { PermissionService } from 'src/app/OtherService/permission.service';
import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
import { ExpedientesService } from 'src/app/Rules/expedientes.service';
import { expedienteTask } from 'src/app/models/dailyworktask.model';
@Component({
selector: 'app-expediente-detail',
@@ -33,7 +34,7 @@ export class ExpedienteDetailPage implements OnInit {
customDate:any;
task: any;
task: expedienteTask;
fulltask: any;
eventsList: Event[];
serialNumber: string;
@@ -256,6 +257,7 @@ export class ExpedienteDetailPage implements OnInit {
"AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
"InstanceID": res.workflowInstanceDataFields.InstanceID
}
this.fulltask = res;
let thedate = new Date(this.task.CreateDate);