Skip to content

Dev#22

Merged
lukaDjordjevic01 merged 44 commits intomainfrom
dev
Aug 6, 2023
Merged

Dev#22
lukaDjordjevic01 merged 44 commits intomainfrom
dev

Conversation

@lukaDjordjevic01
Copy link
Copy Markdown
Contributor

@lukaDjordjevic01 lukaDjordjevic01 commented Aug 6, 2023

No description provided.

cuturic01 and others added 30 commits July 18, 2023 19:12
@cuturic01
#1 Implemented initial model and set up the database
ab1892f
@cuturic01
Merge pull request #2 from ThreeAmigosCoding/model
ac3dabf 
#1 Implemented initial model and set up the database
@lukaDjordjevic01
#3 Implemented 90% of the registration process
9c272eb
@lukaDjordjevic01
#3 Added cors policy
f79cfb7
@cuturic01
Updated gitignore
3a92e86
@cuturic01
#3 Implemented authentication and authorization
920c68d
@cuturic01
Merge pull request #4 from ThreeAmigosCoding/auth
d37b2bf 
Auth
@janosevicsm
Fixed minor issue
5854724
@cuturic01
#5 Changed Rtu class to Device class
b697dde 
Additionally, added some attributes needed for simulation.
@cuturic01
#6 Implemented initial config system
f4968e5
@cuturic01
#5 Implemented simulation logic
1349f1d
@cuturic01
#5 Fixed hosted service dependency issues
e9065e8
@cuturic01
Merge pull request #7 from ThreeAmigosCoding/simulation
2dc3965 
Simulation
@lukaDjordjevic01
Added context seed
0b2318a
@lukaDjordjevic01
#8 Created Services for analog and digital inputs
0e4c33c
@lukaDjordjevic01
Fixed minor issues
e8d1773
@janosevicsm
#8 Implemented Digital Input
0e19b00
@janosevicsm
Merge pull request #13 from ThreeAmigosCoding/inputs
d5a3476 
Inputs
@janosevicsm
#10 Configured web sockets
ca808b4
@janosevicsm
Merge pull request #14 from ThreeAmigosCoding/web-socket-config
05dae6b 
#10 Configured web sockets
@lukaDjordjevic01
Added input records
db15ba4
@cuturic01
#15 Implemented GetAllUserTags method
0c236e8
@cuturic01
Merge pull request #16 from ThreeAmigosCoding/input-records
7bb2387 
Input records
@cuturic01
#11 Implemented alarm creation
8bd9785
@cuturic01
#11 Implemented alarm logic
d843184
@cuturic01
#11 Configured alarm web sockets
341f459
@cuturic01
#11 Fixed alarm message creation
7244e74
@cuturic01
#11 Implemented getAllAlarms method
a3e6067
@cuturic01
#11 Implemented alarm logging
853b1da
@cuturic01
#11 Fixed alarm message formatting
96c9341
cuturic01 and others added 14 commits August 2, 2023 16:36
@cuturic01
Merge pull request #17 from ThreeAmigosCoding/alarms
444a0a5 
Alarms
@janosevicsm
#15 Implemented input state switch
76bcfe2
@janosevicsm
Merge pull request #18 from ThreeAmigosCoding/alarms
0205fa2 
#15 Implemented input state switch
@janosevicsm
#11 Implemented alarm delete
6837a8b
@janosevicsm
Merge pull request #19 from ThreeAmigosCoding/alarms
5061fff 
#11 Implemented alarm delete
@janosevicsm
#12 Implemented report for alarm records by time
45dd8bb
@lukaDjordjevic01
#12 Implemented 3 reports
e9a075c 
1. All alarms of certain priority sorted by time
2. Values for all input records sorted by time
3. Values for all input records for certain input sorted by time
@janosevicsm
#12 Fixed minor issue
eb6dfd6
@lukaDjordjevic01
#12 Fixed minor issues
d8753c8
@janosevicsm
#12 Implemented endpoint for all input ids
4dabd4f
@cuturic01
Merge pull request #20 from ThreeAmigosCoding/reports
17fb2e7 
Reports
@janosevicsm
#9 Implemented outputs
5c81785
@cuturic01
Merge pull request #21 from ThreeAmigosCoding/outputs
2ec3e63 
#9 Implemented outputs
@lukaDjordjevic01
Added tag removal
c321b02
@lukaDjordjevic01 lukaDjordjevic01 merged commit 7db3e01 into main Aug 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lukaDjordjevic01 @cuturic01 @janosevicsm