daniel/Jugenddienst-Stunden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: daniel:1.0.8
Branches Tags
daniel:main
daniel:1.0.9 daniel:1.0.8 daniel:1.0.7
..
compare: daniel:83118103d948e512bcbd90000756fa836468d669
Branches Tags
daniel:main
daniel:1.0.9 daniel:1.0.8 daniel:1.0.7

7 Commits
1.0.8 ... 83118103d9

Author SHA1 Message Date
Daniel Pichler
83118103d9 1.0.9 2025-09-10 22:40:02 +02:00
Daniel Pichler
5ecf6c7537 Cleanup 2025-09-10 22:37:25 +02:00
Daniel Pichler
7540b6e6ad Update Nugets 2025-09-10 21:58:26 +02:00
Daniel Pichler
8937332942 Typo 2025-07-12 16:23:27 +02:00
Daniel Pichler
a0345cad94 Update .gitignore 2025-07-12 16:23:13 +02:00
DaPi
6b4bffe5ec Format 2025-03-18 00:26:18 +01:00
DaPi
093679c9bb Precision 2025-03-18 00:26:08 +01:00
22 changed files with 131 additions and 116 deletions
Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -396,3 +396,5 @@ FodyWeavers.xsd
# JetBrains Rider
*.sln.iml
/.idea
/var

BIN
AppIcon-PlayStore.afdesign
View File

Binary file not shown.

BIN
AppIcon-PlayStore.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

7
Jugenddienst Stunden/Converter/SecondsTimeConverter.cs
View File

@@ -2,13 +2,20 @@
namespace Jugenddienst_Stunden.Converter;
internal class SecondsTimeConverter : IValueConverter {
private int seconds;
/// <summary>
/// Konvertiert eine Sekundenangabe nach Stunden:Minuten, auch bei mehr als 24 Stunden
/// </summary>
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
if (value is null)
return "0:0";
if (value is int) {
seconds = (int)value;
}
if (value is double) {
seconds = (int)Math.Round((double)value);
} else {
int.TryParse((string?)value, out seconds);
}

82
Jugenddienst Stunden/Jugenddienst Stunden.csproj
View File

@@ -27,8 +27,8 @@
<ApplicationId>com.companyname.jugenddienststunden</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
@@ -39,14 +39,14 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<PackageIcon>paket_icon.png</PackageIcon>
<NeutralLanguage>de</NeutralLanguage>
<PackageVersion>1.0.8</PackageVersion>
<PackageVersion>1.0.9</PackageVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
<ApplicationId>com.companyname.jugenddienststunden</ApplicationId>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<Optimize>False</Optimize>
<Deterministic>True</Deterministic>
</PropertyGroup>
@@ -54,8 +54,8 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-maccatalyst|AnyCPU'">
<Optimize>True</Optimize>
<ApplicationId>com.companyname.jugenddienststunden</ApplicationId>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<Deterministic>True</Deterministic>
</PropertyGroup>
@@ -65,8 +65,8 @@
<DebugSymbols>True</DebugSymbols>
<Optimize>False</Optimize>
<Deterministic>True</Deterministic>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<AndroidKeyStore>False</AndroidKeyStore>
</PropertyGroup>
@@ -76,8 +76,8 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows10.0.26100.0|AnyCPU'">
<ApplicationId>com.companyname.jugenddienststunden</ApplicationId>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION</DefineConstants>
<Deterministic>True</Deterministic>
<Optimize>False</Optimize>
@@ -89,8 +89,8 @@
<DebugSymbols>False</DebugSymbols>
<Optimize>True</Optimize>
<Deterministic>True</Deterministic>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<RunAOTCompilation>False</RunAOTCompilation>
<PublishTrimmed>True</PublishTrimmed>
<AndroidKeyStore>False</AndroidKeyStore>
@@ -98,8 +98,8 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows10.0.26100.0|AnyCPU'">
<ApplicationId>com.companyname.jugenddienststunden</ApplicationId>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<Optimize>True</Optimize>
<Deterministic>True</Deterministic>
</PropertyGroup>
@@ -109,43 +109,43 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PlatformTarget>AnyCPU</PlatformTarget>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<AssemblyVersion>1.0.8</AssemblyVersion>
<FileVersion>1.0.8</FileVersion>
<AssemblyVersion>1.0.9</AssemblyVersion>
<FileVersion>1.0.9</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows10.0.19041.0|AnyCPU'">
<ApplicationVersion>9</ApplicationVersion>
<ApplicationVersion>10</ApplicationVersion>
<DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION</DefineConstants>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows10.0.19041.0|AnyCPU'">
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android35.0|AnyCPU'">
<WarningLevel>8</WarningLevel>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<EnableLLVM>True</EnableLLVM>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android35.0|AnyCPU'">
<WarningLevel>8</WarningLevel>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
<EnableLLVM>True</EnableLLVM>
<DebugSymbols>False</DebugSymbols>
<AndroidEnableProfiledAot>False</AndroidEnableProfiledAot>
@@ -163,16 +163,16 @@
<WarningLevel>8</WarningLevel>
<NoWarn>1701;1702</NoWarn>
<WarningsAsErrors>$(WarningsAsErrors);NU1605</WarningsAsErrors>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-windows10.0.26100.0|AnyCPU'">
<WarningLevel>8</WarningLevel>
<NoWarn>1701;1702</NoWarn>
<WarningsAsErrors>$(WarningsAsErrors);NU1605</WarningsAsErrors>
<ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>9</ApplicationVersion>
<ApplicationDisplayVersion>1.0.9</ApplicationDisplayVersion>
<ApplicationVersion>10</ApplicationVersion>
</PropertyGroup>
<PropertyGroup>
@@ -256,18 +256,18 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="11.1.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.40">
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.40" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.40" />
<PackageReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="9.0.2" />
<PackageReference Include="Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk" Version="9.0.2" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.110" />
<PackageReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="9.0.9" />
<PackageReference Include="Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk" Version="9.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4.0" />
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.5.0" />
</ItemGroup>
<ItemGroup>

33
Jugenddienst Stunden/Types/Hours.cs
View File

@@ -4,15 +4,15 @@ using System.Collections.ObjectModel;
namespace Jugenddienst_Stunden.Types;
internal class Hours : ObservableObject {
public int? Zeit;
public int? Nominal;
internal partial class Hours : ObservableObject {
public double? Zeit;
public double? Nominal;
//public Dictionary<DateOnly,NominalDay> nominal_day_api;
public List<NominalDay>? Nominal_day_api;
//public Dictionary<int,NominalWeek> nominal_week_api;
public List<NominalWeek>? Nominal_week_api;
//public List<string> time_line;
public string? Zeit_total;
public double? Zeit_total;
//https://stackoverflow.com/questions/29449641/deserialize-json-when-a-value-can-be-an-object-or-an-empty-array/29450279#29450279
//[JsonConverter(typeof(JsonSingleOrEmptyArrayConverter<Hours>))]
@@ -21,16 +21,23 @@ internal class Hours : ObservableObject {
public List<TimeDay> zeit_total_daily_api;
public List<DayTime>? daytime;
//public List<string> wochensumme;
public int overtime_month;
public int overtime;
[ObservableProperty]
public double overtime_month;
[ObservableProperty]
public double overtime;
//public List<string> overtime_day;
public int zeitausgleich;
public int zeitausgleich_month;
public int holiday;
public int krankheit;
public int weiterbildung;
public int bereitschaft;
public int bereitschaft_month;
[ObservableProperty]
public double zeitausgleich;
public double zeitausgleich_month;
public double holiday;
public double krankheit;
public double weiterbildung;
public double bereitschaft;
public double bereitschaft_month;
//public Operator operator_api;
public DateTime Today;
public DateTime Date;

2
Jugenddienst Stunden/Types/NominalDay.cs
View File

@@ -2,6 +2,6 @@
internal class NominalDay {
public int day_number;
public int month_number;
public int hours;
public double hours;
public DateOnly date;
}

2
Jugenddienst Stunden/Types/NominalWeek.cs
View File

@@ -2,5 +2,5 @@
internal class NominalWeek {
public int Week_number;
public int Hours;
public double Hours;
}

2
Jugenddienst Stunden/Types/Sollstunden.cs
View File

@@ -3,5 +3,5 @@
public class Sollstunden {
public int Timetable { get; set; }
public int Wochentag { get; set; }
public float Zeit { get; set; }
public double Zeit { get; set; }
}

2
Jugenddienst Stunden/Types/TimeDay.cs
View File

@@ -5,5 +5,5 @@
/// </summary>
internal struct TimeDay {
public int Day { get; set; }
public decimal Hours { get; set; }
public double Hours { get; set; }
}

29
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -56,10 +56,9 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
public string Title { get; set; } = GlobalVar.Name + " " + GlobalVar.Surname;
private Hours _hour;
public Hours Hours {
get => _hour;
}
[ObservableProperty]
private Hours hours;
/// <summary>
/// Mindest-Datum für den Datepicker
@@ -94,42 +93,42 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// <summary>
/// Monatsübersicht: Geleistete Stunden
/// </summary>
public string? ZeitCalculated {
public double? ZeitCalculated {
get => Hours.Zeit_total;
}
/// <summary>
/// Monatsübersicht: Sollstunden
/// </summary>
public int? Nominal {
public double? Nominal {
get => Hours.Nominal;
}
/// <summary>
/// Monatsübersicht: Differenz zwischen Soll und geleisteten Stunden
/// </summary>
public int? Overtime {
public double? Overtime {
get => Hours.overtime;
}
/// <summary>
/// Monatsübersicht: Restüberstunden insgesamt
/// </summary>
public int OvertimeMonth {
public double OvertimeMonth {
get => Hours.overtime_month;
}
public int Zeitausgleich {
public double Zeitausgleich {
get => Hours.zeitausgleich;
}
public int ZeitausgleichMonth {
public double ZeitausgleichMonth {
get => Hours.zeitausgleich_month;
}
/// <summary>
/// Monatsübersicht: Resturlaub
/// </summary>
public int Holiday {
public double Holiday {
get => Hours.holiday;
}
@@ -158,7 +157,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// CTOR
/// </summary>
public StundenViewModel() {
_hour = new Hours();
Hours = new Hours();
LoadOverview = "Lade Summen für " + DateToday.ToString("MMMM");
@@ -202,7 +201,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
private async Task LoadData() {
try {
BaseResponse dat = await HoursBase.LoadBase("hours&year=" + DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
_hour = dat.hour;
Hours = dat.hour;
Settings = dat.settings;
if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
@@ -295,14 +294,14 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// Refreshes all properties
/// </summary>
private void RefreshProperties() {
OnPropertyChanged(nameof(Hours));
OnPropertyChanged(nameof(Title));
OnPropertyChanged(nameof(Nominal));
OnPropertyChanged(nameof(Overtime));
OnPropertyChanged(nameof(OvertimeMonth));
OnPropertyChanged(nameof(Zeitausgleich));
OnPropertyChanged(nameof(ZeitCalculated));
OnPropertyChanged(nameof(Holiday));
OnPropertyChanged(nameof(Hours));
OnPropertyChanged(nameof(Title));
OnPropertyChanged(nameof(MinimumDate));
OnPropertyChanged(nameof(MaximumDate));
OnPropertyChanged(nameof(LoadOverview));

2
Jugenddienst Stunden/Views/AllNotesPage.xaml
View File

@@ -33,7 +33,7 @@
SelectionChangedCommand="{Binding SelectNoteCommand}"
SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
<!-- Designate how the collection of items are laid out -->
<!-- Designate how the collection of items is laid out -->
<CollectionView.ItemsLayout>
<LinearItemsLayout Orientation="Vertical" ItemSpacing="10" />
</CollectionView.ItemsLayout>

2
Jugenddienst Stunden/Views/StundePage.xaml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"

BIN
Uhr.afdesign
View File

Binary file not shown.

BIN
Vorstellungsgrafik-PlayStore.afdesign
View File

Binary file not shown.

BIN
Vorstellungsgrafik-PlayStore.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
appicon.afdesign
View File

Binary file not shown.

BIN
appiconfg.afdesign
View File

Binary file not shown.

BIN
paket_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
splash.afdesign
View File

Binary file not shown.

BIN
splash.pdf
View File

Binary file not shown.