diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index bdc264272..14220cdfb 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -219,6 +219,15 @@ const routes: Routes = [ ] }, + { + path: 'document-detail', + children: [ + { + path:'', + loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule) + } + ] + }, ] }, { diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 91323eed8..57c6aed55 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -1,10 +1,151 @@ - - - - document-detail - - + + + + Menu + + + + + + + Efectuar Despacho + + + + Pedido de Parecer + + + + Pedido de Deferimento + + + + Marcar reunião + + + + Descartar + + + + Enviar para pendentes + + + + +
+ +
+
+
+
+
+ +
+ {{LoadedDocument.Subject}} +
+
+ + + +
+
+
+
+
+ +

{{customDate}}{{LoadedDocument.Type}}

+ +
+
+
+
+
Intervenientes
+ + +
+

{{LoadedDocument.Interveners}}

+
+ + +
Status
+ +

{{LoadedDocument.Status}}

+ +
+
+ +
Documentos Anexados
+ + +

{{LoadedDocument.Subject}}

+ + + + +
+
+
+
+ + +
+ + + + +
+ + + +
+
+ + +
+ diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss index e69de29bb..860c052db 100644 --- a/src/app/modals/document-detail/document-detail.page.scss +++ b/src/app/modals/document-detail/document-detail.page.scss @@ -0,0 +1,236 @@ +@import '~src/function.scss'; +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; +} +.color-red{ + font-weight: 500; + color:#d30a0a !important; +} +.btn-size{ + font-size: 18px !important; +} +.main-header{ + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:auto; + color:#000; + transform: translate3d(0, 1px, 0); + .header-top{ + width: 360px; + margin: 0px auto; + overflow: 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: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + padding-top: 4px; + padding-left: 5px; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + 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: 41px; + overflow: auto; + font-size: 18px; + + .label{ + border-radius: 20px; + background: #ffb703; + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } + + .button-calendar-type ion-button{ + height: 25px; + } + .content-details{ + font-size: 17px; + .date{ + color: #797979; + } + } +} +.middle-conten{ + .middle-content p{ + font-size: 16px; + } +} +.bottom-content{ + //width: 360px; + margin: 0 auto; + + .bottom-content h3{ + font-size: 16px; + margin: 0 0 0 10px; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + font-size: 18px; + width: 100%; + color:#0d89d1; + padding-bottom: 5px; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } +} +.aside-right{ + padding: 30px 20px 0 20px !important; + + .arrow-right{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } + } + .buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .btn-ok, .btn-cancel, .btn-delete{ + height: auto !important; + font-size: 16px !important; + font-weight: 600 !important; + width: 100% !important; + margin-bottom: 10px !important; + padding: 15px !important; + } + } + .solid { + display: block; + width: 90%; + border-top: 1px solid #ebebeb; + margin: 0 auto !important; + margin-bottom: 10px !important; + } +} + +@media only screen and (max-width: 800px) { + .content{ + width: 100% !important; + } + .aside-right{ + display: none; + } +} +@media only screen and (min-width: 801px) { + .div-icon{ + display: none; + } + .content{ + width: 65%; + border-right: 1px solid #d8d8d8; + } + + .aside-right{ + width: 35%; + } +} + +@media only screen and (min-width: 1024px){ + .content{ + width: 70%; + } + .aside-right{ + width: 30%; + } +} + +@media only screen and (min-width: 1140px){ + .content{ + width: 75%; + } + .aside-right{ + width: 25%; + } +} diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index db679b63b..cf43adca6 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -1,4 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import { MenuController, ModalController, NavParams } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; @Component({ selector: 'app-document-detail', @@ -7,9 +11,62 @@ import { Component, OnInit } from '@angular/core'; }) export class DocumentDetailPage implements OnInit { - constructor() { } + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + customDate:any; + + docId: string; + applicationId:string; + LoadedDocument:any = null; + + constructor( + private navParams: NavParams, + private modalController: ModalController, + private alertService: AlertService, + private processes: ProcessesService, + private menu: MenuController, + private iab: InAppBrowser, + ) { + this.docId = this.navParams.get('docId'); + this.applicationId = this.navParams.get('applicationId'); + } ngOnInit() { + console.log(this.docId); + console.log(this.applicationId); + this.LoadDocumentDetails(); + } + + async LoadDocumentDetails(){ + this.processes.GetDocumentDetails(this.docId, '').subscribe(res=>{ + console.log(res); + this.LoadedDocument = res[0]; + + let thedate = new Date(this.LoadedDocument.DateDocument); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + }); + } + + viewDocument(){ + this.processes.GetDocumentUrl(this.docId, '8').subscribe(res=>{ + console.log(res); + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + + }); + } + + openMenu() { + this.menu.open(); + this.modalController.dismiss(); + } + close(){ + this.modalController.dismiss(); + } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } } diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html index dc6432e93..12689f63c 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html @@ -55,8 +55,8 @@
-
Intervenientes
+

{{loadedEvent.workflowInstanceDataFields.Participants}}

 diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 0ed22b7f7..89bfe9f74 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -135,7 +135,7 @@ export class ApproveEventModalPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 744df111f..8980a1bc8 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -23,7 +23,9 @@
- +
{{loadedEvent.Subject}} diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 427672943..a53954fc4 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -17,8 +17,15 @@ Chat
- - + + +
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 90dfdab01..98da33591 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -19,11 +19,13 @@ ion-content{ font-size: 25px; } .div-icon{ - width: 60%; + display: flex; + width: 50%; float: right; font-size: 35px; overflow: auto; padding: 1px; + justify-content: flex-end; } .div-icon ion-icon{ float: right; diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 24581eacf..da3cc2b62 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -7,7 +7,9 @@ {{roomName}}
- +
@@ -77,7 +79,10 @@
- + +
@@ -86,7 +91,9 @@
- +
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index b2f8e9705..4ae40f586 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -3,7 +3,9 @@
- +
Nova Conversa diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 87175f7e1..33fb59b72 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -71,7 +71,9 @@
- +
@@ -80,7 +82,9 @@
- +
\ No newline at end of file diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html index 5120198ad..441bdddae 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -3,7 +3,9 @@
- +
Contactos diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 5ee6f3f4c..a6a473665 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -46,13 +46,13 @@
A sua Agenda
- - +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index d88b2a1ef..4a7d05a0f 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -148,7 +148,7 @@ export class ApproveEventModalPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index f5ee17a0b..41bdde68a 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -143,7 +143,7 @@ export class ApproveEventPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else { - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index fa0c5a096..1585f5692 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -116,7 +116,7 @@
-
+
Descartar - + @@ -56,7 +56,7 @@
-
+
@@ -74,7 +74,7 @@
-

Sexta, 14 de AbrilExpediente

+

{{customDate}}Expediente

Muitíssimo urgente
@@ -89,14 +89,16 @@
-
Com conhecimento
- - -
-

{{c.Name}}

-
- - +
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+ + +
Detalhes

@@ -152,11 +154,9 @@ - -
- - - + + +
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 cef4cd329..0faf5dfbb 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 @@ -22,6 +22,11 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart }) export class ExpedienteDetailPage implements OnInit { + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + customDate:any; + task: any; fulltask: any; eventsList: Event[]; @@ -81,6 +86,11 @@ export class ExpedienteDetailPage implements OnInit { } this.fulltask = res; console.log(res); + + let thedate = new Date(this.task.CreateDate); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + + this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{ this.intervenientes = users.filter(user=>{ return user.Type == 'I'; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 72b006c7e..dd8f6f8cf 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -10,6 +10,7 @@ import WordCloud from 'src/plugin/wordcloud2.js'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page'; import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; +import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page'; @Component({ selector: 'app-search', templateUrl: './search.page.html', @@ -25,10 +26,10 @@ export class SearchPage implements OnInit { searchDocTypeId: string; ordinance: string; - searchCategories: SearchCategory[]; - showSearchDocuments: SearchDocument[]; + searchCategories: SearchCategory[] = []; + showSearchDocuments: SearchDocument[] = []; showCategory: string; - searchDocuments: SearchDocument[]; + searchDocuments: SearchDocument[] =[]; showDocuments = false; showAdvanceSearch = false; @@ -447,6 +448,7 @@ export class SearchPage implements OnInit { } else if(window.location.pathname == '/home/gabinete-digital'){ console.log('OPEN DOC'); + this.viewDocumentDetail(id,''); } @@ -467,23 +469,21 @@ export class SearchPage implements OnInit { } - async viewExpedientDetail(serialNumber:any) { - + async viewDocumentDetail(docId:string, applicationId:string) { let classs; if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' + classs = 'modal' } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' + classs = 'modal modal-desktop showAsideOptions' } - + const modal = await this.modalController.create({ - component: ExpedienteDetailPage, + component: DocumentDetailPage, componentProps:{ - serialNumber: serialNumber, - profile: 'mdgpr', + docId: docId, + applicationId: applicationId, }, cssClass: classs, - backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((res)=>{ diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index e0a2ef32d..55c65f18c 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -197,7 +197,7 @@ export class ProcessesService { } GetDocumentDetails(DocId:string, FsId:string){ - const geturl = environment.apiURL + 'ecm/document/viewrequestshort'; + const geturl = environment.apiURL + 'search/documents'; let params = new HttpParams(); params = params.set("docId", DocId); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index efbc157ac..83a63b142 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -73,6 +73,7 @@ {{att.Name}}
+
Detalhes

diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 3c2eb46e0..e94152a2b 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -152,7 +152,7 @@ export class ApproveEventComponent implements OnInit { this.goToEventsToApprove(); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html index 563f30337..893114c7d 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html @@ -1,3 +1,5 @@
- +
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 789262d29..58a589073 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -6,7 +6,9 @@ {{room.name.split('-').join(' ')}}
- +
@@ -55,7 +57,9 @@
- +
@@ -64,7 +68,9 @@
- +
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 9ac6880fb..ca4efdb83 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -7,7 +7,9 @@
- +