added ReadWrite lock, render file progress on dashboard

2 files changed, 9 insertions, 5 deletions

diff --git a/module/web/static/js/models/File.js b/module/web/static/js/models/File.js
index 2ac6c05f5..22ff231cc 100644
--- a/module/web/static/js/models/File.js
+++ b/module/web/static/js/models/File.js
@@ -22,7 +22,8 @@ define(['jquery', 'backbone', 'underscore', 'utils/apitypes'], function($, Backb
 
             // UI attributes
             selected: false,
-            visible: true
+            visible: true,
+            progress: 0
         },
 
 
diff --git a/module/web/static/js/models/Progress.js b/module/web/static/js/models/Progress.js
index c6a2fc4d1..d2d54bdb4 100644
--- a/module/web/static/js/models/Progress.js
+++ b/module/web/static/js/models/Progress.js
@@ -16,6 +16,12 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) {
             download: null
         },
 
+        getPercent: function() {
+            if (this.get('total') > 0)
+                return Math.round(this.get('done') * 100 / this.get('total'));
+            return  0;
+        },
+
         // Model Constructor
         initialize: function() {
 
@@ -28,10 +34,7 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) {
 
         toJSON: function(options) {
             var obj = Backbone.Model.prototype.toJSON.call(this, options);
-            if (obj.total > 0)
-                obj.percent = Math.round(obj.done * 100 / obj.total);
-            else
-                obj.percent = 0;
+            obj.percent = this.getPercent();
 
             return obj;
         },