peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Expediente and break line

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-01 13:22:22 +01:00
parent 189ec6e917
commit b5953c8519
13 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+1 -1
View File
@@ -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>
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -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>
src/app/pages/agenda/view-event/view-event.page.ts
-4
View File
@@ -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()
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+3 -4
View File
@@ -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();
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+4 -6
View File
@@ -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
})
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+3 -2
View File
@@ -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'
src/app/services/notifications.service.ts
+1 -3
View File
@@ -39,9 +39,7 @@ export class NotificationsService {
private platform: Platform,
private router: Router,
private zone: NgZone,
private eventtrigger: EventTrigger,) {
}
private eventtrigger: EventTrigger,) {}
registerCallback({type, funx, id = uuidv4()} : {
src/app/shared/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -82,7 +82,7 @@
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div class="text"> {{ loadedEvent.Body.Text }} </div>
<pre class="text">{{ loadedEvent.Body.Text }} </pre>
</ion-item>
<div class="line"></div>
</div>
src/app/shared/agenda/view-event/view-event.page.ts
-3
View File
@@ -105,9 +105,6 @@ 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.today = new Date(res.StartDate);
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+2 -5
View File
@@ -66,11 +66,8 @@ export class ExpedientesPrPage implements OnInit {
this.processes.GetTaskListExpediente(false).subscribe(result => {
this.taskslist = [];
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')
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+5 -6
View File
@@ -65,17 +65,16 @@ export class ExpedientsPage implements OnInit {
this.taskslist = [];
this.skeletonLoader = false
let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task = this.expedienteTaskPipe.transform(element)
this.taskslist.push(task);
let res = result.filter(data => data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
});
this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
this.addProcessTODb(this.taskslist);
this.taskslist = this.taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
})
this.expedientegbstore.reset(this.taskslist);
}, (error) => {
this.getEventsFromLocalDb();
src/global.scss
+5
View File
@@ -1426,4 +1426,9 @@ $font-size: 11pt;
ngx-mat-datetime-content button.mat-stroked-button {
top: -56px;
margin-bottom: -35px;
}
pre {
font-family: 'Roboto' !important;
font-size: 12pt !important;
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "b3a837927",
"SHA": "b3a83792766282081bb765748386258bca2bb08e",
"shortSHA": "189ec6e91",
"SHA": "189ec6e917f05561bcd400252d24d5fbc8176fcb",
"branch": "no_bug_movemente1",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Feb 1 09:08:46 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4701",
"lastCommitTime": "'Wed Feb 1 11:08:41 2023 +0100'",
"lastCommitMessage": "remove diplomas para assinar",
"lastCommitNumber": "4702",
"change": "",
"changeStatus": "On branch no_bug_movemente1\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\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/services/notifications.service.ts",
"changeStatus": "On branch no_bug_movemente1\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.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/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.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/global.scss",
"changeAuthor": "peter.maquiran"
}