Merge pull request microsoft#440 from rchauhan18/fixingSubmitbutton

Fix User can Add Product without Item description.
willowierhail5 · Oct 19, 2022 · df8f6c0 · df8f6c0
2 parents a5b2939 + 0d97125
commit df8f6c0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/Sample Applications/DataBindingDemo/AddProductWindow.cs b/Sample Applications/DataBindingDemo/AddProductWindow.cs
@@ -19,7 +19,7 @@ public AddProductWindow()
         {
             InitializeComponent();
         }
-
+       
         private void OnInit(object sender, RoutedEventArgs e)
         {
             DataContext = new AuctionItem("Type your description here",
@@ -42,9 +42,17 @@ private void SubmitProduct(object sender, RoutedEventArgs e)
         {
             var automationPeer = UIElementAutomationPeer.CreatePeerForElement(ErrorTextBlock);
 
-            if(StartDateEntryForm.Text.Length == 0 || StartPriceEntryForm.Text.Length == 0)
+            if(StartDateEntryForm.Text.Length == 0 )
+            {
+                AnnounceError("Please, fill start date");
+            }
+            else if(StartPriceEntryForm.Text.Length == 0)
+            {
+                AnnounceError("Please, fill start price");
+            }
+            else if(DescriptionEntryForm.Text.Length == 0)
             {
-                AnnounceError("Please, fill both date and start price");
+                AnnounceError("Please, fill item description");
             }
             else if (Validation.GetHasError(StartDateEntryForm))
             {

diff --git a/Sample Applications/DataBindingDemo/AddProductWindow.xaml b/Sample Applications/DataBindingDemo/AddProductWindow.xaml
@@ -50,11 +50,22 @@
 
                     <TextBlock Grid.Row="1" Grid.Column="0"
                                Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">
-                        Item Description:
+                        Item Description: *
                     </TextBlock>
                     <TextBox Name="DescriptionEntryForm" AutomationProperties.Name="Item Description" Grid.Row="1" Grid.Column="1"
-                             Text="{Binding Path=Description, UpdateSourceTrigger=PropertyChanged}"
-                             Style="{StaticResource TextStyleTextBox}" Margin="8,5,0,5" />
+                             AutomationProperties.IsRequiredForForm="True"
+                             Style="{StaticResource TextStyleTextBox}" Margin="8,5,0,5" 
+                             Validation.Error="OnValidationError" >
+                        <TextBox.Text>
+
+                            <Binding Path="Description" UpdateSourceTrigger="PropertyChanged"
+                                     NotifyOnValidationError="True" >
+                                <Binding.ValidationRules>
+                                    <ExceptionValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox.Text>
+                    </TextBox>
 
                     <TextBlock Grid.Row="2" Grid.Column="0" Style="{StaticResource SmallTitleStyle}" Margin="0,5,0,5">Start Price: *</TextBlock>
 

diff --git a/Sample Applications/DataBindingDemo/AuctionItem.cs b/Sample Applications/DataBindingDemo/AuctionItem.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 
 namespace DataBindingDemo
 {
@@ -52,8 +53,14 @@ public string Description
             get { return _description; }
             set
             {
+
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentException("Item description should be added");
+                }
                 _description = value;
                 OnPropertyChanged("Description");
+
             }
         }