mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
improve links
This commit is contained in:
@@ -28,25 +28,25 @@
|
|||||||
<div>
|
<div>
|
||||||
<p class="time ion-text-left ">{{customDate}}</p>
|
<p class="time ion-text-left ">{{customDate}}</p>
|
||||||
<div class="wrap d-flex float-left">
|
<div class="wrap d-flex float-left">
|
||||||
<div class="event-box">
|
<div class="event-box" (click)="goToAllTaskFilter('ForToDay')">
|
||||||
<!-- <p>correspondencia com prazo para hoje</p> -->
|
<!-- <p>correspondencia com prazo para hoje</p> -->
|
||||||
<p>Tarefas que terminam hoje</p>
|
<p>Tarefas que terminam hoje</p>
|
||||||
<span>{{ TaskService.deadline }}</span>
|
<span>{{ TaskService.deadline }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="event-box">
|
<div class="event-box" (click)="goToAllTaskFilter('OverdueTasks')">
|
||||||
<!-- <p>correspondencia em atraso</p> -->
|
<!-- <p>correspondencia em atraso</p> -->
|
||||||
<p>Tarefas em atraso</p>
|
<p>Tarefas em atraso</p>
|
||||||
<span>{{ TaskService.overdueTasks }}</span>
|
<span>{{ TaskService.overdueTasks }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="event-box">
|
<div class="event-box" (click)="goToAllTaskFilter('New')">
|
||||||
<!-- <p>Novas correspondencia</p> -->
|
<!-- <p>Novas correspondencia</p> -->
|
||||||
<p>Novas tarefas</p>
|
<p>Novas tarefas</p>
|
||||||
<span>{{ TaskService.new }}</span>
|
<span>{{ TaskService.new }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="event-box">
|
<div class="event-box" (click)="goToAllTaskFilter('unread')">
|
||||||
<!-- <p>correspondencia não lidas</p> -->
|
<!-- <p>correspondencia não lidas</p> -->
|
||||||
<p>Tarefas não lidas</p>
|
<p>Tarefas não lidas</p>
|
||||||
<span>{{ TaskService.unread }}</span>
|
<span>{{ TaskService.unread }}</span>
|
||||||
|
|||||||
@@ -436,6 +436,16 @@ export class EventsPage implements OnInit {
|
|||||||
this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras);
|
this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goToAllTaskFilter(event: any) {
|
||||||
|
let navigationExtras: NavigationExtras = { queryParams: {
|
||||||
|
filter: event,
|
||||||
|
processes: true
|
||||||
|
} }
|
||||||
|
|
||||||
|
|
||||||
|
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
|
||||||
|
}
|
||||||
|
|
||||||
goToExpediente(SerialNumber: any) {
|
goToExpediente(SerialNumber: any) {
|
||||||
this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
|
this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export class DiplomasAssinarPage implements OnInit {
|
|||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
skeletonLoader = true
|
skeletonLoader = true
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
<div class="item width-100">
|
<div class="item width-100">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
<ion-label>{{ task.Folio }}</ion-label>
|
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<div class="exp-icon">
|
<div class="exp-icon">
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
skeletonLoader = true
|
skeletonLoader = true
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
|
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes:ProcessesService,
|
private processes:ProcessesService,
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
<div class="item width-100">
|
<div class="item width-100">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
<ion-label>{{ task.Folio }}</ion-label>
|
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<div class="exp-icon">
|
<div class="exp-icon">
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
|
|||||||
skeletonLoader = true
|
skeletonLoader = true
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export class EventListPage implements OnInit {
|
|||||||
eventsList: any = []
|
eventsList: any = []
|
||||||
color: 'pr' | 'mdgpr'
|
color: 'pr' | 'mdgpr'
|
||||||
environment = environment
|
environment = environment
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
showFilter = false
|
showFilter = false
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export class ExpedientePage implements OnInit {
|
|||||||
|
|
||||||
listToPresent= []
|
listToPresent= []
|
||||||
|
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export class ExpedientesPrPage implements OnInit {
|
|||||||
skeletonLoader = true
|
skeletonLoader = true
|
||||||
expedienteGdStore = ExpedienteGdStore;
|
expedienteGdStore = ExpedienteGdStore;
|
||||||
expedienteTaskPipe = new ExpedienteTaskPipe()
|
expedienteTaskPipe = new ExpedienteTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes:ProcessesService,
|
private processes:ProcessesService,
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
@ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
|
@ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
|
||||||
|
|
||||||
|
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processesbackend: ProcessesService,
|
private processesbackend: ProcessesService,
|
||||||
@@ -180,6 +180,7 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
|
|
||||||
this.LoadCounts();
|
this.LoadCounts();
|
||||||
this.updateAllProcess()
|
this.updateAllProcess()
|
||||||
|
this.checkFilter();
|
||||||
|
|
||||||
const pathname = window.location.pathname
|
const pathname = window.location.pathname
|
||||||
this.router.events.forEach((event) => {
|
this.router.events.forEach((event) => {
|
||||||
@@ -190,9 +191,11 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
if(this.NotificationsService.active === false) {
|
if(this.NotificationsService.active === false) {
|
||||||
this.checkRoutes();
|
this.checkRoutes();
|
||||||
this.LoadCounts();
|
this.LoadCounts();
|
||||||
|
this.checkFilter()
|
||||||
} else {
|
} else {
|
||||||
this.checkRoutes();
|
this.checkRoutes();
|
||||||
this.LoadCounts();
|
this.LoadCounts();
|
||||||
|
this.checkFilter()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -293,6 +296,28 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
checkFilter() {
|
||||||
|
const params: any = new Proxy(new URLSearchParams(window.location.search), {
|
||||||
|
get: (searchParams: any, prop: any) => searchParams.get(prop),
|
||||||
|
});
|
||||||
|
|
||||||
|
const filter = params.filter
|
||||||
|
|
||||||
|
if(filter == 'ForToDay') {
|
||||||
|
this.filterName = 'Para hoje'
|
||||||
|
} else if (filter == 'OverdueTasks') {
|
||||||
|
this.filterName = 'OverdueTasks'
|
||||||
|
} else if (filter == 'New') {
|
||||||
|
this.filterName = 'Novos'
|
||||||
|
} else if (filter == 'unread') {
|
||||||
|
this.filterName = 'Não lidos'
|
||||||
|
} else {
|
||||||
|
console.log('filter', filter)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
async loadAllProcesses() {
|
async loadAllProcesses() {
|
||||||
this.LoadCounts();
|
this.LoadCounts();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
<div class="item width-100">
|
<div class="item width-100">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
<ion-label>{{ task.Folio }}</ion-label>
|
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<div class="exp-icon">
|
<div class="exp-icon">
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export class PedidosPage implements OnInit {
|
|||||||
|
|
||||||
segment: string;
|
segment: string;
|
||||||
@Output() openExpedientDetail: EventEmitter<any> = new EventEmitter<any>();
|
@Output() openExpedientDetail: EventEmitter<any> = new EventEmitter<any>();
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export class PendentesPage implements OnInit {
|
|||||||
pendentesstore = PendentesStore;
|
pendentesstore = PendentesStore;
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
listToPresent = [];
|
listToPresent = [];
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export class AllProcessesPage implements OnInit {
|
|||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
|
|
||||||
AllProcess = []
|
AllProcess = []
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
@@ -53,16 +53,39 @@ export class AllProcessesPage implements OnInit {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.updateAllProcess()
|
this.updateAllProcess()
|
||||||
|
this.checkFilter();
|
||||||
|
|
||||||
this.router.events.forEach((event) => {
|
this.router.events.forEach((event) => {
|
||||||
if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
|
if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
|
||||||
if (window.location.pathname.startsWith('/home/gabinete-digital')) {
|
if (window.location.pathname.startsWith('/home/gabinete-digital')) {
|
||||||
this.refreshing();
|
this.refreshing();
|
||||||
|
this.checkFilter();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
checkFilter() {
|
||||||
|
const params: any = new Proxy(new URLSearchParams(window.location.search), {
|
||||||
|
get: (searchParams: any, prop: any) => searchParams.get(prop),
|
||||||
|
});
|
||||||
|
|
||||||
|
const filter = params.filter
|
||||||
|
|
||||||
|
if(filter == 'ForToDay') {
|
||||||
|
this.filterName = 'Para hoje'
|
||||||
|
} else if (filter == 'OverdueTasks') {
|
||||||
|
this.filterName = 'OverdueTasks'
|
||||||
|
} else if (filter == 'New') {
|
||||||
|
this.filterName = 'Novos'
|
||||||
|
} else if (filter == 'unread') {
|
||||||
|
this.filterName = 'Não lidos'
|
||||||
|
} else {
|
||||||
|
console.log('filter', filter)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
doRefresh(event) {
|
doRefresh(event) {
|
||||||
if (event) {
|
if (event) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export class DespachosPrPage implements OnInit {
|
|||||||
loggeduser: LoginUserRespose;
|
loggeduser: LoginUserRespose;
|
||||||
despachosprstore = DespachosprStore;
|
despachosprstore = DespachosprStore;
|
||||||
environment = environment
|
environment = environment
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor (
|
constructor (
|
||||||
private processes:ProcessesService,
|
private processes:ProcessesService,
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export class DespachosPage implements OnInit {
|
|||||||
|
|
||||||
despachoStore = DespachoStore;
|
despachoStore = DespachoStore;
|
||||||
skeletonLoader = true;
|
skeletonLoader = true;
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor (
|
constructor (
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export class DiplomasAssinarPage implements OnInit {
|
|||||||
|
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
|
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export class DiplomasPage implements OnInit {
|
|||||||
@Input() segment:string;
|
@Input() segment:string;
|
||||||
|
|
||||||
|
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
deplomasStore = DeplomasStore
|
deplomasStore = DeplomasStore
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export class EventsToApprovePage implements OnInit {
|
|||||||
color: 'pr' | 'mdgpr'
|
color: 'pr' | 'mdgpr'
|
||||||
eventoaprovacaostore = EventoAprovacaoStore;
|
eventoaprovacaostore = EventoAprovacaoStore;
|
||||||
environment = environment
|
environment = environment
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export class ExpedientesPrPage implements OnInit {
|
|||||||
expedienteTaskPipe = new ExpedienteTaskPipe()
|
expedienteTaskPipe = new ExpedienteTaskPipe()
|
||||||
|
|
||||||
loggeduser: LoginUserRespose;
|
loggeduser: LoginUserRespose;
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
|
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export class ExpedientsPage implements OnInit {
|
|||||||
expedientegbstore = ExpedienteGdStore
|
expedientegbstore = ExpedienteGdStore
|
||||||
|
|
||||||
expedienteTaskPipe = new ExpedienteTaskPipe()
|
expedienteTaskPipe = new ExpedienteTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject d-flex align-center">
|
<div class="subject d-flex align-center">
|
||||||
<ion-label>{{ task.Folio }}</ion-label>
|
<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="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>
|
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject d-flex align-center">
|
<div class="subject d-flex align-center">
|
||||||
<ion-label>{{ task.Folio }}</ion-label>
|
<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="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>
|
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export class PedidosPage implements OnInit {
|
|||||||
skeletonLoader = true
|
skeletonLoader = true
|
||||||
pedidosstore = PedidosStore;
|
pedidosstore = PedidosStore;
|
||||||
customTaskPipe = new CustomTaskPipe()
|
customTaskPipe = new CustomTaskPipe()
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export class PendentesPage implements OnInit {
|
|||||||
@Input() profile:string;
|
@Input() profile:string;
|
||||||
segment:string;
|
segment:string;
|
||||||
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
|
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
|
||||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
|
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "2c18fb4a2",
|
"shortSHA": "d4538fa54",
|
||||||
"SHA": "2c18fb4a20230776ad020d4d4bc4565bbc991fb8",
|
"SHA": "d4538fa54a63120ee8872f15a156ace7e2f64df3",
|
||||||
"branch": "feature/gabineteLabels",
|
"branch": "feature/gabineteLabels",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Mon Apr 17 11:50:41 2023 +0100'",
|
"lastCommitTime": "'Mon Apr 17 14:11:30 2023 +0100'",
|
||||||
"lastCommitMessage": "change home layout",
|
"lastCommitMessage": "merge and add new features",
|
||||||
"lastCommitNumber": "4906",
|
"lastCommitNumber": "4909",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch feature/gabineteLabels\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.module.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\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/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.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/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/environments/suport/dev.ts\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/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user