Commit Graph

817 Commits

Author SHA1 Message Date
Sina Blattmann 79ec12ba5e Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-03-16 08:39:57 +01:00
Sina Blattmann 55974839d9 [WIP] fix drag ;and drop tree bug 2023-03-16 08:39:39 +01:00
ig 4c37c92f73 improve backend 2023-03-15 14:39:54 +01:00
Sina Blattmann c4eb538132 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-03-13 15:17:56 +01:00
Sina Blattmann c5287ce95f add context for state management for installation and group 2023-03-13 15:17:40 +01:00
ig d974a7f176 Move tables to main DB class, convert entity related function to extensions 2023-03-13 11:48:04 +01:00
Sina Blattmann 3a6f4fc046 [WIP] add drag handle to drag and drop, add error handling and user feedback 2023-03-13 11:41:56 +01:00
ig 5a082c22e8 Make DB class static 2023-03-13 11:36:50 +01:00
ig 6db610d308 implement Logic/Wire addressing in ModbusClients 2023-03-10 13:57:39 +01:00
ig df087b9d8e remove MbAddress type 2023-03-10 13:46:46 +01:00
ig 2d242f25b7 Make MbWords writable 2023-03-10 10:12:03 +01:00
Kim 366e0af986 Merge remote-tracking branch 'origin/main' 2023-03-09 17:21:39 +01:00
Kim 55e0ad22a3 giving back user language on login 2023-03-09 17:21:31 +01:00
Sina Blattmann fb86792680 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-03-09 16:38:27 +01:00
Kim 2703dd1e11 adds newly created inst and folders to accessible 2023-03-09 16:37:36 +01:00
Kim 2fdd920572 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	csharp/App/Backend/Database/Db.cs
#	csharp/App/Backend/Database/User.cs
2023-03-09 16:34:19 +01:00
Kim 09a8eee138 seperated create from update 2023-03-09 16:33:14 +01:00
ig d885fa94c6 Remove Result class; 2023-03-09 16:32:11 +01:00
Sina Blattmann 8899f55bd0 Finish dnd treeview, add mobile support for scrolling in dnd treeview 2023-03-09 15:25:57 +01:00
ig 9d753a8471 Introduce State<T> for Enums 2023-03-09 14:02:02 +01:00
Kim a66d547291 Merge remote-tracking branch 'origin/main' 2023-03-09 13:20:46 +01:00
Kim fd10522786 Added daily deletion of Installation s3 keys 2023-03-09 13:20:37 +01:00
ig eb73beb1cd Implement failure resilient TCP connections for Adam and AMPT 2023-03-09 13:16:31 +01:00
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