diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 615bc3e1a..dc98ba689 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -796,6 +796,14 @@ adminSetpassword(awsuser,lenname){ Permanent: false }; } + else if(lenname == 'VENDOR') { + var params = { + Password: 'temp1234', /* required */ + UserPoolId: vendor_poolData.UserPoolId, /* required */ + Username: awsuser, /* required */ + Permanent: false + }; + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 33560102f..51100e60e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -211,9 +211,9 @@ export class ViewPdComponent implements OnInit, OnDestroy { // this.vendor_form_status_arr = JSON.stringify(data.records.vendor_form_status) // localStorage.setItem("vendorFormStatus_arr",this.vendor_form_status_arr) } - this._pd.updateTwlioVideoStatus({"pd_id":this.viewID,"random_string":this.masterRandomString}).subscribe(rr=>{ + // this._pd.updateTwlioVideoStatus({"pd_id":this.viewID,"random_string":this.masterRandomString}).subscribe(rr=>{ - }) + // }) } } }, error => { @@ -683,7 +683,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this._pd.getRecordedPlaybackUrl(params).subscribe(result=>{ if(result && result['dataStatus'] && result['records'] && result['records'].length > 0) { let dialogRef = this.dialog.open(VideoPlayerComponent,{ - data:{videoUrl:result['records']}, + data:{videoUrl:result['records'],masterData:this.pdMasterData[0]}, maxWidth: '100vw', maxHeight: '100vh', height: '90%', diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.html b/ng6-seed/src/app/video-chat/video-player/video-player.component.html index 25678da26..7cd5e9841 100755 --- a/ng6-seed/src/app/video-chat/video-player/video-player.component.html +++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.html @@ -26,8 +26,8 @@ -
-
+
+

{{item.video_name}}

{{item.date}}

@@ -45,10 +45,14 @@

{{item.status}}

- +
diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.scss b/ng6-seed/src/app/video-chat/video-player/video-player.component.scss index 896a27691..6599f1a78 100755 --- a/ng6-seed/src/app/video-chat/video-player/video-player.component.scss +++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.scss @@ -8,6 +8,11 @@ color: #ffffff; background: #ffffff5c; } +.mat-stroked-button{ + color: #ffffff; + // background: #ffffff5c; + border-color: #ffffff; +} .playbackListClass{ cursor: pointer; // padding:5px; @@ -15,5 +20,7 @@ } .playbackListClass :hover{ background-color: darkred; + padding-bottom:5px; + padding-top: 5px; // box-shadow: 2px 3px rgba(255, 0, 0, 0.308) } \ No newline at end of file diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.ts b/ng6-seed/src/app/video-chat/video-player/video-player.component.ts index dee7db066..84950dcd6 100755 --- a/ng6-seed/src/app/video-chat/video-player/video-player.component.ts +++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.ts @@ -24,6 +24,7 @@ export class VideoPlayerComponent implements OnInit { // = 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerFun.mp4' @ViewChild('videoPlayer') videoPlayerEle:ElementRef notifier: NotifierService; + pdMasterData: any = {}; constructor( @Inject(MAT_DIALOG_DATA) public data:any,private matDialogRef:MatDialogRef, notifier:NotifierService,private _pd:PdTrigerService) { this.notifier=notifier @@ -33,9 +34,27 @@ export class VideoPlayerComponent implements OnInit { // this.playbackList.push({video_name:"Sample 1",url : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"}, // {video_name:"Sample 2",url : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4"}) // this.videoSrc = data.videoUrl + if(data && data.hasOwnProperty('masterData')) { + this.pdMasterData = data.masterData + console.log(this.pdMasterData) + } + if(this.playbackList.length > 0) { + let processingStatus = this.playbackList.filter(vv=>vv.url == '') + if(processingStatus.length > 0 ){ + processingStatus.forEach((re,index)=>{ + if(re && re.url == '') { + this.checkVideoStatus(index,re) + } + }) + } + + } + if(this.playbackList[0].url != ''){ this.playVideo(0,this.playbackList[0]); + } } } + } ngOnInit() { @@ -62,5 +81,18 @@ export class VideoPlayerComponent implements OnInit { console.log(url) window.open(url); } + checkVideoStatus(i,obj) { + if(obj && obj.hasOwnProperty('room_id') && obj.room_id) { + this._pd.updateTwlioVideoStatus({"pd_id":this.pdMasterData.pd_id,"random_string":this.pdMasterData.random_string,"room_id":obj.room_id}).subscribe(result=>{ + if(result && result['dataStatus']){ + if(result['records']) { + this.playbackList[i].url = result['records'] + this.playbackList[i].status = 'completed' + } + } + }) + } + + } }