peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add deadline to list

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-12 09:01:03 +01:00
parent 3607a34ed3
commit 8cc4181c41
21 changed files with 139 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+4 -1
View File
@@ -125,6 +125,7 @@ export class DespachoPrPage implements OnInit {
"DocId": res.workflowInstanceDataFields.DispatchDocId,
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"Deadline": res.deadline,
"activityInstanceName": res.activityInstanceName,
}
this.fulltask = res;
@@ -197,6 +198,7 @@ export class DespachoPrPage implements OnInit {
"WorkflowName": process[0].workflowDisplayName,
"DeadlineType": JSON.parse(process[0].workflowInstanceDataFields).DeadlineType,
"activityInstanceName": process[0].activityInstanceName,
"Deadline": process[0].deadline,
}
let fulltak = {
@@ -213,7 +215,8 @@ export class DespachoPrPage implements OnInit {
workflowInstanceDataFields: JSON.parse(process[0].workflowInstanceDataFields),
workflowInstanceFolio: process[0].workflowInstanceFolio,
workflowInstanceID: process[0].workflowInstanceID,
workflowName: process[0].workflowName
workflowName: process[0].workflowName,
"Deadline": process[0].deadline,
}
this.fulltask = fulltak;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+4 -1
View File
@@ -126,6 +126,7 @@ export class DespachoPage implements OnInit {
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
"Deadline": res.deadline
}
this.updateProcessOnDB(res);
@@ -209,6 +210,7 @@ export class DespachoPage implements OnInit {
"DeadlineType": workflow.DeadlineType,
"activityInstanceName": process[0].activityInstanceName,
"Status": workflow.Status,
"Deadline": process[0].deadline
}
let thedate = new Date(this.task.CreateDate);
@@ -228,7 +230,8 @@ export class DespachoPage implements OnInit {
workflowInstanceDataFields: JSON.parse(process[0].workflowInstanceDataFields),
workflowInstanceFolio: process[0].workflowInstanceFolio,
workflowInstanceID: process[0].workflowInstanceID,
workflowName: process[0].workflowName
workflowName: process[0].workflowName,
deadline: process[0].deadline
}
this.fulltask = fulltak;
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+1
View File
@@ -100,6 +100,7 @@ export class DiplomaAssinarPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"activityInstanceName": res.activityInstanceName,
"Deadline": res.deadline,
}
this.fulltask = res;
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+1
View File
@@ -97,6 +97,7 @@ export class DiplomasGerarPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"activityInstanceName": res.activityInstanceName,
"Deadline": res.deadline,
}
this.fulltask = res;
src/app/pages/gabinete-digital/expediente/expediente.page.html
+3 -1
View File
@@ -36,8 +36,10 @@
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex align-center">
<ion-label>{{ task.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.taskStartDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/pages/gabinete-digital/expediente/expediente.page.scss
+14
View File
@@ -233,4 +233,18 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
}
.dead-line {
font-size: 12px;
color: red;
}
.new-task {
border-radius: 20px;
background: #efefef;
font-size: 12px;
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #46465b;
}
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+5 -1
View File
@@ -11,6 +11,8 @@ import { ThemeService } from 'src/app/services/theme.service'
import { SortService } from 'src/app/services/functions/sort.service';
import { Storage } from '@ionic/storage';
import { EventTrigger } from 'src/app/services/eventTrigger.service';
import { TaskDeadlineService } from 'src/app/services/task-deadline.service'
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-expediente',
@@ -43,7 +45,9 @@ export class ExpedientePage implements OnInit {
public ThemeService: ThemeService,
private sortService: SortService,
private storage: Storage,
private eventTriger: EventTrigger
private eventTriger: EventTrigger,
public TaskDeadlineService: TaskDeadlineService,
public TaskService: TaskService
) {
this.eventTriger.getObservable().subscribe((event) => {
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+1
View File
@@ -170,6 +170,7 @@ export class ExpedientePrPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
"Deadline": res.deadline,
}
this.fulltask = res;
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -79,7 +79,7 @@
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="item-date">
<ion-label>{{ task.CreateDate || task.taskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
<ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+7 -1
View File
@@ -314,7 +314,8 @@ export class GabineteDigitalPage implements OnInit {
"workflowID": element.workflowID,
"workflowInstanceDataFields": element.workflowInstanceDataFields,
"workflowInstanceID": element.workflowInstanceID,
"workflowName": element.workflowName
"workflowName": element.workflowName,
"deadline": element.deadline
}
this.sqliteservice.addProcess(process);
@@ -348,6 +349,7 @@ export class GabineteDigitalPage implements OnInit {
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
"Agenda": element.workflowInstanceDataFields.Agenda,
"deadline": element.deadline,
"customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
}
@@ -381,6 +383,7 @@ export class GabineteDigitalPage implements OnInit {
"Status": workflowInstanceDataFields.Status,
"Agenda": workflowInstanceDataFields.Agenda,
"customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
"deadline": element.deadline
}
this.allProcessesList.push(task);
@@ -688,6 +691,7 @@ export class GabineteDigitalPage implements OnInit {
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"deadline": element.deadline
}
}));
@@ -705,6 +709,7 @@ export class GabineteDigitalPage implements OnInit {
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"deadline": element.deadline
}
}));
@@ -759,6 +764,7 @@ export class GabineteDigitalPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
"deadline": element.deadline
}
}))
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+1
View File
@@ -132,6 +132,7 @@ export class PedidoPage implements OnInit {
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
"Deadline": res.deadline,
}
this.updateProcess(res);