Skip to content

Commit da6b3b7

Browse files
gjermund-stensrudgjermund-stensrud
committed
UserSettings lagres. EPJ data oppdatert.
1 parent d87e508 commit da6b3b7

6 files changed

Lines changed: 185 additions & 5 deletions

File tree

‎src/Dhhr.KppParser.ConsoleApp/Dhhr.KppParser.ConsoleApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net6.0</TargetFramework>
6-
<AssemblyVersion>1.5.*</AssemblyVersion>
6+
<AssemblyVersion>1.5.1.*</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

‎src/Dhhr.KppParser.Gui/Dhhr.KppParser.Gui.csproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net6.0-windows</TargetFramework>
6-
<AssemblyVersion>1.5.*</AssemblyVersion>
6+
<AssemblyVersion>1.5.1.*</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<UseWindowsForms>true</UseWindowsForms>
99
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>
@@ -19,6 +19,14 @@
1919
<ProjectReference Include="..\Dhhr.KppParser.Service\Dhhr.KppParser.Service.csproj" />
2020
</ItemGroup>
2121

22+
<ItemGroup>
23+
<Compile Update="Properties\KppParser.Designer.cs">
24+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
25+
<AutoGen>True</AutoGen>
26+
<DependentUpon>KppParser.settings</DependentUpon>
27+
</Compile>
28+
</ItemGroup>
29+
2230
<ItemGroup>
2331
<None Update="appsettings.json">
2432
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -28,6 +36,10 @@
2836
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2937
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
3038
</None>
39+
<None Update="Properties\KppParser.settings">
40+
<Generator>SettingsSingleFileGenerator</Generator>
41+
<LastGenOutput>KppParser.Designer.cs</LastGenOutput>
42+
</None>
3143
</ItemGroup>
3244

3345
</Project>

‎src/Dhhr.KppParser.Gui/MainForm.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,30 @@ public MainForm(Settings settings)
1515
_settings = settings;
1616
InitializeComponent();
1717

18+
// Set default values
19+
var lastYear = DateTime.Today.AddYears(-1).Year;
20+
FromDatePicker.Value = new DateTime(lastYear, 1, 1);
21+
ToDatePicker.Value = new DateTime(lastYear, 12, 31);
22+
1823
_version = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
1924

2025
VersionLabel.Text = $@"Versjon: {_version}";
26+
27+
28+
// Get user settings
29+
if (Properties.KppParser.Default.UpgradeRequired)
30+
{
31+
Properties.KppParser.Default.Upgrade();
32+
Properties.KppParser.Default.UpgradeRequired = false;
33+
Properties.KppParser.Default.Save();
34+
}
35+
36+
EpisodePathBox.Text = Properties.KppParser.Default.EpisodePath;
37+
TjenestePathBox.Text = Properties.KppParser.Default.TjenestePath;
38+
OrgNameBox.Text = Properties.KppParser.Default.Level1Name;
39+
OrgHerIdBox.Text = Properties.KppParser.Default.Level1HerId;
40+
OrgNameBox2.Text = Properties.KppParser.Default.Level2Name;
41+
OrgHerIdBox2.Text = Properties.KppParser.Default.Level2HerId;
2142
}
2243

2344
private void EpisodeButton_Click(object sender, EventArgs e)
@@ -52,6 +73,16 @@ private void TjenesteButton_Click(object sender, EventArgs e)
5273

5374
private void RunButton_Click(object sender, EventArgs e)
5475
{
76+
// Save settings
77+
Properties.KppParser.Default.EpisodePath = EpisodePathBox.Text;
78+
Properties.KppParser.Default.TjenestePath = TjenestePathBox.Text;
79+
Properties.KppParser.Default.Level1Name = OrgNameBox.Text;
80+
Properties.KppParser.Default.Level1HerId = OrgHerIdBox.Text;
81+
Properties.KppParser.Default.Level2Name = OrgNameBox2.Text;
82+
Properties.KppParser.Default.Level2HerId = OrgHerIdBox2.Text;
83+
Properties.KppParser.Default.Save();
84+
85+
// Run
5586
var args = new Args
5687
{
5788
EpisodePath = EpisodePathBox.Text,

‎src/Dhhr.KppParser.Gui/Properties/KppParser.Designer.cs‎

Lines changed: 110 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Dhhr.KppParser.Gui/Properties/KppParser.settings‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Dhhr.KppParser.Gui.Properties" GeneratedClassName="KppParser">
3+
<Profiles />
4+
<Settings>
5+
<Setting Name="EpisodePath" Type="System.String" Scope="User">
6+
<Value Profile="(Default)" />
7+
</Setting>
8+
<Setting Name="TjenestePath" Type="System.String" Scope="User">
9+
<Value Profile="(Default)" />
10+
</Setting>
11+
<Setting Name="Level1Name" Type="System.String" Scope="User">
12+
<Value Profile="(Default)" />
13+
</Setting>
14+
<Setting Name="Level1HerId" Type="System.String" Scope="User">
15+
<Value Profile="(Default)" />
16+
</Setting>
17+
<Setting Name="Level2Name" Type="System.String" Scope="User">
18+
<Value Profile="(Default)" />
19+
</Setting>
20+
<Setting Name="Level2HerId" Type="System.String" Scope="User">
21+
<Value Profile="(Default)" />
22+
</Setting>
23+
<Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
24+
<Value Profile="(Default)">True</Value>
25+
</Setting>
26+
</Settings>
27+
</SettingsFile>

‎src/Dhhr.KppParser.Gui/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"leverandor": "ukjent leverandør",
3-
"navnEpj": "ukjent epj",
4-
"versjonEpj": "ukjent epj versjon",
2+
"leverandor": "HDIR",
3+
"navnEpj": "KppParser",
4+
"versjonEpj": "1.5.1",
55
"hdirQa": "121017",
66
"hdirProd": "94378"
77
}

0 commit comments

Comments
 (0)