Skip to content

Overall progress label #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e-alfred merged 2 commits into from
May 17, 2019
Merged

Overall progress label #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e9652
added overall progress label
JonathanTreffler May 4, 2019
89633d4
added finished chunks counter to file size hover overlay
JonathanTreffler May 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion js/ng-flow-standalone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,16 @@
return ret;
},

/**
* Returns the count of files in the queue
* @function
* @returns {number}
*/
getFilesCount: function () {
var count = this.files.length;
return count;
},

/**
* Returns the total size of all files in bytes.
* @function
Expand Down Expand Up @@ -968,6 +978,22 @@
return this._prevProgress;
},

/**
* Get current number of complete chunks
* @function
* @returns {number} from 0 to chunks.length
*/
completeChunks: function () {
var completeChunks = 0;

each(this.chunks, function (c) {
if(c.progress() === 1){
completeChunks++;
}
});
return completeChunks;
},

/**
* Indicates if file is being uploaded at the moment
* @function
Expand Down Expand Up @@ -1922,4 +1948,4 @@ angular.module('flow.transfers', ['flow.init'])
};
}]);
angular.module('flow', ['flow.provider', 'flow.init', 'flow.events', 'flow.btn',
'flow.drop', 'flow.transfers', 'flow.img', 'flow.dragEvents']);
'flow.drop', 'flow.transfers', 'flow.img', 'flow.dragEvents']);
3 changes: 2 additions & 1 deletion templates/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<a class="btn btn-small btn-danger" ng-click="$flow.pause()"><?= $l->t('Pause'); ?></a>
<a class="btn btn-small btn-info" ng-click="$flow.cancel()"><?= $l->t('Cancel'); ?></a>
<span class="label label-info"><?= $l->t('Size'); ?>: {{$flow.getSize() | bytes}}</span>
<span class="label label-info" ng-if="$flow.getFilesCount() != 0"><?= $l->t('Progress'); ?>: {{$flow.progress()*100 | number:2}}%</span>
<span class="label label-info" ng-if="$flow.isUploading()"><?= $l->t('Uploading'); ?>...</span>
</p>
<table class="table table-hover table-bordered table-striped" flow-transfers>
Expand All @@ -32,7 +33,7 @@
<tr ng-repeat="file in transfers">
<td>{{$index+1}}</td>
<td title="UID: {{file.uniqueIdentifier}}">{{file.relativePath}}</td>
<td title="Chunks: {{file.chunks.length}}"><span ng-if="file.isUploading()">{{file.size*file.progress() | bytes}}/</span>{{file.size | bytes}}</td>
<td title="Chunks: {{file.completeChunks()}} / {{file.chunks.length}}"><span ng-if="file.isUploading()">{{file.size*file.progress() | bytes}}/</span>{{file.size | bytes}}</td>
<td>
<div class="btn-group" ng-if="!file.isComplete() || file.error">
<progress max="1" value="{{file.progress()}}" title="{{file.progress()}}" ng-if="file.isUploading()" style="width:auto; height:auto; display:inline"></progress>
Expand Down