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

pedido

Browse Source
This commit is contained in:
peter.maquiran
2025-10-17 13:58:05 +01:00
parent 9e3c6db93a
commit a9cd4843d5
5 changed files with 121 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/infra/socket/signalR/signalR.ts
+1 -1
View File
@@ -132,7 +132,7 @@ export class SignalRConnection {
this.sendDataSubject.pipe(
filter((message) => {
return input.data.requestId == message?.data?.requestId ||
input?.data?.roomName == message?.data.roomName && typeof input?.data?.roomName == 'string'
input?.data?.roomName == message?.data?.roomName && typeof input?.data?.roomName == 'string'
}),
).subscribe(value => {
src/app/pages/gabinete-digital/gabinete-digital.page.html
+111 -107
View File
@@ -312,6 +312,115 @@
<span class="title1" *ngIf="AllProcess.length > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div (click)="openExpedientListPage(); selectedElement='Correspondence'"
[class.active]="selectedElement == 'Correspondence' || selectedElement == 'Expediente Presidente'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-correspondencia.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Correspondence'"
src="assets/images/theme/gov/icons-correspondencia.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Correspondence'"
src="assets/images/theme/gov/icons-correspondencia-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia.svg"></ion-icon>
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Correspondence'"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Expediente <br>
<span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{
TaskService.expedientegbstore.newList.length}} correspondência nova</span>
<span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{
TaskService.expedientegbstore.newList.length}} correspondências novas</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.expedientegbstore.count}}
<span class="title1" *ngIf="TaskService.expedientegbstore.count == 0">correspondência</span>
<span class="title1" *ngIf="TaskService.expedientegbstore.count == 1">correspondência</span>
<span class="title1" *ngIf="TaskService.expedientegbstore.count > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
(click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
[class.active]="selectedElement == 'DiplomasParaAssinar'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden
*ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])"
(click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
[class.active]="selectedElement == 'DiplomasParaAssinar'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden
*ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas para Assinar<br>
<span class="new-task-count"
*ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novas</span>
<span class="new-task-count "
*ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])"
(click)="openDespachosPrPage(); selectedElement='showDespachosPr'"
@@ -338,7 +447,7 @@
<p class="text-center exp-card-title "
*ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">
Despachos criados por mim<br>
Despachos para concluir<br>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{
TaskService.despachoprstore.newList.length}} correspondências novas </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length ==1">{{
@@ -353,7 +462,7 @@
</div>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])"
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
(click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'"
[class.active]="selectedElement == 'DiplomasAssinados'"
class="box-hover exp-card d-flex flex-column justify-center">
@@ -393,42 +502,6 @@
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
(click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
[class.active]="selectedElement == 'DiplomasParaAssinar'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden
*ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
(click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'"
@@ -459,44 +532,6 @@
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])"
(click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
[class.active]="selectedElement == 'DiplomasParaAssinar'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden
*ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas para Assinar<br>
<span class="new-task-count"
*ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novas</span>
<span class="new-task-count "
*ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{
TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
<span class="title1"
*ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidential"
(click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'"
@@ -555,38 +590,7 @@
</p>
</div>
<!-- List -->
<div (click)="openExpedientListPage(); selectedElement='Correspondence'"
[class.active]="selectedElement == 'Correspondence' || selectedElement == 'Expediente Presidente'"
class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-correspondencia.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Correspondence'"
src="assets/images/theme/gov/icons-correspondencia.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Correspondence'"
src="assets/images/theme/gov/icons-correspondencia-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia.svg"></ion-icon>
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Correspondence'"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Expediente <br>
<span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{
TaskService.expedientegbstore.newList.length}} correspondência nova</span>
<span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{
TaskService.expedientegbstore.newList.length}} correspondências novas</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.expedientegbstore.count}}
<span class="title1" *ngIf="TaskService.expedientegbstore.count == 0">correspondência</span>
<span class="title1" *ngIf="TaskService.expedientegbstore.count == 1">correspondência</span>
<span class="title1" *ngIf="TaskService.expedientegbstore.count > 1">correspondências</span>
</p>
</div>
<!-- List -->
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])"
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+2 -2
View File
@@ -92,7 +92,7 @@
</div>
<!-- <div class="d-flex justify-center align-center font-25" (click)="clickDocumentUPdateIndex(Document.DocId, Document, Document.content);"> -->
<div class="d-flex justify-center align-center font-25" *ngIf="!Document.content">
<!-- <div class="d-flex justify-center align-center font-25" *ngIf="!Document.content">
<button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
<mat-icon>more_vert</mat-icon>
</button>
@@ -110,7 +110,7 @@
<span>Marcar Reunião</span>
</button>
</mat-menu>
</div>
</div> -->
</div>
</ion-label>
src/environments/environment.prod.ts
+1 -1
View File
@@ -4,4 +4,4 @@ import { environment as oaprProd } from './suport/oapr'
// import { environment as doneITProd } from './suport/doneIt'
export const environment: Environment = oaprProd;
export const environment: Environment = DevDev;
version/git-version.ts
+6 -6
View File
@@ -1,11 +1,11 @@
export let versionData = {
"shortSHA": "f79df96d4",
"SHA": "f79df96d48944f1df331220836382e65bd257083",
"shortSHA": "9e3c6db93",
"SHA": "9e3c6db93ab352472ebeb023e65027473b3ab1d4",
"branch": "developer",
"lastCommitAuthor": "'peter.maquiran'",
"lastCommitTime": "'Mon Sep 29 11:34:11 2025 +0100'",
"lastCommitMessage": "fix message",
"lastCommitNumber": "6151",
"changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 8 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/core/chat/entity/message.ts\n\tmodified: src/app/core/chat/usecase/message/message-create-use-case.service.ts\n\tmodified: src/app/infra/database/dexie/instance/chat/schema/attachment.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.ts\n\tmodified: src/app/ui/chat/component/new-group/new-group.page.ts\n\tmodified: src/app/ui/chat/modal/new-group/new-group.page.ts\n\tmodified: src/app/ui/chat/store/model/message.ts\n\tmodified: version/git-version.ts",
"lastCommitTime": "'Thu Oct 16 16:09:35 2025 +0100'",
"lastCommitMessage": "fix chat and gabinete",
"lastCommitNumber": "6152",
"changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 9 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/infra/socket/signalR/signalR.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/environments/environment.prod.ts",
"changeAuthor": "peter.maquiran"
}