From f7c8518cd0c3c44bfdf04d67e69d939f64230a4f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 25 Sep 2017 19:59:13 +0300 Subject: [PATCH] Working on time tracker --- resources/views/tasks/time_tracker.blade.php | 17 +++++++++++++++++ .../views/tasks/time_tracker_knockout.blade.php | 7 +++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php index f7301680e0a1..181f979c230d 100644 --- a/resources/views/tasks/time_tracker.blade.php +++ b/resources/views/tasks/time_tracker.blade.php @@ -20,6 +20,14 @@ outline: none; } + .fade-color { + animation-name: fadeToYellow; + } + + .list-group-item { + animation-duration: .5s; + } + .list-group-item.active { background-color: #f8f8f8 !important; color: black !important; @@ -29,6 +37,15 @@ border-color: #fff !important; } + .list-group-item.changed { + background-color: #ffffaa !important; + } + + @keyframes fadeToYellow { + from {background-color: #f8f8f8} + to {background-color: #ffffaa} + } + .list-group-item.active .list-group-item-text, .list-group-item.active:focus .list-group-item-text, .list-group-item.active:hover .list-group-item-text { diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php index a9b79542dde2..fd96fa4d2081 100644 --- a/resources/views/tasks/time_tracker_knockout.blade.php +++ b/resources/views/tasks/time_tracker_knockout.blade.php @@ -198,7 +198,7 @@ } self.filterStyle = ko.computed(function() { - return 'background-color: ' + (self.filter() ? '#fff68f' : 'white') + ' !important'; + return 'background-color: ' + (self.filter() ? '#ffffaa' : 'white') + ' !important'; }); self.statistics = ko.computed(function() { @@ -432,7 +432,6 @@ } else { data += '&is_running=0'; } - console.log(data); $.ajax({ dataType: 'json', type: method, @@ -590,6 +589,10 @@ var str = ''; if (self == model.selectedTask()) { str = 'active'; + + if (! self.public_id() || model.formChanged()) { + str += ' changed fade-color'; + } } if (! self.project()) { return str;