Kim
|
f1394e4755
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# csharp/App/Backend/Database/User.cs
# csharp/App/Backend/Model/User.cs
|
2023-03-09 12:52:47 +01:00 |
|
Kim
|
d04ebffc76
|
added installation specific s3 keys
|
2023-03-09 12:50:21 +01:00 |
ig
|
932f8bdac4
|
lift AMPT to new StatusApi
|
2023-03-09 12:40:47 +01:00 |
|
ig
|
8935353e38
|
Introduce Ancestors, GetParent
|
2023-03-09 11:12:56 +01:00 |
|
ig
|
99ef91b7be
|
Use safe defaults for User (fail early)
|
2023-03-09 11:01:48 +01:00 |
|
ig
|
ba79b2d16f
|
Tentatively create struct DbConnection, not used yet.
|
2023-03-09 10:58:55 +01:00 |
|
ig
|
27b24b44a0
|
Rewrite IsParentOfChild even shorter :P
|
2023-03-09 10:58:08 +01:00 |
|
Kim
|
7295e6482b
|
changes to s3 bucket keys generation
|
2023-03-09 10:54:56 +01:00 |
|
ig
|
4812e371b0
|
Rewrite IsParentOfChild
|
2023-03-09 10:52:35 +01:00 |
Sina Blattmann
|
53346740ab
|
[WIP] create tree view with drag and drop functionality
|
2023-03-09 10:50:56 +01:00 |
|
Kim
|
683ef02704
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-09 09:06:02 +01:00 |
|
Kim
|
65624cf1aa
|
added dynamic s3 key generation
|
2023-03-09 09:05:59 +01:00 |
|
ig
|
d13e7547c5
|
Remove Energy related measurements from EmuMeterDriver for the time being
|
2023-03-08 16:14:22 +01:00 |
|
Sina Blattmann
|
19978dd211
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-08 15:46:52 +01:00 |
|
ig
|
ee14c0844b
|
Fix duplicate Folders bug
|
2023-03-08 15:45:53 +01:00 |
|
ig
|
2240d3ef47
|
update EmuMeter to new StatusApi
|
2023-03-08 14:22:57 +01:00 |
|
ig
|
1b9353b1db
|
support UnixTime in Units
|
2023-03-08 14:17:39 +01:00 |
|
ig
|
2738fe5aab
|
rename UnixTimeDelta => UnixTimeSpan
|
2023-03-08 14:09:00 +01:00 |
|
ig
|
7e58b78572
|
add new Unit: Energy (kWh)
|
2023-03-08 14:06:39 +01:00 |
|
Sina Blattmann
|
c7604a86cf
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-08 13:45:41 +01:00 |
|
ig
|
72293807ee
|
add new API: GetAllFoldersAndInstallations
|
2023-03-08 13:40:34 +01:00 |
|
ig
|
faf35be6cf
|
Set parentId=0 already in DB layer, not in controller
|
2023-03-08 13:33:55 +01:00 |
|
ig
|
e6fa2933b5
|
Only consider Id, but not ParentId for TreeNode equality checks
|
2023-03-08 13:28:22 +01:00 |
|
ig
|
702fa89914
|
Fix namespaces in Backend
|
2023-03-08 13:20:33 +01:00 |
|
Sina Blattmann
|
40f5c8c391
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-08 13:01:56 +01:00 |
|
ig
|
629d0a1626
|
Set parentId=0 for root folders returned by GetTree
|
2023-03-08 12:53:29 +01:00 |
|
ig
|
774e7d9110
|
MbWords => MbRegisters
|
2023-03-07 11:20:32 +01:00 |
|
ig
|
2fa1009bbd
|
MbWords => MbRegisters
|
2023-03-07 11:20:04 +01:00 |
|
ig
|
479cdd03ba
|
Introduce Endianness to Modbus lib
|
2023-03-07 11:19:15 +01:00 |
|
ig
|
270d78b75f
|
\ => / in *.csproj
|
2023-03-07 11:18:35 +01:00 |
|
ig
|
1e6cb668ec
|
Add Modbus register map doc to EmuMeter
|
2023-03-07 11:17:59 +01:00 |
|
ig
|
5fb3f23799
|
use JsonConverterAttribute for Json serialization
|
2023-03-06 09:52:27 +01:00 |
|
Sina Blattmann
|
8112e1ed8b
|
Change folder structure
|
2023-03-06 09:32:43 +01:00 |
|
Sina Blattmann
|
8dd591d752
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-06 08:47:34 +01:00 |
|
Sina Blattmann
|
8369daec24
|
[WIP] add page tab and corresponding routes
|
2023-03-06 08:47:19 +01:00 |
|
ig
|
94e5496872
|
implement ToJson() for DeviceStatus
|
2023-03-02 18:03:10 +01:00 |
|
ig
|
8ae9119858
|
Round Units to 3 significant digits by default (ToString). Add JsonConverters to generator
|
2023-03-02 17:15:10 +01:00 |
 atef
|
19188fa430
|
Implement IReadOnlyList for State
|
2023-03-02 15:26:27 +01:00 |
|
atef
|
8c3caa06d5
|
Introduce number type
|
2023-03-02 15:22:00 +01:00 |
|
atef
|
a3ccd2a537
|
Add more implicit conversions for State
|
2023-03-02 15:14:22 +01:00 |
|
atef
|
55048b3f99
|
lift EmuMeter to new StatusApi
|
2023-03-01 13:35:33 +01:00 |
|
atef
|
be5999e0f0
|
remove trailing 'require'
|
2023-03-01 13:23:42 +01:00 |
|
atef
|
6f48b97621
|
fix some minor csproj settings
|
2023-03-01 13:23:16 +01:00 |
|
ig
|
afe83e943f
|
Phase => Bus
|
2023-03-01 10:53:34 +01:00 |
|
ig
|
fac1a090bf
|
Phase => Bus
|
2023-03-01 10:52:54 +01:00 |
|
ig
|
b983614cfc
|
Phase => Bus
|
2023-03-01 10:52:21 +01:00 |
|
ig
|
4bf9deffac
|
lift Battery48TL to new StatusApi
|
2023-03-01 10:41:13 +01:00 |
|
ig
|
f5ff1d70a5
|
remove 'require' again (sigh). It only *seems* to build, but doesnt. we need net7.0
|
2023-03-01 10:40:25 +01:00 |
|
ig
|
4cb8e9ecfa
|
add more operators to Percent
|
2023-03-01 10:38:51 +01:00 |
|
Sina Blattmann
|
d2e4f93fd1
|
fix replace, so it works on windows as well
|
2023-03-01 09:41:49 +01:00 |