Merge pull request #5192 from barhom/completed-on-column

Added 'Added on' column in Webui. Closes #5145,#1092,#738

src/webui/btjson.cpp

@@ -709,8 +709,8 @@ QVariantMap toMap(BitTorrent::TorrentHandle *const torrent)
     ret[KEY_TORRENT_SUPER_SEEDING] = torrent->superSeeding();
     ret[KEY_TORRENT_FORCE_START] = torrent->isForced();
     ret[KEY_TORRENT_SAVE_PATH] = Utils::Fs::toNativePath(torrent->savePath());
-    ret[KEY_TORRENT_ADDED_ON] = torrent->addedTime();
-    ret[KEY_TORRENT_COMPLETION_ON] = torrent->completedTime();
+    ret[KEY_TORRENT_ADDED_ON] = torrent->addedTime().toTime_t();
+    ret[KEY_TORRENT_COMPLETION_ON] = torrent->completedTime().toTime_t();
 
     return ret;
 }

src/webui/www/public/scripts/dynamicTable.js

@@ -452,6 +452,7 @@ var TorrentsTable = new Class({
             this.newColumn('eta', 'width: 100px', 'QBT_TR(ETA)QBT_TR');
             this.newColumn('ratio', 'width: 100px', 'QBT_TR(Ratio)QBT_TR');
             this.newColumn('category', 'width: 100px', 'QBT_TR(Category)QBT_TR');
+            this.newColumn('added_on', 'width: 100px', 'QBT_TR(Added on)QBT_TR');
 
             this.columns['state_icon'].onclick = '';
             this.columns['state_icon'].dataProperties[0] = 'state';
@@ -618,6 +619,13 @@ var TorrentsTable = new Class({
                     html = (Math.floor(100 * ratio) / 100).toFixed(2); //Don't round up
                 td.set('html', html);
             };
+
+            // added on
+
+            this.columns['added_on'].updateTd = function (td, row) {
+                var date = new Date(this.getRowValue(row) * 1000).toLocaleString();
+                td.set('html', date);
+            };
         },
 
         applyFilter : function (row, filterName, categoryHash) {