From cc6774ab18f3ca7ee31deaf6f9ff5cdec82b07fa Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Tue, 24 Mar 2015 17:14:59 +1100 Subject: [PATCH] Display date/time for last files synced. Shows time if file synced today, else date for older logs. --- src/pydio/ui/res/list.html | 1 + src/pydio/ui/res/project.js | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/pydio/ui/res/list.html b/src/pydio/ui/res/list.html index e731f43..c724c1a 100644 --- a/src/pydio/ui/res/list.html +++ b/src/pydio/ui/res/list.html @@ -58,6 +58,7 @@

{{_('Last files synced')}} + {{log.date | dateDisplay }} {{log.source && log.source!='NULL' ? log.source:log.target | basename}} {{_('Open File')}} diff --git a/src/pydio/ui/res/project.js b/src/pydio/ui/res/project.js index 0e247bc..30dfbaf 100644 --- a/src/pydio/ui/res/project.js +++ b/src/pydio/ui/res/project.js @@ -98,6 +98,19 @@ angular.module('project', ['ngRoute', 'ngResource', 'ui.bootstrap', 'ui.bootstra }) + .filter('dateDisplay', function(){ + return function(dateString) { + var now = new Date(); + var now_day = ("0" + now.getDate()).slice(-2); + var now_month = ("0" + (now.getMonth() + 1)).slice(-2); + var today_date = now.getFullYear()+"-"+now_month+"-"+now_day + + var disp_date = /\d+-\d+-\d+/.exec(dateString).pop() + var disp_time = /\d+:\d+:\d+/.exec(dateString).pop() + return (disp_date == today_date)? disp_time : disp_date + } + }) + .service('currentJob', function() { var objectValue = null; return {