Merge branch 'master' of github.com:toggl/toggldesktop

toggl-open-source · Mar 20, 2018 · 542590a · 542590a
2 parents 85ff9d3 + 1c0d4fa
commit 542590a
Show file tree

Hide file tree

Showing 26 changed files with 1,588 additions and 249 deletions.
diff --git a/src/context.cc b/src/context.cc
@@ -346,6 +346,7 @@ error Context::save(const bool push_changes) {
 
 UIElements UIElements::Reset() {
     UIElements render;
+    render.first_load = true;
     render.display_time_entries = true;
     render.display_time_entry_autocomplete = true;
     render.display_mini_timer_autocomplete = true;
@@ -494,10 +495,6 @@ void Context::updateUI(const UIElements &what) {
 
     view::TimeEntry editor_time_entry_view;
 
-    std::vector<view::Autocomplete> time_entry_autocompletes;
-    std::vector<view::Autocomplete> minitimer_autocompletes;
-    std::vector<view::Autocomplete> project_autocompletes;
-
     bool use_proxy(false);
     bool record_timeline(false);
     Poco::Int64 unsynced_item_count(0);
@@ -518,10 +515,6 @@ void Context::updateUI(const UIElements &what) {
     {
         Poco::Mutex::ScopedLock lock(user_m_);
 
-        if (what.display_project_autocomplete && user_) {
-            user_->related.ProjectAutocompleteItems(&project_autocompletes);
-        }
-
         if (what.display_time_entry_editor && user_) {
             TimeEntry *editor_time_entry =
                 user_->related.TimeEntryByGUID(what.time_entry_editor_guid);
@@ -585,15 +578,6 @@ void Context::updateUI(const UIElements &what) {
             }
         }
 
-        if (what.display_time_entry_autocomplete && user_) {
-            user_->related.TimeEntryAutocompleteItems(
-                &time_entry_autocompletes);
-        }
-
-        if (what.display_mini_timer_autocomplete && user_) {
-            user_->related.MinitimerAutocompleteItems(&minitimer_autocompletes);
-        }
-
         if (what.display_workspace_select && user_) {
             std::vector<Workspace *> workspaces;
             user_->related.WorkspaceList(&workspaces);
@@ -872,11 +856,27 @@ void Context::updateUI(const UIElements &what) {
     }
 
     if (what.display_time_entry_autocomplete) {
-        UI()->DisplayTimeEntryAutocomplete(&time_entry_autocompletes);
+        if (what.first_load) {
+            std::vector<view::Autocomplete> time_entry_autocompletes;
+            user_->related.TimeEntryAutocompleteItems(&time_entry_autocompletes);
+            UI()->DisplayTimeEntryAutocomplete(&time_entry_autocompletes);
+        } else {
+            Poco::Util::TimerTask::Ptr teTask =
+                new Poco::Util::TimerTaskAdapter<Context>(*this, &Context::onTimeEntryAutocompletes);
+            timer_.schedule(teTask, Poco::Timestamp());
+        }
     }
 
     if (what.display_mini_timer_autocomplete) {
-        UI()->DisplayMinitimerAutocomplete(&minitimer_autocompletes);
+        if (what.first_load) {
+            std::vector<view::Autocomplete> minitimer_autocompletes;
+            user_->related.MinitimerAutocompleteItems(&minitimer_autocompletes);
+            UI()->DisplayMinitimerAutocomplete(&minitimer_autocompletes);
+        } else {
+            Poco::Util::TimerTask::Ptr mtTask =
+                new Poco::Util::TimerTaskAdapter<Context>(*this, &Context::onMiniTimerAutocompletes);
+            timer_.schedule(mtTask, Poco::Timestamp());
+        }
     }
 
     if (what.display_workspace_select) {
@@ -922,7 +922,15 @@ void Context::updateUI(const UIElements &what) {
     // Apply autocomplete as last element,
     // as its depending on selects on Windows
     if (what.display_project_autocomplete) {
-        UI()->DisplayProjectAutocomplete(&project_autocompletes);
+        if (what.first_load) {
+            std::vector<view::Autocomplete> project_autocompletes;
+            user_->related.ProjectAutocompleteItems(&project_autocompletes);
+            UI()->DisplayProjectAutocomplete(&project_autocompletes);
+        } else {
+            Poco::Util::TimerTask::Ptr prTask =
+                new Poco::Util::TimerTaskAdapter<Context>(*this, &Context::onProjectAutocompletes);
+            timer_.schedule(prTask, Poco::Timestamp());
+        }
     }
 
     if (what.display_unsynced_items) {
@@ -1079,6 +1087,24 @@ void Context::onSync(Poco::Util::TimerTask& task) {  // NOLINT
     displayError(save(false));
 }
 
+void Context::onTimeEntryAutocompletes(Poco::Util::TimerTask& task) {  // NOLINT
+    std::vector<view::Autocomplete> time_entry_autocompletes;
+    user_->related.TimeEntryAutocompleteItems(&time_entry_autocompletes);
+    UI()->DisplayTimeEntryAutocomplete(&time_entry_autocompletes);
+}
+
+void Context::onMiniTimerAutocompletes(Poco::Util::TimerTask& task) {  // NOLINT
+    std::vector<view::Autocomplete> minitimer_autocompletes;
+    user_->related.MinitimerAutocompleteItems(&minitimer_autocompletes);
+    UI()->DisplayMinitimerAutocomplete(&minitimer_autocompletes);
+}
+
+void Context::onProjectAutocompletes(Poco::Util::TimerTask& task) {  // NOLINT
+    std::vector<view::Autocomplete> project_autocompletes;
+    user_->related.ProjectAutocompleteItems(&project_autocompletes);
+    UI()->DisplayProjectAutocomplete(&project_autocompletes);
+}
+
 void Context::setOnline(const std::string reason) {
     std::stringstream ss;
     ss << "setOnline, reason:" << reason;

diff --git a/src/context.h b/src/context.h
@@ -36,7 +36,8 @@ class WindowChangeRecorder;
 class UIElements {
  public:
     UIElements()
-        : display_time_entries(false)
+        : first_load(false)
+    , display_time_entries(false)
     , display_time_entry_autocomplete(false)
     , display_mini_timer_autocomplete(false)
     , display_project_autocomplete(false)
@@ -61,6 +62,7 @@ class UIElements {
         const std::string editor_guid,
         const std::vector<ModelChange> &changes);
 
+    bool first_load;
     bool display_time_entries;
     bool display_time_entry_autocomplete;
     bool display_mini_timer_autocomplete;
@@ -472,6 +474,10 @@ class Context : public TimelineDatasource {
     void onWake(Poco::Util::TimerTask& task);  // NOLINT
     void onLoadMore(Poco::Util::TimerTask& task); // NOLINT
 
+    void onTimeEntryAutocompletes(Poco::Util::TimerTask& task);  // NOLINT
+    void onMiniTimerAutocompletes(Poco::Util::TimerTask& task);  // NOLINT
+    void onProjectAutocompletes(Poco::Util::TimerTask& task);  // NOLINT
+
     void startPeriodicUpdateCheck();
     void executeUpdateCheck();
 

diff --git a/src/related_data.cc b/src/related_data.cc
@@ -284,6 +284,10 @@ void RelatedData::taskAutocompleteItems(
             it != Tasks.end(); it++) {
         Task *t = *it;
 
+        if (t == NULL) {
+            continue;
+        }
+
         if (t->IsMarkedAsDeletedOnServer()) {
             continue;
         }
@@ -406,8 +410,6 @@ void RelatedData::MinitimerAutocompleteItems(
     timeEntryAutocompleteItems(&unique_names, result);
     taskAutocompleteItems(&unique_names, nullptr, result);
     projectAutocompleteItems(&unique_names, nullptr, result);
-
-    std::sort(result->begin(), result->end(), CompareAutocompleteItems);
 }
 
 void RelatedData::ProjectAutocompleteItems(
@@ -418,9 +420,6 @@ void RelatedData::ProjectAutocompleteItems(
     workspaceAutocompleteItems(&unique_names, &ws_names, result);
     projectAutocompleteItems(&unique_names, &ws_names, result);
     taskAutocompleteItems(&unique_names, &ws_names, result);
-
-    std::sort(result->begin(), result->end(),
-              CompareStructuredAutocompleteItems);
 }
 
 void RelatedData::workspaceAutocompleteItems(
@@ -451,13 +450,6 @@ void RelatedData::workspaceAutocompleteItems(
 
         std::string ws_name = Poco::UTF8::toUpper(ws->Name());
         (*ws_names)[ws->ID()] = ws_name;
-
-        view::Autocomplete autocomplete_item;
-        autocomplete_item.Text = ws_name;
-        autocomplete_item.WorkspaceName = ws_name;
-        autocomplete_item.WorkspaceID = ws->ID();
-        autocomplete_item.Type = kAutocompleteItemWorkspace;
-        list->push_back(autocomplete_item);
     }
 }
 

diff --git a/src/time_entry.cc b/src/time_entry.cc
@@ -101,16 +101,23 @@ bool TimeEntry::billableIsAPremiumFeature(const error err) const {
 }
 
 void TimeEntry::DiscardAt(const Poco::UInt64 at) {
+    if (!IsTracking()) {
+        logger().error("Cannot discard time entry that is not tracking");
+        return;
+    }
+
     if (!at) {
         logger().error("Cannot discard time entry without a timestamp");
         return;
     }
 
-    Poco::Int64 duration = at + DurationInSeconds();
-    if (duration < 0) {
-        duration = -1 * duration;
+    if (at < Start()) {
+        logger().error("Cannot discard time entry with start time bigger than current moment");
+        return;
     }
 
+    Poco::Int64 duration = at - Start();
+
     if (duration < 0) {
         logger().error("Discarding with this time entry would result in negative duration");  // NOLINT
         return;

diff --git a/src/ui/osx/TogglDesktop/AutoComplete/AutoCompleteInput.m b/src/ui/osx/TogglDesktop/AutoComplete/AutoCompleteInput.m
@@ -0,0 +1,20 @@
+//
+//  AutoCompleteInput.m
+//  TogglDesktop
+//
+//  Created by Indrek Vändrik on 19/02/2018.
+//  Copyright © 2018 Alari. All rights reserved.
+//
+
+#import "AutoCompleteInput.h"
+
+@implementation AutoCompleteInput
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+	[super drawRect:dirtyRect];
+
+	// Drawing code here.
+}
+
+@end
diff --git a/src/ui/osx/TogglDesktop/AutoComplete/AutoCompleteTableCell.m b/src/ui/osx/TogglDesktop/AutoComplete/AutoCompleteTableCell.m
@@ -0,0 +1,20 @@
+//
+//  AutoCompleteTableCell.m
+//  TogglDesktop
+//
+//  Created by Indrek Vändrik on 19/02/2018.
+//  Copyright © 2018 Alari. All rights reserved.
+//
+
+#import "AutoCompleteTableCell.h"
+
+@implementation AutoCompleteTableCell
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+	[super drawRect:dirtyRect];
+
+	// Drawing code here.
+}
+
+@end
diff --git a/src/ui/osx/TogglDesktop/TimeEntryEditViewController.h b/src/ui/osx/TogglDesktop/TimeEntryEditViewController.h
@@ -12,12 +12,12 @@
 #import "NSTextFieldClickable.h"
 #import "NSResize.h"
 #import "MkColorWellCustom.h"
+#import "AutoCompleteInput.h"
+#import "AutoCompleteItem.h"
 
-@interface TimeEntryEditViewController : NSViewController <NSComboBoxDataSource> {
+@interface TimeEntryEditViewController : NSViewController <NSComboBoxDataSource, NSTextFieldDelegate, NSTableViewDelegate> {
 }
 @property (strong) IBOutlet MKColorWellCustom *colorPicker;
-@property IBOutlet NSCustomComboBox *descriptionCombobox;
-@property IBOutlet NSCustomComboBox *projectSelect;
 @property IBOutlet NSTextField *durationTextField;
 @property IBOutlet NSTextField *startTime;
 @property IBOutlet NSTextField *endTime;
@@ -49,9 +49,11 @@
 @property (strong) IBOutlet NSButton *addClientButton;
 @property (strong) IBOutlet NSTextField *clientNameTextField;
 @property (strong) IBOutlet NSButton *saveNewClientButton;
-- (IBAction)descriptionComboboxChanged:(id)sender;
+@property (strong) IBOutlet AutoCompleteInput *descriptionAutoCompleteInput;
+- (IBAction)descriptionAutoCompleteChanged:(id)sender;
+@property (strong) IBOutlet AutoCompleteInput *projectAutoCompleteInput;
+- (IBAction)projectAutoCompleteChanged:(id)sender;
 - (IBAction)durationTextFieldChanged:(id)sender;
-- (IBAction)projectSelectChanged:(id)sender;
 - (IBAction)startTimeChanged:(id)sender;
 - (IBAction)endTimeChanged:(id)sender;
 - (IBAction)dateChanged:(id)sender;
@@ -67,4 +69,7 @@
 - (void)setDragHandle:(BOOL)onLeft;
 - (void)setInsertionPointColor;
 - (void)closeEdit;
+- (BOOL)autcompleteFocused;
+- (void)updateWithSelectedDescription:(AutocompleteItem *)autocomplete withKey:(NSString *)key;
+- (void)updateWithSelectedProject:(AutocompleteItem *)autocomplete withKey:(NSString *)key;
 @end