peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-09-29 15:21:50 +01:00
parent 70960471bb
commit ca30020313
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+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
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+4 -6
View File
@@ -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();
}); });
} }
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+5 -6
View File
@@ -330,7 +330,7 @@ export class EditEventToApproveComponent implements OnInit {
} }
} }
setIntervenient(data = []){ setIntervenient(data = []) {
this.taskParticipants = data; this.taskParticipants = data;
} }
@@ -338,19 +338,18 @@ export class EditEventToApproveComponent implements OnInit {
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;
} }
@@ -366,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) {