mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
fix bug
This commit is contained in:
@@ -44,7 +44,7 @@
|
|||||||
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class">
|
<div class="ion-input-class">
|
||||||
<ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
|
<ion-select placeholder="Tipo" [(ngModel)]="selectedTypes" multiple="true" interface="action-sheet" Cancel-text="Cancelar" required>
|
||||||
<ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
|
<ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
|
||||||
</ion-select>
|
</ion-select>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
user: string;
|
user: string;
|
||||||
loadedAttachments:any;
|
loadedAttachments:any;
|
||||||
subjectTypes:any;
|
subjectTypes:any;
|
||||||
|
selectedTypes: string[]=[];
|
||||||
|
|
||||||
postData: Despacho;
|
postData: Despacho;
|
||||||
dispatchFolder: Folder;
|
dispatchFolder: Folder;
|
||||||
@@ -81,7 +82,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
SouceType: 'FOLDER',
|
SouceType: 'FOLDER',
|
||||||
SourceId: this.task.workflowInstanceDataFields.FolderID,
|
SourceId: this.task.workflowInstanceDataFields.FolderID,
|
||||||
DeadlineType: '',
|
DeadlineType: '',
|
||||||
SubjectTypes: [],
|
SubjectTypes: ['99999844'],
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -89,8 +90,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
this.postData.UsersSelected = this.participants;
|
this.postData.UsersSelected = this.participants;
|
||||||
/* By Default TypeDeadline should be 'Normal' */
|
/* By Default TypeDeadline should be 'Normal' */
|
||||||
this.postData.Priority = '99999861';
|
this.postData.Priority = '99999861';
|
||||||
/* By Default TypeDeadline should be 'Economia' */
|
|
||||||
this.postData.SubjectTypes = [99999844];
|
|
||||||
/* Initialize 'Subject' with the title of the expedient */
|
/* Initialize 'Subject' with the title of the expedient */
|
||||||
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
|
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
|
||||||
this.profile = this.navParams.get('profile');
|
this.profile = this.navParams.get('profile');
|
||||||
@@ -152,7 +151,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
UserEmail: val.EmailAddress,
|
UserEmail: val.EmailAddress,
|
||||||
UserType: val.IsRequired?"I": "CC"
|
UserType: val.IsRequired?"I": "CC"
|
||||||
};
|
};
|
||||||
})
|
});
|
||||||
|
|
||||||
const DocumentToSave = this.documents.map((e) => {
|
const DocumentToSave = this.documents.map((e) => {
|
||||||
return {
|
return {
|
||||||
@@ -161,6 +160,8 @@ export class CreateProcessPage implements OnInit {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.dispatchFolder.SubjectTypes = this.selectedTypes;
|
||||||
|
|
||||||
if(this.taskParticipants.length > 0) {
|
if(this.taskParticipants.length > 0) {
|
||||||
switch (this.taskType) {
|
switch (this.taskType) {
|
||||||
case '0':
|
case '0':
|
||||||
@@ -169,7 +170,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes ,
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
}
|
}
|
||||||
@@ -182,7 +182,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes ,
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
}
|
}
|
||||||
@@ -195,7 +194,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes ,
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ export class Despacho{
|
|||||||
DistributionType: string;
|
DistributionType: string;
|
||||||
CountryCode: string;
|
CountryCode: string;
|
||||||
Priority: string;
|
Priority: string;
|
||||||
SubjectTypes: any[];
|
|
||||||
UserEmail: string;
|
UserEmail: string;
|
||||||
UsersSelected: Participant[];
|
UsersSelected: Participant[];
|
||||||
DispatchFolder: Folder;
|
DispatchFolder: Folder;
|
||||||
|
|||||||
@@ -6,5 +6,5 @@ export class Folder{
|
|||||||
SouceType:string;
|
SouceType:string;
|
||||||
SourceId:string;
|
SourceId:string;
|
||||||
DeadlineType: string;
|
DeadlineType: string;
|
||||||
SubjectTypes: number[];
|
SubjectTypes: string[];
|
||||||
}
|
}
|
||||||
+4
-7
@@ -95,7 +95,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
SouceType: 'DOC', //FOLDER
|
SouceType: 'DOC', //FOLDER
|
||||||
SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
|
SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
|
||||||
DeadlineType: '',
|
DeadlineType: '',
|
||||||
SubjectTypes: new Array(),
|
SubjectTypes: ['99999844'],
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -103,8 +103,6 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
this.postData.UsersSelected = this.participants;
|
this.postData.UsersSelected = this.participants;
|
||||||
/* By Default TypeDeadline should be 'Normal' */
|
/* By Default TypeDeadline should be 'Normal' */
|
||||||
this.postData.Priority = '99999861';
|
this.postData.Priority = '99999861';
|
||||||
/* By Default TypeDeadline should be 'Economia' */
|
|
||||||
this.postData.SubjectTypes = [99999844];
|
|
||||||
/* Initialize 'Subject' with the title of the expedient */
|
/* Initialize 'Subject' with the title of the expedient */
|
||||||
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
|
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
|
||||||
this.profile = this.navParams.get('profile');
|
this.profile = this.navParams.get('profile');
|
||||||
@@ -182,7 +180,9 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
docs.Attachments = DocumentToSave
|
this.dispatchFolder.SubjectTypes = this.selectedTypes;
|
||||||
|
|
||||||
|
docs.Attachments = DocumentToSave;
|
||||||
|
|
||||||
if(this.taskParticipants.length > 0) {
|
if(this.taskParticipants.length > 0) {
|
||||||
switch (this.taskType) {
|
switch (this.taskType) {
|
||||||
@@ -192,7 +192,6 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes ,
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
AttachmentList: docs,
|
AttachmentList: docs,
|
||||||
@@ -220,7 +219,6 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes ,
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
AttachmentList: docs
|
AttachmentList: docs
|
||||||
@@ -245,7 +243,6 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
Priority: this.postData.Priority,
|
Priority: this.postData.Priority,
|
||||||
UserEmail: this.user,
|
UserEmail: this.user,
|
||||||
SubjectTypes: this.postData.SubjectTypes , //this.selectedTypes
|
|
||||||
UsersSelected: attendees,
|
UsersSelected: attendees,
|
||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
AttachmentList: docs
|
AttachmentList: docs
|
||||||
|
|||||||
Reference in New Issue
Block a user