Skip to content

Commit 152e9fc

Browse files
Sha5hwatiSha5hwati
authored
Merge pull request #42 from FourFront-Senior-Design/development
Development
2 parents 32ed756 + b72feac commit 152e9fc

File tree

245 files changed

+7065
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+7065
-126
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ obj/
33
Debug/
44
Release/
55
.vs/
6+
/TestDatabases/

‎Data Entry Form.sln

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,74 +23,56 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ViewModelsTests", "ViewMode
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "IntegrationTests\IntegrationTests.csproj", "{5C406EDD-9798-4F14-9CB1-BE3F292495B7}"
2525
EndProject
26+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{378CA06B-A436-4E1E-AE6F-5D1570E12652}"
27+
EndProject
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug|x64 = Debug|x64
2931
Release|x64 = Release|x64
3032
EndGlobalSection
3133
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32-
{F65A0368-09C8-4986-AD75-6956049C7B28}.Debug|Any CPU.ActiveCfg = Debug|x64
34+
{054A964B-37D2-4473-AE1C-A385A1D78168}.Debug|x64.ActiveCfg = Debug|x64
35+
{054A964B-37D2-4473-AE1C-A385A1D78168}.Debug|x64.Build.0 = Debug|x64
36+
{054A964B-37D2-4473-AE1C-A385A1D78168}.Release|x64.ActiveCfg = Release|x64
37+
{054A964B-37D2-4473-AE1C-A385A1D78168}.Release|x64.Build.0 = Release|x64
3338
{F65A0368-09C8-4986-AD75-6956049C7B28}.Debug|x64.ActiveCfg = Debug|x64
3439
{F65A0368-09C8-4986-AD75-6956049C7B28}.Debug|x64.Build.0 = Debug|x64
35-
{F65A0368-09C8-4986-AD75-6956049C7B28}.Release|Any CPU.ActiveCfg = Release|x64
3640
{F65A0368-09C8-4986-AD75-6956049C7B28}.Release|x64.ActiveCfg = Release|x64
3741
{F65A0368-09C8-4986-AD75-6956049C7B28}.Release|x64.Build.0 = Release|x64
38-
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Debug|Any CPU.ActiveCfg = Debug|x64
3942
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Debug|x64.ActiveCfg = Debug|x64
4043
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Debug|x64.Build.0 = Debug|x64
41-
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Release|Any CPU.ActiveCfg = Release|x64
4244
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Release|x64.ActiveCfg = Release|x64
4345
{9754EA98-88F9-44F4-8EA9-B818F37D01F2}.Release|x64.Build.0 = Release|x64
44-
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Debug|Any CPU.ActiveCfg = Debug|x64
4546
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Debug|x64.ActiveCfg = Debug|x64
4647
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Debug|x64.Build.0 = Debug|x64
47-
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Release|Any CPU.ActiveCfg = Release|x64
4848
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Release|x64.ActiveCfg = Release|x64
4949
{F0341CE9-6A65-4055-A6D8-757B6D9BD937}.Release|x64.Build.0 = Release|x64
50-
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Debug|Any CPU.ActiveCfg = Debug|x64
5150
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Debug|x64.ActiveCfg = Debug|x64
5251
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Debug|x64.Build.0 = Debug|x64
53-
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Release|Any CPU.ActiveCfg = Release|x64
5452
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Release|x64.ActiveCfg = Release|x64
5553
{2D9FEEC2-3218-4755-8FD9-233CEB7B636D}.Release|x64.Build.0 = Release|x64
56-
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Debug|Any CPU.ActiveCfg = Debug|x64
57-
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Debug|Any CPU.Build.0 = Debug|x64
5854
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Debug|x64.ActiveCfg = Debug|x64
5955
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Debug|x64.Build.0 = Debug|x64
60-
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Release|Any CPU.ActiveCfg = Release|x64
61-
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Release|Any CPU.Build.0 = Release|x64
6256
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Release|x64.ActiveCfg = Release|x64
6357
{AA71ED64-9E35-496B-BFD0-60D04D17318D}.Release|x64.Build.0 = Release|x64
64-
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Debug|Any CPU.ActiveCfg = Debug|x64
6558
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Debug|x64.ActiveCfg = Debug|x64
6659
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Debug|x64.Build.0 = Debug|x64
67-
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Release|Any CPU.ActiveCfg = Release|x64
6860
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Release|x64.ActiveCfg = Release|x64
6961
{C60ACF7F-6D2F-4423-84C3-AD29F8EEFDCD}.Release|x64.Build.0 = Release|x64
70-
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Debug|Any CPU.ActiveCfg = Debug|x64
7162
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Debug|x64.ActiveCfg = Debug|x64
7263
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Debug|x64.Build.0 = Debug|x64
73-
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Release|Any CPU.ActiveCfg = Release|x64
7464
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Release|x64.ActiveCfg = Release|x64
7565
{0C493421-EBE7-4915-8BDD-23D2E456C9E3}.Release|x64.Build.0 = Release|x64
76-
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Debug|Any CPU.ActiveCfg = Debug|x64
7766
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Debug|x64.ActiveCfg = Debug|x64
7867
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Debug|x64.Build.0 = Debug|x64
79-
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Release|Any CPU.ActiveCfg = Release|x64
8068
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Release|x64.ActiveCfg = Release|x64
8169
{C2512A5C-2CDE-4E47-8537-DCBEDC87C766}.Release|x64.Build.0 = Release|x64
82-
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Debug|Any CPU.ActiveCfg = Debug|x64
8370
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Debug|x64.ActiveCfg = Debug|x64
8471
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Debug|x64.Build.0 = Debug|x64
85-
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Release|Any CPU.ActiveCfg = Release|x64
8672
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Release|x64.ActiveCfg = Release|x64
8773
{5C406EDD-9798-4F14-9CB1-BE3F292495B7}.Release|x64.Build.0 = Release|x64
88-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Debug|Any CPU.ActiveCfg = Debug|x64
89-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Debug|x64.ActiveCfg = Debug|x64
90-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Debug|x64.Build.0 = Debug|x64
91-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Release|Any CPU.ActiveCfg = Release|x64
92-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Release|x64.ActiveCfg = Release|x64
93-
{054A964B-37D2-4473-AE1C-A385A1D78168}.Release|x64.Build.0 = Release|x64
74+
{378CA06B-A436-4E1E-AE6F-5D1570E12652}.Debug|x64.ActiveCfg = Debug
75+
{378CA06B-A436-4E1E-AE6F-5D1570E12652}.Release|x64.ActiveCfg = Release
9476
EndGlobalSection
9577
GlobalSection(SolutionProperties) = preSolution
9678
HideSolutionNode = FALSE

‎DataEntryForm/DataEntryForm.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@
290290
<Install>false</Install>
291291
</BootstrapperPackage>
292292
</ItemGroup>
293-
<ItemGroup />
293+
<ItemGroup>
294+
<Resource Include="FormIcon.ico" />
295+
</ItemGroup>
294296
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
295297
</Project>

‎DataEntryForm/FormIcon.ico

7.19 KB
Binary file not shown.

‎DataEntryForm/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
mc:Ignorable="d"
6+
mc:Ignorable="d" Icon="FormIcon.ico"
77
Title="Data Entry Form" Height="450" Width="800" Background="#FFE4E4E4">
88
<Grid>
99
<Grid.RowDefinitions>
@@ -32,6 +32,7 @@
3232
<ColumnDefinition Width="1*"/>
3333
</Grid.ColumnDefinitions>
3434
<TextBox
35+
x:Name="sectionPath"
3536
Grid.Column="0"
3637
Text="{Binding FileLocation}"
3738
Background="White"

‎DataEntryForm/MainWindow.xaml.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ public MainWindow(IMainWindowVM viewModel)
2323
public void ResetMainWindow()
2424
{
2525
_viewModel.EnableExtract = false;
26-
_viewModel.FileLocation = "";
2726
_viewModel.Message = "";
2827
_viewModel.FileLocation = Properties.Settings.Default.databaseFilePath;
28+
sectionPath.Focus();
29+
sectionPath.Select(_viewModel.FileLocation.Length, 0);
30+
Trace.WriteLine(_viewModel.FileLocation);
31+
Trace.WriteLine(_viewModel.FileLocation.Length);
2932
}
3033

3134
private void BrowseClick(object sender, RoutedEventArgs e)
@@ -39,6 +42,9 @@ private void BrowseClick(object sender, RoutedEventArgs e)
3942
{
4043
_viewModel.FileLocation = selectedPath;
4144
}
45+
sectionPath.Focus();
46+
sectionPath.Select(_viewModel.FileLocation.Length, 0);
47+
Trace.WriteLine(sectionPath.CaretIndex);
4248
}
4349

4450
private void LoadDataClick(object sender, RoutedEventArgs e)
@@ -64,6 +70,8 @@ private void LoadDataClick(object sender, RoutedEventArgs e)
6470
" records from the Database";
6571
_viewModel.EnableExtract = true;
6672
}
73+
sectionPath.Focus();
74+
sectionPath.Select(_viewModel.FileLocation.Length, 0);
6775
}
6876

6977
private void ReviewClick(object sender, RoutedEventArgs e)

‎DataEntryForm/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.2.0.0")]
55-
[assembly: AssemblyFileVersion("1.2.0.0")]
54+
[assembly: AssemblyVersion("1.3.0.0")]
55+
[assembly: AssemblyFileVersion("1.3.0.0")]

‎DataEntryForm/ReviewWindow.xaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
77
xmlns:s="clr-namespace:System;assembly=mscorlib"
8-
mc:Ignorable="d"
8+
mc:Ignorable="d" Icon="FormIcon.ico"
99
Title="Review" WindowState="Maximized" Background="#FFE4E4E4" KeyDown="Window_KeyDown"
1010
Closing="WindowClosing" d:DesignWidth="1158" d:DesignHeight="843">
1111

@@ -358,16 +358,14 @@
358358
<ColumnDefinition Width="1*"/>
359359
</Grid.ColumnDefinitions>
360360

361-
<Grid Grid.Column="1">
361+
<Grid x:Name="FormImageGrid" Grid.Column="1">
362362
<Grid.ColumnDefinitions>
363363
<ColumnDefinition Width="*"/>
364-
<ColumnDefinition Width="auto"/>
365-
<ColumnDefinition Width="auto"/>
366364
<ColumnDefinition Width="*"/>
367365
</Grid.ColumnDefinitions>
368366

369-
<Image x:Name="frontFaceImage" Grid.Column="1" HorizontalAlignment="Right"/>
370-
<Image x:Name="backFaceImage" Grid.Column="2" HorizontalAlignment="Center"/>
367+
<Image x:Name="frontFaceImage" Grid.Column="0"/>
368+
<Image x:Name="backFaceImage" Grid.Column="1"/>
371369
</Grid>
372370

373371
<ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">

‎DataEntryForm/ReviewWindow.xaml.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,13 @@ private void viewModel_HeadstoneChanged(object sender, EventArgs e)
7272
if (!string.IsNullOrWhiteSpace(_viewModel.CurrentPageData.Image2FileName))
7373
{
7474
backFaceImage.Source = new BitmapImage(new Uri(_viewModel.ImageSource2));
75+
frontFaceImage.SetValue(Grid.ColumnSpanProperty, 1);
76+
7577
}
7678
else
7779
{
7880
backFaceImage.Source = null;
81+
frontFaceImage.SetValue(Grid.ColumnSpanProperty, 2);
7982
}
8083
BurialSectionField.Focus();
8184
}
@@ -224,16 +227,18 @@ private void Textbox_KeyDown(object sender, KeyEventArgs e)
224227
{
225228
System.Diagnostics.Trace.WriteLine("Detected Alt+U");
226229
TextBox tb = (TextBox)sender;
227-
tb.Text = "UNKNOWN ";
228-
tb.CaretIndex = tb.Text.Length;
230+
int pos = tb.CaretIndex;
231+
tb.Text = tb.Text.Insert(pos, "UNKNOWN");
232+
tb.CaretIndex = pos + "UNKNOWN".Length;
229233
}
230234

231235
if ((Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) && Keyboard.IsKeyDown(Key.I))
232236
{
233237
System.Diagnostics.Trace.WriteLine("Detected Alt+I");
234238
TextBox tb = (TextBox)sender;
235-
tb.Text = "ILLEGIBLE ";
236-
tb.CaretIndex = tb.Text.Length;
239+
int pos = tb.CaretIndex;
240+
tb.Text = tb.Text.Insert(pos, "ILLEGIBLE");
241+
tb.CaretIndex = pos + "ILLEGIBLE".Length;
237242
}
238243

239244
if ((Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) && Keyboard.IsKeyDown(Key.B))

‎Installer/FormIcon.ico

7.19 KB
Binary file not shown.

0 commit comments

Comments
 (0)