mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
fix Expediente and break line
This commit is contained in:
@@ -365,7 +365,7 @@
|
||||
</div>
|
||||
<div class="schedule-details">
|
||||
<div class="description">
|
||||
<p class="m-0">{{event.event.Subject}} ....</p>
|
||||
<p class="m-0">{{event.event.Subject}}</p>
|
||||
</div>
|
||||
<div class="location">{{event.event.Location}}</div>
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
<div *ngIf="loadedEvent.Body.Text">
|
||||
<h5>Detalhes</h5>
|
||||
<ion-item lines="none" class="ion-no-margin ion-no-padding">
|
||||
<div class="width-100 text" >{{ loadedEvent.Body.Text }}</div>
|
||||
<pre class="width-100 text">{{ loadedEvent.Body.Text }} </pre>
|
||||
</ion-item>
|
||||
<div class="line"></div>
|
||||
</div>
|
||||
|
||||
@@ -189,11 +189,7 @@ export class ViewEventPage implements OnInit {
|
||||
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
|
||||
this.eventsService.getEvent(this.eventId).subscribe(res => {
|
||||
|
||||
const div = document.createElement("div")
|
||||
div.innerHTML = res.Body.Text
|
||||
res.Body.Text = div.innerText
|
||||
this.loadedEvent = res;
|
||||
|
||||
this.addEventToDb(res);
|
||||
|
||||
loader.remove()
|
||||
|
||||
@@ -9,7 +9,7 @@ import { Platform } from '@ionic/angular';
|
||||
import { BackgroundService } from '../../../services/background.service';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { SortService } from 'src/app/services/functions/sort.service';
|
||||
import {Storage } from '@ionic/storage';
|
||||
import { Storage } from '@ionic/storage';
|
||||
|
||||
@Component({
|
||||
selector: 'app-expediente',
|
||||
@@ -73,7 +73,7 @@ export class ExpedientePage implements OnInit {
|
||||
const result = res
|
||||
|
||||
this.taskslist = new Array();
|
||||
let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
|
||||
let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
|
||||
|
||||
ress.forEach((element: any) => {
|
||||
|
||||
@@ -86,9 +86,8 @@ export class ExpedientePage implements OnInit {
|
||||
})
|
||||
this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate')
|
||||
|
||||
this.expedientegbstore.reset(this.taskslist);
|
||||
this.expedientegbstore.reset(this.listToPresent);
|
||||
|
||||
|
||||
this.skeletonLoader = false;
|
||||
}, (error) => {
|
||||
this.getEventsFromLocalDb();
|
||||
|
||||
@@ -75,14 +75,12 @@ export class ExpedientesPrPage implements OnInit {
|
||||
this.skeletonLoader = false
|
||||
this.showLoader =false
|
||||
this.taskslist = new Array();
|
||||
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
|
||||
res.forEach(element => {
|
||||
let task = this.expedienteTaskPipe.transform(element)
|
||||
this.taskslist.push(task);
|
||||
});
|
||||
|
||||
|
||||
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
|
||||
|
||||
this.taskslist = res.map((element) => this.expedienteTaskPipe.transform(element));
|
||||
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
|
||||
|
||||
this.expedienteGdStore.reset(this.taskslist);
|
||||
this.skeletonLoader = false
|
||||
})
|
||||
|
||||
@@ -620,7 +620,8 @@ export class GabineteDigitalPage implements OnInit {
|
||||
|
||||
loadNum = 0
|
||||
async LoadCounts() {
|
||||
|
||||
this.updateAllProcess()
|
||||
|
||||
let expedientes;
|
||||
this.showLoader = true
|
||||
|
||||
@@ -635,7 +636,7 @@ export class GabineteDigitalPage implements OnInit {
|
||||
|
||||
this.loadNum++;
|
||||
|
||||
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active")
|
||||
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
|
||||
|
||||
expedientes = expedientes.filter((item) => {
|
||||
return item.activityInstanceName != 'Retificar Expediente'
|
||||
|
||||
Reference in New Issue
Block a user