fix update

This commit is contained in:
Peter Maquiran
2023-04-20 13:36:59 +01:00
parent 47dd1b2bc8
commit 74a2fe8058
18 changed files with 218 additions and 204 deletions
@@ -26,6 +26,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-despacho-pr',
@@ -67,7 +68,8 @@ export class DespachoPrPage implements OnInit {
public ThemeService: ThemeService,
private RouteService: RouteService,
public p: PermissionService,
private httpErroHandle: HttpErrorHandle
private httpErroHandle: HttpErrorHandle,
public TaskService: TaskService
) {
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
@@ -112,6 +114,8 @@ export class DespachoPrPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe((res: fullTask) => {
this.TaskService.loadDiplomas();
this.task = {
"SerialNumber": res.serialNumber,
"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 { RouteService } from 'src/app/services/route.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
@@ -67,7 +68,8 @@ export class DespachoPage implements OnInit {
private platform: Platform,
private backgroundservice: BackgroundService,
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) {
this.processes.GetTask(serial).subscribe((res: fullTask) => {
this.TaskService.loadDespachos();
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
@@ -15,6 +15,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'
import { AttachmentList } from 'src/app/models/Excludetask';
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-diploma-assinar',
@@ -45,6 +46,7 @@ export class DiplomaAssinarPage implements OnInit {
public ThemeService: ThemeService,
private httpErroHandle: HttpErrorHandle,
private despachoService: DespachoService,
public TaskService: TaskService
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
@@ -85,7 +87,8 @@ export class DiplomaAssinarPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
console.log("res", res)
this.TaskService.loadDiplomas();
this.task = {
"SerialNumber": res.serialNumber,
"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 { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-diplomas-gerar',
@@ -44,7 +46,8 @@ export class DiplomasGerarPage implements OnInit {
private RouteService: RouteService,
public ThemeService: ThemeService,
private despachoService: DespachoService,
private httpErroHandle: HttpErrorHandle
private httpErroHandle: HttpErrorHandle,
public TaskService: TaskService
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
@@ -83,6 +86,7 @@ export class DiplomasGerarPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
this.TaskService.loadDiplomas()
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
@@ -20,6 +20,7 @@ import { AttachmentList } from 'src/app/models/Excludetask';
import { DespachoService } from 'src/app/Rules/despacho.service'
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { TaskService } from 'src/app/services/task.service'
@Component({
@@ -57,7 +58,8 @@ export class DiplomaPage implements OnInit {
private platform: Platform,
public ThemeService: ThemeService,
private httpErrorHandle: HttpErrorHandle,
private despachoService: DespachoService
private despachoService: DespachoService,
public TaskService: TaskService
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -128,6 +130,8 @@ export class DiplomaPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
this.TaskService.loadDiplomas();
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
@@ -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 { ExpedienteService } from 'src/app/Rules/expediente.service';
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 { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
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 { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-expediente-detail',
@@ -81,7 +82,6 @@ export class ExpedienteDetailPage implements OnInit {
private RouteService: RouteService,
private attachmentsService: AttachmentsService,
public p: PermissionService,
private taskService: TaskService,
private expedienteService: ExpedienteService,
public platform: Platform,
private sqliteservice: SqliteService,
@@ -91,7 +91,8 @@ export class ExpedienteDetailPage implements OnInit {
private storage: Storage,
private userAuth: AuthService,
private httpErroHandle: HttpErrorHandle,
private eventTriger: EventTrigger
private eventTriger: EventTrigger,
public TaskService: TaskService
) {
this.loggeduser = SessionStore.user
console.log('SessionStore', SessionStore)
@@ -357,6 +358,7 @@ export class ExpedienteDetailPage implements OnInit {
this.processes.GetTask(serial).subscribe(res => {
this.TaskService.loadExpedientes();
this.task = {
"SerialNumber": res.serialNumber,
@@ -23,6 +23,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-expediente-pr',
@@ -62,7 +63,8 @@ export class ExpedientePrPage implements OnInit {
private attachmentsService: AttachmentsService,
private RouteService: RouteService,
public ThemeService: ThemeService,
private httpErroHandle: HttpErrorHandle
private httpErroHandle: HttpErrorHandle,
public TaskService: TaskService
) {
this.loggeduser = SessionStore.user;
@@ -156,6 +158,7 @@ export class ExpedientePrPage implements OnInit {
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
this.TaskService.loadExpedientes();
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
@@ -106,12 +106,12 @@
<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" >
<ion-list *ngIf="TaskService.AllProcess">
<ion-list *ngIf="AllProcess">
<div
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)">
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
<div class="item width-100">
@@ -222,7 +222,7 @@
<fa-icon class="icon-selected" icon="align-justify"></fa-icon>
</div>
<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>
<!-- List -->
@@ -99,7 +99,7 @@ export class GabineteDigitalPage implements OnInit {
hideSearchBtn: boolean = false;
showSearch = false;
searchSubject: string = '';
AllProcess = []
constructor(
private processesbackend: ProcessesService,
@@ -139,6 +139,13 @@ export class GabineteDigitalPage implements OnInit {
this.checkRoutes();
this.TaskService.registerCallback({
id: import.meta.url,
funx:() => {
this.dynamicSearch()
}
})
}
closeAllDesktopComponent() {
this.desktopComponent = {
@@ -148,10 +155,31 @@ export class GabineteDigitalPage implements OnInit {
}
openSearch() {}
async closeSearch() {}
async basicSearch() {}
async dynamicSearch() {}
openSearch() {
this.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() {
@@ -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 { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-pedido',
@@ -69,7 +70,8 @@ export class PedidoPage implements OnInit {
private platform: Platform,
public ThemeService: ThemeService,
private dataService: DataService,
private htppErroHandle: HttpErrorHandle ) {
private htppErroHandle: HttpErrorHandle,
public TaskService: TaskService ) {
this.loggeduser = SessionStore.user;
this.activatedRoute.paramMap.subscribe(params => {
@@ -108,7 +110,8 @@ export class PedidoPage implements OnInit {
this.fulltask = res
this.TaskService.loadPedidos();
if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') {
let date = new Date(res.taskStartDate);