-
-
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
-
+
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 369a6ec80..1ae8e2bcd 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -5,131 +5,16 @@
border-top-right-radius: 25px;
}
.content{
- padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
-.color-red{
- font-weight: 500;
- color:#d30a0a !important;
-}
-.document-type{
- border-radius: 20px;
- background: var(--label-bg-color);
- float: right;
- padding: 5px 13.5px 5px 13.5px;
- color: #fff;
-}
-.btn-size{
- font-size: rem(18) !important;
-}
-.main-header{
- overflow: inherit !important;
- display: flex;
- font-family: Roboto;
- background-color: #fff;
- color:#000;
- transform: translate3d(0, 1px, 0);
- .title-content{
- display: flex;
- justify-content: start !important;
- align-items: flex-start !important;
- border-radius: 0 !important;
- }
- .title{
- width: fit-content;
- height: auto;
- font-size: rem(25);
- overflow: auto;
- float: left;
- padding-left: 5px;
- }
- .div-icon{
- width: rem(40) !important;
- font-size: rem(35) !important;
- text-align: start !important;
- padding: 1px;
- }
-}
-ion-item-group{
- margin: 15px;
-}
+
ion-button{
display: block;
width: 80%;
margin: 20px auto;
}
-.upper-content-margin {
- margin-left: 36px;
-}
-
-.upper-content{
- font-family: Roboto;
- margin-top: 15px;
- font-size: rem(18);
-
- .label{
- border-radius: 20px;
- background: var(--label-bg-color);
- float: right;
- padding: 5px 13.5px 5px 13.5px;
- color: black;
- font-size: rem(14);
- }
-
- .button-calendar-type ion-button{
- height: rem(25);
- }
- .content-details{
- font-size: rem(17);
- .date{
- color: #797979;
- }
- }
-}
-.middle-conten{
- .middle-content p{
- font-size: rem(16);
- }
-}
-.bottom-content{
- //width: 360px;
- margin: 0 auto;
-
- .bottom-content h3{
- font-size: rem(16);
- margin: 0 0 0 10px;
- }
- .attach-document{
- font-size: rem(15);
- color: var(--title-text-color);
- margin: 5px 5px 5px 10px;
- padding: 5px;
- float: left;
- }
- .attach-icon{
- width: 37px;
- font-size: rem(35);
- float: left;
- }
- .attach-title-item{
- font-size: rem(18);
- width: 100%;
- color:#0d89d1;
- padding-bottom: 5px;
- }
- /* SPAN */
- .span-left{
- float: left;
- font-size: rem(15);
- }
- .span-right{
- text-align: right;
- float: right;
- font-size: rem(13);
- }
-}
.aside-right{
padding: 30px 20px 0 20px !important;
@@ -198,7 +83,7 @@ ion-button{
}
}
-@media only screen and (min-width: 1140px) {
+@media only screen and (min-width: 1140px){
.content{
width: 75%;
}
@@ -206,34 +91,3 @@ ion-button{
width: 25%;
}
}
-
-
-.option-desc {
- display: flex;
- color: #828282;
- width: 100%;
- justify-content: space-between;
- align-items: center;
- font-size: rem(15);
- .option-desc-line {
- height: 1px;
- flex-grow: 1;
- background-color: #e0e0e0;
- padding-left: 4px;
- }
-}
-
-
-.expand {
- margin-left: -20px;
- margin-right: -20px;
- width: calc(100% + 40px);
-}
-
-
-
-.selected-card {
- border: 3px solid #ffb703;
- color: #3498db;
-
-}
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 049df18d8..afd0b0aba 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -56,7 +56,7 @@ export class DespachoPage implements OnInit {
draftDocumentIds;
selectedIndex = 0
- dropButton = false
+ dropButton = true
constructor(private activateRoute: ActivatedRoute,
@@ -106,7 +106,6 @@ export class DespachoPage implements OnInit {
});
// this.ThemeService
-
}
close() {
@@ -271,43 +270,40 @@ export class DespachoPage implements OnInit {
this.DocumentViewerOptionService.openOptions();
}
- async viewDocument(docId: string, Document, content) {
+ async viewDocument({Document, content}) {
if (Document.content == "") {
- const modal = await this.modalController.create({
- component: ViewDocumentPage,
- componentProps: {
- trustedUrl: '',
- file: {
- title: Document.Assunto,
- url: '',
- title_link: '',
- },
- Document,
- applicationId: Document.ApplicationId,
- docId: Document.DocId || Document.SourceId,
- folderId: this.task.FolderId,
- task: this.fulltask
+ const modal = await this.modalController.create({
+ component: ViewDocumentPage,
+ componentProps: {
+ trustedUrl: '',
+ file: {
+ title: Document.Assunto,
+ url: '',
+ title_link: '',
},
- cssClass: 'modal modal-desktop'
- });
- await modal.present();
- } else {
- const modal = await this.modalController.create({
- component: TinyMCEPage,
- componentProps: {
- Document,
- content
- },
- cssClass: 'modal modal-desktop'
- });
- await modal.present();
- }
-
-
-
+ Document,
+ applicationId: Document.ApplicationId,
+ docId: Document.DocId || Document.SourceId,
+ folderId: this.task.FolderId,
+ task: this.fulltask
+ },
+ cssClass: 'modal modal-desktop'
+ });
+ await modal.present();
+ } else {
+ const modal = await this.modalController.create({
+ component: TinyMCEPage,
+ componentProps: {
+ Document,
+ content
+ },
+ cssClass: 'modal modal-desktop'
+ });
+ await modal.present();
}
+ }
clickAttachment() {
@@ -641,7 +637,4 @@ export class DespachoPage implements OnInit {
}
function mergeArraysAndTag(array1, array2) {
console.log('second', array2)
-
-
}
-
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
index 377536dbb..91c236787 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
@@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular';
import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
import { DiplomasGerarPage } from './diplomas-gerar.page';
+import { TaskDetailsPageModule } from "../../../../shared/gabinete-digital/generic/task-details/task-details.module";
@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- IonicModule,
- DiplomasGerarPageRoutingModule,
- ],
- declarations: [DiplomasGerarPage]
+ declarations: [DiplomasGerarPage],
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ DiplomasGerarPageRoutingModule,
+ TaskDetailsPageModule
+ ]
})
export class DiplomasGerarPageModule {}
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..2ade61c59 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
@@ -6,78 +6,19 @@
-
+
-
-
-
-
-
- Intervenientes
-
-
- {{interveniente.Name}}
-
+
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ fulltask.workflowInstanceDataFields.TaskMessage }}
-
-
-
-
-
-
-
-
- Documentos Anexados
-{{ attachment.Assunto }}Rascunho
-{{ attachment.DocNumber }}
-{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
-
-
-
+
+
-
+
@@ -138,10 +79,10 @@
-
+
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 144435ba0..1ae8e2bcd 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
@@ -5,169 +5,16 @@
border-top-right-radius: 25px;
}
.content{
- padding: 30px 00px 0 00px !important;
margin: 0;
float: left;
}
-.color-red{
- font-weight: 500;
- color:#d30a0a !important;
-}
-.document-type{
- border-radius: 20px;
- background: var(--label-bg-color);
- float: right;
- padding: 5px 13.5px 5px 13.5px;
- color: #fff;
-}
-.btn-size{
- font-size: rem(18) !important;
-}
-.main-header{
- overflow: inherit !important;
- font-family: Roboto;
- border-top-left-radius: 25px;
- border-top-right-radius: 25px;
- background-color: #fff;
- color:#000;
- transform: translate3d(0, 1px, 0);
- .header-top{
- width: 360px;
- margin: 0px auto;
- padding: 0 !important;
- background: #fff;
- .middle{
- padding: 0!important;
- float: left;
- width: 280px;
- margin: 2.5px 0 0 5px;
- display: flex;
- align-items: center;
- }
- .right{
- padding: 0!important;
- float: right;
- font-size: rem(25);
- color: #0782c9;
- margin: 5px 0 0 0;
- }
- }
- .header-bottom{
- width: 310px;
- overflow: auto;
- margin: 0 auto;
-
- .header-bottom-icon{
- width: rem(30);
- font-size: rem(25);
- float: left;
- padding: 2px;
- }
- .header-bottom-contacts{
- width: 275px;
- font-size: rem(15);
- color: #797979;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- float: left;
- padding: 5px;
- margin: 1px;
- }
- }
-
- .title{
- font-size: rem(25);
- overflow: auto;
- float: left;
- padding-top: 4px;
- padding-left: 5px;
- }
- .div-icon{
- width: rem(40);
- float: right;
- font-size: rem(35);
- overflow: auto;
- padding: 1px;
- }
-}
-ion-item-group{
- margin: 15px;
-}
ion-button{
display: block;
width: 80%;
margin: 20px auto;
}
-
-.upper-content{
- font-family: Roboto;
- margin-left: 36px;
- font-size: rem(18);
-
- .label{
- border-radius: 20px;
- background: var(--label-bg-color);
- float: right;
- padding: 5px 13.5px 5px 13.5px;
- color: black;
- font-size: rem(14);
- }
-
- .button-calendar-type ion-button{
- height: rem(25);
- }
- .content-details{
- font-size: rem(17);
- .date{
- color: #797979;
- }
- }
-}
-.middle-conten{
- .middle-content p{
- font-size: rem(16);
- }
-}
-.bottom-content{
- //width: 360px;
- margin: 0 auto;
-
- .bottom-content h3{
- font-size: rem(16);
- margin: 0 0 0 10px;
- }
- .attach-document{
- font-size: rem(15);
- color: var(--title-text-color);
- margin: 5px 5px 5px 10px;
- padding: 5px;
- float: left;
- }
- .attach-icon{
- width: 37px;
- font-size: rem(35);
- float: left;
- }
- .attach-title-item{
- font-size: rem(18);
- width: 100%;
- color:#0d89d1;
- padding-bottom: 5px;
- }
- /* SPAN */
- .span-left{
- float: left;
- font-size: rem(15);
- }
- .span-right{
- text-align: right;
- float: right;
- font-size: rem(13);
- }
-}
.aside-right{
padding: 30px 20px 0 20px !important;
@@ -244,19 +91,3 @@ ion-button{
width: 25%;
}
}
-
-
-.option-desc {
- display: flex;
- color: #828282;
- width: 100%;
- justify-content: space-between;
- align-items: center;
- font-size: rem(15);
- .option-desc-line {
- height: 1px;
- flex-grow: 1;
- background-color: #e0e0e0;
- padding-left: 4px;
- }
-}
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 ab76355a3..ea35e81ee 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
@@ -22,6 +22,8 @@ import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
+import { DocumentViewerOptionService } from "src/app/services/document-viewer-option.service";
+import { DeviceService } from "src/app/services/device.service"
@Component({
selector: 'app-despacho-pr',
@@ -44,6 +46,9 @@ export class DespachoPrPage implements OnInit {
cc: any = [];
mergedArray: any = [];
+ dropButton = false
+ selectedIndex = 0
+
constructor(
private activateRoute: ActivatedRoute,
private processes: ProcessesService,
@@ -58,7 +63,9 @@ export class DespachoPrPage implements OnInit {
private RouteService: RouteService,
public p: PermissionService,
private httpErroHandle: HttpErrorHandle,
- public TaskService: TaskService
+ public TaskService: TaskService,
+ public DeviceService: DeviceService,
+ private DocumentViewerOptionService: DocumentViewerOptionService,
) {
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
@@ -93,6 +100,21 @@ export class DespachoPrPage implements OnInit {
}
+ clickDocumentUPdateIndex(docId: string, Document, content) {
+ this.DocumentViewerOptionService.setData({
+ file: {
+ title: Document.Assunto,
+ url: '',
+ title_link: '',
+ },
+ Document,
+ applicationId: Document.ApplicationId,
+ docId: Document.DocId || Document.SourceId,
+ task: this.fulltask
+ });
+ this.DocumentViewerOptionService.openOptions();
+ }
+
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe((res: fullTask) => {
this.TaskService.loadDiplomas();
@@ -182,43 +204,40 @@ export class DespachoPrPage implements OnInit {
}
- async viewDocument(docId: string, Document, content) {
+ async viewDocument({Document, content}) {
if (Document.content == "") {
- const modal = await this.modalController.create({
- component: ViewDocumentPage,
- componentProps: {
- trustedUrl: '',
- file: {
- title: Document.Assunto,
- url: '',
- title_link: '',
- },
- Document,
- applicationId: Document.ApplicationId,
- docId: Document.DocId || Document.SourceId,
- folderId: this.task.FolderId,
- task: this.fulltask
+ const modal = await this.modalController.create({
+ component: ViewDocumentPage,
+ componentProps: {
+ trustedUrl: '',
+ file: {
+ title: Document.Assunto,
+ url: '',
+ title_link: '',
},
- cssClass: 'modal modal-desktop'
- });
- await modal.present();
- } else {
- const modal = await this.modalController.create({
- component: TinyMCEPage,
- componentProps: {
- Document,
- content
- },
- cssClass: 'modal modal-desktop'
- });
- await modal.present();
- }
-
-
-
+ Document,
+ applicationId: Document.ApplicationId,
+ docId: Document.DocId || Document.SourceId,
+ folderId: this.task.FolderId,
+ task: this.fulltask
+ },
+ cssClass: 'modal modal-desktop'
+ });
+ await modal.present();
+ } else {
+ const modal = await this.modalController.create({
+ component: TinyMCEPage,
+ componentProps: {
+ Document,
+ content
+ },
+ cssClass: 'modal modal-desktop'
+ });
+ await modal.present();
}
+ }
openMenu() {
this.menu.open();
this.modalController.dismiss();
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
index c9f45c8cf..d4c3bf611 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
@@ -11,7 +11,6 @@ import { SharedModule } from 'src/app/shared/shared.module';
import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module'
import { ViewerAttachmentPageModule } from '../../viewer-attachment/viewer-attachment.module';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { ClickAndHoldDirectiveService } from 'src/app/services/click-and-hold-directive.service';
import { DirectivesModule } from 'src/app/services/directives/directives.module';
@NgModule({
@@ -27,7 +26,7 @@ import { DirectivesModule } from 'src/app/services/directives/directives.module'
DirectivesModule
],
declarations: [
- DespachoPage, ClickAndHoldDirectiveService
+ DespachoPage
]
})
export class DespachoPageModule {}
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 791a6ae5b..80c458e0e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -1,208 +1,102 @@
-
-
-
-
-
-
-
-
-
-
- {{ task.Folio }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
-
-
-
-
-
-
-
- Intervenientes
-
-
- {{task.Name}}
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ fulltask.workflowInstanceDataFields.TaskMessage }}
-
-
-
-
-
-
-
-
-
-
- Documentos Anexados
-
-
-
-
-
-
-
- {{ Document.Assunto || "Sem assunto" }} Rascunho
-{{ Document.Sender}}{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
-
-
-
-
-
- Intervenientes
-
-
- {{interveniente.Name}}
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ fulltask.workflowInstanceDataFields.TaskMessage }}
-
-
-
-
-
-
-
-
+ Documentos Anexados
-{{ attachment.Assunto }}
{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
-
+
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 af7b7ee99..60b684cfa 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -1,8 +1,8 @@
-
+
-
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
index 5f45d135e..22b31a138 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
@@ -9,16 +9,17 @@ import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.m
import { ExpedienteDetailPage } from './expediente-detail.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+import { TaskDetailsPageModule } from "../../../../shared/gabinete-digital/generic/task-details/task-details.module";
@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- IonicModule,
-
- ExpedienteDetailPageRoutingModule,
- BtnModalDismissPageModule,
- ],
- declarations: [ExpedienteDetailPage]
+ declarations: [ExpedienteDetailPage],
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ ExpedienteDetailPageRoutingModule,
+ BtnModalDismissPageModule,
+ TaskDetailsPageModule
+ ]
})
export class ExpedienteDetailPageModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index a28735b37..818dbf609 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -1,93 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.WorkflowName }}
-
-
+
-
-
-
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-Detalhes
-{{ task.Note }}
-
-
-
-
-
-
-
-
-
- Documentos Anexados
-{{ Document.Assunto || "Sem assunto" }}
{{ Document.Sender}}{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}
-
-
-
-
- Eventos Associados
-
-
-
-
-
-
-
-
-
-
- {{event.StartDate | date: 'HH:mm'}}
- {{event.EndDate | date: 'HH:mm'}}
-
-
- {{event.Location}}
- {{event.Subject}}
-
+
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index 7834c4878..e9927f52f 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -5,7 +5,7 @@
border-top-right-radius: 25px;
}
.content{
- padding: 30px 20px 0 20px !important;
+ padding: 0px 0px 0 0px !important;
margin: 0;
float: left;
}
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 09d367c4d..ba840baf1 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
@@ -111,113 +111,6 @@ export class ExpedienteDetailPage implements OnInit {
this.toastService.presentToast('Não foi possível fazer login');
}
- // updateProcessDB(res) {
- // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- // this.storage.set('expediente_details',res).then(() =>{
-
- // })
- // } else {
- // //this.sqliteservice.updateProcess(res)
- // }
- // }
-
- // getFromDB() {
- // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- // this.storage.get('expediente_details').then((process) => {
- // this.task = {
- // "SerialNumber": process.serialNumber,
- // "Folio": process.workflowInstanceDataFields.Subject,
- // "Senders": process.originator || process.originator,
- // "CreateDate": momentG(new Date(process.taskStartDate), 'yyyy-MM-dd HH:mm:ss'),
- // "DocumentURL": process.workflowInstanceDataFields.ViewerRequest,
- // "Remetente": process.workflowInstanceDataFields.Sender,
- // "Note": process.workflowInstanceDataFields.TaskMessage || process.workflowInstanceDataFields.Note,
- // "FolderId": process.workflowInstanceDataFields.FolderID,
- // "FsId": process.workflowInstanceDataFields.FsId,
- // "DocId": process.workflowInstanceDataFields.DocID,
- // "WorkflowName": process.workflowDisplayName,
- // "Status": process.workflowInstanceDataFields.Status,
- // "DispatchNumber": process.workflowInstanceDataFields.DispatchNumber,
- // "AttachmentsProcessLastInstanceID": process.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
- // "InstanceID": process.workflowInstanceDataFields.InstanceID
- // }
-
- // this.fulltask = {
- // Documents: process.Documents,
- // actions: process.actions,
- // activityInstanceName: process.activityInstanceName,
- // formURL: process.formURL,
- // interveners: process.interveners,
- // originator: process.originator,
- // serialNumber: process.serialNumber,
- // taskStartDate: process.taskStartDate,
- // TaskStartDate: process.taskStartDate,
- // totalDocuments: process.totalDocuments,
- // workflowDisplayName: process.workflowDisplayName,
- // workflowID: process.workflowID,
- // workflowInstanceDataFields: process.workflowInstanceDataFields,
- // workflowInstanceFolio: process.workflowInstanceFolio,
- // workflowInstanceID: process.workflowInstanceID,
- // workflowName: process.workflowName,
- // }
- // })
- // } else {
- // this.platform.ready().then(() => {
- // this.onlinecheck = false;
- // this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
-
-
- // var workflow = JSON.parse(process[0].workflowInstanceDataFields);
- // var origina
- // if (process[0].originator === "undefined") {
- // origina = ""
- // } else {
- // origina = JSON.parse(process[0].originator)
- // }
-
- // this.task = {
- // "SerialNumber": process[0].serialNumber,
- // "Folio": workflow.Subject,
- // "Senders": origina.email || process[0].originator,
- // "CreateDate": momentG(new Date(process[0].taskStartDate), 'yyyy-MM-dd HH:mm:ss'),
- // "DocumentURL": workflow.ViewerRequest,
- // "Remetente": workflow.Sender,
- // "Note": workflow.TaskMessage || workflow.Note,
- // "FolderId": workflow.FolderID,
- // "FsId": workflow.FsId,
- // "DocId": workflow.DocID,
- // "WorkflowName": process[0].workflowDisplayName,
- // "Status": workflow.Status,
- // "DispatchNumber": workflow.DispatchNumber,
- // "AttachmentsProcessLastInstanceID": workflow.AttachmentsProcessLastInstanceID,
- // "InstanceID": workflow.InstanceID
- // }
-
- // this.fulltask = {
- // Documents: JSON.parse(process[0].Documents),
- // actions: JSON.parse(process[0].actions),
- // activityInstanceName: process[0].activityInstanceName,
- // formURL: process[0].formURL,
- // interveners: process[0].interveners,
- // originator: JSON.parse(process[0].originator),
- // serialNumber: process[0].serialNumber,
- // taskStartDate: process[0].taskStartDate,
- // totalDocuments: process[0].totalDocuments,
- // workflowDisplayName: process[0].workflowDisplayName,
- // workflowID: process[0].workflowID,
- // workflowInstanceDataFields: JSON.parse(process[0].workflowInstanceDataFields),
- // workflowInstanceFolio: process[0].workflowInstanceFolio,
- // workflowInstanceID: process[0].workflowInstanceID,
- // workflowName: process[0].workflowName,
- // }
-
- // })
- // })
- // }
-
- // }
-
-
async approve(note: string, documents: any) {
let body = {
"serialNumber": this.serialNumber,
@@ -371,7 +264,8 @@ export class ExpedienteDetailPage implements OnInit {
"DispatchNumber": res.workflowInstanceDataFields.DispatchNumber,
"AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
"InstanceID": res.workflowInstanceDataFields.InstanceID,
- "DraftIds": res.workflowInstanceDataFields?.DraftIds
+ "DraftIds": res.workflowInstanceDataFields?.DraftIds,
+ "activityInstanceName": res.activityInstanceName,
}
this.fulltask = res;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
index fb3609674..bcd6d999a 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
@@ -8,16 +8,17 @@ import { ExpedientePrPageRoutingModule } from './expediente-pr-routing.module';
import { ExpedientePrPage } from './expediente-pr.page';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+import { TaskDetailsPageModule } from "../../../../shared/gabinete-digital/generic/task-details/task-details.module";
@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- IonicModule,
-
- ExpedientePrPageRoutingModule,
- BtnModalDismissPageModule,
- ],
- declarations: [ExpedientePrPage]
+ declarations: [ExpedientePrPage],
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ ExpedientePrPageRoutingModule,
+ BtnModalDismissPageModule,
+ TaskDetailsPageModule
+ ]
})
export class ExpedientePrPageModule {}
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 2a6638d0e..237ba8829 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
@@ -1,116 +1,19 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 24006f8a5..bf0712704 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -5,7 +5,7 @@
border-top-right-radius: 25px;
}
.content{
- padding: 30px 20px 0 20px !important;
+ padding: 0px 0px 0 0px !important;
margin: 0;
float: left;
}
diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
index 4133b58c5..fd89a6c21 100644
--- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
+++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
+
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
+
-
-
-
-
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ fulltask.workflowInstanceDataFields.TaskMessage }}
-
-
-
-
-
-
-
-
-
- Documentos Anexados
-{{ Document.Assunto || "Sem assunto" }}
{{ Document.Sender}}{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}
-
-
-
-
-
- Eventos Associados
-
-
-
-
-
-
-
-
-
-
-
- {{event.StartDate | date: 'HH:mm'}}
-{{event.EndDate | date: 'HH:mm'}}
-
-
- {{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}
-{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}
-{{event.Subject}}
-
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
index 55a64897a..1a37a69d9 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
@@ -8,16 +8,17 @@ import { PedidoPageRoutingModule } from './pedido-routing.module';
import { PedidoPage } from './pedido.page';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+import { TaskDetailsPageModule } from "../../../../shared/gabinete-digital/generic/task-details/task-details.module";
@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- IonicModule,
-
- PedidoPageRoutingModule,
- BtnModalDismissPageModule,
- ],
- declarations: [PedidoPage]
+ declarations: [PedidoPage],
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ PedidoPageRoutingModule,
+ BtnModalDismissPageModule,
+ TaskDetailsPageModule
+ ]
})
export class PedidoPageModule {}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index cddd2fd0b..e6a7b932f 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -1,84 +1,18 @@
-
@@ -173,4 +107,4 @@
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
-
+
-
-
-
-
-
- Intervenientes
-
-
- {{interveniente.Name}}
-
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ task.Note }}
-
-
-
-
-
-
-
-
- Documentos Anexados
-{{ attachment.Assunto }}
{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
-
+
-
+