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

remove some inputs to pr

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-08 11:06:27 +01:00
parent b60ff07159
commit 9b5cb7e0ef
7 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+2 -2
View File
@@ -79,7 +79,7 @@
</div>
<div class="container-div">
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
@@ -103,7 +103,7 @@
</div>
</div>
<div class="container-div">
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
src/app/modals/create-process/create-process.page.ts
+9 -2
View File
@@ -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, [
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+2 -2
View File
@@ -128,7 +128,7 @@
</div>
</div>
<div class="container-div" >
<div class="container-div" *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
@@ -151,7 +151,7 @@
</div>
</div>
<div class="container-div">
<div class="container-div" *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+12 -3
View File
@@ -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
]),
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+4 -1
View File
@@ -791,7 +791,10 @@ export class GabineteDigitalPage implements OnInit {
if (event) {
setTimeout(() => {
event?.target?.complete();
try {
event?.target?.complete();
} catch(error) {}
}, 2000);
}
else {
src/app/services/chat/chat-system.service.ts
+7
View File
@@ -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() {
version/git-version.ts
+6 -6
View File
@@ -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 <file>...\" 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 <file>...\" 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"
}