added Button to clear the entry fields. Needed for: updating an existing entry and then moving on to adding another one.

Author: al-develop

ReceiptOverview/Assets/clear.png

@@ -83,6 +83,7 @@ public bool CheckVisible
         }
 
 
+        public ICommand ClearEntryCommand { get; set; }
         public ICommand CopyEntryCommand { get; set; }
         public ICommand NewPositionCommand { get; }
         public ICommand RemovePositionCommand { get; }
@@ -115,11 +116,12 @@ public MainWindowViewModel()
 
             CopyEntryCommand = ReactiveCommand.Create(() => CopyEntry());
             NewPositionCommand = ReactiveCommand.Create(() => CreateNewPosition());
-            NewEntryCommand = ReactiveCommand.Create(() => SaveEntry());
-            SaveCommand = ReactiveCommand.Create(() => Save());
-            ExportToCsvCommand = ReactiveCommand.Create(async() => await ExportToCsv());
-            CheckDbConnectionCommand = ReactiveCommand.Create(async () => await CheckDbConnection());
-
+            NewEntryCommand = ReactiveCommand.Create(() => AddEntry());
+            SaveCommand = ReactiveCommand.Create(() => SavePositionsWithEntries());
+            ExportToCsvCommand = ReactiveCommand.Create(()=>  ExportToCsv());
+            CheckDbConnectionCommand = ReactiveCommand.Create(() => CheckDbConnection());
+            ClearEntryCommand = ReactiveCommand.Create(() => ClearEntry());
+            
             LoadPositionsWithEntries();
         }
 
@@ -194,7 +196,7 @@ private void CreateNewPosition()
             CrossVisible = true;
         }
 
-        private void SaveEntry()
+        private void AddEntry()
         {
             int entryId = Logic.SaveEntry(CurrentEntry.VmToModel());
             EntryViewModel entryWithId = CurrentEntry;
@@ -236,8 +238,12 @@ private async Task RemovePosition()
 
         private async Task RemoveEntry()
         {
-            if (CurrentEntry == null! || CurrentEntry.Id == 0)
+            if (CurrentEntry == null || CurrentEntry.Id == 0)
+            {
+                if (CurrentPosition.Entries.Contains(CurrentEntry))
+                    CurrentPosition.Entries.Remove(CurrentEntry);
                 return;
+            }
 
             MainUiActive = false;
 
@@ -259,7 +265,7 @@ private async Task RemoveEntry()
             MainUiActive = true;
         }
 
-        private void Save()
+        private void SavePositionsWithEntries()
         {
             Logic.SavePosition(CurrentPosition.VmToModel());
 
@@ -315,6 +321,11 @@ private void CopyEntry()
             CrossVisible = true;
             CheckVisible = false;
         }
+
+        private void ClearEntry()
+        {
+            CurrentEntry = new EntryViewModel();
+        }
 
 
         private string GetConnectionErrorMessage()

ReceiptOverview/ViewModels/MainWindowViewModel.cs

@@ -272,10 +272,36 @@
 
             <DockPanel HorizontalAlignment="Right"
                        DockPanel.Dock="Top"
-                       Name="DockEntryButtons"
+                       Name="DockEntryButtons" 
                        Margin="0,5,0,25">
                 <StackPanel Orientation="Horizontal">
-                    <Button Margin="5,0,10,0"
+                    <Button Margin="0,0,5,0"
+                            HorizontalAlignment="Stretch"
+                            Command="{Binding ClearEntryCommand}"
+                            IsTabStop="False"
+                            Name="BtnClearEntry">
+                        <Button.Template>
+                            <ControlTemplate>
+                                <Border Background="{TemplateBinding Background}"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Stretch"
+                                        BorderThickness="8"
+                                        CornerRadius="3">
+                                    <StackPanel Orientation="Horizontal"
+                                                HorizontalAlignment="Center">
+                                        <TextBlock Text="Clear Entry"
+                                                   VerticalAlignment="Center"
+                                                   Margin="5,0,0,0" />
+                                        <Image Source="avares://ReceiptOverview/Assets/clear.png"
+                                               Width="18"
+                                               Height="18" />
+                                    </StackPanel>
+                                </Border>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                    
+                    <Button Margin="0,0,5,0"
                             HorizontalAlignment="Stretch"
                             Command="{Binding NewEntryCommand}"
                             IsTabStop="False"