mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix update
This commit is contained in:
@@ -26,6 +26,7 @@ import { ThemeService } from 'src/app/services/theme.service'
|
|||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
import { PermissionService } from 'src/app/services/permission.service';
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-despacho-pr',
|
selector: 'app-despacho-pr',
|
||||||
@@ -67,7 +68,8 @@ export class DespachoPrPage implements OnInit {
|
|||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private RouteService: RouteService,
|
private RouteService: RouteService,
|
||||||
public p: PermissionService,
|
public p: PermissionService,
|
||||||
private httpErroHandle: HttpErrorHandle
|
private httpErroHandle: HttpErrorHandle,
|
||||||
|
public TaskService: TaskService
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if (params["params"].SerialNumber) {
|
if (params["params"].SerialNumber) {
|
||||||
@@ -112,6 +114,8 @@ export class DespachoPrPage implements OnInit {
|
|||||||
|
|
||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
||||||
|
this.TaskService.loadDiplomas();
|
||||||
|
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import { BackgroundService } from 'src/app/services/background.service';
|
|||||||
import { ThemeService } from 'src/app/services/theme.service'
|
import { ThemeService } from 'src/app/services/theme.service'
|
||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -67,7 +68,8 @@ export class DespachoPage implements OnInit {
|
|||||||
private platform: Platform,
|
private platform: Platform,
|
||||||
private backgroundservice: BackgroundService,
|
private backgroundservice: BackgroundService,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private httpErrorHandle: HttpErrorHandle
|
private httpErrorHandle: HttpErrorHandle,
|
||||||
|
public TaskService: TaskService
|
||||||
|
|
||||||
|
|
||||||
) {
|
) {
|
||||||
@@ -110,6 +112,8 @@ export class DespachoPage implements OnInit {
|
|||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
||||||
|
|
||||||
|
this.TaskService.loadDespachos();
|
||||||
|
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
+4
-1
@@ -15,6 +15,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'
|
|||||||
import { AttachmentList } from 'src/app/models/Excludetask';
|
import { AttachmentList } from 'src/app/models/Excludetask';
|
||||||
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
|
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
|
||||||
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diploma-assinar',
|
selector: 'app-diploma-assinar',
|
||||||
@@ -45,6 +46,7 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private httpErroHandle: HttpErrorHandle,
|
private httpErroHandle: HttpErrorHandle,
|
||||||
private despachoService: DespachoService,
|
private despachoService: DespachoService,
|
||||||
|
public TaskService: TaskService
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if(params["params"].SerialNumber) {
|
if(params["params"].SerialNumber) {
|
||||||
@@ -85,7 +87,8 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
|
|
||||||
this.processes.GetTask(serial).subscribe(res => {
|
this.processes.GetTask(serial).subscribe(res => {
|
||||||
console.log("res", res)
|
this.TaskService.loadDiplomas();
|
||||||
|
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
|
|||||||
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
|
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
|
||||||
import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
|
import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diplomas-gerar',
|
selector: 'app-diplomas-gerar',
|
||||||
@@ -44,7 +46,8 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
private RouteService: RouteService,
|
private RouteService: RouteService,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private despachoService: DespachoService,
|
private despachoService: DespachoService,
|
||||||
private httpErroHandle: HttpErrorHandle
|
private httpErroHandle: HttpErrorHandle,
|
||||||
|
public TaskService: TaskService
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if(params["params"].SerialNumber) {
|
if(params["params"].SerialNumber) {
|
||||||
@@ -83,6 +86,7 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
|
|
||||||
this.processes.GetTask(serial).subscribe(res => {
|
this.processes.GetTask(serial).subscribe(res => {
|
||||||
|
this.TaskService.loadDiplomas()
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import { AttachmentList } from 'src/app/models/Excludetask';
|
|||||||
import { DespachoService } from 'src/app/Rules/despacho.service'
|
import { DespachoService } from 'src/app/Rules/despacho.service'
|
||||||
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
|
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
|
||||||
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -57,7 +58,8 @@ export class DiplomaPage implements OnInit {
|
|||||||
private platform: Platform,
|
private platform: Platform,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private httpErrorHandle: HttpErrorHandle,
|
private httpErrorHandle: HttpErrorHandle,
|
||||||
private despachoService: DespachoService
|
private despachoService: DespachoService,
|
||||||
|
public TaskService: TaskService
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
//
|
//
|
||||||
@@ -128,6 +130,8 @@ export class DiplomaPage implements OnInit {
|
|||||||
|
|
||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
this.processes.GetTask(serial).subscribe(res => {
|
this.processes.GetTask(serial).subscribe(res => {
|
||||||
|
this.TaskService.loadDiplomas();
|
||||||
|
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
+5
-3
@@ -19,7 +19,6 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
|
|||||||
import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
|
import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
|
||||||
import { ExpedienteService } from 'src/app/Rules/expediente.service';
|
import { ExpedienteService } from 'src/app/Rules/expediente.service';
|
||||||
import { expedienteTask } from 'src/app/models/dailyworktask.model';
|
import { expedienteTask } from 'src/app/models/dailyworktask.model';
|
||||||
import { TaskService } from 'src/app/Rules/task.service';
|
|
||||||
import { PermissionService } from 'src/app/services/permission.service';
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
||||||
import { ThemeService } from 'src/app/services/theme.service'
|
import { ThemeService } from 'src/app/services/theme.service'
|
||||||
@@ -37,6 +36,8 @@ import { LoginUserRespose } from 'src/app/models/user.model';
|
|||||||
import { AuthService } from 'src/app/services/auth.service';
|
import { AuthService } from 'src/app/services/auth.service';
|
||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-expediente-detail',
|
selector: 'app-expediente-detail',
|
||||||
@@ -81,7 +82,6 @@ export class ExpedienteDetailPage implements OnInit {
|
|||||||
private RouteService: RouteService,
|
private RouteService: RouteService,
|
||||||
private attachmentsService: AttachmentsService,
|
private attachmentsService: AttachmentsService,
|
||||||
public p: PermissionService,
|
public p: PermissionService,
|
||||||
private taskService: TaskService,
|
|
||||||
private expedienteService: ExpedienteService,
|
private expedienteService: ExpedienteService,
|
||||||
public platform: Platform,
|
public platform: Platform,
|
||||||
private sqliteservice: SqliteService,
|
private sqliteservice: SqliteService,
|
||||||
@@ -91,7 +91,8 @@ export class ExpedienteDetailPage implements OnInit {
|
|||||||
private storage: Storage,
|
private storage: Storage,
|
||||||
private userAuth: AuthService,
|
private userAuth: AuthService,
|
||||||
private httpErroHandle: HttpErrorHandle,
|
private httpErroHandle: HttpErrorHandle,
|
||||||
private eventTriger: EventTrigger
|
private eventTriger: EventTrigger,
|
||||||
|
public TaskService: TaskService
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user
|
this.loggeduser = SessionStore.user
|
||||||
console.log('SessionStore', SessionStore)
|
console.log('SessionStore', SessionStore)
|
||||||
@@ -357,6 +358,7 @@ export class ExpedienteDetailPage implements OnInit {
|
|||||||
|
|
||||||
this.processes.GetTask(serial).subscribe(res => {
|
this.processes.GetTask(serial).subscribe(res => {
|
||||||
|
|
||||||
|
this.TaskService.loadExpedientes();
|
||||||
|
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import { ThemeService } from 'src/app/services/theme.service'
|
|||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-expediente-pr',
|
selector: 'app-expediente-pr',
|
||||||
@@ -62,7 +63,8 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
private attachmentsService: AttachmentsService,
|
private attachmentsService: AttachmentsService,
|
||||||
private RouteService: RouteService,
|
private RouteService: RouteService,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private httpErroHandle: HttpErrorHandle
|
private httpErroHandle: HttpErrorHandle,
|
||||||
|
public TaskService: TaskService
|
||||||
|
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
@@ -156,6 +158,7 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
date.setMonth(date.getMonth() + 1);
|
date.setMonth(date.getMonth() + 1);
|
||||||
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
||||||
|
|
||||||
|
this.TaskService.loadExpedientes();
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -106,12 +106,12 @@
|
|||||||
<div *ngSwitchCase="'listview'">
|
<div *ngSwitchCase="'listview'">
|
||||||
|
|
||||||
|
|
||||||
<ion-item-sliding *ngIf="TaskService.loadCount || (TaskService.AllProcess.length >= 1 && TaskService.loadNum >= 1)">
|
<ion-item-sliding *ngIf="TaskService.loadCount || (AllProcess.length >= 1 && TaskService.loadNum >= 1)">
|
||||||
<div class="listview" >
|
<div class="listview" >
|
||||||
<ion-list *ngIf="TaskService.AllProcess">
|
<ion-list *ngIf="AllProcess">
|
||||||
<div
|
<div
|
||||||
class=" box-hover ion-no-padding cursor-pointer"
|
class=" box-hover ion-no-padding cursor-pointer"
|
||||||
*ngFor = "let task of TaskService.AllProcess"
|
*ngFor = "let task of AllProcess"
|
||||||
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
|
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
|
||||||
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="item width-100">
|
<div class="item width-100">
|
||||||
@@ -222,7 +222,7 @@
|
|||||||
<fa-icon class="icon-selected" icon="align-justify"></fa-icon>
|
<fa-icon class="icon-selected" icon="align-justify"></fa-icon>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-center exp-card-title ">Todas as tarefas</p>
|
<p class="text-center exp-card-title ">Todas as tarefas</p>
|
||||||
<p class="text-center exp-card-content"> {{ TaskService.AllProcess.length }} <span class="title1">Documentos</span></p>
|
<p class="text-center exp-card-content"> {{ AllProcess.length }} <span class="title1">Documentos</span></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- List -->
|
<!-- List -->
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
hideSearchBtn: boolean = false;
|
hideSearchBtn: boolean = false;
|
||||||
showSearch = false;
|
showSearch = false;
|
||||||
searchSubject: string = '';
|
searchSubject: string = '';
|
||||||
|
AllProcess = []
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processesbackend: ProcessesService,
|
private processesbackend: ProcessesService,
|
||||||
@@ -139,6 +139,13 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
|
|
||||||
this.checkRoutes();
|
this.checkRoutes();
|
||||||
|
|
||||||
|
this.TaskService.registerCallback({
|
||||||
|
id: import.meta.url,
|
||||||
|
funx:() => {
|
||||||
|
this.dynamicSearch()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
closeAllDesktopComponent() {
|
closeAllDesktopComponent() {
|
||||||
this.desktopComponent = {
|
this.desktopComponent = {
|
||||||
@@ -148,10 +155,31 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
openSearch() {}
|
openSearch() {
|
||||||
async closeSearch() {}
|
this.dynamicSearch()
|
||||||
async basicSearch() {}
|
}
|
||||||
async dynamicSearch() {}
|
async closeSearch() {
|
||||||
|
this.searchSubject = ''
|
||||||
|
this.dynamicSearch()
|
||||||
|
}
|
||||||
|
|
||||||
|
async basicSearch() {
|
||||||
|
this.dynamicSearch()
|
||||||
|
}
|
||||||
|
|
||||||
|
async dynamicSearch() {
|
||||||
|
|
||||||
|
if(this.showSearch && this.searchSubject) {
|
||||||
|
|
||||||
|
this.AllProcess = this.TaskService.AllProcess.filter((task) => {
|
||||||
|
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
|
||||||
|
subject = subject.toLowerCase();
|
||||||
|
return subject.includes(this.searchSubject.toLowerCase())
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.AllProcess = this.TaskService.AllProcess
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
|
|||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-pedido',
|
selector: 'app-pedido',
|
||||||
@@ -69,7 +70,8 @@ export class PedidoPage implements OnInit {
|
|||||||
private platform: Platform,
|
private platform: Platform,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private dataService: DataService,
|
private dataService: DataService,
|
||||||
private htppErroHandle: HttpErrorHandle ) {
|
private htppErroHandle: HttpErrorHandle,
|
||||||
|
public TaskService: TaskService ) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
|
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
@@ -108,6 +110,7 @@ export class PedidoPage implements OnInit {
|
|||||||
|
|
||||||
this.fulltask = res
|
this.fulltask = res
|
||||||
|
|
||||||
|
this.TaskService.loadPedidos();
|
||||||
|
|
||||||
if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') {
|
if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') {
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { CustomTaskPipe } from '../pipes/custom-task.pipe';
|
|||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
import { EventsService } from './events.service';
|
import { EventsService } from './events.service';
|
||||||
import { SortService } from './functions/sort.service';
|
import { SortService } from './functions/sort.service';
|
||||||
|
import { customTask } from '../models/dailyworktask.model';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
@@ -67,6 +68,11 @@ export class TaskService {
|
|||||||
this.updateAllProcess()
|
this.updateAllProcess()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
this.updateAllProcess()
|
||||||
|
this.updateCount()
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
registerCallback({funx, id}) {
|
registerCallback({funx, id}) {
|
||||||
@@ -153,12 +159,10 @@ export class TaskService {
|
|||||||
|
|
||||||
async LoadTask() {
|
async LoadTask() {
|
||||||
|
|
||||||
|
|
||||||
let expedientes;
|
|
||||||
this.showLoader = true
|
this.showLoader = true
|
||||||
|
|
||||||
try {
|
try {
|
||||||
expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
|
await this.loadExpedientes()
|
||||||
this.loadCount = true;
|
this.loadCount = true;
|
||||||
this.showLoader = false;
|
this.showLoader = false;
|
||||||
} catch(error) {
|
} catch(error) {
|
||||||
@@ -167,6 +171,30 @@ export class TaskService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.loadNum++;
|
this.loadNum++;
|
||||||
|
await this.loadDespachos();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
await this.loadPedidos()
|
||||||
|
await this.loadPendestes()
|
||||||
|
|
||||||
|
await this.loadDiplomas()
|
||||||
|
|
||||||
|
|
||||||
|
await this.loadEventosParaAprovacao()
|
||||||
|
this.loadCount = true
|
||||||
|
}
|
||||||
|
|
||||||
|
async loadDespachos() {
|
||||||
|
let despachos = await this.despachoRule.getList({ updateStore: true })
|
||||||
|
if (despachos) {
|
||||||
|
this.despachoStore.reset(despachos)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async loadExpedientes() {
|
||||||
|
let expedientes;
|
||||||
|
expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
|
||||||
|
|
||||||
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
|
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
|
||||||
|
|
||||||
@@ -177,13 +205,9 @@ export class TaskService {
|
|||||||
expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
|
expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
|
||||||
|
|
||||||
this.expedientegbstore.reset(expedientes);
|
this.expedientegbstore.reset(expedientes);
|
||||||
|
}
|
||||||
|
|
||||||
|
async loadPedidos() {
|
||||||
let despachos = await this.despachoRule.getList({ updateStore: true })
|
|
||||||
if (despachos) {
|
|
||||||
this.despachoStore.reset(despachos)
|
|
||||||
}
|
|
||||||
|
|
||||||
let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
|
let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
|
||||||
let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
|
let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
|
||||||
|
|
||||||
@@ -201,59 +225,20 @@ export class TaskService {
|
|||||||
return this.customTaskPipe.transform(element)
|
return this.customTaskPipe.transform(element)
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async loadPendestes() {
|
||||||
let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
|
let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
|
||||||
this.pendentesstore.count = Object.keys(pendentes).length;
|
this.pendentesstore.count = Object.keys(pendentes).length;
|
||||||
|
|
||||||
pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
|
pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
|
||||||
|
|
||||||
this.pendentesstore.reset(pendentes);
|
this.pendentesstore.reset(pendentes);
|
||||||
|
}
|
||||||
let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
|
||||||
|
|
||||||
|
|
||||||
if(SessionStore.user.Profile != 'PR') {
|
async loadEventosParaAprovacao() {
|
||||||
|
|
||||||
let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
|
|
||||||
depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
|
|
||||||
|
|
||||||
depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
|
|
||||||
|
|
||||||
this.despachoprstore.reset(depacho)
|
|
||||||
|
|
||||||
} else if(SessionStore.user.Profile == 'PR') {
|
|
||||||
|
|
||||||
let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
|
|
||||||
depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
|
|
||||||
this.despachoprstore.reset(depacho)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
this.runCallback();
|
|
||||||
|
|
||||||
let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
|
|
||||||
|
|
||||||
diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
|
|
||||||
|
|
||||||
|
|
||||||
this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> {
|
|
||||||
|
|
||||||
let date = new Date(element.taskStartDate);
|
|
||||||
date.setMonth(date.getMonth() + 1);
|
|
||||||
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
|
||||||
|
|
||||||
return this.customTaskPipe.transform(element)
|
|
||||||
}))
|
|
||||||
|
|
||||||
|
|
||||||
let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
|
|
||||||
diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
|
|
||||||
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
|
|
||||||
|
|
||||||
let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
|
|
||||||
diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element))
|
|
||||||
this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
|
|
||||||
|
|
||||||
for(let calendar of this.eventService.calendarNamesAry) {
|
for(let calendar of this.eventService.calendarNamesAry) {
|
||||||
if(calendar == 'Meu calendario') {
|
if(calendar == 'Meu calendario') {
|
||||||
// color
|
// color
|
||||||
@@ -279,24 +264,66 @@ export class TaskService {
|
|||||||
this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList)
|
this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
|
|
||||||
// let eventsMDGPRList = mdEventsOficial
|
|
||||||
|
|
||||||
// eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
|
|
||||||
|
|
||||||
// this.eventoaprovacaostore.countMd = eventsMDGPRList.length
|
|
||||||
// this.eventoaprovacaostore.resetmd(eventsMDGPRList);
|
|
||||||
// this.updateAllProcess()
|
|
||||||
|
|
||||||
// let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
|
|
||||||
// let eventsPRList = prEventsOficial
|
|
||||||
// eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
|
|
||||||
|
|
||||||
// this.eventoaprovacaostore.countPr = eventsPRList.length
|
|
||||||
// this.eventoaprovacaostore.resetpr(eventsPRList);
|
|
||||||
|
|
||||||
|
|
||||||
this.loadCount = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
async loadDiplomas() {
|
||||||
|
|
||||||
|
let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
||||||
|
|
||||||
|
|
||||||
|
if(SessionStore.user.Profile != 'PR') {
|
||||||
|
|
||||||
|
let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
|
||||||
|
depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
|
||||||
|
|
||||||
|
depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
|
||||||
|
|
||||||
|
this.despachoprstore.reset(depacho)
|
||||||
|
|
||||||
|
} else if(SessionStore.user.Profile == 'PR') {
|
||||||
|
|
||||||
|
let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
|
||||||
|
depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
|
||||||
|
this.despachoprstore.reset(depacho)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
let gerarDiploma = depachoAPI.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
|
||||||
|
let diplomasList = []
|
||||||
|
|
||||||
|
gerarDiploma.forEach(element => {
|
||||||
|
let task: customTask = this.customTaskPipe.transform(element);
|
||||||
|
diplomasList.push(task);
|
||||||
|
});
|
||||||
|
|
||||||
|
this.sortService.sortDate(diplomasList, 'CreateDate')
|
||||||
|
this.deplomasStore.resetDiplomaGerar(diplomasList);
|
||||||
|
|
||||||
|
|
||||||
|
let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
|
||||||
|
|
||||||
|
diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
|
||||||
|
|
||||||
|
|
||||||
|
this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> {
|
||||||
|
|
||||||
|
let date = new Date(element.taskStartDate);
|
||||||
|
date.setMonth(date.getMonth() + 1);
|
||||||
|
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
||||||
|
|
||||||
|
return this.customTaskPipe.transform(element)
|
||||||
|
}))
|
||||||
|
|
||||||
|
|
||||||
|
let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
|
||||||
|
diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
|
||||||
|
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
|
||||||
|
|
||||||
|
let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
|
||||||
|
diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element))
|
||||||
|
this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<div class="theicon d-flex">
|
<div class="theicon d-flex">
|
||||||
<div>
|
<div>
|
||||||
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
|
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
|
||||||
<div style="padding-top: 5px;" (click)="openSearch();showSearch=true" *ngIf="!showSearch">
|
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
|
||||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
|
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
|
||||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src='assets/images/icons-search.svg'></ion-icon>
|
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src='assets/images/icons-search.svg'></ion-icon>
|
||||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
|
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
|
||||||
@@ -91,13 +91,13 @@
|
|||||||
|
|
||||||
<div class="overflow-y-auto height-100 width-100">
|
<div class="overflow-y-auto height-100 width-100">
|
||||||
|
|
||||||
<div *ngIf="TaskService.AllProcess.length >= 0">
|
<div *ngIf="AllProcess.length >= 0">
|
||||||
<ion-item-sliding class="overflow-y-auto height-100">
|
<ion-item-sliding class="overflow-y-auto height-100">
|
||||||
<div class="listview">
|
<div class="listview">
|
||||||
<ion-list *ngIf="TaskService.AllProcess">
|
<ion-list *ngIf="AllProcess">
|
||||||
<div
|
<div
|
||||||
class="item-hover ion-no-padding cursor-pointer"
|
class="item-hover ion-no-padding cursor-pointer"
|
||||||
*ngFor = "let task of TaskService.AllProcess"
|
*ngFor = "let task of AllProcess"
|
||||||
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
|
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
|
||||||
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="item width-100 " >
|
<div class="item width-100 " >
|
||||||
@@ -156,13 +156,13 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
*ngIf="!TaskService.showLoader && TaskService.AllProcess.length == 0"
|
*ngIf="!TaskService.showLoader && AllProcess.length == 0"
|
||||||
class="empty-list d-flex height-100 align-center justify-content-center"
|
class="empty-list d-flex height-100 align-center justify-content-center"
|
||||||
>
|
>
|
||||||
<span>Lista vazia</span>
|
<span>Lista vazia</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="TaskService.showLoader && TaskService.AllProcess.length == 0">
|
<div *ngIf="TaskService.showLoader && AllProcess.length == 0">
|
||||||
|
|
||||||
<ion-list>
|
<ion-list>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ export class AllProcessesPage implements OnInit {
|
|||||||
idField: 'DocId'
|
idField: 'DocId'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
AllProcess = []
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
@@ -55,16 +57,36 @@ export class AllProcessesPage implements OnInit {
|
|||||||
this.TaskService.registerCallback({
|
this.TaskService.registerCallback({
|
||||||
id: import.meta.url,
|
id: import.meta.url,
|
||||||
funx:() => {
|
funx:() => {
|
||||||
|
this.dynamicSearch()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
openSearch() {}
|
openSearch() {
|
||||||
async closeSearch() {}
|
this.dynamicSearch()
|
||||||
async basicSearch() {}
|
}
|
||||||
async dynamicSearch() {}
|
async closeSearch() {
|
||||||
|
this.searchSubject = ''
|
||||||
|
this.dynamicSearch()
|
||||||
|
}
|
||||||
|
|
||||||
|
async basicSearch() {
|
||||||
|
this.dynamicSearch()
|
||||||
|
}
|
||||||
|
|
||||||
|
async dynamicSearch() {
|
||||||
|
|
||||||
|
if(this.showSearch && this.searchSubject) {
|
||||||
|
|
||||||
|
this.AllProcess = this.TaskService.AllProcess.filter((task) => {
|
||||||
|
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
|
||||||
|
subject = subject.toLowerCase();
|
||||||
|
return subject.includes(this.searchSubject.toLowerCase())
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.AllProcess = this.TaskService.AllProcess
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
checkFilter() {
|
checkFilter() {
|
||||||
if(this.router.url.includes('ForToDay')) {
|
if(this.router.url.includes('ForToDay')) {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
|
|||||||
import { SortService } from 'src/app/services/functions/sort.service';
|
import { SortService } from 'src/app/services/functions/sort.service';
|
||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-despachos-pr',
|
selector: 'app-despachos-pr',
|
||||||
@@ -30,6 +31,7 @@ constructor (
|
|||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private sortService: SortService,
|
private sortService: SortService,
|
||||||
|
public TaskService: TaskService,
|
||||||
|
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
@@ -55,29 +57,7 @@ constructor (
|
|||||||
async LoadList() {
|
async LoadList() {
|
||||||
|
|
||||||
this.skeletonLoader = true;
|
this.skeletonLoader = true;
|
||||||
|
await this.TaskService.loadDiplomas()
|
||||||
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
|
||||||
let despachoList = [];
|
|
||||||
|
|
||||||
let despachosPr;
|
|
||||||
|
|
||||||
if(this.loggeduser.Profile != 'PR') {
|
|
||||||
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
|
|
||||||
} else if(this.loggeduser.Profile == 'PR') {
|
|
||||||
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
|
|
||||||
}
|
|
||||||
|
|
||||||
despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
|
|
||||||
|
|
||||||
despachosPr.forEach( (element, index) => {
|
|
||||||
|
|
||||||
let task: customTask = this.customTaskPipe.transform(element);
|
|
||||||
|
|
||||||
despachoList.push(task);
|
|
||||||
});
|
|
||||||
|
|
||||||
despachoList = this.sortService.sortDate(despachoList, 'CreateDate')
|
|
||||||
this.despachosprstore.reset(despachoList);
|
|
||||||
this.skeletonLoader = false;
|
this.skeletonLoader = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,19 +70,8 @@ export class DiplomasAssinarPage implements OnInit {
|
|||||||
|
|
||||||
this.skeletonLoader = true
|
this.skeletonLoader = true
|
||||||
|
|
||||||
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
await this.TaskService.loadDiplomas()
|
||||||
this.diplomasList = new Array();
|
|
||||||
this.skeletonLoader = false
|
this.skeletonLoader = false
|
||||||
|
|
||||||
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
|
|
||||||
|
|
||||||
this.diplomasList = diplomasAssinar.map(element => {
|
|
||||||
return this.customTaskPipe.transform(element)
|
|
||||||
});
|
|
||||||
|
|
||||||
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
|
|
||||||
|
|
||||||
this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,21 +60,9 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
|
|
||||||
this.skeletonLoader = true
|
this.skeletonLoader = true
|
||||||
|
|
||||||
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
this.TaskService.loadDiplomas()
|
||||||
this.diplomasList = new Array();
|
|
||||||
|
|
||||||
this.skeletonLoader = false;
|
this.skeletonLoader = false;
|
||||||
|
|
||||||
let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
|
|
||||||
|
|
||||||
gerarDiploma.forEach(element => {
|
|
||||||
let task: customTask = this.customTaskPipe.transform(element);
|
|
||||||
this.diplomasList.push(task);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
|
|
||||||
|
|
||||||
this.deplomasStore.resetDiplomaGerar(this.diplomasList);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,59 +66,12 @@ export class DiplomasPage implements OnInit {
|
|||||||
async LoadList() {
|
async LoadList() {
|
||||||
this.skeletonLoader = true;
|
this.skeletonLoader = true;
|
||||||
|
|
||||||
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
await this.TaskService.loadDiplomas()
|
||||||
|
|
||||||
this.diplomasList = [];
|
|
||||||
|
|
||||||
// let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
|
|
||||||
|
|
||||||
let diplomasList = diplomas.map(element => {
|
|
||||||
return this.pipeTask(element)
|
|
||||||
});
|
|
||||||
|
|
||||||
diplomasList = diplomasList.filter(data => data.activityInstanceName == "Revisar Diploma");
|
|
||||||
|
|
||||||
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
|
|
||||||
|
|
||||||
this.deplomasStore.resetDiplomasReview(this.diplomasList)
|
|
||||||
|
|
||||||
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
|
|
||||||
|
|
||||||
let diplomasAssinadoList = diplomasAssinados.map(element => {
|
|
||||||
return this.pipeTask(element)
|
|
||||||
});
|
|
||||||
|
|
||||||
this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
|
|
||||||
this.deplomasStore.resetDiplomasAssinadoList(this.diplomasAssinadoList)
|
|
||||||
|
|
||||||
this.showLoader = false;
|
this.showLoader = false;
|
||||||
this.skeletonLoader = false
|
this.skeletonLoader = false
|
||||||
}
|
}
|
||||||
|
|
||||||
pipeTask(element) {
|
|
||||||
let date = new Date(element.taskStartDate);
|
|
||||||
date.setMonth(date.getMonth() + 1);
|
|
||||||
|
|
||||||
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
|
||||||
return {
|
|
||||||
"SerialNumber": element.serialNumber,
|
|
||||||
"Folio": element.workflowInstanceDataFields.Subject,
|
|
||||||
"Senders": element.workflowInstanceDataFields.Sender,
|
|
||||||
"CreateDate": taskDate,
|
|
||||||
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
|
|
||||||
"Remetente": element.workflowInstanceDataFields.Remetente,
|
|
||||||
"DocumentsQty": element.totalDocuments,
|
|
||||||
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
|
|
||||||
"WorkflowName": element.workflowDisplayName,
|
|
||||||
"activityInstanceName": element.activityInstanceName,
|
|
||||||
"Status": element.workflowInstanceDataFields.Status,
|
|
||||||
"Deadline": element.deadline,
|
|
||||||
"TaskStartDate": element.taskStartDate,
|
|
||||||
"TaskStatus": element.taskStatus,
|
|
||||||
"TaskReceiveDate": element.taskReceiveDate
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async refreshing() {
|
async refreshing() {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.LoadList();
|
this.LoadList();
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "15276dfc1",
|
"shortSHA": "47dd1b2bc",
|
||||||
"SHA": "15276dfc1a04fd46c5acb95f0c4df5c80cd97e35",
|
"SHA": "47dd1b2bc84906c09e286e745cfc1fef3441133e",
|
||||||
"branch": "feature/gabineteLabels",
|
"branch": "feature/gabineteLabels",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Wed Apr 19 12:34:28 2023 +0100'",
|
"lastCommitTime": "'Thu Apr 20 11:45:46 2023 +0100'",
|
||||||
"lastCommitMessage": "add search",
|
"lastCommitMessage": "add seach button",
|
||||||
"lastCommitNumber": "4923",
|
"lastCommitNumber": "4924",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pipes/evento-approve.pipe.ts\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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts",
|
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.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/pedido/pedido.page.ts\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.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: version/git-version.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user