From faa418d022a9777c6a5016d7e4c554ee377276c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Sat, 15 Jul 2023 06:16:45 +0100 Subject: [PATCH 1/2] tag of the drafft has a balon --- .../diploma-assinar/diploma-assinar.page.html | 2 +- .../diploma-assinar/diploma-assinar.page.scss | 8 ++++++++ version/git-version.ts | 12 ++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) 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 fe360fb23..0202c24f2 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 }} Rascunho

+

{{ 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 e79eb890c..1795bc4fc 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,14 @@ ion-content, .header-2, .main-content{ padding: 30px 20px 0 20px !important; } +.text-span{ + border-radius: 20px; + background: var(--label-bg-color); + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; +} + .document-type{ color: #d30a0a; margin-left: 20px; diff --git a/version/git-version.ts b/version/git-version.ts index a54b4daab..4866a75f8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "069248247", - "SHA": "069248247f42b888dcb2bbef8ed494e0ba993dac", + "shortSHA": "63abde569", + "SHA": "63abde56977535af2bbe1622ceb7281d0f66e8df", "branch": "developer", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu Jul 13 11:39:24 2023 +0100'", - "lastCommitMessage": "added tag rascunho", - "lastCommitNumber": "5058", + "lastCommitTime": "'Thu Jul 13 12:11:28 2023 +0100'", + "lastCommitMessage": "bug saving mc token solved", + "lastCommitNumber": "5059", "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/login/login.page.ts", + "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/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file From eb4cc12d90027cf271fdd74cb26606825a624f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 21 Jul 2023 08:42:59 +0100 Subject: [PATCH 2/2] tinymce auto save --- src/app/tiny-mce/tiny-mce.page.html | 11 ++++++---- src/app/tiny-mce/tiny-mce.page.ts | 24 ++++++++++++++++++--- src/assets/images/error_circle_warning.png | Bin 0 -> 1132 bytes version/git-version.ts | 12 +++++------ 4 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 src/assets/images/error_circle_warning.png diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html index 35b3ff341..23ac9196b 100644 --- a/src/app/tiny-mce/tiny-mce.page.html +++ b/src/app/tiny-mce/tiny-mce.page.html @@ -9,9 +9,9 @@ {{Document.Assunto}} -
+
@@ -26,13 +26,16 @@ apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p" plugins: [ 'advlist autolink lists link image charmap print preview anchor', 'searchreplace visualblocks code fullscreen', - 'insertdatetime media table paste code help wordcount print' + 'insertdatetime media table paste code help wordcount print autosave' ], + autosave_ask_before_unload: false, + autosave_interval: '30s', toolbar: 'undo redo | formatselect | bold italic backcolor | \ alignleft aligncenter alignright alignjustify | \ bullist numlist outdent indent | removeformat | print | help' }" initialValue='{{content}}' [(ngModel)]="content" - (onSaveContent)="somefunction()" + (onSaveContent)="saveDraft()" + > \ No newline at end of file diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts index e1ed7be13..2ff61151b 100644 --- a/src/app/tiny-mce/tiny-mce.page.ts +++ b/src/app/tiny-mce/tiny-mce.page.ts @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { NavParams } from '@ionic/angular'; import { EventDetailsDocumentsOptionsPage } from '../shared/popover/event-details-documents-options/event-details-documents-options.page'; import { AlertController, ModalController } from '@ionic/angular'; +import { ProcessesService } from '../services/processes.service'; +import { HttpErrorHandle } from '../services/http-error-handle.service'; @Component({ selector: 'app-tiny-mce', templateUrl: './tiny-mce.page.html', @@ -22,6 +24,8 @@ export class TinyMCEPage implements OnInit { constructor( private navParams: NavParams, private modalController: ModalController, + private processService: ProcessesService, + private erroHandler: HttpErrorHandle ) { this.Document = this.navParams.get('Document') @@ -36,9 +40,23 @@ export class TinyMCEPage implements OnInit { this.modalController.dismiss() } - somefunction() { - console.log(this.content) - } + saveDraft() { + console.log(document) + let objectDraft = { + "status": false, + "description": this.Document.Assunto, + "content": this.content, + "path": this.Document.path, + "ownerId": this.Document.ownerId + } + this.processService.SaveDraftByID(this.Document.DocId, objectDraft).subscribe((res) => [ + this.erroHandler.httpsSucessMessagge('Draft Save'), + this.modalController.dismiss() + ],(error) => { + this.erroHandler.httpStatusHandle(error) + }) + + } async openOptions() { const modal = await this.modalController.create({ diff --git a/src/assets/images/error_circle_warning.png b/src/assets/images/error_circle_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..a3d952cca7701c5e23afeb9086a0f3c1a43c4de1 GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK0wgC0YY74=rX+877l!}s{b%+AdF&;gzOL-g z*@gMc8P+yv9A#i&uJLqn4DmR=_PS$sNVo|5hx^q%ilNMci)4kR&Dl0*I3@$Pf%Osgshjxsr3KZq?7SSl zF8#)&=E7T7c2qYl$nnaTZu?^OZk@u8^q5;x7V}!)c5VDt!*2H}TkP7$YwI$iYR;`I z6*$~5-}rR=t7#9<9Dn{MLfvrBGWFvR7ft?I!!wt{Cq=3HK9wNO~9DSMmymA+K#AFnxeYvbfx>7gTCoUpCo?kxi6Ofx6#&Z)|KC-5BKa} zPSJR3M_D3FR$X#h? zyCYT6{pm!jtesc5^A@|uugXwmGXQmBzBN z-d)MZxynheRMg+*rQ?Bs&@P138uekte@HTN=lmO&$v2YOMBt*3(||^E;Uao zdbRPi#+Hd0+oiUeikmKLh@WNp(9XMQXU5rsE4;PzBzqT?%@WqRdHv7rRJRKTlA*uM zyjhnoTH(oi@aWXvzZx$$9hvAc&9fveKi}2QVZFYJl%M_jgxe>3lk-;Xmh3$_MPbLQ zw^y6BC2g1OxP83LU0k1gm0i5`pI@aX^uk#WO3wag|F!DsWxnSu2j865o*KUXXIbiz zZo5p@$dw`M*R2kcEp`?7^Ee~>!s;v6gHO#o>i${p+4IPn b(Dj%CjfYrrvi-wDpdJQKS3j3^P6...\" to unstage)\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tnew file: src/assets/images/error_circle_warning.png", "changeAuthor": "eudes.inacio" } \ No newline at end of file