- Speicherfehler bei manuellen Konten behoben

Control/Logger.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Text.RegularExpressions;
 
 namespace GCHR.Control
@@ -20,6 +21,7 @@ namespace GCHR.Control
             }
         }
 
+
         public static void Progress(string message)
         {
             lock(ExportLog)
@@ -38,5 +40,24 @@ namespace GCHR.Control
 
         public static bool DateiExistiert { get { return File.Exists(LogDatei); } 
         }
+
+        public static List<string> Historie()
+        {
+            if (!File.Exists(LogDatei)) return new List<string>();
+
+            using (var sr = new StreamReader(LogDatei, true))
+            {
+                var list = new List<string>();
+                while (!sr.EndOfStream)
+                {
+                    var line = sr.ReadLine();
+                    if (line != null && Regex.IsMatch(line, @" - \d{2}/\d{4}$"))
+                    {
+                        list.Add(line);
+                    }
+                }
+                return list;
+            }
+        }
     }
 }

Control/Tasks/TaskManager.cs

@@ -42,6 +42,7 @@ namespace GCHR.Control.Tasks
             var info = new FileInfo(Logger.ExportLog);
             if (info.Directory != null) info.Directory.Create();
 
+            Logger.Info(DateTime.Now + " - " + periode.Klartext);
             Logger.Info(string.Format("Prozess gestartet. Weitere Infos siehe '{0}'", Logger.ExportLog));
             Logger.Progress(DateTime.Now + " Prozess gestartet.");
         }

Main.xaml

@@ -38,11 +38,6 @@
 
             <Label Foreground="White" FontSize="20" FontWeight="Bold" Name="Kopfzeile">Fehler in gchr.xml!</Label>
             
-        <!--
-            <ScrollViewer Height="80" Margin="10,3">
-                <ListView Name="LvPerioden" ItemTemplate="{StaticResource StatusTemplate}"/>
-            </ScrollViewer>
--->
             <Label Foreground="White" FontSize="14" FontWeight="Bold">Periode auswählen</Label>
             <WrapPanel HorizontalAlignment="Center" Margin="0,0,0,10">
                 <Label Foreground="White">Monat:</Label>
@@ -146,6 +141,9 @@
                     </Button>
                 </StackPanel>
             </Border>
+            <ScrollViewer Height="80" Margin="0,10,0,0">
+                <ListView Name="LvPerioden" MouseDoubleClick="LvPeriodenDoubleClick" />
+            </ScrollViewer>
         </StackPanel>
     </Grid>
 </Window>

Main.xaml.cs

@@ -1,10 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using GCHR.Control;
 using GCHR.Control.Tasks;
 using GCHR.Model;
@@ -16,6 +19,8 @@ namespace GCHR
     {
         private TaskManager _aufgabenListe;
 
+        private List<string> _historie; 
+
         //private readonly List<Periode> _periodenListe = new List<Periode>();
 
         private bool ImportdatenSichern
@@ -46,67 +51,44 @@ namespace GCHR
         private void WindowLoaded(object sender, RoutedEventArgs e)
         {
             var config = Konfiguration.CreateInstance(Constants.ConfigDatei);
-            Logger.Info(DateTime.Now + " GCHR gestartet.");
-
-            /*
-            var von = new Periode((DateTime.Today.Year - 1).ToString(CultureInfo.InvariantCulture) + "01");
-            var bis =
-                new Periode(DateTime.Today.Year +
-                            DateTime.Today.Month.ToString(CultureInfo.InvariantCulture).PadLeft(2, '0'));
-
-            while (!von.ToString().Equals(bis.ToString()))
-            {
-                _periodenListe.Add(von);
-                von = von.Nachfolger;
-            }
-             */
-
-
+            Historie();
             AktuellenMonatEinstellen();
             Kopfzeile.Content = config.Haendler + " - " + config.HaendlernummerBmCode + " - " + config.Mandantenname;
-
-            /*
-            LvPerioden.ItemsSource = _periodenListe;
-            LvPerioden.SelectedIndex = _periodenListe.Count - 1;
-            LvPerioden.ScrollIntoView(_periodenListe[_periodenListe.Count - 1]);
-            LvPerioden.Focus();
-            */
         }
 
         private void AktuellenMonatEinstellen()
         {
             Jahrbox.Items.Clear();
-            for (var i = 2010; i <= DateTime.Today.Year; i++)
+            for (var i = 2012; i <= DateTime.Today.Year; i++)
             {
                 Jahrbox.Items.Add(i);
             }
 
-            var aktPeriode = aktuellenMonatBestimmen();
+            var aktPeriode = AktuellenMonatBestimmen();
 
             Monatsbox.SelectedIndex = Int32.Parse(aktPeriode.Monat) - 1;
             Jahrbox.SelectedValue = Int32.Parse(aktPeriode.Jahr);
         }
 
-        private Periode aktuellenMonatBestimmen()
+        private void Historie()
         {
-            var neuerMonat =
-                new Periode(DateTime.Today.Year +
-                            DateTime.Today.Month.ToString(CultureInfo.InvariantCulture).PadLeft(2, '0'));
-            var monateZurueck = DateTime.Today.Month;
-            if (monateZurueck <= 2)
-            {
-                monateZurueck += 12;
-            }
+            _historie = Logger.Historie();
+            _historie.Reverse();
+            LvPerioden.ItemsSource = _historie;
+        }
 
-            for (var i = 0; i < monateZurueck; i++)
-            {
-                neuerMonat = neuerMonat.Vorgaenger;
-                if (!File.Exists(neuerMonat.Vorgaenger.BalanceDatei)) continue;
-                var aelterAlsFuenfTage =
-                    File.GetLastWriteTime(neuerMonat.Vorgaenger.BalanceDatei).AddDays(5).CompareTo(DateTime.Now) <= 0;
-                return (aelterAlsFuenfTage) ? neuerMonat : neuerMonat.Vorgaenger;
-            }
-            return neuerMonat.Nachfolger;
+        private Periode AktuellenMonatBestimmen()
+        {
+            var vormonat = new Periode(DateTime.Today.Year, DateTime.Today.Month).Vorgaenger;
+            if (_historie.Count == 0) return vormonat;
+
+            var match = Regex.Match(_historie[0], @"(\d{2})/(\d{4})$");
+            if (!match.Success) return vormonat;
+
+            var aktMonat = new Periode(match.Groups[2].Value + match.Groups[1].Value); 
+            var letzteFuenfTage = File.GetLastWriteTime(aktMonat.BalanceDatei).AddDays(5).CompareTo(DateTime.Now) >= 0;
+            if (!File.Exists(aktMonat.BalanceDatei) || letzteFuenfTage) return aktMonat;
+            return aktMonat.Nachfolger;
         }
 
         private void BtnStartenClick(object sender, RoutedEventArgs e)
@@ -175,6 +157,10 @@ namespace GCHR
                 {
                     BtnStarten.IsEnabled = true;
                     BtnProtokoll.Visibility = Visibility.Visible;
+                    Historie();
+                    Logger.Progress(DateTime.Now + " Prozess beendet.");
+                    Logger.Progress("------------------------------------");
+                    Logger.Progress("");
                 }
             }
         }
@@ -213,7 +199,19 @@ namespace GCHR
         {
             var dateiInfo = new FileInfo(Logger.ExportLog);
             if (dateiInfo.Directory == null) return;
-            var psi = new ProcessStartInfo("explorer.exe", dateiInfo.Directory.ToString())
+            ProzessStarten("explorer.exe", dateiInfo.Directory.ToString());
+        }
+
+        private void LvPeriodenDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            var match = Regex.Match(_historie[LvPerioden.SelectedIndex], @"(\d{2})/(\d{4})$");
+            var log = new Periode(match.Groups[2].Value + match.Groups[1].Value).LogDatei;
+            ProzessStarten("notepad.exe", log);
+        }
+
+        private static void ProzessStarten(string programm, string parameter)
+        {
+            var psi = new ProcessStartInfo(programm, parameter)
                 {
                     RedirectStandardOutput = true,
                     WindowStyle = ProcessWindowStyle.Normal,

Model/Konto/HaendlerKonto.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Controls;
+using System.Windows.Input;
 using System.Xml.Serialization;
 using GCHR.Model.Mandant;
 
@@ -27,6 +29,7 @@ namespace GCHR.Model.Konto
             if (typ != KontoTypen.Debug) return;
             Marke = new string('0', _markeLength);
             Betrieb = new string('0', _betriebLength);
+            //ClickMeCommand = new RoutedCommand(SaldoAusAuswahl);
         }
 
         public static HaendlerKonto ManStatNeu(string kontonummer)
@@ -247,10 +250,7 @@ namespace GCHR.Model.Konto
             get 
             {
                 var saldo = SaldoSuchen(AktuellePeriode.ToString());
-                if (saldo != null)
-                    return saldo.Soll.ToString(Constants.Zahlenformat);
-                SaldoZuordnen(AktuellePeriode.ToString(), Decimal.Parse(Vormonat1, Constants.Zahlenformat), 0m);
-                return Vormonat1;
+                return (saldo != null) ? saldo.Soll.ToString(Constants.Zahlenformat) : (0m).ToString(Constants.Zahlenformat);
             }
             set
             {
@@ -329,5 +329,18 @@ namespace GCHR.Model.Konto
             get { return _mandant; }
             set { _mandant = value; }
         }
+
+        internal void SaldoAusVormonat()
+        {
+            if (SaldoSuchen(AktuellePeriode.ToString()) != null) return;
+            Saldo = (ZugeordneteSaldi.Count == 0) ? "0" : ZugeordneteSaldi.Last().Soll.ToString(Constants.Zahlenformat);
+        }
+
+        //public ICommand ClickMeCommand { get; set; }
+
+        public void SaldoAusAuswahl(object sender)
+        {
+            Saldo = ((TextBox)sender).Text;
+        }
     }
 }

Model/Mandant/Fiat.cs

@@ -63,7 +63,7 @@ namespace GCHR.Model.Mandant
 
         public string KontonummerFormatieren(HaendlerKonto konto)
         {
-            return konto.Marke + konto.Betrieb + konto.Kontonummer;
+            return konto.Kontonummer;
         }
 
         public Encoding Encoding

Model/Periode.cs

@@ -20,6 +20,13 @@ namespace GCHR.Model
         
         private readonly bool _keinJahresabschluss;
 
+        public Periode(int jahr, int monat)
+            : this(
+                jahr.ToString(CultureInfo.InvariantCulture) +
+                monat.ToString(CultureInfo.InvariantCulture).PadLeft(2, '0'))
+        {
+            
+        }
 
         public Periode(string periode)
             : this(periode, false)

View/ManuelleKontenBearbeiten.xaml

@@ -2,7 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:konto="clr-namespace:GCHR.Model.Konto" xmlns:view="clr-namespace:GCHR.View" mc:Ignorable="d"
+        xmlns:konto="clr-namespace:GCHR.Model.Konto"
+        mc:Ignorable="d"
         x:Name="Root"
     Title="Manuelle Konten bearbeiten" Height="480" Width="780">
 
@@ -15,7 +16,7 @@
         </Grid.Background>
         <Label Margin="12,12,12,0" VerticalAlignment="Top" Foreground="White">Bitte geben Sie die aktuellen Werte für die manuellen Konten ein:</Label>
 
-        <ListView Name="LvManuelle" Opacity="1.0" Margin="12,36,12,42" Focusable="True" KeyboardNavigation.TabNavigation="Continue" HorizontalContentAlignment="Stretch" view:EnterKeyTraversal.IsEnabled="True">
+        <ListView Name="LvManuelle" Opacity="1.0" Margin="12,36,12,42" Focusable="True" KeyboardNavigation.TabNavigation="Continue" HorizontalContentAlignment="Stretch">
             <ListView.ItemContainerStyle>
                 <Style TargetType="{x:Type ListViewItem}">
                     <Setter Property="IsTabStop" Value="False" />
@@ -47,11 +48,11 @@
 
                                     <Label HorizontalContentAlignment="Left" Content="{Binding Path=Bezeichnung}" FontSize="12" />
                                     <WrapPanel Grid.Row="1" TextElement.FontSize="9">
-                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Cursor="Hand" Text="{Binding Path=Vormonat5, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat5, Mode=OneWay}" GotFocus="VormonatGotFocus" />
-                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Cursor="Hand" Text="{Binding Path=Vormonat4, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat4, Mode=OneWay}" GotFocus="VormonatGotFocus" />
-                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Cursor="Hand" Text="{Binding Path=Vormonat3, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat3, Mode=OneWay}" GotFocus="VormonatGotFocus" />
-                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Cursor="Hand" Text="{Binding Path=Vormonat2, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat2, Mode=OneWay}" GotFocus="VormonatGotFocus" />
-                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Cursor="Hand" Text="{Binding Path=Vormonat1, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat1, Mode=OneWay}" GotFocus="VormonatGotFocus" />
+                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Text="{Binding Path=Vormonat5, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat5, Mode=OneWay}" />
+                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Text="{Binding Path=Vormonat4, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat4, Mode=OneWay}" />
+                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Text="{Binding Path=Vormonat3, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat3, Mode=OneWay}" />
+                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Text="{Binding Path=Vormonat2, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat2, Mode=OneWay}" />
+                                        <TextBox HorizontalContentAlignment="Right" IsReadOnly="True" IsTabStop="False" TextAlignment="Right" Width="70" Text="{Binding Path=Vormonat1, Mode=OneWay}" ToolTip="{Binding ElementName=Root, Path=Vormonat1, Mode=OneWay}" />
                                     </WrapPanel>
                                 </Grid>                                
                             </DataTemplate>
@@ -60,7 +61,7 @@
                     <GridViewColumn Width="100" Header="Aktuelle Periode">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate DataType="konto:HaendlerKonto">
-                                <TextBox HorizontalContentAlignment="Right" Text="{Binding Path=Saldo, Mode=TwoWay}" GotFocus="TextBoxGotFocus" TextAlignment="Right" FontSize="12" VerticalAlignment="Bottom" Width="90"/>
+                                <TextBox HorizontalContentAlignment="Right" Text="{Binding Path=Saldo, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" GotFocus="TextBoxGotFocus" KeyUp="TextBox_KeyUp" TextAlignment="Right" FontSize="12" VerticalAlignment="Bottom" Width="90"/>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -76,8 +77,8 @@
         </ListView>
 
         <WrapPanel VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="12,0,12,6">
-            <Button IsTabStop="False" Margin="3" Width="80" Height="24" Template="{DynamicResource GlassButton}" Click="BtnManuelleDruckenClick"  Foreground="White" Name="BtnManuelleDrucken">Drucken</Button>
-            <Button IsTabStop="False" Margin="3" Width="80" Height="24" Template="{DynamicResource GlassButton}" Click="BtnManuelleIgnorierenClick" Foreground="White" Name="BtnManuelleIgnorieren">Ignorieren</Button>
+            <!--<Button IsTabStop="False" Margin="3" Width="80" Height="24" Template="{DynamicResource GlassButton}" Click="BtnManuelleDruckenClick"  Foreground="White" Name="BtnManuelleDrucken">Drucken</Button>
+            <Button IsTabStop="False" Margin="3" Width="80" Height="24" Template="{DynamicResource GlassButton}" Click="BtnManuelleIgnorierenClick" Foreground="White" Name="BtnManuelleIgnorieren">Ignorieren</Button>-->
             <Button Margin="3" Width="80" Height="24" Template="{DynamicResource GlassButton}" Click="BtnManuelleSpeichernClick" Name="BtnManuelleSpeichern" Foreground="White">Speichern</Button>
         </WrapPanel>
     </Grid>

View/ManuelleKontenBearbeiten.xaml.cs

@@ -25,6 +25,7 @@ namespace GCHR.View
         public ManuelleKontenBearbeiten(IEnumerable<HaendlerKonto> konten)
         {
             ManuelleKonten = (from kto in konten orderby kto.Ebene1, kto.Kontonummer select kto).ToList();
+            ManuelleKonten.ForEach(k => k.SaldoAusVormonat());
 
             InitializeComponent();
             LvManuelle.ItemsSource = ManuelleKonten;
@@ -37,7 +38,7 @@ namespace GCHR.View
 
         private void BtnManuelleIgnorierenClick(object sender, RoutedEventArgs e)
         {
-            BtnManuelleIgnorieren.IsEnabled = false;
+            //BtnManuelleIgnorieren.IsEnabled = false;
             BtnManuelleSpeichern.IsEnabled = false;
 
             Close();
@@ -45,7 +46,7 @@ namespace GCHR.View
 
         private void BtnManuelleSpeichernClick(object sender, RoutedEventArgs e)
         {
-            BtnManuelleIgnorieren.IsEnabled = false;
+            //BtnManuelleIgnorieren.IsEnabled = false;
             BtnManuelleSpeichern.IsEnabled = false;
 
             Close();
@@ -102,5 +103,17 @@ namespace GCHR.View
             MessageBox.Show(((TextBox)sender).Text);
         }
 
+        private void TextBox_KeyUp(object sender, KeyEventArgs e)
+        {
+            TraversalRequest request;
+            if (e.Key == Key.Enter || e.Key == Key.Return || e.Key == Key.Down)
+            {
+                request = new TraversalRequest(FocusNavigationDirection.Next) {Wrapped = true};
+                ((TextBox)e.Source).MoveFocus(request);
+            }
+            if (e.Key != Key.Up) return;
+            request = new TraversalRequest(FocusNavigationDirection.Previous) { Wrapped = true };
+            ((TextBox)e.Source).MoveFocus(request);
+        }
     }
 }