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 chat

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-19 12:47:00 +01:00
parent 39f1884aac
commit f83ef8201f
6 changed files with 72 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+52 -68
View File
@@ -152,7 +152,6 @@
"ngx-socket-io": "^3.2.0", "ngx-socket-io": "^3.2.0",
"pdfjs": "^2.4.6", "pdfjs": "^2.4.6",
"pdfjs-dist": "^2.9.359", "pdfjs-dist": "^2.9.359",
"puppeteer": "^15.1.1",
"rocket.chat.realtime.api.rxjs": "^2.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1",
"rxjs": "~6.6.3", "rxjs": "~6.6.3",
"rxjs-compat": "^6.6.7", "rxjs-compat": "^6.6.7",
@@ -6791,6 +6790,7 @@
"version": "2.10.0", "version": "2.10.0",
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"peer": true,
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@@ -10974,13 +10974,6 @@
"yarn": ">=1" "yarn": ">=1"
} }
}, },
"node_modules/cross-fetch": {
"version": "3.1.5",
"license": "MIT",
"dependencies": {
"node-fetch": "2.6.7"
}
},
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"license": "MIT", "license": "MIT",
@@ -12032,8 +12025,10 @@
} }
}, },
"node_modules/devtools-protocol": { "node_modules/devtools-protocol": {
"version": "0.0.1011705", "version": "0.0.869402",
"license": "BSD-3-Clause" "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
"integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
"peer": true
}, },
"node_modules/di": { "node_modules/di": {
"version": "0.0.1", "version": "0.0.1",
@@ -13270,6 +13265,7 @@
"node_modules/extract-zip": { "node_modules/extract-zip": {
"version": "2.0.1", "version": "2.0.1",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"peer": true,
"dependencies": { "dependencies": {
"debug": "^4.1.1", "debug": "^4.1.1",
"get-stream": "^5.1.0", "get-stream": "^5.1.0",
@@ -13288,6 +13284,7 @@
"node_modules/extract-zip/node_modules/get-stream": { "node_modules/extract-zip/node_modules/get-stream": {
"version": "5.2.0", "version": "5.2.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"pump": "^3.0.0" "pump": "^3.0.0"
}, },
@@ -26073,30 +26070,34 @@
} }
}, },
"node_modules/puppeteer": { "node_modules/puppeteer": {
"version": "15.3.0", "version": "9.1.1",
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
"integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
"deprecated": "< 18.1.0 is no longer supported",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "peer": true,
"dependencies": { "dependencies": {
"cross-fetch": "3.1.5", "debug": "^4.1.0",
"debug": "4.3.4", "devtools-protocol": "0.0.869402",
"devtools-protocol": "0.0.1011705", "extract-zip": "^2.0.0",
"extract-zip": "2.0.1", "https-proxy-agent": "^5.0.0",
"https-proxy-agent": "5.0.1", "node-fetch": "^2.6.1",
"pkg-dir": "4.2.0", "pkg-dir": "^4.2.0",
"progress": "2.0.3", "progress": "^2.0.1",
"proxy-from-env": "1.1.0", "proxy-from-env": "^1.1.0",
"rimraf": "3.0.2", "rimraf": "^3.0.2",
"tar-fs": "2.1.1", "tar-fs": "^2.0.0",
"unbzip2-stream": "1.4.3", "unbzip2-stream": "^1.3.3",
"ws": "8.8.0" "ws": "^7.2.3"
}, },
"engines": { "engines": {
"node": ">=14.1.0" "node": ">=10.18.1"
} }
}, },
"node_modules/puppeteer/node_modules/debug": { "node_modules/puppeteer/node_modules/debug": {
"version": "4.3.4", "version": "4.3.4",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"ms": "2.1.2" "ms": "2.1.2"
}, },
@@ -26109,25 +26110,6 @@
} }
} }
}, },
"node_modules/puppeteer/node_modules/ws": {
"version": "8.8.0",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": "^5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/q": { "node_modules/q": {
"version": "1.5.1", "version": "1.5.1",
"license": "MIT", "license": "MIT",
@@ -36462,6 +36444,7 @@
"node_modules/unbzip2-stream": { "node_modules/unbzip2-stream": {
"version": "1.4.3", "version": "1.4.3",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"buffer": "^5.2.1", "buffer": "^5.2.1",
"through": "^2.3.8" "through": "^2.3.8"
@@ -43086,6 +43069,7 @@
"@types/yauzl": { "@types/yauzl": {
"version": "2.10.0", "version": "2.10.0",
"optional": true, "optional": true,
"peer": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }
@@ -45788,12 +45772,6 @@
"cross-spawn": "^7.0.1" "cross-spawn": "^7.0.1"
} }
}, },
"cross-fetch": {
"version": "3.1.5",
"requires": {
"node-fetch": "2.6.7"
}
},
"cross-spawn": { "cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"requires": { "requires": {
@@ -46443,7 +46421,10 @@
"version": "1.0.1" "version": "1.0.1"
}, },
"devtools-protocol": { "devtools-protocol": {
"version": "0.0.1011705" "version": "0.0.869402",
"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
"integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
"peer": true
}, },
"di": { "di": {
"version": "0.0.1", "version": "0.0.1",
@@ -47285,6 +47266,7 @@
}, },
"extract-zip": { "extract-zip": {
"version": "2.0.1", "version": "2.0.1",
"peer": true,
"requires": { "requires": {
"@types/yauzl": "^2.9.1", "@types/yauzl": "^2.9.1",
"debug": "^4.1.1", "debug": "^4.1.1",
@@ -47294,6 +47276,7 @@
"dependencies": { "dependencies": {
"get-stream": { "get-stream": {
"version": "5.2.0", "version": "5.2.0",
"peer": true,
"requires": { "requires": {
"pump": "^3.0.0" "pump": "^3.0.0"
} }
@@ -55860,31 +55843,31 @@
} }
}, },
"puppeteer": { "puppeteer": {
"version": "15.3.0", "version": "9.1.1",
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
"integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
"peer": true,
"requires": { "requires": {
"cross-fetch": "3.1.5", "debug": "^4.1.0",
"debug": "4.3.4", "devtools-protocol": "0.0.869402",
"devtools-protocol": "0.0.1011705", "extract-zip": "^2.0.0",
"extract-zip": "2.0.1", "https-proxy-agent": "^5.0.0",
"https-proxy-agent": "5.0.1", "node-fetch": "^2.6.1",
"pkg-dir": "4.2.0", "pkg-dir": "^4.2.0",
"progress": "2.0.3", "progress": "^2.0.1",
"proxy-from-env": "1.1.0", "proxy-from-env": "^1.1.0",
"rimraf": "3.0.2", "rimraf": "^3.0.2",
"tar-fs": "2.1.1", "tar-fs": "^2.0.0",
"unbzip2-stream": "1.4.3", "unbzip2-stream": "^1.3.3",
"ws": "8.8.0" "ws": "^7.2.3"
}, },
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "4.3.4", "version": "4.3.4",
"peer": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
} }
},
"ws": {
"version": "8.8.0",
"requires": {}
} }
} }
}, },
@@ -63019,6 +63002,7 @@
}, },
"unbzip2-stream": { "unbzip2-stream": {
"version": "1.4.3", "version": "1.4.3",
"peer": true,
"requires": { "requires": {
"buffer": "^5.2.1", "buffer": "^5.2.1",
"through": "^2.3.8" "through": "^2.3.8"
package.json
-1
View File
@@ -162,7 +162,6 @@
"ngx-socket-io": "^3.2.0", "ngx-socket-io": "^3.2.0",
"pdfjs": "^2.4.6", "pdfjs": "^2.4.6",
"pdfjs-dist": "^2.9.359", "pdfjs-dist": "^2.9.359",
"puppeteer": "^15.1.1",
"rocket.chat.realtime.api.rxjs": "^2.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1",
"rxjs": "~6.6.3", "rxjs": "~6.6.3",
"rxjs-compat": "^6.6.7", "rxjs-compat": "^6.6.7",
src/app/services/auth.service.ts
+2
View File
@@ -80,6 +80,8 @@ export class AuthService {
} }
// async UpdateLogin() {}
SetSession(response: LoginUserRespose, user:UserForm) { SetSession(response: LoginUserRespose, user:UserForm) {
const session: UserSession = Object.assign(SessionStore.user, response) const session: UserSession = Object.assign(SessionStore.user, response)
src/app/services/chat/chat-system.service.ts
+11 -7
View File
@@ -184,14 +184,18 @@ export class ChatSystemService {
async getAllRooms () { async getAllRooms () {
this.loadingWholeList = true this.loadingWholeList = true
var rooms; var rooms;
try {
rooms = await this.RochetChatConnectorService.getRooms(); if(this.RochetChatConnectorService.isLogin) {
} catch (error) {
console.error('chatgetrooms',error)
}
try { try {
await this.storage.remove('Rooms'); rooms = await this.RochetChatConnectorService.getRooms();
} catch(e) {} } catch (error) {
this.loadingWholeList = false
console.error('chatgetrooms',error)
}
try {
await this.storage.remove('Rooms');
} catch(e) {}
}
let index = 0 let index = 0
src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button> <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button> <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<div class="solid"></div> <div class="solid"></div>
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('1')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button> <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button> <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button> <button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "d8e8066ea", "shortSHA": "39f1884aa",
"SHA": "d8e8066eaef190243233370651928d9571bcb07d", "SHA": "39f1884aac462aefbe93eec560febe4636b13b1a",
"branch": "no_bug_movemente", "branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Jan 19 11:48:43 2023 +0100'", "lastCommitTime": "'Thu Jan 19 12:05:14 2023 +0100'",
"lastCommitMessage": "event permission on chat", "lastCommitMessage": "fix create action mobile",
"lastCommitNumber": "4660", "lastCommitNumber": "4661",
"change": "", "change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts", "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }