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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-24 11:47:00 +01:00
parent 04785f32f9
commit fd0941999d
15 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/dailyworktask.model.ts
+1
View File
@@ -147,6 +147,7 @@ export class customTask {
TaskStartDate: string
TaskStatus: string
TaskReceiveDate: string
Subject: string
}
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+3 -1
View File
@@ -131,8 +131,10 @@
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">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/diplomas/diplomas.page.html
+3 -1
View File
@@ -109,8 +109,10 @@
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">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/pedidos/pedidos.page.html
+3 -1
View File
@@ -122,8 +122,10 @@
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/pipes/custom-task.pipe.ts
+1
View File
@@ -14,6 +14,7 @@ export class CustomTaskPipe implements PipeTransform {
return {
"SerialNumber": fullTask.serialNumber,
"Subject": fullTask.workflowInstanceDataFields.Subject,
"Folio": fullTask.workflowInstanceDataFields.Subject,
"Senders": fullTask.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1 -1
View File
@@ -66,7 +66,7 @@
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.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.TaskReceiveDate)">Nova</span>
src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+1 -1
View File
@@ -64,7 +64,7 @@
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">Nova</span>
src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
+4 -2
View File
@@ -30,8 +30,10 @@
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Subject }}</ion-label>
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts
+4 -1
View File
@@ -6,6 +6,8 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
import { ThemeService } from 'src/app/services/theme.service'
import { SortService } from 'src/app/services/functions/sort.service';
import { Storage } from '@ionic/storage';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-expedients',
@@ -29,7 +31,8 @@ export class ExpedientsPage implements OnInit {
private router: Router,
public ThemeService: ThemeService,
private sortService: SortService,
private storage: Storage
private storage: Storage,
public TaskService: TaskService
) {
this.profile = 'mdgpr';
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+6 -2
View File
@@ -64,8 +64,10 @@
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -101,8 +103,10 @@
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</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.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+3 -1
View File
@@ -52,8 +52,10 @@
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default'" src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -61,7 +61,7 @@
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<div class="subjectc d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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.TaskReceiveDate)">Nova</span>
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+1
View File
@@ -88,6 +88,7 @@ export class ExpedientsPage implements OnInit {
this.expedientegbstore.reset(this.taskslist);
}, (error) => {
this.skeletonLoader = false
this.getEventsFromLocalDb();
});
}
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+11 -3
View File
@@ -82,10 +82,16 @@ export class PedidosPage implements OnInit {
if(this.segment == 'parecer') {
this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
let parecer = [];
let parecerPr = [];
this.skeletonLoader = false
try {
parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
this.skeletonLoader = false
} catch (error) {
this.skeletonLoader = false
}
let allParecer = parecer.concat(parecerPr).reverse();
@@ -118,6 +124,8 @@ export class PedidosPage implements OnInit {
this.pedidosstore.resetdeferimento(this.sortService.sortDate(this.deferimentoList, 'CreateDate'));
},() => {
this.skeletonLoader = false
});
}
this.skeletonLoader = false
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "8639f08f9",
"SHA": "8639f08f9eedebab62ccbacd220495ee9c00b03f",
"shortSHA": "04785f32f",
"SHA": "04785f32f92e970c7be48e91384d2df3845df9a0",
"branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Apr 21 16:26:13 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4927",
"lastCommitTime": "'Mon Apr 24 11:30:21 2023 +0100'",
"lastCommitMessage": "fix count",
"lastCommitNumber": "4928",
"change": "",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: version/git-version.ts",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts",
"changeAuthor": "peter.maquiran"
}