diff --git a/.gitignore b/.gitignore index 52265823b..c3cc397fa 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,7 @@ _platforms src/app/store/notification.service.spec.ts -src/app/store/notification.service.ts \ No newline at end of file +src/app/store/notification.service.ts + + +src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf \ No newline at end of file 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 262b21dc0..c04aabb5c 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -15,7 +15,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { DespachoService } from 'src/app/Rules/despacho.service' import { Location } from '@angular/common' import { fullTask } from 'src/app/models/dailyworktask.model'; -import { Attachment, AttachmentList } from 'src/app/models/Excludetask'; +import { AttachmentList } from 'src/app/models/Excludetask'; import { PermissionService } from 'src/app/OtherService/permission.service'; @Component({ @@ -51,10 +51,8 @@ export class DespachoPage implements OnInit { private toastService: ToastService, private despachoService: DespachoService, private location: Location, - public p: PermissionService, - - - ) { + public p: PermissionService) { + this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; @@ -160,10 +158,10 @@ export class DespachoPage implements OnInit { }); } - viewDocument(docId:string){ + viewDocument(docId:string) { this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); + const browser = this.iab.create('https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=https://equilibrium.dyndns.info/FileShare/merged_fastview.pdf', "_blank", 'location=yes,x=0,y=200,width=437,height=650,fullscreen=no'); browser.show(); }); } diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index aae0b7732..02485a606 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -95,6 +95,7 @@ export class PublicationDetailPage implements OnInit { if(this.isModal) { this.close() } else { + // alert('go back') this.location.back(); } @@ -107,6 +108,11 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); this.toastService.successMessage('Publicação eliminada') + + if(window['app-view-publications-page-doRefresh']) { + window['app-view-publications-page-doRefresh']() + } + this.goBack(); } catch (error) { this.toastService.badRequest('Publicaçao não eliminada') diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 0794423b6..da3343530 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -4,7 +4,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; -import { LoginUserRespose, UserSession } from '../models/user.model'; +import { UserSession } from '../models/user.model'; import { EventList } from '../models/agenda/AgendaEventList'; import { ChangeProfileService } from './change-profile.service'; @@ -26,7 +26,6 @@ export class EventsService { headersSharedOficial: HttpHeaders; headersSharedPessoal: HttpHeaders; - //lastloadedevent: Event; constructor( private http: HttpClient, diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 22d37ee80..a09ca1d31 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -8,7 +8,7 @@
- Editar evento por aprovar + Editar evento por aprovar::.
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 169268a04..78837cf93 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -330,28 +330,26 @@ export class EditEventToApproveComponent implements OnInit { } } - setIntervenient(data){ + setIntervenient(data = []) { this.taskParticipants = data; - this.postEvent.Attendees = data; } - setIntervenientCC(data) { + setIntervenientCC(data = []) { this.taskParticipantsCc = data; } - addParticipants(){ + addParticipants() { this.adding = 'intervenient' this.openAttendees(); - } - addParticipantsCC(){ + addParticipantsCC() { this.adding = 'CC' this.openAttendees(); } - dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) { this.taskParticipants = taskParticipants; this.taskParticipantsCc = taskParticipantsCc; } @@ -367,7 +365,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments = result - console.log('this.loadedAttachments', this.loadedAttachments, result) + // console.log('this.loadedAttachments', this.loadedAttachments, result) } deleteAttachment(attachment: Attachment, index) {