aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-16 15:13:55 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-16 15:13:55 +0200
commit92c52918e13dbbaf2a658945c349a6d04c29aa81 (patch)
tree82967e8201bcf009c8a51ea2284a759fae3fd69b /Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels
parente87626ffc0298426d8242c2453a6992d94f38e1f (diff)
downloadTango-92c52918e13dbbaf2a658945c349a6d04c29aa81.tar.gz
Tango-92c52918e13dbbaf2a658945c349a6d04c29aa81.zip
Added custom image support for bug reporting.
Fixed issue with dispensers filter search.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
index d92d86580..2bd7e16a0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
@@ -11,6 +11,7 @@ using System.Data.Entity;
using Tango.MachineStudio.Common.Notifications;
using Tango.MachineStudio.Dispensers.Contracts;
using Tango.Core.Commands;
+using Tango.Core.Threading;
namespace Tango.MachineStudio.Dispensers.ViewModels
{
@@ -19,6 +20,7 @@ namespace Tango.MachineStudio.Dispensers.ViewModels
private ObservablesContext _dbContext;
private ObservablesContext _activeContext;
private INotificationProvider _notification;
+ private ActionTimer _filter_timer;
private ObservableCollection<Dispenser> _dispensers;
public ObservableCollection<Dispenser> Dispensers
@@ -68,6 +70,7 @@ namespace Tango.MachineStudio.Dispensers.ViewModels
public MainViewVM(INotificationProvider notificationProvider)
{
_notification = notificationProvider;
+ _filter_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
ManageDispenserCommand = new RelayCommand(() => LoadSelectedDispenser(), () => SelectedDispenser != null);
BackToDispensersCommand = new RelayCommand(() => { View.NavigateTo(DispensersNavigationView.DispensersView); });
@@ -76,13 +79,16 @@ namespace Tango.MachineStudio.Dispensers.ViewModels
RemoveDispenserCommand = new RelayCommand(RemoveSelectedDispenser, () => SelectedDispenser != null);
}
- private async void OnFilterChanged()
+ private void OnFilterChanged()
{
if (Filter != null)
{
- IsFree = false;
- Dispensers = (await _dbContext.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(Filter.ToLower())).Include(x => x.DispenserType).Include(x => x.IdsPacks).ToListAsync()).ToObservableCollection();
- IsFree = true;
+ _filter_timer.ResetReplace(() =>
+ {
+ IsFree = false;
+ Dispensers = _dbContext.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(Filter.ToLower())).Include(x => x.DispenserType).Include(x => x.IdsPacks).ToList().ToObservableCollection();
+ IsFree = true;
+ });
}
}