Carter
|
e2bfa68ca9
|
Merge branch 'auth_stuff' into dev_environment
|
2025-06-25 15:37:13 -06:00 |
|
Carter
|
a43ff1a8ad
|
added preferred units back to the user settings menu
|
2025-06-25 13:44:40 -06:00 |
|
Carter
|
b4877038f1
|
Merge branch 'auth_stuff' into dev_environment
|
2025-06-25 11:04:33 -06:00 |
|
Carter
|
338b256d13
|
took out the login page route again, auth redirect forces login page if doing a sign up
|
2025-06-25 10:59:20 -06:00 |
|
Carter
|
1b36170a91
|
Merge branch 'auth_stuff' into dev_environment
|
2025-06-25 09:59:00 -06:00 |
|
Carter
|
c7848a25ef
|
put the login page back
|
2025-06-25 09:45:02 -06:00 |
|
Carter
|
15d2a6a690
|
moved login page logic into the auth file to redirect correctly before auth redirects because you're unauthenticated
|
2025-06-24 16:46:59 -06:00 |
|
csawatzky
|
2c3ba2c1f5
|
updating the proto and adding a button on the device page to test the scan i2c command
|
2025-06-19 11:32:21 -06:00 |
|
csawatzky
|
cb7bf64c68
|
Merge branch 'hybrid_inventory_control' into staging_environment
|
2025-06-09 14:55:26 -06:00 |
|
csawatzky
|
691b3be1f9
|
approval of transactions works, is also now requires a matching transaction if the bin selected also uses hybrid control, rejection still needs to be implemented
|
2025-06-04 15:20:46 -06:00 |
|
csawatzky
|
a083f7d8ed
|
added to transaction api and built the submit function
|
2025-05-30 14:50:21 -06:00 |
|
Carter
|
6a6334da6a
|
fixed tag apis to use new context logic
|
2025-05-28 10:32:19 -06:00 |
|
csawatzky
|
d17be025cb
|
Merge branch 'staging_environment' into hybrid_inventory_control
|
2025-05-27 10:38:26 -06:00 |
|
csawatzky
|
554fd0c228
|
added bintransactions component and function for the transaction api to get transaction involving a given object
|
2025-05-22 13:16:47 -06:00 |
|
Carter
|
ebf6bdb71a
|
fixed navigation bug in devices page; added option to seperate dust from sen5x to different column
|
2025-05-16 10:53:26 -06:00 |
|
csawatzky
|
8c66a9d2c8
|
bolding the text for selected yard, changing font colour in drawer title to black
|
2025-05-08 16:18:24 -06:00 |
|
csawatzky
|
446147d4d5
|
fixed the temp and humidity on the bin cards in the drawer on the map, also fixed the drawer loading bins not in the yard
|
2025-05-08 15:56:38 -06:00 |
|
csawatzky
|
5f9d39e26d
|
Merge branch 'master' into staging_environment
|
2025-05-08 15:22:08 -06:00 |
|
csawatzky
|
1c41157281
|
Merge branch 'dev_environment' into staging_environment
|
2025-05-08 15:19:54 -06:00 |
|
Carter
|
8ed5a44789
|
hotfix: changed loging with popup to login with redirect
|
2025-05-08 13:20:30 -06:00 |
|
Carter
|
9041482131
|
device statistics load properly with context
|
2025-05-07 13:27:37 -06:00 |
|
Carter
|
59c14e3f8b
|
adjusted some spacing stuff on the bin page
|
2025-05-06 11:17:35 -06:00 |
|
csawatzky
|
b197f34f33
|
added function to the bin model to get the bushels from either the settings or the status based on the inventory control and replaced the instances in the bin card and visualizer where it was getting it from the settings with the function
|
2025-04-30 17:01:55 -06:00 |
|
csawatzky
|
acbd49b907
|
update to the group setting for adding/removing devices
|
2025-04-29 14:04:08 -06:00 |
|
csawatzky
|
765ac72431
|
Merge branch 'integrations' into dev_environment
|
2025-04-28 16:11:01 -06:00 |
|
csawatzky
|
ef4a09856e
|
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
|
2025-04-28 10:48:18 -06:00 |
|
csawatzky
|
59f7f7f4e1
|
updated all uses of as in the api files to use the global state as well as a passed in value, will give priority to the passed in value and fall back to the state if it is undefined.
|
2025-04-28 10:47:59 -06:00 |
|
Carter
|
ea2ba42024
|
Merge branch 'staging_environment' into dev_environment
|
2025-04-25 14:41:04 -06:00 |
|
Carter
|
afdbe3426e
|
fixed a bunch of group/team permission stuff on the devices page
|
2025-04-25 14:40:49 -06:00 |
|
csawatzky
|
b7e21a8fa1
|
fixed permission issue causing problems with simple export
|
2025-04-24 14:10:55 -06:00 |
|
csawatzky
|
7c5332662d
|
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
|
2025-04-24 12:55:01 -06:00 |
|
csawatzky
|
960275eb75
|
added the key manager card to the team page
|
2025-04-24 12:54:47 -06:00 |
|
Carter
|
860f730d88
|
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
|
2025-04-24 12:00:08 -06:00 |
|
Carter
|
b4c1a543de
|
fixed indexing wrong group when getting permissions
|
2025-04-24 11:59:23 -06:00 |
|
csawatzky
|
a95bccbc22
|
added the usage api and put the device wizard back in the device page
|
2025-04-23 14:03:53 -06:00 |
|
csawatzky
|
424b75afb8
|
put the jd and cnh pages in, still need to test that the re-directs still function as expected with the new platform
|
2025-04-23 13:25:45 -06:00 |
|
csawatzky
|
b62c7dbe5c
|
updated the component and device api's to have as be a parameter for the function
|
2025-04-22 14:33:19 -06:00 |
|
csawatzky
|
c617ebf868
|
updated as in the interactions api
|
2025-04-21 16:40:30 -06:00 |
|
csawatzky
|
e8e32e1886
|
updated as in home marker api
|
2025-04-21 16:05:09 -06:00 |
|
csawatzky
|
a99ab8b8b5
|
update as in the harvest plan api
|
2025-04-21 16:02:31 -06:00 |
|
csawatzky
|
0d3f7fa8a6
|
update as in the field marker api
|
2025-04-21 15:57:51 -06:00 |
|
csawatzky
|
4912d319ff
|
update as in the transaction api
|
2025-04-21 15:10:18 -06:00 |
|
csawatzky
|
ae458c3fca
|
updated as in the field api
|
2025-04-21 14:44:07 -06:00 |
|
csawatzky
|
29902bc40b
|
updated as in the objectHeaterApi
|
2025-04-21 14:39:04 -06:00 |
|
csawatzky
|
59356aad27
|
update as in site api
|
2025-04-21 14:26:59 -06:00 |
|
csawatzky
|
1acbfe36b0
|
update as in the grain bag api
|
2025-04-21 13:58:37 -06:00 |
|
csawatzky
|
9b9f4cdf63
|
update to mine api for as to be passed in to the functions
|
2025-04-21 13:24:26 -06:00 |
|
csawatzky
|
74c8ed661c
|
updated as in the terminal and gate api's
|
2025-04-17 15:42:19 -06:00 |
|
csawatzky
|
76744c1b6f
|
updated the bin yard api with as fix
|
2025-04-17 14:35:24 -06:00 |
|
csawatzky
|
e2f5eb0557
|
modified th api's for bin, contract and task to have as passed in as a prop and not get it ffrom the global state directly in the api
|
2025-04-17 13:33:27 -06:00 |
|