zotan/esh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update

Browse source
This commit is contained in:
Laura Hausmann 2019-09-05 11:33:39 +02:00
parent aa1d3b1e75
commit 6512bc8918
No known key found for this signature in database
GPG key ID: 1720DF2EC8974C2D
6 changed files with 116 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
.idea/.idea.esh/.idea/workspace.xml
View file

@ -2,83 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0ee83f84-6c61-4576-961c-48b96913bf8d" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/.idea.esh/.idea/projectSettingsUpdater.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/esh.core.test.deps.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/esh.core.test.dll" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/esh.core.test.pdb" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/esh.core.test.runtimeconfig.dev.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/esh.core.test.runtimeconfig.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/xunit.runner.reporters.netcoreapp10.dll" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/xunit.runner.utility.netcoreapp10.dll" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/bin/Debug/netcoreapp2.2/xunit.runner.visualstudio.dotnetcore.testadapter.dll" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.csproj.CoreCompileInputs.cache" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.csproj.FileListAbsolute.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.dll" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.pdb" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Triggers.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.esh/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.esh/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.esh/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.esh/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.assets.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.assets.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/Debug/netcoreapp2.2/esh.core.test.csprojAssemblyReference.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.g.props" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.g.targets" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/esh.core.test.csproj.nuget.g.targets" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/project.assets.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.test/obj/project.packagespec.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.test/obj/project.packagespec.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Shared/_Layout.cshtml" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Shared/_Layout.cshtml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.Views.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.Views.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.Views.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.Views.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.deps.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.deps.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.runtimeconfig.dev.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/bin/Debug/netcoreapp2.2/esh.core.web.runtimeconfig.dev.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Actors.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Actors.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Config.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Config.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Error.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Error.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Index.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Index.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Sensors.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Sensors.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Shared/_Layout.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Shared/_Layout.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Shared/_ValidationScriptsPartial.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Shared/_ValidationScriptsPartial.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/_ViewImports.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/_ViewImports.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/_ViewStart.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/_ViewStart.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/api.g.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/api.g.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.RazorCoreGenerate.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.RazorCoreGenerate.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.Views.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.Views.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.Views.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.Views.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.assets.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.assets.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csproj.CoreCompileInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csproj.CoreCompileInputs.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csproj.FileListAbsolute.txt" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csproj.FileListAbsolute.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.csprojAssemblyReference.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/esh.core.web.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.g.props" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.g.targets" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/esh.core.web.csproj.nuget.g.targets" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/project.assets.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/obj/project.packagespec.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/obj/project.packagespec.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/bin/Debug/netcoreapp2.2/esh.core.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/bin/Debug/netcoreapp2.2/esh.core.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/bin/Debug/netcoreapp2.2/esh.core.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/bin/Debug/netcoreapp2.2/esh.core.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core.web/Pages/api.cshtml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core.web/Pages/api.cshtml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/components.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/components.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/core.cs" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/core.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.assets.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.assets.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csproj.CoreCompileInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csproj.CoreCompileInputs.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csproj.FileListAbsolute.txt" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csproj.FileListAbsolute.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.csprojAssemblyReference.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.dll" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.dll" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/Debug/netcoreapp2.2/esh.core.pdb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.cache" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.g.props" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.g.targets" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/esh.core.csproj.nuget.g.targets" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/project.assets.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/esh.core/obj/project.packagespec.json" beforeDir="false" afterPath="$PROJECT_DIR$/esh.core/obj/project.packagespec.json" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -90,29 +19,30 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Shared/_ValidationScriptsPartial.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Shared/_Layout.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/obj/Debug/netcoreapp2.2/Razor/Pages/Shared/_Layout.g.cshtml.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/api.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.test/UnitTest1.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/_ViewImports.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.test/UnitTest1.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/api.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/_ViewStart.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Startup.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Index.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Web.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/app.config" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core/components.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Index.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/_ViewStart.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/app.config" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Index.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core/core.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Index.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/33E46F62-2720-44F4-B84B-BEBF6D7F0B71/59/fcb19f61/Action`1.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Shared/_ValidationScriptsPartial.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/esh.core.web/Pages/Shared/_Layout.cshtml" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
@ -133,15 +63,15 @@
<option value="$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/config.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/api.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/api.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Shared/_Layout.cshtml" />
<option value="$PROJECT_DIR$/esh.core/core.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Sensors.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Actors.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Triggers.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/Config.cshtml" />
<option value="$PROJECT_DIR$/esh.core.web/Pages/api.cshtml.cs" />
<option value="$PROJECT_DIR$/esh.core/components.cs" />
</list>
</option>
@ -214,6 +144,14 @@
<workItem from="1565739462054" duration="8521000" />
<workItem from="1565810577404" duration="12000" />
<workItem from="1565810605060" duration="2453000" />
<workItem from="1566341584829" duration="292000" />
<workItem from="1566394704885" duration="393000" />
<workItem from="1566686961036" duration="1690000" />
<workItem from="1566779054765" duration="3953000" />
<workItem from="1566867883181" duration="1578000" />
<workItem from="1566901012383" duration="116000" />
<workItem from="1566926428303" duration="2940000" />
<workItem from="1567294288139" duration="77000" />
</task>
<servers />
</component>
@ -240,14 +178,46 @@
<option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="true" />
</component>
<component name="WindowStateProjectService">
<state width="1878" height="304" key="GridCell.Tab.0.bottom" />
<state width="1878" height="304" key="GridCell.Tab.0.bottom/1920.1080/1920.1080" />
<state width="1878" height="304" key="GridCell.Tab.0.center" />
<state width="1878" height="304" key="GridCell.Tab.0.center/1920.1080/1920.1080" />
<state width="1878" height="304" key="GridCell.Tab.0.left" />
<state width="1878" height="304" key="GridCell.Tab.0.left/1920.1080/1920.1080" />
<state width="1878" height="304" key="GridCell.Tab.0.right" />
<state width="1878" height="304" key="GridCell.Tab.0.right/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.0.bottom" />
<state width="1878" height="357" key="GridCell.Tab.0.bottom/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.0.center" />
<state width="1878" height="357" key="GridCell.Tab.0.center/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.0.left" />
<state width="1878" height="357" key="GridCell.Tab.0.left/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.0.right" />
<state width="1878" height="357" key="GridCell.Tab.0.right/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.1.bottom" />
<state width="1878" height="357" key="GridCell.Tab.1.bottom/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.1.center" />
<state width="1878" height="357" key="GridCell.Tab.1.center/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.1.left" />
<state width="1878" height="357" key="GridCell.Tab.1.left/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.1.right" />
<state width="1878" height="357" key="GridCell.Tab.1.right/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.2.bottom" />
<state width="1878" height="357" key="GridCell.Tab.2.bottom/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.2.center" />
<state width="1878" height="357" key="GridCell.Tab.2.center/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.2.left" />
<state width="1878" height="357" key="GridCell.Tab.2.left/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.2.right" />
<state width="1878" height="357" key="GridCell.Tab.2.right/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.3.bottom" />
<state width="1878" height="357" key="GridCell.Tab.3.bottom/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.3.center" />
<state width="1878" height="357" key="GridCell.Tab.3.center/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.3.left" />
<state width="1878" height="357" key="GridCell.Tab.3.left/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.3.right" />
<state width="1878" height="357" key="GridCell.Tab.3.right/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.4.bottom" />
<state width="1878" height="357" key="GridCell.Tab.4.bottom/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.4.center" />
<state width="1878" height="357" key="GridCell.Tab.4.center/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.4.left" />
<state width="1878" height="357" key="GridCell.Tab.4.left/1920.1080/1920.1080" />
<state width="1878" height="357" key="GridCell.Tab.4.right" />
<state width="1878" height="357" key="GridCell.Tab.4.right/1920.1080/1920.1080" />
<state x="630" y="238" key="RiderGenerateDialog" />
<state x="630" y="238" key="RiderGenerateDialog/1920.1080/1920.1080" />
<state x="453" y="161" key="SettingsEditor" />

19
esh.core.web/Pages/Config.cshtml
View file

@ -63,8 +63,23 @@ else if (Request.Query.ContainsKey("trigger"))
<option value="Time">Time-based [WIP]</option>
</select>
</div>
<div class="form-group">
<label for="conditionValue">Condition Value</label>
<div id="ValueDiv">
<div class="form-group">
<label for="source">Source</label>
<select class="custom-select" id="source" name="source">
@foreach (var sensor in Web.Core.Sensors)
{
<option value="@sensor.Mac">@((sensor.CustomName ?? sensor.SensorType) + $" ({sensor.Mac})")</option>
}
</select>
</div>
<div class="form-group">
<label for="conditionValue">Condition Value</label>
<input class="form-control" type="number" id="conditionValue" name="conditionValue"/>
</div>
</div>
<div class="form-group" id="TimeDiv" hidden>
<label for="conditionValue">Time</label>
<input class="form-control" type="number" id="conditionValue" name="conditionValue"/>
</div>
<div class="form-group">

20
esh.core.web/Pages/Config.cshtml.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.RazorPages;
@ -30,6 +31,25 @@ namespace esh.core.web.Pages
}
return;
}
if (Request.Query.ContainsKey("action") && Request.Query["action"] == "newtrigger" &&
Request.Query.ContainsKey("name") && Request.Query.ContainsKey("conditionType") &&
Request.Query.ContainsKey("source") && Request.Query.ContainsKey("conditionValue"))
{
var condition = new Components.Trigger.Condition();
condition.Type = Components.Trigger.Condition.ConditionType.ValueExact;
var value = new Components.Value();
value.Type = Components.Value.ValueType.Integer;
value.StringValue = Request.Query["conditionValue"];
condition.CheckValue = value;
var action = new Components.Trigger.Action();
action.Type = Components.Trigger.Action.ActionType.Passthrough;
var trigger = new Components.Trigger(Request.Query["name"], condition, action);
Web.Core.Triggers.Add(trigger);
Response.Redirect("/Triggers");
return;
}
if (Request.Query.ContainsKey("sensor") && Web.Core.Sensors.Any(p => p.Mac == Request.Query["sensor"]) ||
Request.Query.ContainsKey("actor") && Web.Core.Actors.Any(p => p.Mac == Request.Query["actor"]) ||
Request.Query.ContainsKey("trigger") && (Request.Query["trigger"] == "new" ||

8
esh.core.web/Pages/Triggers.cshtml
View file

@ -4,7 +4,9 @@
@{
ViewData["Title"] = "triggers";
}
<a href="/Config?trigger=new" class="btn btn-primary">Edit</a>
<a href="/Config?trigger=new" class="btn btn-primary">New</a>
<br/><br/>
<div class="row">
@foreach (var trigger in Web.Core.Triggers)
@ -17,8 +19,8 @@
</div>
<environment include="Development">
<div class="card-footer" style="font-family: Hack,monospace; font-size: 8pt">
ConditionType: @(trigger.condition.Type) <br/>
ConditionValue: @(trigger.condition.CheckValue) <br/>
ConditionType: @(trigger.condition.Type)<br/>
ConditionValue: @(trigger.condition.CheckValue.StringValue)<br/>
ActionType: @(trigger.action.Type)<br/>
Last Trigger: @trigger.LastTrigger.ToShortDateString() @trigger.LastTrigger.ToLongTimeString()
</div>

8
esh.core.web/Pages/api.cshtml.cs
View file

@ -64,6 +64,14 @@ namespace esh.core.web.Pages
public string GetActorValue(IQueryCollection requestQuery)
{
foreach (var trigger in Web.Core.Triggers)
{
if (trigger.condition.Type != Components.Trigger.Condition.ConditionType.Time &&
trigger.target.Mac == requestQuery["sensor"])
{
}
}
return Web.Core.Sensors.Any() ? Web.Core.Sensors.First().Value : "0";
}
}

1
esh.core/components.cs
View file

@ -65,6 +65,7 @@ namespace esh.core
ValueExact, //when sensor value is EXACTLY x
ThresholdRisingEdge, //when value goes above threshold
ThresholdFallingEdge, //when value goes below threshold
ValueChanged, //when sensor value is different than before TODO!
Time //TODO: intervals and stuff
}