From 81fbd7482fed66a405c47ccab7a4d1d25c417307 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 9 Mar 2023 08:21:31 +0100
Subject: [PATCH] added some small improvements

---
 ENI2/EditControls/CompareExcelDialog.xaml    |  4 +--
 ENI2/EditControls/CompareExcelDialog.xaml.cs | 30 ++++++++++++++++++++
 bsmd.database/RuleEngine.cs                  |  2 +-
 bsmd.database/ValidationAttribute.cs         |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ENI2/EditControls/CompareExcelDialog.xaml b/ENI2/EditControls/CompareExcelDialog.xaml
index cf243be2..230bd65a 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml
+++ b/ENI2/EditControls/CompareExcelDialog.xaml
@@ -28,7 +28,7 @@
             </AccessText>
         </Label>
         <Image x:Name="imageSource" Grid.Row="1" Grid.Column="1" Margin="4" Source="../Resources/import2.png" AllowDrop="True" Drop="imageSource_Drop" DragEnter="imageSource_DragEnter"/>
-        <TextBox TextWrapping="Wrap" x:Name="textBoxSource" Grid.Row="1" Grid.Column="2" IsReadOnly="True" Margin="2" Drop="imageSource_Drop" AllowDrop="True" DragEnter="imageSource_DragEnter" PreviewDragOver="textBoxSource_PreviewDragOver"/>
+        <TextBox TextWrapping="Wrap" x:Name="textBoxSource" Grid.Row="1" Grid.Column="2" IsReadOnly="True" Margin="2" Drop="imageSource_Drop" AllowDrop="True" DragEnter="imageSource_DragEnter" PreviewDragOver="textBoxSource_PreviewDragOver" PreviewMouseDown="textBoxSource_PreviewMouseDown"/>
 
         <Label VerticalAlignment="Center" Grid.Row="2" Grid.Column="0">
             <AccessText TextWrapping="Wrap">
@@ -36,7 +36,7 @@
             </AccessText>
         </Label>
         <Image x:Name="imageTarget" Grid.Row="2" Grid.Column="1" Margin="4"  Source="../Resources/import1.png" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter"/>
-        <TextBox TextWrapping="Wrap" x:Name="textBoxTarget" Grid.Row="2" Grid.Column="2" IsReadOnly="True" Margin="2" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter" PreviewDragOver="textBoxSource_PreviewDragOver"/>
+        <TextBox TextWrapping="Wrap" x:Name="textBoxTarget" Grid.Row="2" Grid.Column="2" IsReadOnly="True" Margin="2" AllowDrop="True" Drop="imageTarget_Drop" DragEnter="imageSource_DragEnter" PreviewDragOver="textBoxSource_PreviewDragOver" PreviewMouseDown="textBoxTarget_PreviewMouseDown"/>
 
         <Button x:Name="buttonCompare" Margin="2" Grid.Row="3" Grid.Column="1" Content="Compare" IsEnabled="False" Click="buttonCompare_Click"/>
     </Grid>
diff --git a/ENI2/EditControls/CompareExcelDialog.xaml.cs b/ENI2/EditControls/CompareExcelDialog.xaml.cs
index 62bfba7a..a9d4f9f1 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml.cs
+++ b/ENI2/EditControls/CompareExcelDialog.xaml.cs
@@ -210,5 +210,35 @@ namespace ENI2.EditControls
 
         #endregion
 
+        #region click on textboxes opens file selection
+
+        private void textBoxSource_PreviewMouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+            if (ofd.ShowDialog() ?? false)
+            {
+                textBoxSource.Text = ofd.FileName;
+            }
+            EnableCompareButton();
+        }
+
+        private void textBoxTarget_PreviewMouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+            if (ofd.ShowDialog() ?? false)
+            {
+                textBoxTarget.Text = ofd.FileName;
+            }
+            EnableCompareButton();
+        }
+
+        #endregion
+
     }
 }
diff --git a/bsmd.database/RuleEngine.cs b/bsmd.database/RuleEngine.cs
index 40b2c78f..9d7f8f10 100644
--- a/bsmd.database/RuleEngine.cs
+++ b/bsmd.database/RuleEngine.cs
@@ -205,7 +205,7 @@ namespace bsmd.database
                 {
                     MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute;
                     bool isStandardML = (mla.MaxLength == 99) || (mla.MaxLength == 100);
-                    if((value.Length >= 90) && ((mla.MaxLength == value.Length) || isStandardML))
+                    if(((value.Length >= 90) && isStandardML) || ((mla.MaxLength == value.Length) && (value.Length > 20) && !isStandardML))
                     {
                         // put out a warning this might be truncated
                         violations.Add(RuleEngine.CreateViolation(ValidationCode.TRUNCATE, property.Name, value, entity.Title, identifier, entity.Tablename));
diff --git a/bsmd.database/ValidationAttribute.cs b/bsmd.database/ValidationAttribute.cs
index 2a9baf85..050ce2c8 100644
--- a/bsmd.database/ValidationAttribute.cs
+++ b/bsmd.database/ValidationAttribute.cs
@@ -37,7 +37,7 @@ namespace bsmd.database
         DOT_NO_COMMA,
         VESSEL_TYPE,
         NOT_NULL_MAX_LEN,
-        FRZ, 
+        FRZ,
         POSITION_COUNT = 22,
         STRING_UNNUMBER = 23,
         STRING_IMOCLASS = 24,