Add SelectFirstDay and SelectLastDay elements.
This commit is contained in:
parent
ff3086d9c8
commit
f069c858c9
@ -25,7 +25,7 @@ using zaaReloaded2.LabModel;
|
|||||||
using zaaReloaded2.Formatter;
|
using zaaReloaded2.Formatter;
|
||||||
using zaa = zaaReloaded2.Controller.Elements;
|
using zaa = zaaReloaded2.Controller.Elements;
|
||||||
|
|
||||||
namespace Tests.Formatter.Elements
|
namespace Tests.Controller.Elements
|
||||||
{
|
{
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
class ItemsTest
|
class ItemsTest
|
45
Tests/Controller/Elements/SelectFirstDayTest.cs
Executable file
45
Tests/Controller/Elements/SelectFirstDayTest.cs
Executable file
@ -0,0 +1,45 @@
|
|||||||
|
/* SelectFirstDayTest.cs
|
||||||
|
* part of zaaReloaded2
|
||||||
|
*
|
||||||
|
* Copyright 2015 Daniel Kraus
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using f = zaaReloaded2.Formatter;
|
||||||
|
using zaaReloaded2.Importer.ZaaImporter;
|
||||||
|
using zaaReloaded2.Controller.Elements;
|
||||||
|
|
||||||
|
namespace Tests.Controller.Elements
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
class SelectFirstDayTest
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void SelectFirstDay()
|
||||||
|
{
|
||||||
|
SelectFirstDay element = new SelectFirstDay();
|
||||||
|
ZaaImporter importer = TestHelpers.ZaaImporterFromResource();
|
||||||
|
f.Formatter formatter = new f.Formatter();
|
||||||
|
formatter.Laboratory = importer.Laboratory;
|
||||||
|
element.Run(formatter);
|
||||||
|
Assert.AreEqual(5, formatter.WorkingTimePoints.Count);
|
||||||
|
DateTime firstDay = new DateTime(2015, 07, 04);
|
||||||
|
Assert.AreEqual(firstDay.Date, formatter.WorkingTimePoints.First().Key.Date);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
49
Tests/Controller/Elements/SelectLastDayTest.cs
Executable file
49
Tests/Controller/Elements/SelectLastDayTest.cs
Executable file
@ -0,0 +1,49 @@
|
|||||||
|
/* SelectFirstDayTest - Copy.cs
|
||||||
|
* part of zaaReloaded2
|
||||||
|
*
|
||||||
|
* Copyright 2015 Daniel Kraus
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using f = zaaReloaded2.Formatter;
|
||||||
|
using zaaReloaded2.Importer.ZaaImporter;
|
||||||
|
using zaaReloaded2.Controller.Elements;
|
||||||
|
|
||||||
|
namespace Tests.Controller.Elements
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
class SelectLastDayTest
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void SelectLastDay()
|
||||||
|
{
|
||||||
|
SelectLastDay element = new SelectLastDay();
|
||||||
|
ZaaImporter importer = TestHelpers.ZaaImporterFromResource();
|
||||||
|
f.Formatter formatter = new f.Formatter();
|
||||||
|
formatter.Laboratory = importer.Laboratory;
|
||||||
|
element.Run(formatter);
|
||||||
|
// There are two time points of 6-July-2015 in the demo output file,
|
||||||
|
// but since they have the exact same time stamps, they are merged
|
||||||
|
// into one!
|
||||||
|
Assert.AreEqual(1, formatter.WorkingTimePoints.Count);
|
||||||
|
DateTime firstDay = new DateTime(2015, 07, 06);
|
||||||
|
Assert.AreEqual(firstDay.Date, formatter.WorkingTimePoints.First().Key.Date);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -66,9 +66,11 @@
|
|||||||
</Otherwise>
|
</Otherwise>
|
||||||
</Choose>
|
</Choose>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="Controller\Elements\SelectLastDayTest.cs" />
|
||||||
|
<Compile Include="Controller\Elements\SelectFirstDayTest.cs" />
|
||||||
<Compile Include="Controller\SettingsRepositoryTest.cs" />
|
<Compile Include="Controller\SettingsRepositoryTest.cs" />
|
||||||
<Compile Include="Thesaurus\ThesaurusTest.cs" />
|
<Compile Include="Thesaurus\ThesaurusTest.cs" />
|
||||||
<Compile Include="Formatter\Elements\ItemsTest.cs" />
|
<Compile Include="Controller\Elements\ItemsTest.cs" />
|
||||||
<Compile Include="Formatter\FormatterTest.cs" />
|
<Compile Include="Formatter\FormatterTest.cs" />
|
||||||
<Compile Include="Importer\ZaaImporter\LaurisItemTest.cs" />
|
<Compile Include="Importer\ZaaImporter\LaurisItemTest.cs" />
|
||||||
<Compile Include="Importer\ZaaImporter\LaurisParagraphTest.cs" />
|
<Compile Include="Importer\ZaaImporter\LaurisParagraphTest.cs" />
|
||||||
|
41
zaaReloaded2/Controller/Elements/SelectFirstDay.cs
Executable file
41
zaaReloaded2/Controller/Elements/SelectFirstDay.cs
Executable file
@ -0,0 +1,41 @@
|
|||||||
|
/* SelectFirstDay.cs
|
||||||
|
* part of zaaReloaded2
|
||||||
|
*
|
||||||
|
* Copyright 2015 Daniel Kraus
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace zaaReloaded2.Controller.Elements
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Selects the time points of the first day in a given Formatter
|
||||||
|
/// object.
|
||||||
|
/// </summary>
|
||||||
|
class SelectFirstDay : ElementBase
|
||||||
|
{
|
||||||
|
public override string Label
|
||||||
|
{
|
||||||
|
get { return "Ersten Tag auswählen"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Run(Formatter.Formatter formatter)
|
||||||
|
{
|
||||||
|
formatter.SelectFirstDay();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
42
zaaReloaded2/Controller/Elements/SelectLastDay.cs
Executable file
42
zaaReloaded2/Controller/Elements/SelectLastDay.cs
Executable file
@ -0,0 +1,42 @@
|
|||||||
|
/* SelectFirstDay - Copy.cs
|
||||||
|
* part of zaaReloaded2
|
||||||
|
*
|
||||||
|
* Copyright 2015 Daniel Kraus
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace zaaReloaded2.Controller.Elements
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Selects the time points of the last day in a given Formatter
|
||||||
|
/// object.
|
||||||
|
/// </summary>
|
||||||
|
class SelectLastDay : ElementBase
|
||||||
|
{
|
||||||
|
public override string Label
|
||||||
|
{
|
||||||
|
get { return "Letzten Tag auswählen"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Run(Formatter.Formatter formatter)
|
||||||
|
{
|
||||||
|
formatter.SelectLastDay();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -67,11 +67,11 @@ namespace zaaReloaded2.Formatter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the current working set of TimePointFormatters.
|
/// Gets the current working set of TimePointFormatters.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ITimePointFormatterDictionary WorkingTimePoints { get; private set; }
|
public Dictionary<DateTime, TimePointFormatter> WorkingTimePoints { get; private set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Constructor
|
#region Constructors
|
||||||
|
|
||||||
public Formatter()
|
public Formatter()
|
||||||
{
|
{
|
||||||
@ -95,18 +95,41 @@ namespace zaaReloaded2.Formatter
|
|||||||
/// current position of the cursor).</param>
|
/// current position of the cursor).</param>
|
||||||
public void Run()
|
public void Run()
|
||||||
{
|
{
|
||||||
WorkingTimePoints = _timePointFormatters;
|
|
||||||
foreach (ElementBase element in Settings.Elements)
|
foreach (ElementBase element in Settings.Elements)
|
||||||
{
|
{
|
||||||
element.Run(this);
|
element.Run(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Selects all time points for the first day in the
|
||||||
|
/// laboratory.
|
||||||
|
/// </summary>
|
||||||
|
public void SelectFirstDay()
|
||||||
|
{
|
||||||
|
DateTime first = _timePointFormatters.First().Key;
|
||||||
|
WorkingTimePoints = _timePointFormatters
|
||||||
|
.Where(kv => kv.Key.Date == first.Date)
|
||||||
|
.ToDictionary(kv => kv.Key, kv => kv.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Selects all time points for the first day in the
|
||||||
|
/// laboratory.
|
||||||
|
/// </summary>
|
||||||
|
public void SelectLastDay()
|
||||||
|
{
|
||||||
|
DateTime last = _timePointFormatters.Last().Key;
|
||||||
|
WorkingTimePoints = _timePointFormatters
|
||||||
|
.Where(kv => kv.Key.Date == last.Date)
|
||||||
|
.ToDictionary(kv => kv.Key, kv => kv.Value);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
||||||
ITimePointFormatterDictionary _timePointFormatters;
|
TimePointFormatterDictionary _timePointFormatters;
|
||||||
Laboratory _laboratory;
|
Laboratory _laboratory;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -23,7 +23,7 @@ using System.Text;
|
|||||||
namespace zaaReloaded2.Formatter
|
namespace zaaReloaded2.Formatter
|
||||||
{
|
{
|
||||||
public class TimePointFormatterDictionary
|
public class TimePointFormatterDictionary
|
||||||
: Dictionary<DateTime, TimePointFormatter>,
|
: SortedDictionary<DateTime, TimePointFormatter>,
|
||||||
ITimePointFormatterDictionary
|
ITimePointFormatterDictionary
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -163,6 +163,8 @@
|
|||||||
can be found.
|
can be found.
|
||||||
-->
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="Controller\Elements\SelectLastDay.cs" />
|
||||||
|
<Compile Include="Controller\Elements\SelectFirstDay.cs" />
|
||||||
<Compile Include="Controller\Settings.cs" />
|
<Compile Include="Controller\Settings.cs" />
|
||||||
<Compile Include="Controller\SettingsRepository.cs" />
|
<Compile Include="Controller\SettingsRepository.cs" />
|
||||||
<Compile Include="Thesaurus\ThesaurusBase.cs" />
|
<Compile Include="Thesaurus\ThesaurusBase.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user