diff --git a/config.xml b/config.xml index db621118f..b3e4a2084 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index b91870e62..d088bb30b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -1,220 +1,227 @@ - -
- + +
+
-
-
+
+ +
- ***Editar Evento + Editar Evento com divisão
+
- -
-
- -
-
-
-
- -
-
- -
-
- - + -
- -
-
-
- +
+
+
+
-
- - Oficial - Pessoal - -
-
-
- -
-
-
- -
-
- - Reunião - Viagem - Conferência - Encontro - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - -
-
-
- -
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - +
+
+
+
-
- +
+
-
-
-
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- -
-
-
-
- + + -
- -
-
-
-
-
- + +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+ +
+
+
+ +
+
+ + Reunião + Viagem + Conferência + Encontro + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+
-
- - - + +
-
+
Intervenientes
@@ -58,18 +59,20 @@
+
Detalhes
-

+
+
-
+
-

Documentos Anexados

+
Documentos Anexados
+ (click)="viewDocument(attach.SourceId)">

{{attach.SourceName}}

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

 diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index c74dbf83b..78ef0dad7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -151,6 +151,10 @@ ion-menu{ font-size: 16px; } } + .line{ + margin-top: 15px; + border-top: 1px solid #d8d8d8; + } .middle-conten{ .middle-content h3, .middle-content p{ font-size: 16px; @@ -158,7 +162,6 @@ ion-menu{ } .bottom-content{ - width: 360px; margin: 0 auto; .bottom-content h3{ @@ -230,4 +233,8 @@ ion-menu{ margin: 0 auto !important; margin-bottom: 10px !important; } + } + textarea{ + border:none; + --background:#fff !important; } \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 42ef96f47..20af874a9 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -8,7 +8,7 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { EventEditPage } from '../../events/edit-event/edit-event.component'; +import { ProcessesService } from 'src/app/services/processes.service'; @Component({ selector: 'app-view-event', @@ -43,6 +43,7 @@ export class ViewEventPage implements OnInit { private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, + private processes: ProcessesService, ) { this.profile = this.navParams.get('profile'); @@ -116,7 +117,7 @@ export class ViewEventPage implements OnInit { } const modal = await this.modalController.create({ - component: EventEditPage, + component: EditEventPage, componentProps: { eventId: this.loadedEvent.EventId, profile: this.profile, @@ -157,10 +158,14 @@ export class ViewEventPage implements OnInit { }); } - viewDocument(){ - const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + viewDocument(sourceId){ + this.processes.GetDocumentUrl(sourceId, '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(); + + }); } } diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.html b/src/app/pages/events/edit-event/app-edit-event-home.page.html index 95d9fe4c5..860adfe23 100644 --- a/src/app/pages/events/edit-event/app-edit-event-home.page.html +++ b/src/app/pages/events/edit-event/app-edit-event-home.page.html @@ -3,7 +3,7 @@ - Visualizar Evento + 21Visualizar Evento
+
Intervenientes
@@ -92,7 +93,7 @@

- Aprovar + Aprovar1

- -
+ +
@@ -79,6 +79,7 @@
+
Intervenientes
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 61dd1cfc3..692d35783 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -163,7 +163,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.closeAllDesktopComponent(); let classs; - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ classs = 'modal' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 039073d1e..5baf710a6 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -97,6 +97,7 @@ *ngIf="desktopComponent.showPublicationDetail" class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1" [publicationId]="publicationId" + [folderId]="folderId" (addNewPublication)="addNewPublication($event)" (closeDesktopComponent)="closeDesktopComponent($event)" (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index e0be9c7e9..2f4b88c16 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -192,7 +192,7 @@ export class EventsService { return this.http.delete(`${puturl}`, options) } postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any){ - const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente'); + const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event'; 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 bfe3ff7ba..47f43beaa 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -21,7 +21,7 @@ - Aprovar + Aprovar3 @@ -65,6 +65,7 @@
+
Intervenientes
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 d581aead1..b67787367 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -71,8 +71,12 @@ export class ApproveEventComponent implements OnInit { }) } approveTask(serialNumber:string){ - - this.approveEventDismiss.emit({ + let body = { "serialNumber": serialNumber, "action": "Aprovar" } + console.log(body); + this.processes.PostTaskAction(body); + this.alertService.presentAlert('Operação realizada com sucesso!'); + this.modalController.dismiss(serialNumber); + /* this.approveEventDismiss.emit({ "serialNumber": serialNumber, "action": "Aprovar", "saveData": { @@ -80,7 +84,7 @@ export class ApproveEventComponent implements OnInit { today: this.today, customDate: this.customDate } - }); + }); */ } emendTask(serialNumber:string){ diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html index 8507950bc..5475e1375 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -3,7 +3,7 @@
- Editar Evento + 2Editar Evento
@@ -177,10 +177,8 @@
-
- - - +
+
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.component.scss index fcb66c717..dc20d1e33 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.scss +++ b/src/app/shared/agenda/edit-event/edit-event.component.scss @@ -57,7 +57,6 @@ ion-content{ margin-bottom: 15px; } .ion-item-class-2{ - margin: 0px auto; } .ion-icon-class{ @@ -81,8 +80,11 @@ ion-content{ float: left; } .ion-input-class-no-height{ + height: auto !important; border: 1px solid #ebebeb; border-radius: 5px; + margin-bottom: 15px; + overflow: auto; } .list-people{ @@ -165,11 +167,4 @@ ion-content{ color:red; } - } - - -.container-div{ - ion-textarea{ - height: 81px; - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 7cf1473f5..0da22289c 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -36,10 +36,15 @@ export class EditEventComponent implements OnInit { private eventsService: EventsService, public alertController: AlertController, ) { + } ngOnInit() { + let innerHtml :string = this.postEvent.Body.Text; + this.postEvent.Body.Text = innerHtml; + console.log(this.postEvent); + this.isEventEdited = false; if(this.postEvent.IsRecurring == false){ @@ -49,13 +54,13 @@ export class EditEventComponent implements OnInit { this.isRecurring = "Repete"; } } + close(){ console.log('!!!!!!!!!!!!!!!!! close') this.closeComponent.emit(); this.clearContact.emit(); } save(){ - this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index 4eba898ba..8101f01fb 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -49,7 +49,7 @@ + (click)="openApproveModal(event.serialNumber, event)">

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 2c5e63791..e4349e261 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -32,6 +32,7 @@
+
Intervenientes
@@ -44,22 +45,24 @@
Detalhes
- -

+ +
+
+
Documentos Anexados
-

Documentos Anexados

- + + (click)="viewDocument(attach.SourceId)">

{{attach.SourceName}}

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
+
\ No newline at end of file diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index fc6473ef4..316f0026a 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -123,6 +123,10 @@ ion-menu{ font-size: 16px; } } + .line{ + margin-top: 15px; + border-top: 1px solid #d8d8d8; + } .middle-conten{ .middle-content h3, .middle-content p{ font-size: 16px; diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index c742ad4c1..42e1439ca 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -7,6 +7,7 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { ProcessesService } from 'src/app/services/processes.service'; @Component({ selector: 'app-view-event', @@ -42,24 +43,26 @@ export class ViewEventPage implements OnInit { private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, + private processes: ProcessesService, ) { this.isEventEdited = false; this.loadedEvent = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.loadedEvent.Body = this.eventBody; + } ngOnInit() { + /* console.log(this.eventId); */ this.loadEvent(); - this.getAttachments(); - + //this.getAttachments(); } ngOnChanges(changes: any): void { + this.loadedAttachments = null; this.loadEvent(); - this.getAttachments(); } close(){ @@ -73,12 +76,11 @@ export class ViewEventPage implements OnInit { loadEvent(){ this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; - console.log(res); - this.today = new Date(res.StartDate); console.log(new Date(this.today)); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); + this.getAttachments(this.loadedEvent.EventId); }); } deleteEvent(){ @@ -95,8 +97,8 @@ export class ViewEventPage implements OnInit { }); } - getAttachments(){ - this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{ + getAttachments(eventId){ + this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ this.loadedAttachments = res; console.log(res); }); @@ -109,10 +111,15 @@ export class ViewEventPage implements OnInit { event: this.loadedEvent }) } - viewDocument(){ - const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + + viewDocument(sourceId){ + this.processes.GetDocumentUrl(sourceId, '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(); + + }); } } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 93c3b1d1c..89dfbc49c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -67,7 +67,7 @@ S } async openApproveModal(eventSerialNumber){ let classs; - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' @@ -81,7 +81,11 @@ S cssClass: classs, }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then((res) => { + console.log(res['data']); + + this.LoadToApproveEvents(); + }); } doRefresh(event) { diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 810ff4866..b9ae10405 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -29,9 +29,9 @@
-
Fotografia Anexada
+
Fotografia Anexada
-
+
image
@@ -45,7 +45,7 @@
-
+
Fotografia Anexada @@ -66,7 +66,7 @@ -->
-
+
@@ -77,7 +77,7 @@
-
+
diff --git a/src/app/shared/publication/new-publication/new-publication.page.scss b/src/app/shared/publication/new-publication/new-publication.page.scss index d4f8b2a55..79762d048 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.scss +++ b/src/app/shared/publication/new-publication/new-publication.page.scss @@ -152,4 +152,8 @@ font-size: 25px; .container-title{ font-size: 15px; font-weight: bold; -} \ No newline at end of file +} +.hide-desktop{ + display: block; +} + diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 0b836a3c4..0e9f1f426 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -12,10 +12,11 @@ import { PublicationsService } from 'src/app/services/publications.service'; }) export class PublicationDetailPage implements OnInit { showLoader: boolean; - folderId: string; + /* folderId: string; */ publication: Publication; @Input() publicationId: string; + @Input() folderId: string; @Output() addNewPublication = new EventEmitter(); @Output() closeDesktopComponent = new EventEmitter(); @Output() goBackToViewPublications = new EventEmitter(); @@ -41,6 +42,8 @@ export class PublicationDetailPage implements OnInit { } ngOnInit() { + console.log(this.folderId); + /* console.log(this.publication.FileBase64); */ this.getPublicationDetail(); } diff --git a/src/global.scss b/src/global.scss index 8a7b43e87..58b54ef86 100644 --- a/src/global.scss +++ b/src/global.scss @@ -97,7 +97,10 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- width: 100% !important; margin-left: 0px !important; } - +.line{ + margin-top: 15px; +border-top: 1px solid #d8d8d8; +} @@ -290,6 +293,16 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- height: 100%; } } + +@media screen and (min-width: 1200px) { + .hide-desktop{ + display: none !important; + } + .container-div{ + border-bottom:none !important; + } +} + .hideAsideOptions{ @media only screen and (max-width: 800px) { .div-icon{