added tag rascunho

This commit is contained in:
Eudes Inácio
2023-07-13 11:39:24 +01:00
parent 44f8aa8f2b
commit 069248247f
15 changed files with 40 additions and 15 deletions
@@ -70,7 +70,7 @@
class="ion-no-margin ion-no-padding cursor-pointer"> class="ion-no-margin ion-no-padding cursor-pointer">
<ion-label <ion-label
(click)="viewDocument(attachment.DocId, attachment, attachment.content)"> (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p> <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label> </ion-label>
@@ -13,6 +13,11 @@
font-weight: 500; font-weight: 500;
color:#d30a0a !important; color:#d30a0a !important;
} }
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
}
.btn-size{ .btn-size{
font-size: 18px !important; font-size: 18px !important;
} }
@@ -124,7 +124,7 @@ export class DespachoPrPage implements OnInit {
} }
this.fulltask = res; this.fulltask = res;
let stringDraft = res.workflowInstanceDataFields.DraftIds; let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";"); let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try { try {
this.getDraft(split_stringDraft); this.getDraft(split_stringDraft);
@@ -65,7 +65,7 @@
<h5>Documentos Anexados</h5> <h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of mergedArray"> <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of mergedArray">
<ion-label class="d-block" (click)="viewDocument(Document.DocId, Document,Document.content)"> <ion-label class="d-block" (click)="viewDocument(Document.DocId, Document,Document.content)">
<p class="attach-title-item">{{ Document.Assunto || "Sem assunto" }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p class="attach-title-item">{{ Document.Assunto || "Sem assunto" }} <span class="document-type" *ngIf="Document.content != ''">Rascunho</span></p>
<p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p> <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
</ion-label> </ion-label>
</ion-item> </ion-item>
@@ -13,6 +13,11 @@
font-weight: 500; font-weight: 500;
color:#d30a0a !important; color:#d30a0a !important;
} }
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
}
.btn-size{ .btn-size{
font-size: 18px !important; font-size: 18px !important;
} }
@@ -111,7 +111,7 @@ export class DespachoPage implements OnInit {
this.TaskService.loadDiplomas(); this.TaskService.loadDiplomas();
let stringDraft = res.workflowInstanceDataFields.DraftIds; let stringDraft = res.workflowInstanceDataFields.DraftIds;
console.log('sring to array', stringDraft) console.log('sring to array', stringDraft)
let split_stringDraft = stringDraft?.split(";"); let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try { try {
this.getDraft(split_stringDraft); this.getDraft(split_stringDraft);
@@ -72,7 +72,7 @@
<ion-label <ion-label
(click)="viewDocument(attachment.DocId, attachment,attachment.content)" (click)="viewDocument(attachment.DocId, attachment,attachment.content)"
> >
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p> <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label> </ion-label>
@@ -13,6 +13,12 @@ ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important; padding: 30px 20px 0 20px !important;
} }
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
}
.main-content { .main-content {
padding-top: 0px !important; padding-top: 0px !important;
} }
@@ -113,7 +113,7 @@ export class DiplomaAssinarPage implements OnInit {
this.fulltask = res; this.fulltask = res;
let stringDraft = res.workflowInstanceDataFields.DraftIds; let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";"); let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try { try {
this.getDraft(split_stringDraft); this.getDraft(split_stringDraft);
@@ -69,7 +69,7 @@
> >
<ion-label <ion-label
(click)="viewDocument(attachment.DocId, attachment, attachment.content)"> (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span> </p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p> <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p> <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label> </ion-label>
@@ -16,6 +16,11 @@
.btn-size{ .btn-size{
font-size: 18px !important; font-size: 18px !important;
} }
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
}
.main-header{ .main-header{
overflow: inherit; overflow: inherit;
font-family: Roboto; font-family: Roboto;
@@ -125,7 +125,7 @@ export class DiplomaPage implements OnInit {
console.log('Diploma anexo',this.fulltask.Documents ) console.log('Diploma anexo',this.fulltask.Documents )
// this.updateProcessOnDB(res) // this.updateProcessOnDB(res)
let stringDraft = res.workflowInstanceDataFields.DraftIds; let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";"); let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try { try {
this.getDraft(split_stringDraft); this.getDraft(split_stringDraft);
+1 -1
View File
@@ -21,7 +21,7 @@
apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p" apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p"
[(ngModel)]="editorContent" [(ngModel)]="editorContent"
[init]="{ [init]="{
height: 500, height: 600,
menubar: false, menubar: false,
plugins: [ plugins: [
'advlist autolink lists link image charmap print preview anchor', 'advlist autolink lists link image charmap print preview anchor',
+4
View File
@@ -24,4 +24,8 @@
.container-img { .container-img {
background-size: 25%; background-size: 25%;
} }
}
#my-tinymce {
height: 200% !important;
} }
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "b56efb704", "shortSHA": "44f8aa8f2",
"SHA": "b56efb7043c3b8ced7c0cef92fba2c0abd7b5f58", "SHA": "44f8aa8f2b07c4d6623f394b9385c40eb5144b8c",
"branch": "developer", "branch": "developer",
"lastCommitAuthor": "'Eudes Inácio'", "lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Jul 12 10:30:16 2023 +0100'", "lastCommitTime": "'Wed Jul 12 15:15:56 2023 +0100'",
"lastCommitMessage": "merge made with feature/gabinete-search branch", "lastCommitMessage": "string de draft id bug solved",
"lastCommitNumber": "5056", "lastCommitNumber": "5057",
"change": "", "change": "",
"changeStatus": "On branch developer\nYour branch is up to date with 'origin/developer'.\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" 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" "changeAuthor": "eudes.inacio"
} }