peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Saidas testastas

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-27 22:16:15 +01:00
parent 75e6a62695
commit c037078ca7
6 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/add-note/add-note.page.html
+2 -1
View File
@@ -5,7 +5,7 @@
</div>
</div>
<div class="ion-input-class-no-height">
<ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Comentário*" rows="6" cols="20"></ion-textarea>
<ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Comentário" rows="6" cols="20"></ion-textarea>
</div>
<div *ngIf="hideThisFeature" class="ion-item-container-no-border">
@@ -53,6 +53,7 @@
<button *ngIf="actionName == 'Executado'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Executado</button>
<button *ngIf="actionName == 'Gerar Diploma'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Gerar</button>
<button *ngIf="actionName == 'Arquivar'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Arquivar</button>
<button *ngIf="actionName == 'Arquivo'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Arquivar</button>
<button *ngIf="actionName == 'Reexecução'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
<button *ngIf="actionName == 'Concluido'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Concluído</button>
<button *ngIf="actionName == 'Solicitar assinatura'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Solicitar</button>
src/app/modals/create-process/create-process.page.ts
+8 -5
View File
@@ -103,7 +103,8 @@ export class CreateProcessPage implements OnInit {
) {
this.loggeduser = SessionStore.user;
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
console.log(this.task)
if (this.task.SerialNumber) {
this.task.serialNumber = this.task.SerialNumber
}
@@ -127,9 +128,10 @@ export class CreateProcessPage implements OnInit {
let SourceId;
let SourceType;
let SourceSecFsId;
const taskId = this.task.workflowInstanceDataFields?.FolderID || this.task?.FolderId || this.task?.FolderID
if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId || this.task.FolderID) {
SourceId = this.task.workflowInstanceDataFields.FolderID
if(taskId) {
SourceId = taskId
SourceType = 'FOLDER'
SourceSecFsId = 361
} else {
@@ -147,7 +149,7 @@ export class CreateProcessPage implements OnInit {
SourceId: SourceId,
DeadlineType: '',
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber || NumberPDPP
NumberPDPP: this.task?.workflowInstanceDataFields?.DispatchNumber || NumberPDPP || this.fulltask?.workflowInstanceDataFields?.DispatchNumber
};
this.postData.DispatchFolder = this.dispatchFolder;
@@ -155,7 +157,8 @@ export class CreateProcessPage implements OnInit {
/* By Default TypeDeadline should be 'Normal' */
this.postData.Priority = '99999861';
/* Initialize 'Subject' with the title of the expedient */
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
console.log('Subject',this.fulltask)
this.postData.DispatchFolder.Subject = this.task?.workflowInstanceDataFields?.Subject || this.fulltask?.workflowInstanceDataFields?.Subject;
this.profile = this.navParams.get('profile');
}