removed some colors that weren't working and added double click suppo…

…rt to the search results list
MikePohatu · Jul 21, 2017 · 33a3e8d · 33a3e8d
1 parent c720251
commit 33a3e8d
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 45 deletions.
diff --git a/Visualizer/CollectionNode.cs b/Visualizer/CollectionNode.cs
@@ -32,7 +32,7 @@ public void OnCollectionPropertyChanged(object sender, PropertyChangedEventArgs
                 }
                 else
                 {
-                    this.Attr.LineWidth = 1;
+                    this.Attr.LineWidth = _normallinewidth;
                     this.Attr.Color = Color.Black;
                 }
             }

diff --git a/Visualizer/Panes/ApplicationPane.cs b/Visualizer/Panes/ApplicationPane.cs
@@ -45,6 +45,7 @@ public ApplicationPane(SccmConnector connector): base(connector)
             this._pane.DataContext = this;
             this._pane.searchbtn.KeyUp += this.OnBuildKeyUp;
             this._pane.buildbtn.Click += this.OnBuildButtonPressed;
+            this._pane.searchresultslb.MouseDoubleClick += this.OnSearchResultsListDoubleClick;
             this._pane.searchbtn.Click += this.OnSearchButtonPressed;
             this._pane.searchtb.KeyUp += this.OnSearchKeyUp;
             //this._pane.gviewer.AsyncLayoutProgress += this.OnProgressUpdate;

diff --git a/Visualizer/Panes/ApplicationTabControl.xaml b/Visualizer/Panes/ApplicationTabControl.xaml
@@ -41,7 +41,7 @@
             </Grid>
 
             <ListBox x:Name="searchresultslb" Grid.Row="1" MinHeight="130"
-                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay}"
+                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         SelectedValuePath="ID" Style="{DynamicResource ListBoxStyle}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>

diff --git a/Visualizer/Panes/BaseCollectionPane.cs b/Visualizer/Panes/BaseCollectionPane.cs
@@ -48,6 +48,7 @@ public BaseCollectionPane(SccmConnector connector):base(connector)
             MsaglHelpers.ConfigureCollectionsGViewer(this._pane.gviewer);
             this._pane.DataContext = this;
             this._pane.buildbtn.Click += this.OnBuildButtonPressed;
+            this._pane.searchresultslb.MouseDoubleClick += this.OnSearchResultsListDoubleClick;
             this._pane.gviewer.AsyncLayoutProgress += this.OnProgressUpdate;
             this._pane.gviewer.MouseDoubleClick += this.OnGViewerMouseDoubleClick;
             //this._pane.abortbtn.Click += OnAbortButtonClick;

diff --git a/Visualizer/Panes/BasePane.cs b/Visualizer/Panes/BasePane.cs
@@ -158,6 +158,14 @@ protected void OnBuildKeyUp(object sender, KeyEventArgs e)
                 this.BuildGraph();
             }
         }
+        protected void OnSearchResultsListDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                //if (this._selectedresult != null) { this.BuildGraph(); }
+                this.BuildGraph();
+            }
+        }
 
         protected void OnBuildButtonPressed(object sender, RoutedEventArgs e)
         {

diff --git a/Visualizer/Panes/DeploymentsPane.cs b/Visualizer/Panes/DeploymentsPane.cs
@@ -24,6 +24,7 @@ public DeploymentsPane(SccmConnector connector):base(connector)
             MsaglHelpers.ConfigureCollectionsGViewer(this._pane.gviewer);
             this._pane.DataContext = this;
             this._pane.buildbtn.Click += this.OnBuildButtonPressed;
+            this._pane.searchresultslb.MouseDoubleClick += this.OnSearchResultsListDoubleClick;
             this._pane.gviewer.MouseClick += this.OnGViewerMouseClicked;
             this._pane.gviewer.MouseDoubleClick += this.OnGViewerMouseDoubleClick;
             this._pane.searchbtn.Click += this.OnSearchButtonPressed;
@@ -68,6 +69,7 @@ protected virtual void OnGViewerMouseDoubleClick(object sender, System.Windows.F
                         else if (this.SelectedNode.SccmObject is SccmSoftwareUpdateGroup) { this._pane.modecombo.Text = "Update Group"; }
                         else if (this.SelectedNode.SccmObject is SMS_DeploymentSummary) { this._pane.modecombo.Text = "Deployment"; }
                         else if (this.SelectedNode.SccmObject is SccmSoftwareUpdate) { this._pane.modecombo.Text = "Update"; }
+                        else if (this.SelectedNode.SccmObject is SccmTaskSequence) { this._pane.modecombo.Text = "Task Sequence"; }
                     }
                 }               
             }
@@ -105,6 +107,9 @@ protected async void UpdateSearchResults()
             else if (this._pane.modecombo.Text == "Update")
             { await Task.Run(() => this.SearchResults = this._connector.GetSoftwareUpdateSccmObjectsFromSearch(this._searchtext)); }
 
+            else if (this._pane.modecombo.Text == "Task Sequence")
+            { await Task.Run(() => this.SearchResults = this._connector.GetTaskSequenceSccmObjectsFromSearch(this._searchtext)); }
+
             this._processing = false;
             this.ControlsEnabled = true;
         }

diff --git a/Visualizer/Panes/DeploymentsTabControl.xaml b/Visualizer/Panes/DeploymentsTabControl.xaml
@@ -52,6 +52,7 @@
                         <ComboBoxItem>Application</ComboBoxItem>
                         <ComboBoxItem IsSelected="True">Collection</ComboBoxItem>
                         <!--<ComboBoxItem>Deployment</ComboBoxItem>-->
+                        <ComboBoxItem>Task Sequence</ComboBoxItem>
                         <ComboBoxItem>Update</ComboBoxItem>
                         <ComboBoxItem>Update Group</ComboBoxItem>
                     </ComboBox>
@@ -62,7 +63,7 @@
                 </Grid>
 
                 <ListBox Grid.Row="2" x:Name="searchresultslb" MinHeight="130"
-                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay}"
+                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         SelectedValuePath="ID" Style="{DynamicResource ListBoxStyle}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>

diff --git a/Visualizer/Panes/ResourceTabControl.xaml b/Visualizer/Panes/ResourceTabControl.xaml
@@ -56,7 +56,7 @@
                 </StackPanel>
 
                 <ListBox Grid.Row="1" x:Name="searchresultslb" MinHeight="130"
-                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay}"
+                         ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedResult, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         SelectedValuePath="CIID"
                          Style="{DynamicResource ListBoxStyle}">
                     <ListBox.ItemTemplate>

diff --git a/Visualizer/SccmNode.cs b/Visualizer/SccmNode.cs
@@ -7,7 +7,7 @@ namespace Visualizer
 {
     public class SccmNode : Node
     {
-        protected int _highlightedlinewidth = 5;
+        protected int _highlightedlinewidth = 4;
         protected int _normallinewidth = 3;
 
         protected ISccmObject _sccmobject;
@@ -26,7 +26,8 @@ public SccmNode(string id, ISccmObject sccmobject) :base(id)
             this.Attr.YRadius = 3;
             this.Attr.Padding = 3;
             this.Attr.LabelMargin = 5;
-
+            this.Attr.LineWidth = this._normallinewidth;
+
             this.SetLayout();
         }
 
@@ -39,25 +40,58 @@ public virtual void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
                 {
                     this.Attr.LineWidth = this._highlightedlinewidth;
                     this.Attr.Color = Color.Green;
+                    //this.Attr.FillColor = Color.LightGreen;
                 }
                 else
                 {
                     this.Attr.LineWidth = this._normallinewidth;
                     this.Attr.Color = Color.Black;
+                    //this.Attr.Color = Color.White;
                 }
             }
         }
 
         protected void SetLayout()
         {
             string prefix = string.Empty;
-            if (this._sccmobject is SccmApplication) { this.Attr.Color = Color.SandyBrown; prefix = "Application: "; }
-            else if (this._sccmobject is SMS_DeploymentSummary) { this.Attr.Color = Color.LightBlue; prefix = "Deployment: "; }
-            else if (this._sccmobject is SccmCollection) { this.Attr.Color = Color.RoyalBlue; prefix = "Collection: "; }
-            else if (this._sccmobject is SccmSoftwareUpdateGroup) { this.Attr.Color = Color.Gold; prefix = "SUG: "; }
-            else if (this._sccmobject is SccmTaskSequence) { this.Attr.Color = Color.Thistle; prefix = "Task Sequence: "; }
-            else if (this._sccmobject is SccmPackage) { this.Attr.Color = Color.Chocolate; prefix = "Package: "; }
-            else if (this._sccmobject is SccmConfigurationBaseline) { this.Attr.Color = Color.CornflowerBlue; prefix = "Baseline: "; }
+            //if (this._sccmobject is SccmApplication) { this.Attr.Color = Color.SandyBrown; prefix = "Application: "; }
+            ////else if (this._sccmobject is SMS_DeploymentSummary) { this.Attr.Color = Color.LightBlue; prefix = "Deployment: "; }
+            //else if (this._sccmobject is SccmCollection) { this.Attr.Color = Color.RoyalBlue; prefix = "Collection: "; }
+            //else if (this._sccmobject is SccmSoftwareUpdateGroup) { this.Attr.Color = Color.Gold; prefix = "SUG: "; }
+            //else if (this._sccmobject is SccmTaskSequence) { this.Attr.Color = Color.Thistle; prefix = "Task Sequence: "; }
+            //else if (this._sccmobject is SccmPackage) { this.Attr.Color = Color.Chocolate; prefix = "Package: "; }
+            //else if (this._sccmobject is SccmConfigurationBaseline) { this.Attr.Color = Color.CornflowerBlue; prefix = "Baseline: "; }
+
+            switch (this._sccmobject.Type)
+            {
+                case SccmItemType.Application:
+                    //this.Attr.Color = Color.SandyBrown;
+                    prefix = "Application: ";
+                    break;
+                case SccmItemType.Collection:
+                    //this.Attr.Color = Color.RoyalBlue;
+                    prefix = "Collection: ";
+                    break;
+                case SccmItemType.SoftwareUpdateGroup:
+                    //this.Attr.Color = Color.Gold;
+                    prefix = "SUG: ";
+                    break;
+                case SccmItemType.TaskSequence:
+                    //this.Attr.Color = Color.Thistle;
+                    prefix = "Task Sequence: ";
+                    break;
+                case SccmItemType.Package:
+                    //this.Attr.Color = Color.Chocolate;
+                    prefix = "Package: ";
+                    break;
+                case SccmItemType.ConfigurationBaseline:
+                    //this.Attr.Color = Color.CornflowerBlue;
+                    prefix = "Baseline: ";
+                    break;
+                default:
+                    break;
+
+            }
 
             this.LabelText = this._sccmobject.Name + Environment.NewLine + prefix + this._sccmobject.ID;
         }

diff --git a/viewmodel/Factory.cs b/viewmodel/Factory.cs
@@ -135,7 +135,7 @@ public static SccmCollection GetCollectionFromSMS_CollectionResults(IResultObjec
             item.Comment = ResultObjectHandler.GetString(resource, "Comment");
             item.IncludeExcludeCollectionCount = ResultObjectHandler.GetInt(resource, "IncludeExcludeCollectionsCount");
             int typeint = ResultObjectHandler.GetInt(resource, "CollectionType");
-            item.Type = (CollectionType)typeint;
+            item.CollectionType = (CollectionType)typeint;
 
             return item;
         }
@@ -186,5 +186,16 @@ public static SMS_DeploymentInfo GetDeploymentInfoFromSMS_DeploymentInfoResults(
 
             return item;
         }
+
+        public static SccmTaskSequence GetTaskSequenceFromSMS_TaskSequenceResults(IResultObject resource)
+        {
+            SccmTaskSequence item = new SccmTaskSequence();
+
+            item.ID = ResultObjectHandler.GetString(resource, "PackageID");
+            item.Name = ResultObjectHandler.GetString(resource, "Name");
+            int tstype = ResultObjectHandler.GetInt(resource, "Type");
+            item.TaskSequenceType = (TaskSequenceType)tstype;
+            return item;
+        }
     }
 }
diff --git a/viewmodel/ISccmObject.cs b/viewmodel/ISccmObject.cs
@@ -4,6 +4,7 @@ namespace viewmodel
 {
     public interface ISccmObject
     {
+        SccmItemType Type { get; }
         event PropertyChangedEventHandler PropertyChanged;
         string ID { get; }
         string Name { get; }

diff --git a/viewmodel/SMS_DeploymentInfo.cs b/viewmodel/SMS_DeploymentInfo.cs
@@ -5,6 +5,7 @@
     /// </summary>
     public class SMS_DeploymentInfo: ViewModelBase, IDeployment
     {
+        public SccmItemType Type { get { return SccmItemType.SMS_DeploymentInfo; } }
         protected string _collectionid;
         public string CollectionID
         {

diff --git a/viewmodel/SMS_DeploymentSummary.cs b/viewmodel/SMS_DeploymentSummary.cs
@@ -5,6 +5,7 @@
     /// </summary>
     public class SMS_DeploymentSummary: ViewModelBase, IDeployment
     {
+        public SccmItemType Type { get { return SccmItemType.SMS_DeploymentSummary; } }
         protected string _collectionid;
         public string CollectionID
         {

diff --git a/viewmodel/SccmCollection.cs b/viewmodel/SccmCollection.cs
@@ -5,9 +5,10 @@ namespace viewmodel
 {
     public class SccmCollection: ViewModelBase, ISccmObject
     {
+        public SccmItemType Type { get { return SccmItemType.Collection; } }
         public string LimitingCollectionID { get; set; }
         public SccmCollection LimitingCollection { get; set; }
-        public CollectionType Type { get; set; }
+        public CollectionType CollectionType { get; set; }
 
         private string _comment;
         public string Comment

diff --git a/viewmodel/SccmConnector.cs b/viewmodel/SccmConnector.cs
@@ -518,35 +518,29 @@ public List<ISccmObject> GetSoftwareUpdateGroupSccmObjectsFromSearch(string cina
             return CIs;
         }
 
-        //public SccmApplication GetApplication(string ciid)
-        //{
-        //    try
-        //    {
-        //        // This query selects all collections
-        //        string query = "select * from SMS_Application WHERE IsLatest='TRUE' AND CI_ID='" + ciid + "'";
-
-        //        // Run query
-        //        using (IResultObject results = this._connection.QueryProcessor.ExecuteQuery(query))
-        //        {
-        //            // Enumerate through the collection of objects returned by the query.
-        //            foreach (IResultObject resource in results)
-        //            {
-        //                SccmApplication app = new SccmApplication();
-        //                app.CIID = resource["CI_ID"].IntegerValue.ToString();
-        //                app.Name = resource["LocalizedDisplayName"].StringValue;
-        //                app.IsDeployed = resource["IsDeployed"].BooleanValue;
-        //                app.IsEnabled = resource["IsEnabled"].BooleanValue;
-        //                app.IsSuperseded = resource["IsSuperseded"].BooleanValue;
-        //                app.IsSuperseding = resource["IsSuperseding"].BooleanValue;
-        //                app.IsLatest = resource["IsLatest"].BooleanValue;
-        //                return app;
-        //            }
-        //        }
-
-        //    }
-        //    catch { }
-        //    return null;
-        //}
+        public List<ISccmObject> GetTaskSequenceSccmObjectsFromSearch(string search)
+        {
+            List<ISccmObject> items = new List<ISccmObject>();
+            try
+            {
+                string query;
+                if (string.IsNullOrWhiteSpace(search)) { query = "select * from SMS_TaskSequencePackage ORDER BY Name"; }
+                else { query = "select * from SMS_TaskSequencePackage WHERE Name LIKE '%" + search + "%' ORDER BY Name"; }
+
+                // Run query
+                using (IResultObject results = this._connection.QueryProcessor.ExecuteQuery(query))
+                {
+                    // Enumerate through the collection of objects returned by the query.
+                    foreach (IResultObject resource in results)
+                    {
+                        SccmTaskSequence app = Factory.GetTaskSequenceFromSMS_TaskSequenceResults(resource);
+                        items.Add(app);
+                    }
+                }
+            }
+            catch { }
+            return items;
+        }
 
         public SccmDevice GetDevice(string name)
         {

diff --git a/viewmodel/SccmEnums.cs b/viewmodel/SccmEnums.cs
@@ -1,5 +1,6 @@
 namespace viewmodel
 {
+    public enum TaskSequenceType { Generic = 1, OSD = 2 }
     public enum SccmItemType {
         Application = 1,
         Package = 2,
@@ -14,6 +15,9 @@ public enum SccmItemType {
         ConfigurationPolicy=11,
         SoftwareUpdate = 37,
         Device,
-        User
+        User,
+        Collection,
+        SMS_DeploymentInfo,
+        SMS_DeploymentSummary
     }
 }
diff --git a/viewmodel/SccmTaskSequence.cs b/viewmodel/SccmTaskSequence.cs
@@ -3,6 +3,7 @@
     public class SccmTaskSequence : SccmDeployableItem
     {
         public override SccmItemType Type { get { return SccmItemType.TaskSequence; } }
+        public TaskSequenceType TaskSequenceType { get; set; }
 
         public new string ToString()
         {
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     else
                     {
-                        this.Attr.LineWidth = 1;
+                        this.Attr.LineWidth = _normallinewidth;
                         this.Attr.Color = Color.Black;
                     }
                 }
@@ Expand Down @@