diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index 05b020680..f33540813 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -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 = 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) } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 3568ac553..7db1940b3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -129,7 +129,7 @@
- +
@@ -145,19 +145,19 @@ - + -->    diff --git a/ng6-seed/src/app/video-chat/video-chat.component.ts b/ng6-seed/src/app/video-chat/video-chat.component.ts index 999907b5e..48324c3c2 100755 --- a/ng6-seed/src/app/video-chat/video-chat.component.ts +++ b/ng6-seed/src/app/video-chat/video-chat.component.ts @@ -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}) } }