diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 0f08bdc40..f4db62035 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -365,7 +365,7 @@
-
{{event.event.Subject}} ....
+
{{event.event.Subject}}
{{event.event.Location}}
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 8cfe4296f..5a40b5cb3 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -85,7 +85,7 @@
Detalhes
- {{ loadedEvent.Body.Text }}
+ {{ loadedEvent.Body.Text }}
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index d52a17c96..093422105 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -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()
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 6b3e5b1ed..bc27d8bea 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -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();
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 0d873db35..97c563faf 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -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
})
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 674a59a16..ab0b6f288 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -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'
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 07b39a581..84ca59d99 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -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()} : {
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 137f98ba9..9aecb93c1 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -82,7 +82,7 @@
Detalhes
- {{ loadedEvent.Body.Text }}
+ {{ loadedEvent.Body.Text }}
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index ae151e20b..d0af86e44 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -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);
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 634e32cd5..dcdaac781 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -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')
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index fff5fee73..7301ef71f 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -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();
diff --git a/src/global.scss b/src/global.scss
index 92657ef51..06a847a14 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -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;
}
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index ca0f1bb36..f2f736bfc 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -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
...\" 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 ...\" 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"
}
\ No newline at end of file