From 116e10218d989cfed3f6ade9f9682556a01d7eea Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 20 Jan 2016 20:14:22 +0000 Subject: [PATCH] Added Ability to Sort Results by SourceSafe date or Development Date --- PROMS/Sync/Sync/FileCompare.cs | 2 +- PROMS/Sync/Sync/frmSync.Designer.cs | 22 ++++++++--------- PROMS/Sync/Sync/frmSync.cs | 38 +++++++++++++++++++++++++++++ PROMS/Sync/Sync/frmSync.resx | 3 +++ 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/PROMS/Sync/Sync/FileCompare.cs b/PROMS/Sync/Sync/FileCompare.cs index 44b9878e..648e4ed0 100644 --- a/PROMS/Sync/Sync/FileCompare.cs +++ b/PROMS/Sync/Sync/FileCompare.cs @@ -5,7 +5,7 @@ using System.IO; namespace Sync { - class FileCompare + public class FileCompare { private FileInfo _Developement; private FileInfo _SourceSafe; diff --git a/PROMS/Sync/Sync/frmSync.Designer.cs b/PROMS/Sync/Sync/frmSync.Designer.cs index e15c8dfd..c564aa3d 100644 --- a/PROMS/Sync/Sync/frmSync.Designer.cs +++ b/PROMS/Sync/Sync/frmSync.Designer.cs @@ -64,13 +64,13 @@ namespace Sync this.checkedOutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.differentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contentDifferentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.differentAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sourceSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreUnchangedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreReadOnlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.listToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.differentAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit(); this.cms.SuspendLayout(); @@ -226,6 +226,7 @@ namespace Sync this.dgv.Name = "dgv"; this.dgv.Size = new System.Drawing.Size(759, 283); this.dgv.TabIndex = 2; + this.dgv.ColumnHeaderMouseClick += dgv_ColumnHeaderMouseClick; this.dgv.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dgv_ColumnWidthChanged); this.dgv.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dgv_MouseDown); // @@ -340,14 +341,14 @@ namespace Sync // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(101, 22); this.clearToolStripMenuItem.Text = "Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // buildToolStripMenuItem // this.buildToolStripMenuItem.Name = "buildToolStripMenuItem"; - this.buildToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.buildToolStripMenuItem.Size = new System.Drawing.Size(101, 22); this.buildToolStripMenuItem.Text = "Build"; this.buildToolStripMenuItem.Click += new System.EventHandler(this.buildToolStripMenuItem_Click); // @@ -383,6 +384,13 @@ namespace Sync this.contentDifferentToolStripMenuItem.Text = "Content Different"; this.contentDifferentToolStripMenuItem.Click += new System.EventHandler(this.contentDifferentToolStripMenuItem_Click); // + // differentAllToolStripMenuItem + // + this.differentAllToolStripMenuItem.Name = "differentAllToolStripMenuItem"; + this.differentAllToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.differentAllToolStripMenuItem.Text = "DifferentAll"; + this.differentAllToolStripMenuItem.Click += new System.EventHandler(this.differentAllToolStripMenuItem_Click); + // // sourceSafeToolStripMenuItem // this.sourceSafeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -429,13 +437,6 @@ namespace Sync this.listToClipboardToolStripMenuItem.Text = "List toClipboard"; this.listToClipboardToolStripMenuItem.Click += new System.EventHandler(this.listToClipboardToolStripMenuItem_Click); // - // differentAllToolStripMenuItem - // - this.differentAllToolStripMenuItem.Name = "differentAllToolStripMenuItem"; - this.differentAllToolStripMenuItem.Size = new System.Drawing.Size(166, 22); - this.differentAllToolStripMenuItem.Text = "DifferentAll"; - this.differentAllToolStripMenuItem.Click += new System.EventHandler(this.differentAllToolStripMenuItem_Click); - // // frmSync // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -462,7 +463,6 @@ namespace Sync this.PerformLayout(); } - #endregion private System.Windows.Forms.Panel panel1; diff --git a/PROMS/Sync/Sync/frmSync.cs b/PROMS/Sync/Sync/frmSync.cs index 02561d28..3eaab354 100644 --- a/PROMS/Sync/Sync/frmSync.cs +++ b/PROMS/Sync/Sync/frmSync.cs @@ -194,6 +194,7 @@ namespace Sync private void frmSync_FormClosing(object sender, FormClosingEventArgs e) { Properties.Settings.Default.Location = Location; + WindowState = FormWindowState.Normal; Properties.Settings.Default.Size = Size; Properties.Settings.Default.DevelopmentFolder = tbDevelopment.Text; Properties.Settings.Default.SourceSafeFolder = tbSourceSafe.Text; @@ -683,5 +684,42 @@ namespace Sync CompareOneFile(fc.FileName, fc.FileName.Replace(tbDevelopment.Text, tbSSMailBox.Text)); } } + + void dgv_ColumnHeaderMouseClick(object sender, System.Windows.Forms.DataGridViewCellMouseEventArgs e) + { + Console.WriteLine("{0},{1}",e.ColumnIndex,e.RowIndex); + SortedList sorted = new SortedList(); + List fcnew = new List(); + //ComparerDevModified myComparer = new ComparerDevModified(); + switch (e.ColumnIndex) + { + case 1: + dgv.DataSource = _CheckedOut; + break; + case 2: + foreach (FileCompare fc in _CheckedOut) + sorted.Add(GetUniqueDateTime(sorted,fc.DevModified), fc); + foreach (FileCompare fc in sorted.Values) + fcnew.Add(fc); + dgv.DataSource = fcnew; + break; + case 3: + foreach (FileCompare fc in _CheckedOut) + sorted.Add(GetUniqueDateTime(sorted,fc.SSModified), fc); + foreach (FileCompare fc in sorted.Values) + fcnew.Add(fc); + dgv.DataSource = fcnew; + break; + } + SetColumnWidth(); + } + + private DateTime GetUniqueDateTime(SortedList sorted, DateTime? dt) + { + DateTime dtUnique = dt ?? DateTime.Now; + while (sorted.Keys.Contains(dtUnique)) + dtUnique += TimeSpan.FromTicks(1); + return dtUnique; + } } } \ No newline at end of file diff --git a/PROMS/Sync/Sync/frmSync.resx b/PROMS/Sync/Sync/frmSync.resx index f0eaa433..88d339a7 100644 --- a/PROMS/Sync/Sync/frmSync.resx +++ b/PROMS/Sync/Sync/frmSync.resx @@ -129,6 +129,9 @@ 194, 17 + + 33 +