diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 9be13754e..5aa32d39b 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -79,7 +79,7 @@ -
+
@@ -103,7 +103,7 @@
-
+
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 0a82d21eb..2cd5a655b 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -97,7 +97,7 @@ export class CreateProcessPage implements OnInit { public p: PermissionService, private despachoService: DespachoService, private pedidoService: PedidoService, - public ThemeService: ThemeService + public ThemeService: ThemeService, ) { this.loggeduser = SessionStore.user; this.task = this.navParams.get('task'); @@ -199,6 +199,13 @@ export class CreateProcessPage implements OnInit { this.validateFrom = true } + defaultParticipants () { + if(this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks])) { + return ['MDGPR'] + } + + return null + } injectValidation() { this.Form = new FormGroup({ @@ -212,7 +219,7 @@ export class CreateProcessPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - participantes: new FormControl(this.taskParticipants, [ + participantes: new FormControl(this.defaultParticipants() || this.taskParticipants, [ Validators.required ]), selectedTypes: new FormControl(this.selectedTypes, [ diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 06b039b26..2d3276ca4 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -128,7 +128,7 @@
-
+
@@ -151,7 +151,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index a404030e8..85196ed05 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -23,7 +23,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; - +import { PermissionService } from 'src/app/services/permission.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -109,7 +109,8 @@ export class ExpedientTaskModalPage implements OnInit { private userAuth: AuthService, private toastService: ToastService, private despachoService: DespachoService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public p: PermissionService, ) { this.loggeduser = SessionStore.user; @@ -194,6 +195,14 @@ export class ExpedientTaskModalPage implements OnInit { this.validateFrom = true; } + defaultParticipants () { + if(this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks])) { + return ['MDGPR'] + } + + return null + } + injectValidation() { this.Form = new FormGroup({ @@ -210,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - participantes: new FormControl(this.taskParticipants, [ + participantes: new FormControl(this.defaultParticipants() || this.taskParticipants, [ Validators.required ]), diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 71391ca4c..51d3aafc0 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -791,7 +791,10 @@ export class GabineteDigitalPage implements OnInit { if (event) { setTimeout(() => { - event?.target?.complete(); + try { + event?.target?.complete(); + } catch(error) {} + }, 2000); } else { diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 4e666deaf..f6bc9eab7 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -95,6 +95,13 @@ export class ChatSystemService { this.loadChat(); } + + document.addEventListener('resume', function () { + if(this._dm?.length == 0 && this._group?.length == 0) { + this.getAllRooms(); + } + }); + } loadChat() { diff --git a/version/git-version.ts b/version/git-version.ts index db7a39bda..e9c192547 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "66025fca6", - "SHA": "66025fca69955209a5ada0eed4e38b56dcfaeebf", + "shortSHA": "b60ff0715", + "SHA": "b60ff0715956f98df8ef0c989174452c1eeabb9f", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 8 10:17:12 2023 +0100'", - "lastCommitMessage": "improve tab", - "lastCommitNumber": "4754", + "lastCommitTime": "'Wed Feb 8 10:19:33 2023 +0100'", + "lastCommitMessage": "add lebal", + "lastCommitNumber": "4755", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file