peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-10 16:46:55 +01:00
parent 8b3989de3b
commit 19ddb18148
33 changed files with 257 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/messages/messages.page.scss
+3 -3
View File
@@ -148,9 +148,9 @@ ion-content {
font-size: rem(13);
color: #797979;
padding: 10px;
margin: 0 auto;
line-height: 1.2rrem;
margin: 20px 39px 25px;
margin: 0 auto !important;
line-height: 1.2rem;
// margin: 20px 39px 25px;
border-radius: 8px;
}
src/app/pages/events/events.page.html
+3 -3
View File
@@ -26,7 +26,7 @@
<div class="main-content justify-center d-flex height-100">
<div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoaderNum != 0"></ion-progress-bar>
<div class="px-20 pb-20 container-filters">
<p class="time ion-text-left font-18-em">{{customDate}}</p>
<div class="filters-box wrap d-flex float-left">
@@ -137,7 +137,7 @@
</div>
<div class="flex-1">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.access])" class="schedule schedule-1 height-100">
<ion-progress-bar type="indeterminate" *ngIf="showCorrespondenciasLoader"></ion-progress-bar>
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoaderNum != 0"></ion-progress-bar>
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
@@ -292,7 +292,7 @@
<div class="content overflow-y-auto flex-grow-1 height-100">
<ion-list>
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of AllProcess"
(click)="goToExpediente(task.SerialNumber)">
(click)="TaskService.goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
<div class="item-exp d-flex">
<div class="schedule-date">
<div class="time-end">{{task.TaskStartDate | date: 'dd-MM-yy'}}</div>
src/app/pages/events/events.page.ts
+1 -25
View File
@@ -54,7 +54,6 @@ export class EventsPage implements OnInit {
expedienteGdStore = ExpedienteGdStore
listToPresent = [];
listToPresentexpediente = []
expedienteTaskPipe = new ExpedienteTaskPipe()
@@ -103,7 +102,6 @@ export class EventsPage implements OnInit {
this.changeProfileService.registerCallback(() => {
this.listToPresent = [];
this.listToPresentexpediente = []
})
@@ -275,12 +273,6 @@ export class EventsPage implements OnInit {
//
})
this.storage.get('process').then((process: any[] = []) => {
//
if(Array.isArray(process)) {
this.listToPresentexpediente = process;
}
})
this.showLoader = false;
@@ -355,21 +347,8 @@ export class EventsPage implements OnInit {
LoadList() {
if(this.firstEnter) {
this.showCorrespondenciasLoader = true
this.processes.GetTaskListExpediente(false).subscribe(result => {
let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e))
this.listToPresentexpediente = ExpedienteTask;
this.storage.set('process', ExpedienteTask)
this.showCorrespondenciasLoader = false
}, ((error) => {
this.showCorrespondenciasLoader = false
//
this.getEventsFromLocalDb();
}));
this.getEventsFromLocalDb();
}
this.firstEnter = true
@@ -404,9 +383,6 @@ export class EventsPage implements OnInit {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
goToExpediente(SerialNumber: any) {
this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
}
viewExpedientListPage() {
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -1
View File
@@ -9,7 +9,8 @@
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
<ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoader"></ion-progress-bar>
{{ TaskService.showLoaderNum }}
<ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoaderNum != 0"></ion-progress-bar>
<div class="title-container">
<div class="title d-flex justify-center">
<ion-label *ngIf="hideRefreshBtn">Gabinete Digital</ion-label>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+2 -3
View File
@@ -1,5 +1,4 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ModalController } from '@ionic/angular';
import {NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
@@ -221,6 +220,7 @@ export class GabineteDigitalPage implements OnInit {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
this.loadAllProcesses()
if(this.NotificationsService.active === false) {
this.checkRoutes();
// this.LoadCounts();
@@ -302,9 +302,8 @@ export class GabineteDigitalPage implements OnInit {
goToProcess(serialNumber: string, workflowName: string, activityName: string) {
if (workflowName == 'Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho' || activityName == 'Reexecutar Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
}
}
src/app/pages/login/login.page.ts
+2
View File
@@ -122,6 +122,8 @@ export class LoginPage implements OnInit {
loader.remove()
console.log('attempt', attempt)
if (attempt) {
if (attempt.UserId == SessionStore.user.UserId) {
src/app/pages/publications/edit-action/edit-action.page.scss
+1 -1
View File
@@ -70,7 +70,7 @@
}
.container-div{
margin-bottom: rem(15);
overflow: auto;
overflow: hidden;
}
.ion-item-container{
margin: rem(15) auto;