From 66897668cc365f88d7f677dbcdc9c6fc10affa59 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 23 Dec 2021 08:36:13 +0100
Subject: [PATCH] =?UTF-8?q?UI=20Knopf=20und=20das=20au=C3=9Fenrum=20angele?=
 =?UTF-8?q?gt,=20Version=20erh=C3=B6ht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OverViewDetailControl.xaml                |  15 ++++++--
 .../OverViewDetailControl.xaml.cs             |  33 ++++++++++++++++++
 ENI2/ENI2.csproj                              |   3 +-
 ENI2/Import/ExcelManager.cs                   |  19 +++++++++-
 ENI2/Properties/Resources.Designer.cs         |  21 ++++++++++-
 ENI2/Properties/Resources.resx                |   8 ++++-
 ENI2/Resources/excel.png                      | Bin 0 -> 1516 bytes
 .../Properties/AssemblyProductInfo.cs         |   2 +-
 .../Properties/AssemblyProjectInfo.cs         |   2 +-
 9 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 ENI2/Resources/excel.png

diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 9922c38e..ec9d46f3 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -110,11 +110,20 @@
                 <Label Grid.Column="0" Grid.Row="7" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelCancelled" VerticalContentAlignment="Center" FontWeight="Bold" />
                 <Label Grid.Column="1" Grid.Row="7" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelHIS" VerticalContentAlignment="Center" Content="{x:Static p:Resources.textSendToHIS}" />
                 <ComboBox Grid.Column="2" Grid.Row="7" Margin="2" Name="comboBoxInitialHis" VerticalContentAlignment="Center" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding Path=InitialHIS}" />
-                <Button Grid.Column="3" Grid.Row="7" Margin="2" Name="buttonExcelImport" Content="{x:Static p:Resources.textExcelImport}" Click="buttonExcelImport_Click">
-                        <!-- hier könnte noch ein nettes Icon hin -->
+                <Button Grid.Column="3" Grid.Row="7" Margin="2" Name="buttonExcelImport" Click="buttonExcelImport_Click">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{x:Static p:Resources.textExcelImport}"></TextBlock>
+                        <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
+                    </StackPanel>
+                </Button>
+                <Button Grid.Column="4" Grid.Row="7" Margin="2" Name="buttonExcelExport" Click="buttonExcelExport_Click">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{x:Static p:Resources.textExcelExport}"></TextBlock>
+                        <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
+                    </StackPanel>
                 </Button>
 
-                <StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="7" Visibility="Hidden" Name="stackPanelLock">
+                    <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="7" Visibility="Hidden" Name="stackPanelLock">
                     <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
                     <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
                 </StackPanel>
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 38f60a94..96eb4f6e 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -754,6 +754,9 @@ namespace ENI2.DetailViewControls
             this.OnRequestValidate();           
         }
 
+        /// <summary>
+        /// update class fields from named excel sheet
+        /// </summary>
         private void buttonExcelImport_Click(object sender, RoutedEventArgs e)
         {
             SelectImportClassesDialog sicd = new SelectImportClassesDialog();
@@ -789,6 +792,36 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        /// <summary>
+        /// export all classes to excel reference sheet
+        /// </summary>        
+        private void buttonExcelExport_Click(object sender, RoutedEventArgs e)
+        {
+            string filename = string.Format("{0}_{1}_ref.xlsx", this.Core.Shipname, this.Core.DisplayId);
+            SaveFileDialog sfd = new SaveFileDialog()
+            {
+                Filter = "Excel Files|*.xls;*.xlsx",
+                FileName = filename
+            };
+            if(sfd.ShowDialog() ?? false)
+            {
+                Util.UIHelper.SetBusyState();
+
+                ExcelManager em = new ExcelManager();
+                string resultMessage = "";
+
+                try
+                {
+                    em.Export(sfd.FileName, this.Core, this.Messages, out resultMessage);
+                    MessageBox.Show("Exported " + sfd.FileName, "Export successful", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+                catch(Exception ex)
+                {                    
+                    MessageBox.Show(resultMessage, "Export failed: " + ex.Message, MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
         #endregion
 
         #region mouse wheel
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index ee8ae89e..b2f080c7 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.8.1.0</ApplicationVersion>
+    <ApplicationVersion>6.9.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -788,6 +788,7 @@
     <Resource Include="Resources\document_down.png" />
     <Resource Include="Resources\undo.png" />
     <Resource Include="Resources\Logo.gif" />
+    <Resource Include="Resources\excel.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI2/Import/ExcelManager.cs b/ENI2/Import/ExcelManager.cs
index 046444fc..e92edb15 100644
--- a/ENI2/Import/ExcelManager.cs
+++ b/ENI2/Import/ExcelManager.cs
@@ -52,6 +52,23 @@ namespace ENI2.Import
                 _log.Error(ex);
             }
             return result; 
-        }        
+        }
+
+        
+        // TODO: ich finde man müsste den Folder zu "excel" umbenennen es ist ja nicht nur "import"..
+
+        internal void Export(string fileName, MessageCore core, List<Message> messages, out string resultMessage)
+        {
+            throw new NotImplementedException();
+
+            // Create ExcelWriter
+
+            // Open reference Sheet
+
+            // somehow loop across all messages and derive their label names from it
+
+            // save excel
+
+        }
     }
 }
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 5379282a..9be029ee 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -370,6 +370,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap excel {
+            get {
+                object obj = ResourceManager.GetObject("excel", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -2092,7 +2102,16 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Excel Import.
+        ///   Looks up a localized string similar to Excel export.
+        /// </summary>
+        public static string textExcelExport {
+            get {
+                return ResourceManager.GetString("textExcelExport", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Excel import.
         /// </summary>
         public static string textExcelImport {
             get {
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 37296c32..64855ba0 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1739,7 +1739,7 @@
     <value>..\Resources\undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="textExcelImport" xml:space="preserve">
-    <value>Excel Import</value>
+    <value>Excel import</value>
   </data>
   <data name="textSelectAll" xml:space="preserve">
     <value>Select all</value>
@@ -1753,4 +1753,10 @@
   <data name="Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Logo.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="excel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="textExcelExport" xml:space="preserve">
+    <value>Excel export</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/Resources/excel.png b/ENI2/Resources/excel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c00f6211318be963f944e6af9e4c6defc1fa1128
GIT binary patch
literal 1516
zcmV<I1rz#-P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00009a7bBm000ie
z000ie0hKEb8vp<RAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ>a!Eu%RCwClR(nj9Wf*_n_q&`6hr<L3N-iPFWyD1T!waSfgqmr{N|Q_@w$hx-
z&1TEAW*N0yxp`qGb6KLU%d})^l-fo(C!kGHkOS<1Tn^X6xqjdKec$``$3bI69%%Vb
z&wt<E=X-z8^ZPxQ7cs`*K^le!Y!e0`s^XEQ@%!_BJ-P?`+U>T6j+R?@n%nxix*UB&
zUf268H!e+^|8D?XlDF3}VD0OuZ@1jGS(|&>+xof&y-tZp6ex!|9&t|MkySFz4A4E1
zFEw8K_)MA2IWXX|J0!QFDu58raXiO!2qT2<{i9GdGbSZAG*V-9<XwzWN|_)CYqORm
zN5+lL;I_?Ld9&IaVCFb13W81$|0yV{(S(TDxv{Al)hJ^e#tZ-e0Wii`UF*$*Kc6^I
zv|}`Y!0|@WpyLF;S*uh{i;7z^V^{-?Q4ELyV1xi5ENJrnv*lxHfEb{0(Q42ccAq-*
z;i)h3(-*Co`^<~`w*o>$QD(*@mKE<J3gIyJQ$>_f${0o%Bg7b!RT%*31Q7uO01T+#
zJ>-(y{cgLWDjoecihw92A~<X~)DeP>0l*j-MT5X`9wHN}aEQxz^f9AgsA;QLsfGYa
zMB1_9^}N(9qs|ayG@ajmgfYZ`8U;N7P{si63m_@-f`p9E3*RcgRI&B=o|Wl2Uu`Hk
zRdeCD#u}YY1OR~-&i?UxZOhH9_?g+sb3Q$D1OOCGiGMg|+w$U(;g1a<^4yh{>qJuv
zGM+B^;c&sMTmU%uOF6>eqloAEYD-<ea}Z&aF)jI6^%;slB63zj`nKi8$Zscen729l
zODj+AEZ9)|WWj=@jI-COu38%mdV|lwOUP^4t23u2M+ApY2?;;3X^*d#f=xjHK$*W;
z!~pc7c>3DKUYC8#(sf4BP<sC4a1Hu21g0p8N0wxjFv>i#<RxB@?2(D=JN1(R0uVT%
zy}z@%@#^x&7uGc2xZHBxAnN`qQ$cs=;x~53;42HC-?Dh^%cXBK1VoXt;xlrR=lItE
z092}lnuF7#;~8U#k+Dfrrrqdh(hEKeMl>}qY3`KZuvxLmA*P_sIfV>B)zqmEMfwOp
zegV8hS~qV+^yEkO{d8<Y-s)EutlV^TH{9)UqN$m2X}L+W1C1uLF|aUe86ZR%4G<0B
z8yEN2K%+F&6uc>Sjm6ehQc+gddMiI8J3c(-?gYg~QU6IrS^9gcN`5@t*4Me{qoSvF
zub;Q8@QtG%002hVkH}s{E_fn0EGYO`RYk9B;QK3;A}?%N{1T<U&={pGA~<|zbYf&k
zm`)H=BB!TD#id3kOb?3!0OnU@qo}KDsD19U&9^$6Cz~gouDc*&0dv@F2#{5R5SA2a
zW6tXQ^lT1co)^A-bFZ)XI1c+L^4A9lTYB0QP1W(D$cs+Nz3<m@jImL#_oc5F^n1^J
zeW3FAvojX1n!RNGp?4U7tdbc~iKRt5Mp49%*#|tw^BnIB2V-n91PmYeXho>U(eISp
zvm7ZzB~9H{hCo*2P}3wB={L@u{P!;L5bw?v8*`KAn2muUrl5=4zeETaWk#JI0C<km
zs5S-wV{DW@W14SyVT^Tx;F4T+_mGYkeK#qZ+SFxj=xXJ;vGxH5Oo-xSZiIlx0*^7q
z7$b}rFf?i!3g2BmSJhanF^U)(MG8?#(SrOjmj0mAQQKPI+I#0lXS1ct+U4vUbPu^@
zkESt<FwgS><`6~*z%6_Bt$p`}%)E&`TP6jXvr}f@`y6l$b=&)zZSD1UES8=&i><xW
z-s6<qL{r?7N2PSa&zAd}he(}+z3l_tO<h)p$GJFdeo{p2e+lqEdi+k*{u}_pT#2MP
SWvgWX0000<MNUMnLSTYEMa-Q5

literal 0
HcmV?d00001

diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 1c950252..ad2d76b0 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.8.1")]
+[assembly: AssemblyInformationalVersion("6.9.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2021 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 74799200..d52adb8b 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.8.1.*")]
+[assembly: AssemblyVersion("6.9.0.*")]