Intervenientes
+Participantes
Remetente
-
+
+
diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html
index 5c570a082..5cead8350 100644
--- a/src/app/modals/view-event/view-event.page.html
+++ b/src/app/modals/view-event/view-event.page.html
@@ -74,7 +74,7 @@
-
Intervenientes
+Participantes
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 73dcf5d28..c60990902 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -252,7 +252,7 @@
- Adicionar intervenientes*
+ Adicionar Participantes*
{{participant.Name}}
@@ -275,7 +275,7 @@
- Adicionar intervenientes*
+ Adicionar Participantes*
{{participant.Name}}
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 77a305cbf..98fb70356 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -209,7 +209,7 @@
- Adicionar intervenientes*
+ Adicionar Participantes*
{{participant.Name}}
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 b2c974144..caf3b6402 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -69,7 +69,7 @@
-
Intervenientes
+Participantes
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 1bc6b9bed..c0cc88d13 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -36,7 +36,7 @@
-
Intervenientes
+Participantes
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index 6c4cdbb55..da943b2ee 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -35,7 +35,7 @@
-
Intervenientes
+Participantes
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
index 682f78928..f1cacacd2 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
@@ -37,7 +37,7 @@
-
Intervenientes
+Participantes
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 171621ffd..619a9011b 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -74,7 +74,7 @@
-
{{att.Name}}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 43d8776cd..2e7a9ab40 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -73,7 +73,7 @@
Intervenientes
+Participantes
-
{{att.Name}}
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 680fecbeb..843b19513 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -213,7 +213,7 @@
- Adicionar intervenientes*
+ Adicionar Participantes*
{{participant.Name}}
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 164c28b59..53fcebd69 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
@@ -140,7 +140,7 @@
- Adicionar intervenientes*
+ Adicionar Participantes*
{{participant.Name}}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 8e1a653ba..a49b2da27 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -44,7 +44,7 @@
Intervenientes
+Participantes
-
- 
- 
- 
-
-
-
@@ -212,7 +212,7 @@
+
{{notificationLength}}
- ();
@Output() openPublicationDetails = new EventEmitter();
@Output() goBackToViewPublications = new EventEmitter();
@@ -45,7 +42,6 @@ export class NewPublicationPage implements OnInit {
capturedImage:any = '';
capturedImageTitle:any = '';
- photos: any[] = [];
constructor(
public photoService: PhotoService,
@@ -56,58 +52,25 @@ export class NewPublicationPage implements OnInit {
public PublicationFolderService: PublicationFolderService
) {
this.publicationTitle = 'Nova Publicação';
+
+
}
ngOnInit() {
- if(this.publicationType == '3'){
- this.getPublicationDetail();
- }
+
this.setTitle();
- //this.clear();
- //this.takePicture();
+ this.setData()
}
- getPublicationDetail() {
-
- const folderId = this.folderId
- const localPublication = this.PublicationFolderService.getLocalPublication(folderId, this.publicationId);
-
- if(localPublication?.DocumentId) {
-
- this.publication = {
- DateIndex: localPublication.DateIndex,
- DocumentId: localPublication.DocumentId,
- ProcessId:localPublication.ProcessId,
- Title:localPublication.Title,
- Message: localPublication.Message,
- DatePublication: localPublication.DatePublication,
- FileBase64: localPublication.FileBase64,
- OriginalFileName: localPublication.OriginalFileName,
- FileExtension: 'jpeg',
- }
+ setData() {
+ if(!this.publication) {
+ setTimeout(() => {
+ this.setData()
+ }, 500)
} else {
- this.showLoader = true;
- this.publications.GetPublicationById(this.publicationId).subscribe( res => {
- this.publication = {
- DateIndex: res.DateIndex,
- DocumentId: res.DocumentId,
- ProcessId:res.ProcessId,
- Title:res.Title,
- Message: res.Message,
- DatePublication: res.DatePublication,
- FileBase64: "data:image/jpg;base64," + res.FileBase64,
- OriginalFileName: res.OriginalFileName,
- FileExtension: 'jpeg',
- }
- this.pub = this.publication;
- this.showLoader = false;
- }, () => {
- this.showLoader = false;
- this.goBack()
- });
+ this.pub = this.publication
}
-
}
@@ -182,6 +145,7 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.capturedImage,
FileExtension: 'jpeg',
}
+
}
else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { //
@@ -193,8 +157,8 @@ export class NewPublicationPage implements OnInit {
Message: this.pub.Message,
DatePublication: this.publication.DatePublication,
OriginalFileName: this.publication.OriginalFileName,
- FileBase64: "",
- FileExtension: this.publication.FileExtension,
+ FileBase64: "data:image/png;base64,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",
+ FileExtension: 'jpeg',
}
} else {
@@ -206,32 +170,31 @@ export class NewPublicationPage implements OnInit {
Message: this.pub.Message,
DatePublication: this.publication.DatePublication,
OriginalFileName: this.publication.OriginalFileName,
- FileBase64: this.capturedImage,
- FileExtension: 'jpeg',
+ FileBase64: this.publication.FileBase64,
+ FileExtension: this.publication.FileExtension,
}
}
try {
- const response = await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
- try {
- await this.publications.DeletePublication(this.folderId, this.publication.DocumentId).toPromise();
- } catch(error) {}
+ const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErroHandle.httpsSucessMessagge('Editar publicação')
console.log({response})
-
this.goBack();
+
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
+ if(error.status == 404) {
+ this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
+ this.goBack();
+ }
} finally {
loader.remove()
}
- this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
- this.PublicationFolderService.deletePost(this.publication.DocumentId, this.publication.ProcessId)
}
else {
@@ -240,12 +203,12 @@ export class NewPublicationPage implements OnInit {
this.publication = {
DateIndex: time,
DocumentId: null,
- ProcessId:this.folderId,
+ ProcessId: this.folderId ,
Title: this.pub.Title,
Message: this.pub.Message,
DatePublication: time,
- OriginalFileName: this.capturedImageTitle,
- FileBase64: this.capturedImage,
+ OriginalFileName: this.capturedImageTitle || 'foto',
+ FileBase64: this.capturedImage || "data:image/png;base64,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",
FileExtension: 'jpeg',
}
@@ -253,7 +216,7 @@ export class NewPublicationPage implements OnInit {
try {
- await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
+ await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
if(this.publicationTitle == '1') {
} else if (this.publicationTitle == '2') {
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 75c114728..971d9ea34 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -9,6 +9,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
+import { PublicationPipe } from 'src/app/pipes/publication.pipe';
@Component({
selector: 'app-publication-detail-shared',
templateUrl: './publication-detail.page.html',
@@ -23,6 +24,7 @@ export class PublicationDetailPage implements OnInit {
@Output() addNewPublication = new EventEmitter();
@Output() closeDesktopComponent = new EventEmitter();
@Output() goBackToViewPublications = new EventEmitter();
+ publicationPipe = new PublicationPipe()
constructor(
private modalController: ModalController,
@@ -67,35 +69,18 @@ export class PublicationDetailPage implements OnInit {
const folderId = this.folderId
const localPublication = this.publicationFolderService.getLocalPublication(folderId, this.publicationId);
- if(localPublication?.DocumentId) {
+ if(localPublication?.ProcessId) {
- this.publication = {
- DateIndex: localPublication.DateIndex,
- DocumentId: localPublication.DocumentId,
- ProcessId:localPublication.ProcessId,
- Title:localPublication.Title,
- Message: localPublication.Message,
- DatePublication: localPublication.DatePublication,
- FileBase64: localPublication.FileBase64,
- OriginalFileName: localPublication.OriginalFileName,
- FileExtension: 'jpeg',
- }
+ this.publication = localPublication
+
} else {
this.showLoader = true;
this.publications.GetPublicationById(this.publicationId).subscribe(res => {
- this.publication = {
- DateIndex: res.DateIndex,
- DocumentId: res.DocumentId,
- ProcessId:res.ProcessId,
- Title:res.Title,
- Message: res.Message,
- DatePublication: res.DatePublication,
- FileBase64: "data:image/jpg;base64," + res.FileBase64,
- OriginalFileName: res.OriginalFileName,
- FileExtension: 'jpeg',
- }
+ this.publication = this.publicationPipe.itemList(res)
+
+
this.showLoader = false;
}, (error) => {
this.showLoader = false;
@@ -165,6 +150,7 @@ export class PublicationDetailPage implements OnInit {
});
await modal.present();
} else {
+
this.addNewPublication.emit({
publicationType: publicationType,
folderId: this.folderId,
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 9f716f4a6..c536289f6 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -38,7 +38,7 @@
+ (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
![]()
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index c2b7d8b41..6ad1c7a91 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -191,7 +191,6 @@ export class ViewPublicationsPage implements OnInit {
const found = this.publicationIsPresent(publicationId, folderId)
if(!found) {
this.publicationFolderService.publicationList[folderId].push(publicationDetails)
- // PublicationModel.create(publicationDetails)
} else {
this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
}
@@ -287,9 +286,9 @@ export class ViewPublicationsPage implements OnInit {
}
- async viewPublicationDetail(publicationId:string) {
+ async viewPublicationDetail(DocumentId:string, ProcessId: string) {
- this.openPublicationDetails.emit(publicationId);
+ this.openPublicationDetails.emit({DocumentId, ProcessId});
}
diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts
index da941d2fe..1d40c7ca0 100644
--- a/src/app/store/publication-folder.service.ts
+++ b/src/app/store/publication-folder.service.ts
@@ -84,11 +84,11 @@ export class PublicationFolderService {
}
}
- deletePost(folderId: any, publicationId: any) {
+ deletePost(folderId: any, DocumentId: any) {
if(this.publicationList[folderId]) {
- this.publicationList[folderId] = this.publicationList[folderId].filter( e => e.DocumentId != publicationId)
+ this.publicationList[folderId] = this.publicationList[folderId].filter( e => e.DocumentId != DocumentId)
this.save(folderId)
}
@@ -191,13 +191,10 @@ export class PublicationFolderService {
}
- getLocalPublication (folderId, publicationId) {
+ getLocalPublication (folderId, DocumentId) {
if(this.publicationList[folderId]) {
-
- this.publicationList[folderId].filter( e=> e.ProcessId == publicationId || e.DocumentId == publicationId);
-
- return this.publicationList[folderId].filter( e => e.ProcessId == publicationId || e.DocumentId == publicationId)?.[0]
+ return this.publicationList[folderId].find( e => e.DocumentId == DocumentId )
} else {
}
diff --git a/src/assets/images/camera.png b/src/assets/images/camera.png
new file mode 100644
index 000000000..d82617719
Binary files /dev/null and b/src/assets/images/camera.png differ
diff --git a/version/git-version.ts b/version/git-version.ts
index 74c865c58..c967dd3d3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "3451e74c9",
- "SHA": "3451e74c90fe8c3346bf27fe75b00e30a29cf608",
+ "shortSHA": "9e9601603",
+ "SHA": "9e960160381e0ff9579e599b896ddeb0794cf3de",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Thu Aug 24 18:39:31 2023 +0100'",
- "lastCommitMessage": "prepare for presantation",
- "lastCommitNumber": "5213",
+ "lastCommitTime": "'Mon Aug 28 11:29:21 2023 +0100'",
+ "lastCommitMessage": "pull made 28/08/2023 11:29",
+ "lastCommitNumber": "5215",
"change": "",
- "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 7 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/view-media/view-media.page.html\n\tmodified: src/app/modals/view-media/view-media.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.scss\n\tmodified: src/app/services/functions/file.service.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.scss",
+ "changeStatus": "On branch developer-prod\nYour branch is ahead of 'origin/developer-prod' by 8 commits.\n (use \"git push\" to publish your local commits)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/pipes/publication.pipe.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/app/store/publication-folder.service.ts\n\tnew file: src/assets/images/camera.png",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file
+
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index cbf068614..ddfd82478 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -11,7 +11,7 @@
.profile-image {
border-radius: 80%; /* Tornar a imagem circular */
- width: 25.33%;
+ width: 100%;
height: 25.33%;
overflow: auto;
}
@@ -88,12 +88,12 @@
.div-profile {
height: fit-content;
- justify-content: flex-end;
- display: flex;
background-color: transparent;
- justify-content: center;
- align-items: center;
overflow: auto;
+ display: flex !important;
+ justify-content: end;
+ max-width: 45px;
+ border-radius: 50px;
.icon{
position: relative;
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 1c4f0e856..de1dc4cf2 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -19,8 +19,7 @@ import { PublicationFolderService } from 'src/app/store/publication-folder.servi
export class NewPublicationPage implements OnInit {
showLoader: boolean;
pub: Publication = new Publication();
- image: Image = new Image();
-
+
publicationTitle:string;
imgUrl:any;
@@ -29,13 +28,11 @@ export class NewPublicationPage implements OnInit {
Form: FormGroup;
validateFrom = false
- photo: SafeResourceUrl;
-
- publication: Publication = new Publication();
+ @Input() publication!: Publication;
@Input() publicationType: string;
- @Input() folderId: string;
- @Input() publicationId:string;
+ @Input() folderId:string;
+
@Output() closeDesktopComponent = new EventEmitter
{{notificationLength}}
{{publicationFolderService.FolderDetails[folderId].Detail}}