ENI2/DetailViewControls/OverViewDetailControl.xaml.cs

@@ -433,50 +433,44 @@ namespace ENI2.DetailViewControls
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
-                this.SendMessages((IList<Message>)this.dataGridMessages.SelectedItems);                                
+                bool somethingsNotSaved = false;
-            }
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
-        }
-
-        private void SendMessages(IList<Message> messages)
-        {
-            bool somethingsNotSaved = false;
-
-            foreach (Message selectedMessage in messages)
-            {
-                if (selectedMessage.IsDirty) somethingsNotSaved = true;
-            }
-
-            if (somethingsNotSaved)
-            {
-                if (MessageBox.Show(Properties.Resources.textUnsavedChangesSendAnyWay, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
-                    return;
-            }
-
-            List<Message> watchList = new List<Message>();
-            foreach (Message selectedMessage in messages)
-            {
-                if (selectedMessage.Reset) selectedMessage.Reset = false; // "nochmal" Versenden ist möglich
-                selectedMessage.InternalStatus = Message.BSMDStatus.TOSEND;
-                string userName = "?";
-                if (App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
                 {
-                    userName = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].Logon;
+                    if (selectedMessage.IsDirty) somethingsNotSaved = true;
                 }
-                selectedMessage.ChangedBy = string.Format("{0} at {1} (Send)", userName, DateTime.Now);
-                selectedMessage.StatusInfo = string.Format(Properties.Resources.textMessageSentAt, DateTime.Now);
-                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
-                watchList.Add(selectedMessage);
-            }
 
-            // komplette Anmeldung auf "zu versenden" stellen
+                if(somethingsNotSaved)
-            this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                {
-            this.Core.DefaultReportingPartyId = App.UserId;
+                    if (MessageBox.Show(Properties.Resources.textUnsavedChangesSendAnyWay, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
+                        return;
+                }
 
-            DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
+                List<Message> watchList = new List<Message>();
-            this.OnRequestSendValidation();
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
-            this.dataGridMessages.Items.Refresh();
+                {
+                    if (selectedMessage.Reset) selectedMessage.Reset = false; // "nochmal" Versenden ist möglich
+                    selectedMessage.InternalStatus = Message.BSMDStatus.TOSEND;
+                    string userName = "?";
+                    if (App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
+                    {
+                        userName = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].Logon;
+                    }
+                    selectedMessage.ChangedBy = string.Format("{0} at {1} (Send)", userName, DateTime.Now);
+                    selectedMessage.StatusInfo = string.Format(Properties.Resources.textMessageSentAt, DateTime.Now);
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
+                    watchList.Add(selectedMessage);
+                }
 
-            /*
+                // komplette Anmeldung auf "zu versenden" stellen
+                this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                this.Core.DefaultReportingPartyId = App.UserId;
+
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
+                this.OnRequestSendValidation();
+                this.dataGridMessages.Items.Refresh();
+
+
+                /*
                 if (this.mssd == null)
                 {
                     this.mssd = new MessageSendStatusDialog(this.Core);
@@ -496,6 +490,7 @@ namespace ENI2.DetailViewControls
                 this.mssd.Activate(); // bring to foreground
                 this.mssd.AddMessages(watchList);                
                 */
+            }
         }
 
         private void contextResetMessage(object sender, RoutedEventArgs e)
@@ -833,38 +828,7 @@ namespace ENI2.DetailViewControls
 
         private void buttonSendAll_Click(object sender, RoutedEventArgs e)
         {
-            SelectImportClassesDialog sicd = new SelectImportClassesDialog();
+            // TBD
-            List<Message> readyToSendMessages = new List<Message>();
-            
-            foreach (Message message in this.Messages)
-            {
-                if (message.MessageNotificationClass == NotificationClass.STO) continue;
-                // other filters?
-
-                if (((message.ViolationCount ?? 0) > 0) || ((message.ErrorCount ?? 0) > 0)) continue; // these need more work
-                readyToSendMessages.Add(message);
-            }
-
-            sicd.Messages = readyToSendMessages;
-            sicd.IsTransit = this.Core.IsTransit;
-
-            if ((sicd.ShowDialog() ?? false) && (sicd.SelectedClasses.Count > 0))
-            {
-                // now send all selected messages
-                List<Message> toSendMessages = new List<Message>();
-                foreach(NotificationClass notificationClass in sicd.SelectedClasses)
-                {
-                    Message selectedMessage = readyToSendMessages.Find(x => x.MessageNotificationClass == notificationClass);
-                    if (selectedMessage != null)
-                    {
-                        toSendMessages.Add(selectedMessage);
-                    }                    
-                }
-                if (toSendMessages.Count > 0)
-                {
-                    this.SendMessages(toSendMessages);
-                }
-            }
         }
 
         #endregion

ENI2/ENI2.csproj

@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.2.10.1</ApplicationVersion>
+    <ApplicationVersion>7.2.10.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI2/Properties/Resources.Designer.cs

@@ -5306,7 +5306,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select message classes.
+        ///   Looks up a localized string similar to Select classes to import.
         /// </summary>
         public static string textSelectImportClasses {
             get {

ENI2/Properties/Resources.resx

@@ -1757,7 +1757,7 @@
     <value>Select all</value>
   </data>
   <data name="textSelectImportClasses" xml:space="preserve">
-    <value>Select message classes</value>
+    <value>Select classes to import</value>
   </data>
   <data name="textSelectNone" xml:space="preserve">
     <value>Select none</value>