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 30bba2131..b9a3782c5 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
@@ -70,7 +70,7 @@
class="ion-no-margin ion-no-padding cursor-pointer">
- {{ attachment.Assunto }}
+ {{ attachment.Assunto }}Rascunho
{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
index 005a549ec..051f13153 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
@@ -13,6 +13,11 @@
font-weight: 500;
color:#d30a0a !important;
}
+.document-type{
+ color: #d30a0a;
+ margin-left: 20px;
+ font-size: medium;
+}
.btn-size{
font-size: 18px !important;
}
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 123108b77..5c1ffa29e 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
@@ -124,7 +124,7 @@ export class DespachoPrPage implements OnInit {
}
this.fulltask = res;
let stringDraft = res.workflowInstanceDataFields.DraftIds;
- let split_stringDraft = stringDraft?.split(";");
+ let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try {
this.getDraft(split_stringDraft);
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 45e0c1afa..0df9b5c97 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -65,7 +65,7 @@
Documentos Anexados
- {{ Document.Assunto || "Sem assunto" }}
+ {{ Document.Assunto || "Sem assunto" }} Rascunho
{{ Document.Sender}}{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index ff9d8918c..39a7afe97 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -13,6 +13,11 @@
font-weight: 500;
color:#d30a0a !important;
}
+.document-type{
+ color: #d30a0a;
+ margin-left: 20px;
+ font-size: medium;
+}
.btn-size{
font-size: 18px !important;
}
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 818cb66f1..24652c45d 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -111,7 +111,7 @@ export class DespachoPage implements OnInit {
this.TaskService.loadDiplomas();
let stringDraft = res.workflowInstanceDataFields.DraftIds;
console.log('sring to array', stringDraft)
- let split_stringDraft = stringDraft?.split(";");
+ let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try {
this.getDraft(split_stringDraft);
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index 4da539873..fe360fb23 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -72,7 +72,7 @@
- {{ attachment.Assunto }}
+ {{ attachment.Assunto }} Rascunho
{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index 2199028ff..e79eb890c 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -13,6 +13,12 @@ ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
}
+.document-type{
+ color: #d30a0a;
+ margin-left: 20px;
+ font-size: medium;
+}
+
.main-content {
padding-top: 0px !important;
}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index bb9d7f275..13bd75c13 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -113,7 +113,7 @@ export class DiplomaAssinarPage implements OnInit {
this.fulltask = res;
let stringDraft = res.workflowInstanceDataFields.DraftIds;
- let split_stringDraft = stringDraft?.split(";");
+ let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try {
this.getDraft(split_stringDraft);
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index 74c16bc27..8e69f353c 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -69,7 +69,7 @@
>
- {{ attachment.Assunto }}
+ {{ attachment.Assunto }} Rascunho
{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
index b818677f0..d385c9770 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
@@ -16,6 +16,11 @@
.btn-size{
font-size: 18px !important;
}
+.document-type{
+ color: #d30a0a;
+ margin-left: 20px;
+ font-size: medium;
+}
.main-header{
overflow: inherit;
font-family: Roboto;
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 320451219..b4d071859 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -125,7 +125,7 @@ export class DiplomaPage implements OnInit {
console.log('Diploma anexo',this.fulltask.Documents )
// this.updateProcessOnDB(res)
let stringDraft = res.workflowInstanceDataFields.DraftIds;
- let split_stringDraft = stringDraft?.split(";");
+ let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try {
this.getDraft(split_stringDraft);
diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html
index 528614cd6..35b3ff341 100644
--- a/src/app/tiny-mce/tiny-mce.page.html
+++ b/src/app/tiny-mce/tiny-mce.page.html
@@ -21,7 +21,7 @@
apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p"
[(ngModel)]="editorContent"
[init]="{
- height: 500,
+ height: 600,
menubar: false,
plugins: [
'advlist autolink lists link image charmap print preview anchor',
diff --git a/src/app/tiny-mce/tiny-mce.page.scss b/src/app/tiny-mce/tiny-mce.page.scss
index d13f62918..9d4dd139e 100644
--- a/src/app/tiny-mce/tiny-mce.page.scss
+++ b/src/app/tiny-mce/tiny-mce.page.scss
@@ -24,4 +24,8 @@
.container-img {
background-size: 25%;
}
+ }
+
+ #my-tinymce {
+ height: 200% !important;
}
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index e8b6e52d4..1b7df48d9 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "b56efb704",
- "SHA": "b56efb7043c3b8ced7c0cef92fba2c0abd7b5f58",
+ "shortSHA": "44f8aa8f2",
+ "SHA": "44f8aa8f2b07c4d6623f394b9385c40eb5144b8c",
"branch": "developer",
"lastCommitAuthor": "'Eudes InĂ¡cio'",
- "lastCommitTime": "'Wed Jul 12 10:30:16 2023 +0100'",
- "lastCommitMessage": "merge made with feature/gabinete-search branch",
- "lastCommitNumber": "5056",
+ "lastCommitTime": "'Wed Jul 12 15:15:56 2023 +0100'",
+ "lastCommitMessage": "string de draft id bug solved",
+ "lastCommitNumber": "5057",
"change": "",
- "changeStatus": "On branch developer\nYour branch is up to date with 'origin/developer'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/suport/dev.ts",
+ "changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 1 commit.\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/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.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.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.scss",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file