Commits · 9337a67643b39225849d439e949c60b12cd3a1d4 · Eilert Tunheim / Bacheloroppgave_2022

Mar 30, 2022
- Merge branch 'Eilerts_branch' into 'master' · 9337a676
  Eilert Tunheim authored 2 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!35
  9337a676
- Updated GUI to display popup window at the launch of the application · 20055e23
  Eilert Tunheim authored 2 years ago
  
  20055e23
- Updated the linechart class and added separate button for input parameters in GUI · 46aa23f2
  Eilert Tunheim authored 2 years ago
  
  46aa23f2
- Seperated the lineChart into a separate class · 91315e47
  Eilert Tunheim authored 2 years ago
  
  91315e47
Mar 29, 2022
- Updated input popup window and connected the parameters · b9f08ef4
  Eilert Tunheim authored 2 years ago
  
  b9f08ef4
- Updated input popup window and connected the parameters · 11e9abc5
  Eilert Tunheim authored 2 years ago
  
  11e9abc5
Mar 28, 2022
- Merge branch 'Eilerts_branch' into 'master' · 87b4c71e
  Eilert Tunheim authored 2 years ago
  
  Added input-popup window, started filling in textfields, labels and buttons See merge request mesji/bacheloroppgave_2022!34
  87b4c71e
- Added input-popup window, started filling in textfields, labels and buttons · 8a4deb32
  Eilert Tunheim authored 2 years ago
  
  8a4deb32
Mar 25, 2022
- Merge branch 'Eilerts_branch' into 'master' · bcd8cdb1
  Eilert Tunheim authored 2 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!33
  bcd8cdb1
- Started working on the input popup window · c2e4f346
  Eilert Tunheim authored 2 years ago
  
  c2e4f346
- Updated constants and database dynamic coding · 82f24126
  Eilert Tunheim authored 2 years ago
  
  82f24126
- Updated the constants class with input parameters from the user · c729ff26
  Eilert Tunheim authored 2 years ago
  
  c729ff26
- Fully functional quick switching using constans class · 8a74b214
  Eilert Tunheim authored 2 years ago
  
  8a74b214
- Implemented today's date into the sql statements · f13d4efc
  Eilert Tunheim authored 2 years ago
  
  f13d4efc
- Implemented the Constants class · 69a7e386
  Eilert Tunheim authored 2 years ago
  
  69a7e386
- Implemented the Constants class · c814f499
  Eilert Tunheim authored 2 years ago
  
  c814f499
- Sorts the data incrementally · 74e773e2
  Eilert Tunheim authored 2 years ago
  
  74e773e2
- Merge branch 'Eilerts_branch' into 'master' · a6646932
  Eilert Tunheim authored 2 years ago
  
  Updated DB functions withb new sql statements See merge request mesji/bacheloroppgave_2022!32
  a6646932
- Updated DB functions withb new sql statements · 2f57272b
  Eilert Tunheim authored 2 years ago
  
  2f57272b
Mar 13, 2022
- Merge branch 'Eilerts_branch' into 'master' · 3895ba25
  Eilert Tunheim authored 3 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!31
  3895ba25
- Updated the graph, plots 30 drying processes · 8aa29fb7
  Eilert Tunheim authored 3 years ago
  
  8aa29fb7
Mar 11, 2022
- Connected the data to the graph plot · 70875382
  Eilert Tunheim authored 3 years ago
  
  70875382
- Added full functionality to gathering kWh! Retireves seperate drying periods. · d8333184
  Eilert Tunheim authored 3 years ago
  
  d8333184
- Merge branch 'Eilerts_branch' into 'master' · a612e81f
  Eilert Tunheim authored 3 years ago
  
  Started implementing the correct dates into kwh function See merge request mesji/bacheloroppgave_2022!30
  a612e81f
- Started implementing the correct dates into kwh function · a1f9e2b8
  Eilert Tunheim authored 3 years ago
  
  a1f9e2b8
- Merge branch 'Eilerts_branch' into 'master' · 95dec771
  Eilert Tunheim authored 3 years ago
  
  Full functionality of the getZeroPointDate() function! Returns a hashmap... See merge request mesji/bacheloroppgave_2022!29
  95dec771
- Full functionality of the getZeroPointDate() function! Returns a hashmap... · 33639486
  Eilert Tunheim authored 3 years ago
  
  Full functionality of the getZeroPointDate() function! Returns a hashmap containging the final intditork and the corresponding uttidtork values.
  33639486
- Added functional functionality to compare dates and finds the date that will reset kwh to 0! · 96d0c351
  Eilert Tunheim authored 3 years ago
  
  96d0c351
Mar 10, 2022
- Merge branch 'Eilerts_branch' into 'master' · 824e2b1e
  Eilert Tunheim authored 3 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!28
  824e2b1e
- Added circular progressbar library and adjusted Moelven logos · a4966c39
  Eilert Tunheim authored 3 years ago
  
  a4966c39
- Updated some minor style values · 2e7546f7
  Eilert Tunheim authored 3 years ago
  
  2e7546f7
- Redesigned the menubar and added labels and textfields to the sidebar · 1660f80c
  Eilert Tunheim authored 3 years ago
  
  1660f80c
Mar 08, 2022
- Retrieved the next date and managed to add extra days to check for · 83574509
  Eilert Tunheim authored 3 years ago
  
  83574509
Mar 07, 2022
- Merge branch 'Eilerts_branch' into 'master' · 9a7b4bc3
  Eilert Tunheim authored 3 years ago
  
  Updated DB file See merge request mesji/bacheloroppgave_2022!27
  9a7b4bc3
- Updated DB file · 979e4d5a
  Eilert Tunheim authored 3 years ago
  
  979e4d5a
Mar 04, 2022
- Merge branch 'Karins_branch' into 'master' · 25e1e467
  Karin Pettersen authored 3 years ago
  
  Karins branch See merge request mesji/bacheloroppgave_2022!26
  25e1e467
- Merge remote-tracking branch 'origin/Karins_branch' into Karins_branch · 5ad214fe
  Karin Pettersen authored 3 years ago
  
  # Conflicts: # src/main/java/com/application/DB/Sort.java # target/classes/com/application/Main.class
  5ad214fe
- Finished sort class · 017557c9
  Karin Pettersen authored 3 years ago
  
  017557c9
- Finished sort class · 97917277
  Karin Pettersen authored 3 years ago
  
  97917277
- Created sql statement in sort · f3be99fe
  Karin Pettersen authored 3 years ago
  
  f3be99fe