diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html
index 52e76aa19..8258e8d1b 100644
--- a/src/app/modals/add-note/add-note.page.html
+++ b/src/app/modals/add-note/add-note.page.html
@@ -50,6 +50,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts
index 6087e52f1..2f6a8636e 100644
--- a/src/app/modals/add-note/add-note.page.ts
+++ b/src/app/modals/add-note/add-note.page.ts
@@ -14,6 +14,7 @@ export class AddNotePage implements OnInit {
documents: SearchList[] = [];
loadedAttachments:any;
hideThisFeature: boolean = true;
+ actionName: string;
constructor(
private modalController: ModalController,
@@ -23,6 +24,7 @@ export class AddNotePage implements OnInit {
) {
this.note = '';
this.hideThisFeature = this.navParams.get('showAttachmentBtn');
+ this.actionName = this.navParams.get('actionName');
}
ngOnInit() {
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 3fb228478..82af13f40 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -188,6 +188,7 @@
-
+
+
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html
index 8b6165111..b18736918 100644
--- a/src/app/modals/delegar/delegar.page.html
+++ b/src/app/modals/delegar/delegar.page.html
@@ -93,7 +93,7 @@
-
+
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 fe77ab78d..279d22d2b 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -252,6 +252,11 @@
+
+
diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss
index 606a601f1..c0202be99 100644
--- a/src/app/pages/agenda/new-event/new-event.page.scss
+++ b/src/app/pages/agenda/new-event/new-event.page.scss
@@ -90,6 +90,10 @@ ion-content{
border-radius: 5px;
flex: 1;
}
+
+ .textarea{
+ font-size: small;
+ }
.list-people{
width: 250px;
float: left;
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 29cd58fe8..f5c522774 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -437,6 +437,7 @@ export class DespachoPrPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: true,
+ actionName: actionName
},
cssClass: classs,
backdropDismiss: true
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 86b1659be..17800754e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -127,7 +127,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 9eacb4e33..0226a201e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -47,6 +47,9 @@ export class DespachoPage implements OnInit {
profile: string;
intervenientes: any = []
cc: any = [];
+ executadoText: string = "Executado";
+ gerarText: string = "Gerar"
+
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
@@ -394,7 +397,12 @@ export class DespachoPage implements OnInit {
// loader.remove()
}
+ tstemethod(value: string) {
+ alert(value)
+ }
+
async openAddNoteModal(actionName: string) {
+
let classs;
if (window.innerWidth <= 800) {
classs = 'modal modal-desktop'
@@ -405,6 +413,7 @@ export class DespachoPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: true,
+ actionName: actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
index 32c26f587..380d50899 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -212,6 +212,7 @@ export class DiplomasGerarPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: true,
+ actionName:false
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 1517c080f..0aa97c549 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -377,6 +377,7 @@ export class DiplomaPage implements OnInit {
const modal = await this.modalController.create({
component: AddNotePage,
componentProps: {
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index b7b169a45..31eac214b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -297,6 +297,7 @@ export class ExpedienteDetailPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: false,
+ actionName:actionName
},
cssClass: classs,
//backdropDismiss: true
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 873801858..7bd3d7fc1 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -366,6 +366,7 @@ export class ExpedientePrPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: false,
+ actionName:actionName
},
cssClass: classs,
//backdropDismiss: true
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index fbf4c24c0..545734816 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -663,6 +663,7 @@ export class PedidoPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: true,
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 9f02d1f86..4a2d4f487 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -293,7 +293,7 @@
-
+
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index fc2255adf..ff95ee712 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -49,6 +49,7 @@ export class DeplomaOptionsPage implements OnInit {
const modal = await this.modalController.create({
component: AddNotePage,
componentProps:{
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index 644e62b35..73f3fa64b 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -202,7 +202,8 @@ export class DespachosOptionsPage implements OnInit {
const modal = await this.modalController.create({
component: AddNotePage,
componentProps: {
- showAttachmentBtn: true
+ showAttachmentBtn: true,
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index e81ac580f..33abab260 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -233,7 +233,8 @@ export class DespachosPrOptionsPage implements OnInit {
const modal = await this.modalController.create({
component: AddNotePage,
componentProps: {
- showAttachmentBtn: true
+ showAttachmentBtn: true,
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
index 215e14258..8e5286f47 100644
--- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -52,6 +52,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
component: AddNotePage,
componentProps: {
showAttachmentBtn: true,
+ actionName:false
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index d66bf5833..8104ac08a 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -90,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit {
component: AddNotePage,
componentProps:{
showAttachmentBtn: false,
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 03b4c0e3e..bb71ed919 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -201,6 +201,7 @@ export class OptsExpedientePage implements OnInit {
component: AddNotePage,
componentProps:{
showAttachmentBtn: false,
+ actionName:actionName
},
cssClass: classs,
//backdropDismiss: true
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index d8c317807..0cb7f842f 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -222,6 +222,7 @@ export class RequestOptionsPage implements OnInit {
component: AddNotePage,
componentProps:{
showAttachmentBtn: true,
+ actionName:actionName
},
cssClass: classs,
backdropDismiss: true
diff --git a/version/git-version.ts b/version/git-version.ts
index 3704935a7..07bc5a489 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "c0029364c",
- "SHA": "c0029364c8429dc183fd6b9743f8f78ab81532f5",
+ "shortSHA": "d44ca806e",
+ "SHA": "d44ca806efc86c21048752383dd3b5169e68670e",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Wed Feb 15 18:47:55 2023 +0100'",
- "lastCommitMessage": "dates on publications solved",
- "lastCommitNumber": "4789",
+ "lastCommitTime": "'Thu Feb 16 15:43:15 2023 +0100'",
+ "lastCommitMessage": "pull made",
+ "lastCommitNumber": "4795",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 5 and 5 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: .husky/pre-commit\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/assets/www/pdfjs/web/viewer.html\n\tmodified: version/git-version.ts",
+ "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 6 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged
...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/add-note/add-note.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file