From 16aef60e85dab1b7c6b05ff67b42e877af33732d Mon Sep 17 00:00:00 2001
From: tduguid <tduguid@NB61300907>
Date: Wed, 14 Feb 2018 10:55:11 +1100
Subject: [PATCH] #5 Added a table for time formats

---
 CS/App_Data/ScriptHelp.sdf | Bin 204800 -> 204800 bytes
 CS/Ribbon.xml              |  12 ++++++------
 CS/Scripts/Data.cs         |  39 +++++++++++++++++++++++++++++++++++++
 CS/Scripts/Ribbon.cs       |  39 ++++++++++++++++++++++++++++---------
 CS/TaskPane/TableData.cs   |   7 +++++++
 5 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/CS/App_Data/ScriptHelp.sdf b/CS/App_Data/ScriptHelp.sdf
index 95a583bdab5a0007a857b704f24f036d8fe67c32..b29a0b3a6f7a0c341e9fe978d8d51c07117f0791 100644
GIT binary patch
delta 3000
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

delta 3097
zcmdT`eQXp(6n}5_w!OV}@3zqE-QM+MTUuMO)q)g5ByyCt6w1f76tq_8HO7x<3vHpP
z1k*bb6OEC0wILf#u$7P+qtU|su@VGN62L@E&R{Sxew?ZClSpHT7{Jt-ot*;znrPx&
z_I7?VZ|3)A=I#4UBAuT|=hvMhdrN>8AN!-_(7pyh`tGz50CC=m3!rAKE>67U=(`=b
zWGgiqp?!VyVPoI&1N=tYPAudDSp98U_0T6qpGU@*kbvBy1B{ycyRj%0BZt((nxX8v
z@>O51s~##-%D@PslG;D`tAtXje|X$;I8v{?Uw5WYru~JMlE$ZH>zOn7f@dt|Qf7=9
zdteP6c-5!qA8zkgT`?FP|0od{H<GQb&4b>Mcfw1&tw;+%G6J;eRj(o%q?`2#?<oDX
zdY5|3y)WA45;f-r*0&k-`Nm=mxltvNGayG&*C%96Ilg14-$x0P{~n>=A#`c<7*1aM
zw9!NPmRU*$>4L-La$_FFog5#|YRWgm6a58ruQpkVfpjygtidXzyIGZLC*z(YXecw!
zpE^-U2dy`^S7E?3l4!)62UXo(a#3_O-62(1B^%}l$a{4GLw4^10mC+|60q2YUI9yN
zST10x4Lt&uQ5Z)k5!kT1!vdDu5IE$tZU;C%mI=sx%omUwFA|XZs0qk@3~(3^soY7I
z=;luP1!PVl5COT5K>@jsJ`OpL>;T8dVgb32ih$flBQ7u>tP04TtQ3&@SRf$xv4TTx
zn#Tb*EaiZk<#NCm65@a_LyE4J*_oHKARkoQVin2qv@u&|ltoJuCCTE+@N_7xXM)+l
zY>`n^?~fEl7seJ06eP5yZ_+!hrt@d>AW!ocO1(Rh8_kKy1FnRWBx%f8f8B$Uro6Il
zb23aLZVCHLQbscC3lv|FYI0l==%RUn70ERj)az$WY)2h8noFYiGj6fM?f4X8+gN+4
z9Hhwy557SHR=NWf#0_=|8H>45H+O8qD%0DEm$03ghJ~p~O+DtStvH7r^XA3O`~YsY
zE^Wg~;?2$_P$W2Lpu^3RU0AH#1<udx?ZTjWtqTheUM4}SqzhZ|-~dr^g_w~Py3F2(
zu+SHPfEdNz=6&5*%LbW4595B^G;bf`_GV2tPPn6Ub8P)Z=F#m~XWi(=Ls*w6i_Fc{
z09^(z>m-QWL{6g$Zd&_E8vicgzduosD1qC5YlnIVo^0yf)7$ab?%}>YyP>0b%hnB@
zJx!}So9R|Mvp}s$_o2ruLJ}xhFq%tVJCI8%==0_WxuhfPCKuXNGOWAFAJ*|6T&pP~
zdpncG^emUppQZkiTK%|0Q;yIJF?SAi?ZL6M8|}(?Ch?9^M`>&6qtk5kql6(lDd~4U
zu;!eL&dGXNk(`z5mL5SrTDw-`MYKLygVn^kw}sZtQ){u!`aXlB?v3doZD-<%=%cZo
zf$nVQbQCrwTaBj7s`Sd}igZJCY2@zd>cpaC*<@JrXSGZ|xHUTc&ZA%NVDT5_jJL<1
zm&ad`6MqT|Dvt;%C;n7%oS1h@{1q@$RhZrqfBt!MACJG4|8@M`FFX+O%HwbS|0VuR
z7JpOIsI^3v_3R>GK$CNJK}aIx0)(L6zHGQ44WI&eAqk)X<gq_`K_Q?aEC5)@PCc9|
zh#m9k^vYtF_{Ej<o6zVOUW%=PG`Z}X%A%%xe&l0YQlm^#>Gk8;DtwM!KitX}R}Q=$
zqH();UP;U2Jfkxib={(&GH+)3Df3Ltv{UA(ndzp?b1~CQxxyA3rk8T1U1eG+-(gpo
zOv*KOl}V($*sd~pl<axqz|>JtGih|FnJhZgOcEVxCWj6+lR}4@sh~s66wsk&>gP~1
z<#VW+>PdVZO!MM`nkk+`&D74JHdvKgGm&$snZP;JOxzr5N7(qrFkzGU#xPlv_{K0%
zllaCkNt0^OL-zxyqJgxS$=NTed29kVO=(0^&X0U%-y(zT7J1bt-#C4?F=)vdyzZNd
z(EjZ2=Nol;nw9)ArT=g`zK><4RwpFH%gIV6%}P^PV-+=GHA*4Xu+FZ*T4K@!#hSlt
z5zW+%jC=DxNm4C;zBj`HeTzdKgcyMe06!$maFm2f%bcJt6+sQK2%>BV6vBZ0!KaMa
e%RW6MW?0^8hq<`wSBo$w5lhRG*;VXc)BXlta$&##

diff --git a/CS/Ribbon.xml b/CS/Ribbon.xml
index a16ee7f..4a91cc7 100644
--- a/CS/Ribbon.xml
+++ b/CS/Ribbon.xml
@@ -175,25 +175,25 @@ Or use the following tag to remove all other ribbons when this loads
 						keytip="DTA"
 							/>
 					<comboBox
-						id="cboDateFormatReplace"
+						id="cboFormatDate"
 						onChange="OnChange"
 						getText="GetText"
 						getItemCount="GetItemCount"
 						getItemLabel="GetItemLabel"
 						sizeString= "XXXXXXXXXXXXXXXXXXXX"
-						screentip="Replace Date Format"
+						screentip="Date Format"
 						supertip="This is the date format the script uses to replace the formatting for date columns."
 						keytip="DFR"
 							/>
 					<comboBox
-							id="cboDateFormatFind"
+							id="cboFormatTime"
 							onChange="OnChange"
 							getText="GetText"
 							getItemCount="GetItemCount"
 							getItemLabel="GetItemLabel"
 							sizeString= "XXXXXXXXXXXXXXXXXXXX"
-							screentip="Find Date Format"
-							supertip="This is the date format to find. It defaults to the format from SQL Server Management Studio after you paste records into Excel."
+							screentip="Time Format"
+							supertip="This is the time format the script uses to replace the formatting for time columns."
               keytip="DFF"
 							/>
 					<button
@@ -220,7 +220,7 @@ Or use the following tag to remove all other ribbons when this loads
 							onAction="OnAction"
 							screentip="Open Date Format List"
 							supertip="This will open the date format list form."
-							tag="DateFormat"
+							tag="TimeFormat"
               keytip="LFR"
 							/>
 					<separator
diff --git a/CS/Scripts/Data.cs b/CS/Scripts/Data.cs
index 97f9c87..7804517 100644
--- a/CS/Scripts/Data.cs
+++ b/CS/Scripts/Data.cs
@@ -34,6 +34,11 @@ public static string Connection()
         /// </summary>
         public static DataTable DateFormatTable = new DataTable();
 
+        /// <summary>
+        /// List of time format strings
+        /// </summary>
+        public static DataTable TimeFormatTable = new DataTable();
+
         /// <summary>
         /// List of graph data
         /// </summary>
@@ -107,6 +112,40 @@ public static void CreateDateFormatTable()
 
         }
 
+        /// <summary>
+        /// Creates the datatable for the date format strings
+        /// </summary>
+        public static void CreateTimeFormatTable()
+        {
+            try
+            {
+                string tableName = "TimeFormat";
+                string columnName = "FormatString";
+                string sql = "SELECT * FROM " + tableName + " ORDER BY " + columnName;
+                dynamic dcFormatString = new DataColumn(columnName, typeof(string));
+                TimeFormatTable.Rows.Clear();
+                DataColumnCollection columns = TimeFormatTable.Columns;
+                if (columns.Contains(columnName) == false)
+                {
+                    TimeFormatTable.Columns.Add(dcFormatString);
+                }
+
+                using (var da = new SqlCeDataAdapter(sql, Connection()))
+                {
+                    da.Fill(TimeFormatTable);
+                }
+                TimeFormatTable.DefaultView.Sort = columnName + " asc";
+                TimeFormatTable.TableName = tableName;
+
+            }
+            catch (Exception ex)
+            {
+                ErrorHandler.DisplayMessage(ex);
+
+            }
+
+        }
+
         /// <summary>
         /// Creates the datatable for the graph data
         /// </summary>
diff --git a/CS/Scripts/Ribbon.cs b/CS/Scripts/Ribbon.cs
index 69e5da2..6e1402f 100644
--- a/CS/Scripts/Ribbon.cs
+++ b/CS/Scripts/Ribbon.cs
@@ -176,6 +176,7 @@ public void Ribbon_Load(Office.IRibbonUI ribbonUI)
 
                 Data.CreateTableAliasTable();
                 Data.CreateDateFormatTable();
+                Data.CreateTimeFormatTable();
                 Data.CreateGraphDataTable();
 
             }
@@ -358,9 +359,10 @@ public int GetItemCount(Office.IRibbonControl control)
             {
                 switch (control.Id)
                 {
-                    case "cboDateFormatReplace":
-                    case "cboDateFormatFind":
+                    case "cboFormatDate":
                         return Data.DateFormatTable.Rows.Count;
+                    case "cboFormatTime":
+                        return Data.TimeFormatTable.Rows.Count;
                     case "cboTableAlias":
                         return Data.TableAliasTable.Rows.Count;
                     default:
@@ -386,9 +388,10 @@ public string GetItemLabel(Office.IRibbonControl control, int index)
             {
                 switch (control.Id)
                 {
-                    case "cboDateFormatReplace":
-                    case "cboDateFormatFind":
+                    case "cboFormatDate":
                         return UpdateDateFormatComboBoxSource(index);
+                    case "cboFormatTime":
+                        return UpdateTimeFormatComboBoxSource(index);
                     case "cboTableAlias":
                         return UpdateTableAliasComboBoxSource(index);
                     default:
@@ -413,9 +416,9 @@ public string GetText(Office.IRibbonControl control)
             {
                 switch (control.Id)
                 {
-                    case "cboDateFormatReplace":
+                    case "cboFormatDate":
                         return Properties.Settings.Default.Table_ColumnFormatDate;
-                    case "cboDateFormatFind":
+                    case "cboFormatTime":
                         return Properties.Settings.Default.Table_ColumnFormatTime;
                     case "cboTableAlias":
                         return Properties.Settings.Default.Table_ColumnTableAlias;
@@ -622,11 +625,11 @@ public void OnChange(Office.IRibbonControl control, string text)
             {
                 switch (control.Id)
                 {
-                    case "cboDateFormatReplace":
+                    case "cboFormatDate":
                         Properties.Settings.Default.Table_ColumnFormatDate = text;
                         Data.InsertRecord(Data.DateFormatTable, text);
                         break;
-                    case "cboDateFormatFind":
+                    case "cboFormatTime":
                         Properties.Settings.Default.Table_ColumnFormatTime = text;
                         Data.InsertRecord(Data.DateFormatTable, text);
                         break;
@@ -1535,7 +1538,7 @@ public void OpenTableDataPane()
                     myTableData.Dispose();
                 }
                 myTableData = new TaskPane.TableData();
-                myTaskPaneTableData = Globals.ThisAddIn.CustomTaskPanes.Add(myTableData, "List of " + Ribbon.AppVariables.TableName + " for " + Scripts.AssemblyInfo.Title);
+                myTaskPaneTableData = Globals.ThisAddIn.CustomTaskPanes.Add(myTableData, Ribbon.AppVariables.TableName);
                 myTaskPaneTableData.DockPosition = Office.MsoCTPDockPosition.msoCTPDockPositionRight;
                 myTaskPaneTableData.DockPositionRestrict = Office.MsoCTPDockPositionRestrict.msoCTPDockPositionRestrictNoChange;
                 myTaskPaneTableData.Width = 300;
@@ -1566,6 +1569,24 @@ public string UpdateDateFormatComboBoxSource(int itemIndex)
             }
         }
 
+        /// <summary> 
+        /// Update the value of the combobox from a data table by index
+        /// </summary>
+        /// <param name="itemIndex">Represents the index of the list value </param>
+        /// <returns>the label value for the combobox index</returns>
+        public string UpdateTimeFormatComboBoxSource(int itemIndex)
+        {
+            try
+            {
+                return Data.TimeFormatTable.Rows[itemIndex]["FormatString"].ToString();
+            }
+            catch (Exception ex)
+            {
+                ErrorHandler.DisplayMessage(ex);
+                return string.Empty;
+            }
+        }
+
         /// <summary> 
         /// Update the value of the combobox from a data table by index
         /// </summary>
diff --git a/CS/TaskPane/TableData.cs b/CS/TaskPane/TableData.cs
index 77199eb..e8bf70b 100644
--- a/CS/TaskPane/TableData.cs
+++ b/CS/TaskPane/TableData.cs
@@ -30,6 +30,9 @@ public TableData()
                     case "DateFormat":
                         dgvList.DataSource = Data.DateFormatTable;
                         break;
+                    case "TimeFormat":
+                        dgvList.DataSource = Data.TimeFormatTable;
+                        break;
                 }
                 this.dgvList.Columns[0].Width = dgvList.Width - 75;
 
@@ -85,6 +88,10 @@ private void btnSave_Click(object sender, EventArgs e)
                         sda.Update(Data.DateFormatTable);
                         Data.CreateDateFormatTable();
                         break;
+                    case "TimeFormat":
+                        sda.Update(Data.TimeFormatTable);
+                        Data.CreateDateFormatTable();
+                        break;
                 }
                 Ribbon.ribbonref.InvalidateRibbon();