atef
05926994b7
Update AcPower and Dc Power Devices under the folder devices
2023-10-23 10:03:00 +02:00
Kim
8b5c1516ca
Fixing stuff
2023-10-16 13:47:27 +02:00
Kim
19410edcbb
Key schenanigans
2023-10-16 12:51:11 +02:00
Kim
6f4c1122f7
Various S3 is WIP
2023-10-16 11:27:19 +02:00
atef
6347eba1be
update the hostlist and upload the publickey to resources folder
2023-10-16 10:44:06 +02:00
Kim
8fc06b0f60
VrmGrabber fix
2023-10-09 14:31:39 +02:00
Kim
bb2de9d0d4
Merge remote-tracking branch 'origin/main'
2023-10-09 14:30:51 +02:00
Kim
4eedb913c5
Merge branch 'new_S3_API'
...
# Conflicts:
# csharp/App/VrmGrabber/Controller.cs
2023-10-09 14:26:18 +02:00
Kim
2a5f9a0cc6
Rewrote Backend.csproj to use new S3Utils.csproj, Testing needed
2023-10-09 14:23:31 +02:00
atef
358b1f0ec1
Add System Log to the statusRecord
2023-10-04 15:19:41 +02:00
atef
04bfbfc8b9
Add Log {Led and Message} for Salimax status and alarm
2023-10-04 15:17:43 +02:00
atef
1afcbfbf4f
Host list added
2023-10-04 15:15:13 +02:00
atef
21518ebd8b
Add host List to git
2023-10-04 15:14:36 +02:00
atef
7c7fdf1eae
Update to unix time 2/2
2023-10-03 16:01:34 +02:00
atef
81ee127d62
Update to Unix time
2023-10-03 16:01:17 +02:00
atef
07e0e1f956
Add time stamp on console
2023-10-03 16:00:54 +02:00
atef
ea5ce5617a
add loginfo on the toCsv()
2023-10-03 16:00:28 +02:00
atef
1fb95cbb56
Update the S3 data in config file (in Debug mode)
2023-10-03 15:59:07 +02:00
ig
b92391efcd
remove leftover Resources Folder
2023-10-02 15:45:58 +02:00
Kim
965a85ba81
Merge remote-tracking branch 'origin/main'
2023-10-02 15:40:06 +02:00
Kim
5146491dcd
updated VrmGrabber to automatically grab battery ids
2023-10-02 15:40:03 +02:00
ig
2f5622e26c
S3 Utils
2023-10-02 15:37:27 +02:00
ig
b7cda31b58
minor
2023-10-02 15:10:01 +02:00
ig
13611da7c8
cleanup project file
2023-10-02 15:09:40 +02:00
ig
3b3381247a
bump System.Linq.Async to 6.0.1
2023-10-02 15:09:39 +02:00
ig
3ce40b936a
Remove UnixTime.csproj, use DateTimeUtils instead
2023-10-02 15:08:40 +02:00
atef
8f876a37bd
Update to the battery power instead of Dc Dc power for the variable "l"
2023-10-02 14:50:10 +02:00
atef
b1d553870e
Change from control special error to Detect Alarm States
...
Add loginfo to toCsv()
2023-10-02 14:49:24 +02:00
atef
3affba7899
Update Battery service
2023-10-02 14:20:01 +02:00
atef
25d3ae9252
Adapt logfile to save .csv in local machine.
2023-09-27 14:37:11 +02:00
Kim
d04b431c9f
Merge branch 'marios'
2023-09-18 15:51:47 +02:00
Kim
651f2974c4
added deploy scripts for backend and frontend (use in the folder and while in the vpn)
2023-09-18 15:43:07 +02:00
Kim
315fab8463
Merge remote-tracking branch 'origin/main'
2023-09-18 13:21:44 +02:00
Kim
b727ef765a
Checking for loops in foldertree, getting only unique children now.
...
Small Stability changes to VrmGrabber
2023-09-18 13:21:39 +02:00
Kim
731587ac77
Merge branch 'marios'
...
# Conflicts:
# csharp/App/S3Explorer/Program.cs
2023-09-15 17:00:51 +02:00
Kim
40535cf0f1
Small changes cleanup for release
2023-09-15 16:59:59 +02:00
Kim
a33c78ffe9
wip
2023-09-15 16:45:00 +02:00
Kim
128063165d
No / in token!
2023-09-15 16:39:01 +02:00
Kim
13a2f22e36
Refactored Mailer out of backend into lib.
2023-09-15 16:30:41 +02:00
Kim
875d00d8a9
small typo
2023-09-15 14:29:48 +02:00
Kim
9686fed805
WIP password reset
2023-09-15 14:23:22 +02:00
Noe
637c8ae4ba
Updated backend
2023-09-15 13:34:28 +02:00
atef
0d400a0eea
Add Control Special Error.
2023-09-15 09:38:21 +02:00
atef
3ae8a97d15
Delete to do log
2023-09-15 09:23:09 +02:00
atef
3b77c4a5b2
Added the feature of the forceCalibrationCharge in the config file.
2023-09-13 10:57:12 +02:00
ig
b213d97537
resharper ignore "typo"
2023-09-11 11:33:12 +02:00
ig
e538f6dd7e
set Root Namespace for EmuMeterDriver
2023-09-11 11:33:12 +02:00
Kim
908238244f
null passwords for new users
2023-09-08 16:13:36 +02:00
Kim
bd4ad2b16e
finished s3explorer rewrite
2023-09-08 15:54:02 +02:00
ig
4791b139b8
Do not crash when file is not available
2023-09-08 15:22:39 +02:00
ig
f98a149318
WIP: S3Explorer, TODO: fix missing entries
2023-09-08 15:19:46 +02:00
Kim
d9548f6207
oops revert
2023-09-08 12:00:19 +02:00
Kim
eb54250031
Added alarm changing
2023-09-08 11:56:49 +02:00
Kim
47c8d438d1
Added keys to S3Cmd.cs
2023-09-08 11:52:49 +02:00
Kim
3484d4bca3
Threw out "deleted" Backups as we backup our db after each transaction.
2023-09-08 10:27:09 +02:00
Kim
7da9389358
Merge remote-tracking branch 'origin/main'
2023-09-08 09:46:00 +02:00
Kim
50e01e6c8c
fixed deletion
2023-09-08 09:45:56 +02:00
atef
93539bee0e
Add max power control in Program.cs
2023-09-08 09:34:38 +02:00
atef
e58b949160
Add max Dc Power in the config file
2023-09-08 09:33:29 +02:00
atef
fd52a94d18
update control constants.
2023-09-07 17:41:42 +02:00
atef
b39b512a12
Fix control constants, we assign the Dc bus Voltage info depends on the mode
2023-09-07 17:28:10 +02:00
atef
f8b13a9814
Delete the hard coded value for Dc Bus Voltage
2023-09-07 17:25:56 +02:00
atef
bcaab09190
Correct the name of the reference Dc Link Voltage
2023-09-07 17:24:56 +02:00
atef
9510d0b47e
Add Dc Bus Voltage info in the Config.cs
2023-09-07 17:23:48 +02:00
atef
31ad48e77e
Add DevicesConfig, AcDcConfig and DcDCConfig
2023-09-07 17:22:39 +02:00
ig
3b1a553be5
Limit DischargePower based on nb. of batteries that are actually connected to the DC bus, not nb. of batteries that communicate
2023-09-06 10:20:32 +02:00
atef
7f91d49374
Add resources folder to the solution
2023-09-04 15:57:26 +02:00
atef
b9098e3979
Delete unnecessary code and comment
2023-09-04 15:57:08 +02:00
atef
1fa598049d
Add Salimax and battery service file
2023-09-04 10:19:08 +02:00
atef
1ab369bff9
Change name flag to requested
2023-09-04 10:15:55 +02:00
ig
7ecb6e4607
Introduce VoltageRms and CurrentRms and use them where appropriate
2023-09-01 14:52:09 +02:00
ig
006ea0e1ee
remove stale file
2023-09-01 14:36:50 +02:00
ig
7fc5f80e8c
make BatteryStatus nullable
2023-09-01 14:36:50 +02:00
ig
851b936217
only write config file when contents have changed (memo)
2023-09-01 14:36:50 +02:00
atef
b5436e64aa
Use the Active power for display Ac Power
2023-09-01 14:15:31 +02:00
atef
26422284dd
Change from falg to requested
2023-09-01 14:14:34 +02:00
atef
9bbccfd34b
Add a Calibration Charge Flag based on the Time Since TOC.
2023-09-01 10:48:44 +02:00
ig
05f0a7e9f9
convert composite units to records
2023-09-01 09:18:44 +02:00
atef
6c2360f0ad
Add time to TOC request
2023-08-31 15:16:27 +02:00
ig
cc2ab03d01
split CalculateEnergyFlow into 3 functions
2023-08-31 13:19:48 +02:00
atef
5bcb46f841
Add Fi Warning and Error display
2023-08-31 12:58:37 +02:00
atef
9e03965d5b
Add a CalculateEnergyflow function in program.cs
...
Moved the CalculateEnergyFlow to Toplogy.cs
2023-08-31 10:13:28 +02:00
ig
3c47089bcf
make Power of virtual devices "required", ditch Null device
2023-08-30 15:12:41 +02:00
atef
28d46d6689
Add Salimax007 and Salimax008 to the list.
2023-08-30 13:45:25 +02:00
atef
9e31046f43
Update the energy flow calculation and add the ascii topology as a comment
2023-08-30 13:44:58 +02:00
atef
9edd875066
Display heating power in the battery and fix the K1/K2 open switch
2023-08-30 13:42:41 +02:00
atef
c5cb31ac88
Delete a no needed display.
2023-08-30 13:40:53 +02:00
ig
db6fe5ecbf
make collector aware of "secret" limp string alarms/warnings (too many broken cells)
2023-08-29 13:57:59 +02:00
Kim
2f403a9819
email must be unique
2023-08-29 11:17:34 +02:00
Kim
d93eb2c987
Added checkmarks for must reset password
2023-08-29 10:47:35 +02:00
ig
41ccc63175
modify Topology.cs to properly display missing/unreachable devices (mayor rewrite)
2023-08-25 17:22:02 +02:00
ig
9a400d992d
remove fake nullables from status record
2023-08-25 17:18:26 +02:00
ig
4907654841
add support for unknown/nullable flows
2023-08-25 17:17:41 +02:00
ig
27a4411ebf
make AmptStatus nullable in StatusRecord.cs
2023-08-25 17:16:28 +02:00
ig
2ace3fad51
"Notify" the Watchdog
2023-08-24 10:03:20 +02:00
ig
fc981d1019
do not deploy .pdb files
2023-08-23 16:11:50 +02:00
ig
d4fdf92009
add visual representation of relay states to topology
2023-08-23 16:11:34 +02:00
ig
980b09ddb4
declutter Topology code some more
2023-08-23 13:37:59 +02:00
Kim
107a439e44
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# typescript/Frontend/src/config/axiosConfig.tsx
2023-08-23 11:31:42 +02:00
Kim
5e320941bd
multiple fixes
2023-08-23 11:31:30 +02:00
ig
664290c44b
reorder Topology generation code
2023-08-23 09:23:50 +02:00
ig
d731c12f64
add minor error handling in Texblock
2023-08-18 15:57:00 +02:00
ig
2047f25e4e
Break off Topology related stuff into own class
2023-08-16 15:41:13 +02:00
ig
3d3a0375d2
Undo Default constructor. Compiler cannot deal with it yet.
2023-08-16 15:38:46 +02:00
ig
df9de4c9ed
Cleanup text based Topology
2023-08-16 15:15:45 +02:00
ig
9b4b947569
use primary constructor
2023-08-16 15:11:37 +02:00
ig
2d6c6b6140
reduce debug clutter
2023-08-16 10:36:31 +02:00
ig
bf4bd20efa
readd adam gone missing
2023-08-16 10:36:08 +02:00
ig
0b8aa5a96e
move Watchdog related code into its own class
2023-08-16 09:45:34 +02:00
ig
d633564b93
fix Config.cs for debug mode
2023-08-15 15:45:43 +02:00
ig
31c725520f
minor edit in AllStates.graphml
2023-08-15 15:06:57 +02:00
atef
bfb1670d11
Update Display of the battery features
...
( A H = Heating Current
A C/D = Charging/Discharging Current
A T = Total Current)
2023-08-10 13:08:24 +02:00
atef
898ea3fcd8
Delete the intermediate state.
...
Update the state machine as defined in the excel sheet.
Commment the disable function of Dc/Dc, as we don't need to disable Dc/DC in the grid tie and island transition(I will delete the function in the future).
2023-08-10 13:06:42 +02:00
atef
8b159a6a2c
Update the state number on Select Control mode function
2023-08-10 13:04:07 +02:00
atef
f6699787dd
Add Observable for the run task
...
Add few constant control
2023-08-02 11:08:40 +02:00
atef
f9193f4624
Introduce constant (battery heating power = 200)
2023-08-02 11:05:26 +02:00
atef
e6f1263e4b
Change the max charge batteries limit when we are in heating mode
2023-08-02 11:04:33 +02:00
atef
a10193592f
clean code
2023-08-02 11:01:05 +02:00
atef
9ff2a54e0f
add Salimmax0005 and 0006 to hostlist
2023-08-02 10:59:14 +02:00
Kim Baumgartner
3ab4383eab
Started to rewrite vrmgrabber in rust.
2023-07-27 16:52:40 +02:00
Kim Baumgartner
21a0603309
Started to rewrite vrmgrabber in rust.
2023-07-27 16:51:57 +02:00
Kim
b4174d09bf
updated https
2023-07-27 13:24:14 +02:00
Kim
1ed3a64ade
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# typescript/Frontend/src/components/Context/S3CredentialsContextProvider.tsx
2023-07-27 13:23:52 +02:00
Kim
22e2561f14
updates to backend and 10.2.0.1
2023-07-27 13:23:17 +02:00
atef
6270a0d8a3
Delete old scripts and create a common one
2023-07-24 10:54:50 +02:00
atef
a677c878e8
Add reference and Window Dc/Dc voltage to the config file
2023-07-24 10:50:41 +02:00
Kim
c23149c5cc
fixed some small bugs uncovered by testing
2023-07-20 13:57:12 +02:00
Kim
142044c77b
secret ate a bug
2023-07-13 16:51:39 +02:00
Kim
9777771c7f
Refactoring S3Explorer
2023-07-13 16:37:52 +02:00
Kim
7ff1d05708
Added S3Explorer a cmdline tool to grab and display data from our s3 buckets
2023-07-13 16:17:58 +02:00
Kim
add66565c4
Merge remote-tracking branch 'origin/main'
2023-07-13 13:23:09 +02:00
Kim
8db786f965
In-Memory Database with automatic versioning Backups. When starting the server the newest backup is loaded into memory.
2023-07-13 13:23:05 +02:00
atef
4563103572
Add console display in island mode and replace loginfo instead console.writeline
2023-07-13 10:49:23 +02:00
Kim
2aae717859
refactoring
2023-07-13 10:18:34 +02:00
Kim
b5b7f65384
catching moves to same parent
2023-07-13 10:16:31 +02:00
Kim
ba23280693
Merge remote-tracking branch 'origin/main'
2023-07-13 10:01:33 +02:00
Kim
a070891e7e
Set bucket cors on creation of new installation
2023-07-13 10:01:30 +02:00
atef
12b0c94d78
Update Config file and Inverter state
2023-07-13 09:53:44 +02:00
atef
486abbdf56
Switch few function from public to private
2023-07-13 09:53:13 +02:00
atef
df0983e97e
Update tunnel and running script.
2023-07-13 09:43:19 +02:00
Kim
be18b291af
Merge remote-tracking branch 'origin/main'
2023-07-13 09:40:10 +02:00
Kim
e92d5a507c
Included Write keys for s3
2023-07-13 09:40:04 +02:00
ig
68e870ba9b
Update/rename States_Table.xlsx
2023-07-12 15:26:07 +02:00
ig
6e1a5a6349
Add new State diagrams
2023-07-12 15:23:05 +02:00
ig
e400c11d3c
Remove InvertersAreConnectedToAc enum. no longer used.
2023-07-11 14:07:42 +02:00
atef
44a2488b07
New excel matrix.
2023-07-10 11:24:53 +02:00
ig
b361959f53
Properly parametrize deploy script
2023-07-10 10:39:03 +02:00
atef
bd24a725c6
Add display fail reading error
2023-07-10 10:34:51 +02:00
atef
93d8936430
Add Console Writeline in Log
2023-07-10 10:22:09 +02:00
atef
4ee7aebf95
Add display messages, Battery alarms and warnings
2023-07-10 10:10:39 +02:00
atef
c2f32cdc95
Add salimax0003 run script
2023-07-10 10:07:53 +02:00
ig
39262d1a46
Use IReadOnlyList for BatteryNodes
2023-07-06 15:19:06 +02:00
Sina Blattmann
4b873306e3
bugfix login
2023-07-06 11:42:52 +02:00
Sina Blattmann
6628e57861
kims work
2023-07-06 11:16:00 +02:00
Kim
fc3ad1806c
changed name to email
2023-07-06 11:09:16 +02:00
Kim
c738804b1c
made password nullable in login function
2023-07-06 11:06:55 +02:00
Kim
a0dc85b57b
changed db to real data
2023-07-06 10:57:57 +02:00
ig
9068f183d6
Use separate S3 data fields as in S3Config (cs & ts)
2023-07-05 15:13:44 +02:00
ig
3a10e4cb20
Split S3KeySecret into S3Key and S3Secret
2023-07-05 15:10:08 +02:00
ig
25450aecee
Extract ExoCmd into own file
2023-07-05 15:09:28 +02:00
ig
395d5a89b2
Change S3 keys format; add correct S3 key for SalimaxPrototype
2023-07-05 14:31:53 +02:00
ig
146daed8d9
use ToDisplayString
2023-07-04 11:18:16 +02:00
ig
c6fbb1d931
fix defaults for Salimax Release
2023-07-04 09:59:26 +02:00
ig
e80cc2fbd0
remove spurious propertygroup from projects
2023-07-04 09:09:50 +02:00
ig
63f80e3ef7
drop unused packages
2023-07-03 17:30:01 +02:00
ig
dd33744612
centralize config
2023-07-03 17:30:01 +02:00
ig
cc8621d632
Introduce Ip4Address class, standard IpAddress class is unwieldy...
2023-07-03 17:30:01 +02:00
ig
d7cb9401da
Centralize configs: DeviceConfig & SystemConfig
2023-07-03 17:30:01 +02:00
ig
6648d318ca
Minor improvements for TextBlocks
2023-07-03 17:30:01 +02:00
atef
e31c40b659
Add Rootnamespace property in project files
2023-07-03 14:59:59 +02:00
atef
1bd62086ab
Comment and delete unused lines
2023-07-03 14:23:58 +02:00
atef
932fab50f7
Add $ to the value name
2023-07-03 14:23:19 +02:00
atef
1c4e2dee2e
Add to display string
2023-07-03 14:23:05 +02:00
atef
c0c65c2bb8
Add Log Error and log Warning
2023-07-03 14:21:18 +02:00
Noe
869a83b799
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-30 16:15:41 +02:00
Noe
f2c04e2ccc
Version Bleu
2023-06-30 16:13:09 +02:00
atef
8fc2b8fe9d
Create Individual Battery
2023-06-30 10:30:18 +02:00
atef
5dfd8e69b4
Change Dc link Window Voltage
2023-06-30 10:29:50 +02:00
atef
da38aa7b83
rename the log to loginfo and create log debug
2023-06-30 10:27:14 +02:00
atef
ca7d58ff0e
Fix the run scripts
2023-06-30 10:26:04 +02:00
Noe
9e9a899f8e
fix merge conflict
2023-06-30 09:00:44 +02:00
Noe
7cb055bc7b
styling of website
2023-06-30 08:58:50 +02:00
Sina Blattmann
531c296a15
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-29 08:41:03 +02:00
Sina Blattmann
4ee1709386
[WIP] fix graph bugs
2023-06-29 08:40:28 +02:00
ig
5484aea6cb
ToStringRounded => ToDisplayString, introduce scientific notation (mW, kW,...) for units
2023-06-27 17:02:56 +02:00
ig
a761e46686
fix bugs introduced by 'required' changes
2023-06-27 17:01:40 +02:00
ig
7f97ab8e14
make use of "required" with "init" (.net 7)
2023-06-27 13:14:17 +02:00
atef
225d9616c0
add Publish Trimmed = false
2023-06-26 12:00:36 +02:00
Sina Blattmann
30da19dadc
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-26 11:36:21 +02:00
Sina Blattmann
b256e9bd75
add db
2023-06-26 11:34:17 +02:00
atef
a1f55afe6f
Change the ip address to run as a service
2023-06-23 10:42:02 +02:00
atef
3a2050dcbc
Update the Print Display
2023-06-23 10:41:20 +02:00
atef
b5f025dc69
Add toStringRounded
2023-06-23 10:40:11 +02:00
ig
a2d9017326
remove stray .sln files
2023-06-22 10:18:26 +02:00
ig
f7ee9276a3
Add calculated powers (loads etc.), Dc Load is still broken
2023-06-22 10:17:06 +02:00
ig
5976ce3a8c
remove stray ControllerPConstant from config
2023-06-22 10:09:15 +02:00
atef
f1c03ad333
Create an apply Default settings for dc
2023-06-22 10:00:44 +02:00
atef
8455bb64e3
Add the print Topology
2023-06-22 10:00:01 +02:00
atef
b8b908e7f8
Clean up controller
2023-06-22 09:55:57 +02:00
atef
1c253bb603
Change the salimax0001 port to 700* and 400*
2023-06-22 09:52:58 +02:00
atef
75f1f42252
Reduce the default height of vertical flow
2023-06-22 09:52:17 +02:00
atef
1201fd1c2f
Change grid set point to 0
2023-06-22 09:50:50 +02:00
atef
8feee5db43
Introduce ClampMin and ClampMax
2023-06-20 15:34:04 +02:00
atef
789780791f
throw exception if min is bigger than max in Clamp
2023-06-20 15:27:53 +02:00
ig
c78451d4cf
new implementation of TextBlock
2023-06-20 14:26:48 +02:00
ig
dcc4bfa78a
implement circular current prevention
2023-06-20 10:23:44 +02:00
ig
d88fc677b5
add virtual devices
2023-06-20 10:23:44 +02:00
ig
dbfb1b3707
add Dc side config for inverters
2023-06-20 10:23:44 +02:00
ig
075c54d179
rename SystemState => StateMachine
2023-06-20 10:23:44 +02:00
ig
5e8ec1aebf
add EmuMeter TODO
2023-06-20 10:23:44 +02:00
ig
73f4b22930
remove host from BmsTunnel
2023-06-20 10:23:44 +02:00
ig
5c5d2b72e5
remove node detection from BmsTunnel, did more harm than good.
2023-06-20 10:23:44 +02:00
ig
5a3da7434b
Trumpf V2
2023-06-20 10:23:43 +02:00
ig
eeaefb0f54
Salimax V2
2023-06-20 10:23:43 +02:00
Ivo Graber
4736657375
Delete Sqlite Db from backend
...
suspecting it to be the cause of a git error (too big)
2023-06-13 11:52:13 +00:00
Kim
b3c04888ed
fixed ip from offline installations
2023-06-01 16:19:06 +02:00
Kim
4b04794c5f
fixed watchdog
2023-06-01 16:11:26 +02:00
Kim
8e148a35c1
refactoring, fixing not finding bug, randomly ordering the list of installations to increase coverage.
2023-06-01 16:10:57 +02:00
Kim
149f89f89f
added automatic tags setters for vrm
2023-06-01 15:29:39 +02:00
Kim
92f0e400e1
Fixed a bug in the batteryupdate progress
2023-06-01 11:21:13 +02:00
Kim
b5fbca3f8d
removed take
2023-05-25 14:50:20 +02:00
Kim
92721376a6
Added updating battery firmware
2023-05-25 14:49:40 +02:00
Kim
ec4d76f8fd
minor fixes, pre-implemented battery firmware upgrade (needs the binary)
2023-05-25 12:55:23 +02:00
Kim
c969b72a82
Fixed a bug that stopped the updating of installations
2023-05-25 09:18:41 +02:00
Kim
5eb373b78e
added battery number and firmware version
2023-05-18 12:38:34 +02:00
Kim
24684ccb09
Changed VrmGrabber to run with an SQLite DB
2023-05-18 10:45:44 +02:00
Kim
3453b05a94
Renaming only when necessary and rebooting after renaming
2023-05-11 17:02:13 +02:00
Kim
be099118c1
added renaming to installations
2023-05-11 15:41:41 +02:00
Kim
9c927bfc3a
updated VrmGrabber to include online-status
2023-05-11 13:26:13 +02:00
Kim
fa9d06192d
added Grafana
2023-05-11 10:20:47 +02:00
Kim
70a4a1bfb8
updated vrmgrabber
2023-05-04 17:22:58 +02:00
Kim
d1fb0a8ac2
added VrmGrabber to replicate VRM installations in memory (to run run the server.py file with flask run) FLASK_APP=server.py
2023-05-04 13:59:47 +02:00
Kim
9f0d37ce03
Merge remote-tracking branch 'origin/main'
2023-04-27 16:59:54 +02:00
Kim
313dd4d406
added VrmGrabber Still WIP
2023-04-27 16:59:45 +02:00
Sina Blattmann
6fc414a2c0
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-04-24 09:36:18 +02:00
Sina Blattmann
39b414d0f0
add datacache (ivos code), first working version with diagrams, only sample data
2023-04-24 09:35:01 +02:00
Kim
76e23d579f
Merge remote-tracking branch 'origin/main'
2023-04-20 15:30:36 +02:00
Kim
f5515c110a
changed signed urls for keysecret pairs in installations
2023-04-20 15:30:11 +02:00
atef
cb5bd91e55
Update the Topology display and the AsciiArt
2023-04-20 13:21:41 +02:00
atef
8631ada267
Delete Log and Salimax Utils(it has only Round3) function
2023-04-20 13:20:26 +02:00
atef
7635a8175e
Add EocReached and Total Current and correct naming
2023-04-20 13:19:33 +02:00
atef
bf1c869cba
Update AsciiArt.cs and Topology
2023-04-18 10:04:30 +02:00
Kim
5682d2893f
Todo check different return methods and choose one @ig
2023-04-13 16:24:00 +02:00
Kim
b8fc04a90c
Testing new error messages in Backend, fixing small bugs, possibly breaking BMSTunnel, fixed tests
2023-04-13 14:30:01 +02:00
Sina Blattmann
e84c10607f
add Graphs, simple version
2023-04-13 11:40:57 +02:00
Kim
171d290e36
python gui fixed for reference
2023-04-06 14:28:35 +02:00
Kim
184fc8c10e
Implemented mailer for new users, creation fails on invalid email address
2023-04-06 10:36:42 +02:00
Kim
b6fbeb48b5
fixing bug in updating user
2023-04-06 08:32:47 +02:00
Kim
1021bb852a
fixed bug in creating user and returning parents of installations/folders
2023-04-06 08:05:05 +02:00
atef
840643f069
Introduce CombinedStatus
2023-04-04 16:37:37 +02:00
ig
005da7fbcb
Subscribe Cleanup on TaskPoolScheduler, should make Backend startup faster
2023-04-04 10:39:42 +02:00
ig
904d05c0de
Add temporary hack to read info from VRM
2023-04-04 10:24:46 +02:00
ig
79ccad37c5
Move Controller to src root
2023-04-04 10:24:37 +02:00
Kim
b290ded0a9
Fill Order Numbers everywhere where installations are given back
2023-03-30 09:28:44 +02:00
Kim
e1305126ee
Shifted sanitizing outputs into Controller.cs
...
Now Hiding Parents
2023-03-30 09:27:18 +02:00
Kim
46db92fee5
fixed trimming bug in get_cert, its 75mb now
2023-03-30 08:30:40 +02:00
Kim
eb03329441
supressing warnings
2023-03-23 17:36:24 +01:00
Kim
b8da0c379d
refactoring and testing OpenVpnCertificatesServer with token
2023-03-23 17:17:10 +01:00
Kim
f62375ae54
added token generator and getting token from token.json
2023-03-23 16:58:26 +01:00
Kim
888a9f716b
added token generator and getting token from token.json
2023-03-23 16:57:50 +01:00
Kim
610aa05a38
Wip test commit
2023-03-23 15:57:51 +01:00
Kim
50036daa78
typo
2023-03-23 15:46:19 +01:00
Kim
c2d10b63d2
rewrote getchildusers
2023-03-23 15:45:40 +01:00
Kim
55628e2186
updating installations with new order numbers automatically updates the ordernumber2installation relation table
2023-03-23 14:58:59 +01:00
Kim
b07991e75d
added Ordernumber to installation relation and automatically filled installation order relations on get calls
2023-03-23 14:23:03 +01:00
Kim
7c385bc51c
added smtpconfig class and put smtp config data into resources json file
2023-03-23 13:37:35 +01:00
Kim
432189f461
simplify s3 keys from json
2023-03-23 13:28:55 +01:00
Kim
cc234cad97
added foldernames to inherited folder calls
2023-03-23 12:53:14 +01:00
Kim
7d4309f3af
Added deletedFolders/installations/users for archive purposes, login is now possible without pw if no pw is set and you need to reset your pw, user hased pws should no longer be given out by the backend, moving folders and installations now have their own calls, loading s3 keys from disk on use
2023-03-23 12:47:25 +01:00
Kim
656b671962
split users with direct and inherited access to folders call
2023-03-23 08:27:29 +01:00
Kim
c751cb8e8f
added method to get all child users, split get user with access to installation to direct and inherited
2023-03-23 08:23:36 +01:00
ig
abcec0ae10
remove HeaderFilter.cs, no longer needed
2023-03-21 11:56:34 +01:00
ig
381df5f38d
fix handling of relative roots
2023-03-21 11:49:17 +01:00
ig
9098ac81b5
prevent rider from automatically opening swagger on each launch
2023-03-21 11:46:38 +01:00
ig
8d7f0cd8bf
Use users name instead of email for login ( https://softwareengineering.stackexchange.com/a/30087 )
2023-03-21 11:45:50 +01:00
ig
1b5baf90ae
Fix bug where properties were missing in json of installations and folders (were serialized as TreeNodes)
2023-03-21 11:42:49 +01:00
ig
e25de16f65
Run CleanUp on TaskPool
2023-03-21 11:40:23 +01:00
ig
28a0ef5530
put back cors, apparently it's still necessary, sigh
2023-03-20 15:17:52 +01:00
ig
e70ab41bc0
backslashes are the worstest
2023-03-20 13:28:52 +01:00
ig
3613199917
tentatively remove cors (we don't need it)
2023-03-20 10:31:24 +01:00
ig
5ef49de742
simplify WebApplication builder
2023-03-20 10:20:56 +01:00
ig
e025b8cd11
Make Controller less magic.
2023-03-20 08:33:44 +01:00
ig
9454fbf878
Use InstallationAccess/FolderAccess as arguments to GrantUserAccessTo* RevokeUserAccessTo*
2023-03-19 17:53:00 +01:00
ig
0541918beb
RevokeAccessTo => RevokeUserAccessTo, BucketPrefix => S3Prefix
2023-03-19 17:02:18 +01:00
ig
ed7c65be2c
group S3 related functions into S3 namespace
2023-03-19 16:09:45 +01:00
ig
44e183a9f1
Fix AccessibleFolders
2023-03-17 09:11:26 +01:00
Kim
4a19ebd49c
various small comments
2023-03-16 16:53:36 +01:00
Kim
91a1c47328
various small comments
2023-03-16 16:52:20 +01:00
Kim
df65b48c8f
creating new folders and installations now gives you access to the new folder/installation
2023-03-16 16:45:25 +01:00
Kim
4eac790eaa
exchanged api keys for ones with specific restricted permissions
2023-03-16 16:34:52 +01:00
Kim
6366cb5569
fixed deleting buckets method
2023-03-16 16:22:18 +01:00
Kim
774291c1c9
Merge remote-tracking branch 'origin/main'
2023-03-16 16:13:10 +01:00
Kim
20c70b10ac
added s3 bucket creation on installation creation
2023-03-16 16:13:04 +01:00
ig
e136767b12
Add tree traversal functions. Skip self in Folder/User descendants
2023-03-16 14:13:45 +01:00
Kim
fb4a407a52
added calls for granting and revoking permissions
2023-03-16 13:33:51 +01:00
Kim
b1c6aeb9ab
made python s3cmd the standart across all os
2023-03-16 12:49:54 +01:00
Kim
083c412177
added python variant of s3cmd
2023-03-16 12:49:25 +01:00
Kim
0f7daea8ea
renamed user2folder and user2installation, reimplemented getbyId
2023-03-16 11:16:23 +01:00
Kim
787b02f97e
fixed merge error
2023-03-16 10:34:47 +01:00
Kim
e4dd24c1b0
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# csharp/App/Backend/DataTypes/Methods/User.cs
# csharp/App/Backend/Database/Db.cs
2023-03-16 10:33:23 +01:00