Merge pull request #57 from FourFront-Senior-Design/development

Development

Author: Sha5hwati

DataEntryForm/DataEntryForm.csproj

@@ -293,5 +293,8 @@
   <ItemGroup>
     <Resource Include="FormIcon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Emblems\emb-empty.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DataEntryForm/MainWindow.xaml

@@ -3,8 +3,8 @@
         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"
-        mc:Ignorable="d" Icon="FormIcon.ico"
-        Title="Data Entry Form (Version 1.4)" Height="450" Width="800" Background="#FFE4E4E4">
+        mc:Ignorable="d" Icon="FormIcon.ico" Title="{Binding Title}"
+        Height="450" Width="800" Background="#FFE4E4E4">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.2*"/>
@@ -75,7 +75,7 @@
                     FontSize="18"
                     Margin="10"
                     Click="ReviewClick"
-                    IsEnabled="{Binding EnableExtract}" />
+                    IsEnabled="{Binding ReviewButtonEnabled}" />
 
                 <Button 
                     Content="Exit" 

DataEntryForm/MainWindow.xaml.cs

@@ -22,54 +22,37 @@ public MainWindow(IMainWindowVM viewModel)
 
         public void ResetMainWindow()
         {
-            _viewModel.EnableExtract = false;
-            _viewModel.Message = "";
-            _viewModel.FileLocation = Properties.Settings.Default.databaseFilePath;
+            _viewModel.ResetWindow();
+            _viewModel.SetFilePath(Properties.Settings.Default.databaseFilePath);
+
             sectionPath.Focus();
             sectionPath.Select(_viewModel.FileLocation.Length, 0);
+
             Trace.WriteLine(_viewModel.FileLocation);
-            Trace.WriteLine(_viewModel.FileLocation.Length);
         }
 
         private void BrowseClick(object sender, RoutedEventArgs e)
-        {
-            _viewModel.Message = "";
+        {   
             var dialog = new System.Windows.Forms.FolderBrowserDialog();
             dialog.ShowDialog();
-
             string selectedPath = dialog.SelectedPath;
-            if(selectedPath != string.Empty)
-            {
-                _viewModel.FileLocation = selectedPath;
-            }
+
+            _viewModel.SetFilePath(selectedPath);
+            
             sectionPath.Focus();
             sectionPath.Select(_viewModel.FileLocation.Length, 0);
-            Trace.WriteLine(sectionPath.CaretIndex);
         }
 
         private void LoadDataClick(object sender, RoutedEventArgs e)
         {
-            Trace.WriteLine("Printing...");
             Trace.WriteLine(_viewModel.FileLocation);
 
-            int countData = _viewModel.LoadData();
-
-            if(countData == -1)
-            {
-                _viewModel.Message = "Invalid Path. Try Again.";
-            }
-            else if (countData == 0)  
-            {
-                _viewModel.Message = "No database found. Try Again.";
-            }
-            else
+            if (_viewModel.LoadData())
             {
                 Properties.Settings.Default.databaseFilePath = _viewModel.FileLocation;
                 Properties.Settings.Default.Save();
-                _viewModel.Message = "Successfully uploaded " + countData.ToString() +
-                                 " records from the Database";
-                _viewModel.EnableExtract = true;
             }
+            
             sectionPath.Focus();
             sectionPath.Select(_viewModel.FileLocation.Length, 0);
         }
@@ -81,8 +64,7 @@ private void ReviewClick(object sender, RoutedEventArgs e)
 
         private void OnTextChanged(object sender, RoutedEventArgs e)
         {
-            _viewModel.EnableExtract = false;
-            _viewModel.Message = "";
+            _viewModel.ResetWindow();
         }
 
         private void ExitClick(object sender, RoutedEventArgs e)

DataEntryForm/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]