Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
sriram-at-840620226347 2020-06-30 18:24:46 +05:30
commit 8f0ec626e4
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
View File

@ -707,7 +707,20 @@ export class BusinessInfoComponent implements OnInit {
result.records[val.document_name] = 'yes'
}
})
if(result.records.hasOwnProperty('other_documents') && result.records.other_documents == 'yes' && result.records.other_documents_info.length > 0) {
const otherDoc = <FormArray>this.businessForm.controls['documents'];
for(let i=1; i<= result.records.other_documents_info.length;i++) {
// result.records.other_documents_info.forEach(val=>{
let val = result.records.other_documents_info[i]
if(val) {
otherDoc.push(this.createDocument());
}
// })
}
}
delete result.records.documents_info
result.records.documents = result.records.other_documents_info
delete result.records.other_documents_info
this.businessForm.patchValue(result.records);
console.log(this.businessForm.value,result.records)
}

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
View File

@ -129,7 +129,7 @@
<!-- ENABLING THE FAB COPY LINK IMAGE CAPTURE AND VIDEO CALL BUTTON FOR TELE PD -->
<div fxLayout="column">
<app-speed-dial-fab fxFlex="30" class="fab-group" *ngIf="master.fk_pd_type == '3'" [options]="FabOptions" (fabClick)="copyCusURL($event)"></app-speed-dial-fab>
<app-speed-dial-fab fxFlex="30" class="fab-group" *ngIf="master.fk_pd_type == '3' || master.fk_pd_type == '2'" [options]="FabOptions" (fabClick)="copyCusURL($event)"></app-speed-dial-fab>
</div>
<!-- END OF COPY LINK IMAGE CAPTURE AND VIDEO CALL BUTTON FOR TELE PD -->
@ -145,19 +145,19 @@
<!-- <app-speed-dial-fab class="fab-group" *ngIf="master.fk_pd_type == '3'" [options]="FabOptions" (fabClick)="copyCusURL($event)"></app-speed-dial-fab> -->
<!-- ENABLING THE SINGLE COPY LINK VIDEO CALL BUTTON FOR SMART PD -->
<span> <button *ngIf="master.fk_pd_type == '2'"
<!-- <span> <button *ngIf="master.fk_pd_type == '2'"
mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="copyCusURL({
placeholder:'Video Chat',
btnValue:'video'
})"
matTooltip="Copy Video Chat Customer Link" matTooltipPosition="above">
<mat-icon>link</mat-icon>
</button></span>
</button></span> -->
<!-- END OF COPY LINK VIDEO CALL BUTTON FOR SMART PD -->
<span> <button *ngIf="master.fk_pd_type == '3' || master.fk_pd_type == '2'"
mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="onClickSmsLink(master)"
matTooltip="Send Link Via SMS" matTooltipPosition="above" [disabled] = "master.fk_pd_type == '2'">
matTooltip="Send Link Via SMS" matTooltipPosition="above" >
<mat-icon>sms</mat-icon>
</button>&nbsp;&nbsp;</span>
<!-- <div class="fab-group" *ngIf="master.fk_pd_type == '3'"> -->

12
ng6-seed/src/app/video-chat/video-chat.component.ts
View File

@ -424,7 +424,7 @@ this.stopRecording(true);
const fileURL1 = window.URL.createObjectURL(mergedVideos);
// localStorage.setItem('blob_url',fileURL1)
console.log("File url 11111",fileURL1)
window.open(fileURL1)
// window.open(fileURL1)
}
// let formData= new FormData();
@ -471,6 +471,9 @@ sendVideoToServer(blob) {
disconnect() {
console.log(this.peer)
if(this.peer) {
this.stopRecording().then(res=>{
})
this.peer.destroy();
this.peerVideoEnable = false
this.targetpeer = ''
@ -478,9 +481,7 @@ sendVideoToServer(blob) {
// this.cdRef.detectChanges();
this.socket.emit('callStatus',{random_string:this.chat_info.random_string,status:'disconnected',status_code:0})
this.peervideo.nativeElement.pause();
this.stopRecording().then(res=>{
})
// this.stopAndGetSingleBlob(function(blob) {
// var url = URL.createObjectURL(blob);
// // previewVideo.src = url;
@ -556,9 +557,12 @@ sendVideoToServer(blob) {
this.MediaStream.getVideoTracks()[0].enabled = this.video_mute;
}
clearRandomString() {
if(this.peer) {
console.log("if part");
this.disconnect() }
else{
console.log("else part");
this.socket.emit('callStatus',{random_string:this.chat_info.random_string,status:'disconnected',status_code:0})
}
}