FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix close issue
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2019-07-19 10:01:39 +02:00
parent e4b21306b1
commit 455562aa90
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.service.ts
View File

@ -40,10 +40,15 @@ export class ResumableFileUploadService implements OnDestroy{
updatetotalprogress() { updatetotalprogress() {
var totalProgress =0; var totalProgress =0;
var n=0;
for(var i =0;i<this.files.length;i++) { for(var i =0;i<this.files.length;i++) {
if(!this.files[i].error) {
totalProgress+=this.files[i].progress; totalProgress+=this.files[i].progress;
n++;
}
} }
this.totalProgress=totalProgress/this.files.length; this.totalProgress=totalProgress/this.files.length;
if(totalProgress==100) this.isUploading=false;
} }
handleState(state:UploadState) { handleState(state:UploadState) {
@ -57,14 +62,12 @@ export class ResumableFileUploadService implements OnDestroy{
var file =this.files.find((f) => f.identifier == state.uploadId ) var file =this.files.find((f) => f.identifier == state.uploadId )
if(file) { if(file) {
file.progress = (state.progress?state.progress:0); file.progress = (state.progress?state.progress:0);
this.updatetotalprogress();
} }
};break; };break;
case "complete": { case "complete": {
var file =this.files.find((f) => f.identifier == state.uploadId ) var file =this.files.find((f) => f.identifier == state.uploadId )
if(file) { if(file) {
file.progress = (state.progress?state.progress:0); file.progress = (state.progress?state.progress:0);
this.updatetotalprogress();
} }
file.success=true; file.success=true;
};break; };break;
@ -76,6 +79,7 @@ export class ResumableFileUploadService implements OnDestroy{
} }
};break; };break;
} }
this.updatetotalprogress();
this.refresh.next({}); this.refresh.next({});
} }