Skip to content

Commit

Permalink
Merge pull request #49 from dotob/dev
Browse files Browse the repository at this point in the history 
Merging v1.0.1 dev content to master
  • Loading branch information
@punker76
punker76 committed Dec 7, 2016
2 parents 9b2429f + bebfac9 commit d7b186b
Show file tree
Hide file tree
Showing 97 changed files with 3,352 additions and 7,607 deletions.
10 changes: 6 additions & 4 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ root = true
[*]
end_of_line = CRLF

; 4-column tab indentation
[*.cs]
indent_style = space
indent_size = 2
indent_size = 4

; 4-column tab indentation
[*.xaml]
indent_style = space
indent_size = 2
indent_size = 2

[*.xml]
indent_style = space
indent_size = 2
Binary file added .paket/paket.bootstrapper.exe
View file
Binary file not shown.
Binary file added .paket/paket.exe
View file
Binary file not shown.
43 changes: 43 additions & 0 deletions .paket/paket.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
<!-- Download Paket.exe if it does not already exist -->
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
</PropertyGroup>
<PropertyGroup>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExePath)')">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExePath)')">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
<!-- Commands -->
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
</PropertyGroup>
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate paket.exe -->
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
</Target>
<Target Name="DownloadPaket">
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true"
Condition=" '$(DownloadPaket)' == 'true' AND '$(DownloadPaketCommand)' != '' AND !Exists('$(PaketExePath)')" />
</Target>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
</Target>
</Project>
12 changes: 6 additions & 6 deletions MONI.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MONI", "MONI\MONI.csproj",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Debug|x86.ActiveCfg = Debug|x86
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Debug|x86.Build.0 = Debug|x86
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Release|x86.ActiveCfg = Release|x86
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Release|x86.Build.0 = Release|x86
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BC740CF-1273-4042-B33F-A6029A1A3BFB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 6 additions & 3 deletions MONI/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
using System.Windows;
using MONI.Util;

namespace MONI {
namespace MONI
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application {
protected override void OnStartup(StartupEventArgs e) {
public partial class App : Application
{
protected override void OnStartup(StartupEventArgs e)
{
AppHelper.Instance.ConfigureApp(this, Assembly.GetExecutingAssembly().GetName().Name);
base.OnStartup(e);
}
Expand Down
45 changes: 30 additions & 15 deletions MONI/Data/CSVExporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,45 @@
using System.IO;
using System.Text;

namespace MONI.Data {
public class CSVExporter {
namespace MONI.Data
{
public class CSVExporter
{
private readonly string dataDirectory;

public CSVExporter(string dataDirectory) {
public CSVExporter(string dataDirectory)
{
this.dataDirectory = dataDirectory;
// check for dir
if (!Directory.Exists(dataDirectory)) {
try {
if (!Directory.Exists(dataDirectory))
{
try
{
Directory.CreateDirectory(dataDirectory);
}
catch (Exception e) {
catch (Exception e)
{
Console.WriteLine(e);
}
}
}

public void Export(WorkYear year) {
foreach (var month in year.Months) {
public void Export(WorkYear year)
{
foreach (var month in year.Months)
{
var dataFileName = FilenameForMonth(month);
this.Export(month, dataFileName);
}
}

private void Export(WorkMonth month, string filename) {
private void Export(WorkMonth month, string filename)
{
List<string> data = new List<string>();
this.AddHeader(data);
var gotData = this.AddData(month, data);
if (gotData) {
if (gotData)
{
File.WriteAllLines(filename, data, Encoding.GetEncoding("ISO-8859-1"));
}
}
Expand All @@ -43,10 +53,13 @@ public class CSVExporter {
/// <param name="month"></param>
/// <param name="data"></param>
/// <returns>if there was any data</returns>
private bool AddData(WorkMonth month, List<string> data) {
private bool AddData(WorkMonth month, List<string> data)
{
bool gotData = false;
foreach (var day in month.Days) {
foreach (var item in day.Items) {
foreach (var day in month.Days)
{
foreach (var item in day.Items)
{
var description = string.IsNullOrEmpty(item.Description) ? "-" : item.Description;
data.Add(string.Format(CultureInfo.InvariantCulture, " {0:00} {1} {2} {3:00.00} {4} {5} {6}", day.Day, item.Start.ToMonlistString(), item.End.ToMonlistString(), item.HoursDuration, item.Project, item.Position, description));
gotData = true;
Expand All @@ -55,12 +68,14 @@ public class CSVExporter {
return gotData;
}

private void AddHeader(List<string> data) {
private void AddHeader(List<string> data)
{
data.Add("Tag Von Bis Std. Prj-Nr Pos. durchgefuehrte Arbeiten");
data.Add("========================================================================");
}

public string FilenameForMonth(WorkMonth month) {
public string FilenameForMonth(WorkMonth month)
{
var filename = string.Format("monlist_{0}_{1}.txt", month.Year, month.Month.ToString("00"));
return Path.Combine(this.dataDirectory, filename);
}
Expand Down
18 changes: 12 additions & 6 deletions MONI/Data/CustomWindowPlacementSettings.cs
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
using MahApps.Metro.Controls;
using MahApps.Metro.Native;

namespace MONI.Data {
public class CustomWindowPlacementSettings : IWindowPlacementSettings {
namespace MONI.Data
{
public class CustomWindowPlacementSettings : IWindowPlacementSettings
{
private readonly MoniSettings moniSettings;

public CustomWindowPlacementSettings(MoniSettings settings) {
public CustomWindowPlacementSettings(MoniSettings settings)
{
this.moniSettings = settings;
}

public WINDOWPLACEMENT? Placement { get; set; }

public bool UpgradeSettings { get; set; }

public void Reload() {
public void Reload()
{
this.Placement = this.moniSettings.MainSettings.Placement;
}

public void Upgrade() {
public void Upgrade()
{
}

public void Save() {
public void Save()
{
this.moniSettings.MainSettings.Placement = this.Placement;
}
}
Expand Down
45 changes: 30 additions & 15 deletions MONI/Data/JSONExporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,47 @@
using System.Text;
using Newtonsoft.Json;

namespace MONI.Data {
public class JSONExporter {
namespace MONI.Data
{
public class JSONExporter
{
private readonly string dataDirectory;

public JSONExporter(string dataDirectory) {
public JSONExporter(string dataDirectory)
{
this.dataDirectory = Path.Combine(dataDirectory, "json");
// check for dir
if (!Directory.Exists(this.dataDirectory)) {
try {
if (!Directory.Exists(this.dataDirectory))
{
try
{
Directory.CreateDirectory(this.dataDirectory);
}
catch (Exception e) {
catch (Exception e)
{
Console.WriteLine(e);
}
}
}

public void Export(WorkYear year) {
foreach (var month in year.Months) {
public void Export(WorkYear year)
{
foreach (var month in year.Months)
{
var dataFileName = FilenameForMonth(month);
this.Export(month, dataFileName);
}
}

private void Export(WorkMonth month, string filename) {
private void Export(WorkMonth month, string filename)
{
var pack = new JSONPackage();
pack.UserId = 123;
var items = new List<JSONWorkItem>();
foreach (var day in month.Days) {
foreach (var item in day.Items) {
foreach (var day in month.Days)
{
foreach (var item in day.Items)
{
items.Add(new JSONWorkItem(item));
}
}
Expand All @@ -43,19 +54,23 @@ public class JSONExporter {
File.WriteAllText(filename, serializeObject);
}

public string FilenameForMonth(WorkMonth month) {
public string FilenameForMonth(WorkMonth month)
{
var filename = string.Format("monlist_{0}_{1}.json", month.Year, month.Month.ToString("00"));
return Path.Combine(this.dataDirectory, filename);
}
}

class JSONPackage {
class JSONPackage
{
public int UserId { get; set; }
public IEnumerable<JSONWorkItem> Items { get; set; }
}

class JSONWorkItem {
public JSONWorkItem(WorkItem item) {
class JSONWorkItem
{
public JSONWorkItem(WorkItem item)
{
this.Day = item.WorkDay.Day;
this.Month = item.WorkDay.Month;
this.Year = item.WorkDay.Year;
Expand Down
27 changes: 18 additions & 9 deletions MONI/Data/MonapiJSONExporter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
using System.Collections.Generic;
using Newtonsoft.Json;

namespace MONI.Data {
public class MonapiJSONExporter {
namespace MONI.Data
{
public class MonapiJSONExporter
{
private readonly int monlistUserNUmber;
private readonly string dataDirectory;

public MonapiJSONExporter(int monlistUserNUmber) {
public MonapiJSONExporter(int monlistUserNUmber)
{
this.monlistUserNUmber = monlistUserNUmber;
}

public string Export(WorkMonth wmonth) {
public string Export(WorkMonth wmonth)
{
var month = new MonapiMonth();
month.Nummer = this.monlistUserNUmber;
month.Jahr = wmonth.Year;
month.Monat = wmonth.Month;
var items = new List<MonapiWorkItem>();
foreach (var day in wmonth.Days) {
foreach (var item in day.Items) {
foreach (var day in wmonth.Days)
{
foreach (var item in day.Items)
{
items.Add(new MonapiWorkItem(item));
}
}
Expand All @@ -27,15 +33,18 @@ public class MonapiJSONExporter {
}
}

class MonapiMonth {
class MonapiMonth
{
public int Nummer { get; set; }
public int Jahr { get; set; }
public int Monat { get; set; }
public IEnumerable<MonapiWorkItem> Stunden { get; set; }
}

class MonapiWorkItem {
public MonapiWorkItem(WorkItem item) {
class MonapiWorkItem
{
public MonapiWorkItem(WorkItem item)
{
this.Tag = item.WorkDay.Day;
this.Von = item.Start.ToString();
this.Bis = item.End.ToString();
Expand Down
Loading

0 comments on commit d7b186b

Please sign in to comment.