This commit is contained in:
tiago.kayaya
2021-09-30 08:44:12 +01:00
6 changed files with 23 additions and 19 deletions
+3
View File
@@ -47,3 +47,6 @@ _platforms
src/app/store/notification.service.spec.ts src/app/store/notification.service.spec.ts
src/app/store/notification.service.ts src/app/store/notification.service.ts
src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf
@@ -15,7 +15,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { DespachoService } from 'src/app/Rules/despacho.service' import { DespachoService } from 'src/app/Rules/despacho.service'
import { Location } from '@angular/common' import { Location } from '@angular/common'
import { fullTask } from 'src/app/models/dailyworktask.model'; 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'; import { PermissionService } from 'src/app/OtherService/permission.service';
@Component({ @Component({
@@ -51,10 +51,8 @@ export class DespachoPage implements OnInit {
private toastService: ToastService, private toastService: ToastService,
private despachoService: DespachoService, private despachoService: DespachoService,
private location: Location, private location: Location,
public p: PermissionService, public p: PermissionService) {
) {
this.activatedRoute.paramMap.subscribe(params => { this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) { if(params["params"].SerialNumber) {
this.serialnumber = 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=>{ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); 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(); browser.show();
}); });
} }
@@ -95,6 +95,7 @@ export class PublicationDetailPage implements OnInit {
if(this.isModal) { if(this.isModal) {
this.close() this.close()
} else { } else {
// alert('go back')
this.location.back(); this.location.back();
} }
@@ -107,6 +108,11 @@ export class PublicationDetailPage implements OnInit {
try { try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.toastService.successMessage('Publicação eliminada') this.toastService.successMessage('Publicação eliminada')
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
this.goBack(); this.goBack();
} catch (error) { } catch (error) {
this.toastService.badRequest('Publicaçao não eliminada') this.toastService.badRequest('Publicaçao não eliminada')
+1 -2
View File
@@ -4,7 +4,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { AuthService } from '../services/auth.service'; 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 { EventList } from '../models/agenda/AgendaEventList';
import { ChangeProfileService } from './change-profile.service'; import { ChangeProfileService } from './change-profile.service';
@@ -26,7 +26,6 @@ export class EventsService {
headersSharedOficial: HttpHeaders; headersSharedOficial: HttpHeaders;
headersSharedPessoal: HttpHeaders; headersSharedPessoal: HttpHeaders;
//lastloadedevent: Event;
constructor( constructor(
private http: HttpClient, private http: HttpClient,
@@ -8,7 +8,7 @@
<ion-header> <ion-header>
<div class="title-content"> <div class="title-content">
<div class="middle"> <div class="middle">
<ion-label class="title">Editar evento por aprovar</ion-label> <ion-label class="title">Editar evento por aprovar::.</ion-label>
</div> </div>
</div> </div>
</ion-header> </ion-header>
@@ -330,28 +330,26 @@ export class EditEventToApproveComponent implements OnInit {
} }
} }
setIntervenient(data){ setIntervenient(data = []) {
this.taskParticipants = data; this.taskParticipants = data;
this.postEvent.Attendees = data;
} }
setIntervenientCC(data) { setIntervenientCC(data = []) {
this.taskParticipantsCc = data; this.taskParticipantsCc = data;
} }
addParticipants(){ addParticipants() {
this.adding = 'intervenient' this.adding = 'intervenient'
this.openAttendees(); this.openAttendees();
} }
addParticipantsCC(){ addParticipantsCC() {
this.adding = 'CC' this.adding = 'CC'
this.openAttendees(); this.openAttendees();
} }
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = taskParticipants; this.taskParticipants = taskParticipants;
this.taskParticipantsCc = taskParticipantsCc; this.taskParticipantsCc = taskParticipantsCc;
} }
@@ -367,7 +365,7 @@ export class EditEventToApproveComponent implements OnInit {
this.loadedAttachments = result this.loadedAttachments = result
console.log('this.loadedAttachments', this.loadedAttachments, result) // console.log('this.loadedAttachments', this.loadedAttachments, result)
} }
deleteAttachment(attachment: Attachment, index) { deleteAttachment(attachment: Attachment, index) {