فهرست منبع

Renamed KanbanView to KanbanViewType and changed reconnect code a little.

Kenric Nugteren 1 سال پیش
والد
کامیت
68c9a069e8

+ 2 - 2
prs.classes/Settings/KanbanSettings.cs

@@ -83,7 +83,7 @@ namespace Comal.Classes
     {
         public KanbanSettings()
         {
-            ViewTypeType = KanbanViewType.Status;
+            ViewType = KanbanViewType.Status;
 
             StatusSettings = new KanbanStatusSettings();
             UserSettings = new KanbanUserSettings();
@@ -91,7 +91,7 @@ namespace Comal.Classes
             ListSettings = new KanbanListSettings();
         }
 
-        public KanbanViewType ViewTypeType { get; set; }
+        public KanbanViewType ViewType { get; set; }
 
         public KanbanStatusSettings StatusSettings { get; set; }
 

+ 1 - 1
prs.desktop/Grids/KanbanGrid.cs

@@ -221,7 +221,7 @@ namespace PRSDesktop
 
         #region ITaskControl Support
 
-        public KanbanView KanbanView => KanbanView.List;
+        public KanbanViewType KanbanViewType => KanbanViewType.List;
 
         public ITaskHost Host { get; set; }
 

+ 25 - 18
prs.desktop/MainWindow.xaml.cs

@@ -166,14 +166,13 @@ namespace PRSDesktop
                 
                 case DatabaseType.Networked:                    
                     //new RPC stuff (temporary disabled - for enabling when RPC is ready)
-                    //_transport = new RpcClientSocketTransport(App.DatabaseSettings.URLs);
-                    //_transport.OnClose += TransportConnectionLost;
-                    //_transport.Connect();
-                    //ClientFactory.SetClientType(typeof(RpcClient<>), Platform.Wpf, CoreUtils.GetVersion(), _transport );
+                    /*_transport = new RpcClientSocketTransport(App.DatabaseSettings.URLs);
+                    _transport.OnClose += TransportConnectionLost;
+                    _transport.Connect();
+                    ClientFactory.SetClientType(typeof(RpcClient<>), Platform.Wpf, CoreUtils.GetVersion(), _transport );*/
 
                     var url = RestClient<User>.Ping(App.DatabaseSettings.URLs, out DatabaseInfo info);
-                    ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(), 
-                        url, true);
+                    ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(), url, true);
                     break;
                 
                 case DatabaseType.Local:
@@ -349,21 +348,29 @@ namespace PRSDesktop
                 Dispatcher.Invoke(() => {
                     Progress.ShowModal("Reconnecting", (progress) =>
                     {
-                        DateTime lost = DateTime.Now;
-                        while (!client.IsConnected())
+                        try
                         {
-                            progress.Report($"Connection lost - ({(DateTime.Now - lost):hh\\:mm})");
-                            try
+                            DateTime lost = DateTime.Now;
+                            while (!client.IsConnected())
                             {
-                                Logger.Send(LogType.Error,ClientFactory.UserID,"Reconnecting - ({0:hh\\:mm})",DateTime.Now - lost);
-                                client.Connect();
-                                if (client.IsConnected())
-                                    ClientFactory.Validate(ClientFactory.SessionID);
-                            }
-                            catch (System.Exception e1)
-                            {
-                                Logger.Send(LogType.Error,ClientFactory.UserID,$"Reconnect Failed: {e1.Message}");
+                                progress.Report($"Connection lost - ({(DateTime.Now - lost):hh\\:mm})");
+                                try
+                                {
+                                    Logger.Send(LogType.Error, ClientFactory.UserID, "Reconnecting - ({0:hh\\:mm})", DateTime.Now - lost);
+                                    client.Connect();
+                                    if (client.IsConnected())
+                                        break;
+                                }
+                                catch (System.Exception e1)
+                                {
+                                    Logger.Send(LogType.Error, ClientFactory.UserID, $"Reconnect Failed: {e1.Message}");
+                                }
                             }
+                            ClientFactory.Validate(ClientFactory.SessionID);
+                        }
+                        catch(Exception e)
+                        {
+                            Logger.Send(LogType.Error, ClientFactory.UserID, $"Reconnect Failed: {e.Message}");
                         }
                     });
                 });

+ 1 - 1
prs.desktop/Panels/Tasks/ITaskControl.cs

@@ -36,7 +36,7 @@ namespace PRSDesktop
     {
         ITaskHost Host { get; set; }
 
-        KanbanView KanbanView { get; }
+        KanbanViewType KanbanViewType { get; }
 
         bool IsReady { get; set; }
 

+ 4 - 4
prs.desktop/Panels/Tasks/TaskPanel.xaml.cs

@@ -46,7 +46,7 @@ namespace PRSDesktop
             foreach (TabItem tab in TaskPanels.Items)
             {
                 var panel = (tab.Content as ITaskControl)!;
-                _viewmap[panel.KanbanView] = tab;
+                _viewmap[panel.KanbanViewType] = tab;
                 panel.Host = this;
             }
 
@@ -679,7 +679,7 @@ namespace PRSDesktop
                 var panel = GetCurrentPanel();
                 if(panel is not null)
                 {
-                    KanbanSettings.ViewType = panel.KanbanView;
+                    KanbanSettings.ViewType = panel.KanbanViewType;
                     new UserConfiguration<KanbanSettings>().Save(KanbanSettings);
                     panel.Refresh(false);
                 }
@@ -774,7 +774,7 @@ namespace PRSDesktop
         {
         }
 
-        private readonly Dictionary<KanbanView, TabItem> _viewmap = new();
+        private readonly Dictionary<KanbanViewType, TabItem> _viewmap = new();
 
         private readonly List<ITaskControl> _initialized = new();
 
@@ -823,7 +823,7 @@ namespace PRSDesktop
             if (ParentID == Guid.Empty)
             {
                 if (TaskPanels.SelectedItem == TasksPlannerTabItem)
-                    TaskPanels.SelectedItem = _viewmap[KanbanView.Status];
+                    TaskPanels.SelectedItem = _viewmap[KanbanViewType.Status];
                 if (TasksPlannerTabItem.Visibility == Visibility.Visible)
                     TasksPlannerTabItem.Visibility = Visibility.Collapsed;
             }

+ 1 - 1
prs.desktop/Panels/Tasks/TaskPlannerControl.xaml.cs

@@ -518,7 +518,7 @@ namespace PRSDesktop
 
         #region ITaskControl Support
 
-        public KanbanView KanbanView => KanbanView.Planner;
+        public KanbanViewType KanbanViewType => KanbanViewType.Planner;
 
         public ITaskHost Host { get; set; }
 

+ 1 - 1
prs.desktop/Panels/Tasks/TasksByStatusControl.xaml.cs

@@ -330,7 +330,7 @@ namespace PRSDesktop
 
         public ITaskHost Host { get; set; }
 
-        public KanbanView KanbanView => KanbanView.Status;
+        public KanbanViewType KanbanViewType => KanbanViewType.Status;
 
         public IEnumerable<TaskModel> SelectedModels(TaskModel sender = null)
         {

+ 1 - 1
prs.desktop/Panels/Tasks/TasksByUserControl.xaml.cs

@@ -633,7 +633,7 @@ namespace PRSDesktop
 
         public ITaskHost Host { get; set; }
 
-        public KanbanView KanbanView => KanbanView.User;
+        public KanbanViewType KanbanViewType => KanbanViewType.User;
 
         public IEnumerable<TaskModel> SelectedModels(TaskModel? sender = null)
         {