Commit Graph

247 Commits

Author SHA1 Message Date
69afb590d4 chore: Remove unused imports in DatasetController, DatasetService, and dataRepository 2024-07-06 18:26:54 +02:00
Erik Foris
61dbf0dde7 Merge branch '39-add-tests' into '22-integrate-api-and-frontend'
Resolve "Add tests"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!38
2024-07-06 18:24:26 +02:00
Erik Foris
54b7a916ed Merge branch '22-integrate-api-and-frontend' into '39-add-tests'
# Conflicts:
#   src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java
2024-07-06 18:23:09 +02:00
J-Klinke
442c532e85 Merge remote-tracking branch 'origin/45-finalize-details-page' into 45-finalize-details-page 2024-07-06 18:06:38 +02:00
Erik Foris
9f9c6550a4 Merge branch '48-make-rating-of-0-possible' into '45-finalize-details-page'
Resolve "make rating of 0 possible"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!48
2024-07-06 18:04:02 +02:00
1effb09cdb feat: Update dataset voting logic to allow for zero stars 2024-07-06 18:03:27 +02:00
Erik Foris
1ddf7dbd10 Merge branch '47-remove-unused-methods-in-backend' into '22-integrate-api-and-frontend'
Resolve "remove unused methods in backend"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!47
2024-07-06 17:58:54 +02:00
603517d187 feat: Remove unused methods in dataRepository and CategoryRepository 2024-07-06 17:57:52 +02:00
7e08a507e4 feat: Add CategoryRepositoryTests and DataRepositoryTests
The code changes include adding new test classes CategoryRepositoryTests and DataRepositoryTests. These test classes are used to test the functionality of the CategoryRepository and DataRepository classes respectively. The CategoryRepositoryTests class contains tests for the findById, findByName, and findAll methods of the CategoryRepository class. The DataRepositoryTests class contains tests for the findByOptionalCriteria and getDatasetById methods of the DataRepository class.
2024-07-06 17:54:48 +02:00
J-Klinke
cff7e8166e implemented delete & back button 2024-07-06 17:11:11 +02:00
Elias Schriefer
9215148eff Merge branch '22-integrate-api-and-frontend' into 46-add-missing-fields-to-the-add-page 2024-07-06 16:23:35 +02:00
Julian Klinke
474da3091e Merge branch '7-add-page-to-view-dataset-api' into '22-integrate-api-and-frontend'
Resolve "Add page to view dataset/API"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!21
2024-07-06 14:54:29 +02:00
Elias Schriefer
75f8f886c0 Merge branch '22-integrate-api-and-frontend' into 7-add-page-to-view-dataset-api 2024-07-06 14:49:52 +02:00
Elias Schriefer
3f857f023e Merge branch '43-store-entry-authorship' into '22-integrate-api-and-frontend'
Resolve "Store entry authorship"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!42
2024-07-06 14:46:41 +02:00
J-Klinke
8b5ac69e3c changed key name
added cancelbtn eventlistener
2024-07-06 14:44:10 +02:00
Elias Schriefer
467951d0ce Use more native html elements 2024-07-06 14:35:30 +02:00
Elias Schriefer
e0bebe87e3 Add details not found page 2024-07-06 14:35:00 +02:00
46b11fd638 Merge branch 'main' into 39-add-tests 2024-07-06 14:28:07 +02:00
J-Klinke
4e19a24833 local authorship is now stored 2024-07-06 14:26:57 +02:00
Erik Foris
cffa898b38 Merge branch '44-fix-page-serialisazion-waring' into 'main'
Resolve "Fix page serialisazion waring"

Closes #44

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!43
2024-07-06 14:23:21 +02:00
e94ead7026 fix: use dto to make json structure stable 2024-07-06 14:22:54 +02:00
J-Klinke
bd854ff016 Merge branch '7-add-page-to-view-dataset-api' into 43-store-entry-authorship
got code from 7 in order to further implement 43
2024-07-06 14:04:31 +02:00
Erik Foris
39e4c3eebd Merge branch '42-add-licence-field-to-dataset-class' into '22-integrate-api-and-frontend'
Resolve "add Terms of use  field to dataset class"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!41
2024-07-06 13:37:18 +02:00
c9211a0b00 chore: Update dataset table schema and Dataset class to accominate terms of use 2024-07-06 13:36:45 +02:00
Julian Klinke
09b60c547b Merge branch '41-make-details-page-acceseble' into '22-integrate-api-and-frontend'
Resolve "Make details page acceseble"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!40
2024-07-06 13:32:41 +02:00
J-Klinke
464cf104f9 datasets now redirect to their details pages.
also implemented 'button' look and feel for the datasets
2024-07-06 13:31:30 +02:00
aea23b0a6a refactor: optimize imports 2024-07-06 13:08:37 +02:00
Elias Schriefer
6380355227 Add basic support for viewing datasets 2024-07-06 10:00:33 +02:00
Erik Foris
cd1e4c6b26 Merge branch '40-depricate-old-way-of-searching-datasets' into '22-integrate-api-and-frontend'
Resolve "depricate "Old" way of searching datasets"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!39
2024-07-05 19:31:58 +02:00
bf9b411c9b chore: Remove unused DatasetController endpoint and method 2024-07-05 19:31:19 +02:00
bbf4f93279 feat: Add CategoryServiceTest and CategoryControllerTest
The code changes include adding new test classes CategoryServiceTest and CategoryControllerTest. These test classes are used to test the functionality of the CategoryService and CategoryController classes respectively. The CategoryServiceTest class contains tests for the addCategory, getAllCategories, and getCategoryById methods of the CategoryService class. The CategoryControllerTest class contains tests for the getAllCategories, fetchCategoryById, and createCategory methods of the CategoryController class.

Recent user commits:
- Merge branch '36-refactor-dataset-class' into '22-integrate-api-and-frontend'
- Merge branch '22-integrate-api-and-frontend' into '36-refactor-dataset-class'
- Refactor Dataset class
- Merge branch '11-add-api-for-getting-home-page-data' into '22-integrate-api-and-frontend'
- Merge branch '37-restructure-backend-according-to-seperation-by-concerns' into '11-add-api-for-getting-home-page-data'
- refactor: finilase project structure
- Merge branch '11-add-api-for-getting-home-page-data' into '22-integrate-api-and-frontend'
- Merge branch '25-consider-moving-non-templated-html-into-static' into '11-add-api-for-getting-home-page-data'
- refactor: move static sites into static, Remove unused PageController and update main.js for page navigation
- fixed bugs:
  - suppressed display of search results if nothing was found but there were previous searches
  - improved display timing of search results/initial pages, which led to false displays
2024-07-05 19:25:13 +02:00
Elias Schriefer
922dfdd26d Merge branch '22-integrate-api-and-frontend' into 7-add-page-to-view-dataset-api 2024-07-05 17:18:09 +02:00
Elias Schriefer
baa8349110 Merge branch '36-refactor-dataset-class' into '22-integrate-api-and-frontend'
Resolve "Refactor Dataset class"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!35
2024-07-05 17:05:53 +02:00
Elias Schriefer
91a365fdd3 Merge branch '22-integrate-api-and-frontend' into 36-refactor-dataset-class 2024-07-05 17:04:58 +02:00
Elias Schriefer
66ac0bfc29 Refactor Dataset class 2024-07-05 16:57:06 +02:00
afeca6b780 Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-07-05 14:14:14 +02:00
Erik Foris
738fd2cac1 Merge branch '37-restructure-backend-according-to-seperation-by-concerns' into '11-add-api-for-getting-home-page-data'
Resolve "Restructure backend according to seperation by concerns"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!37
2024-07-05 14:11:23 +02:00
3d71bfee2b refactor: finilase project structure 2024-07-05 13:05:56 +02:00
c55c18c746 Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-07-05 12:38:56 +02:00
Erik Foris
3c992aaa4a Merge branch '25-consider-moving-non-templated-html-into-static' into '11-add-api-for-getting-home-page-data'
Resolve "Consider moving non-templated HTML into `static/`"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!36
2024-07-05 12:35:45 +02:00
68595e22a7 refactor: move static sites into static, Remove unused PageController and update main.js for page navigation 2024-07-05 12:34:26 +02:00
J-Klinke
15f743d8ab fixed bugs:
- suppressed display of search results if nothing was found but there were previous searches
- improved display timing of search results/initial pages, which led to false displays
2024-07-05 12:30:40 +02:00
6ae3a73a7e refactor: Add licence field to Dataset constructor 2024-07-05 12:19:47 +02:00
49eda4ce0a Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-07-05 12:16:34 +02:00
Erik Foris
7a0e2490fe Merge branch '35-implement-functionality-for-extended-categories' into '22-integrate-api-and-frontend'
Resolve "implement functionality for extended categories"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!34
2024-07-05 12:08:53 +02:00
J-Klinke
93a52097de - main.js:
fixed bug in the filterButton EventListener (removed if-clause)
added new EventListener for fetching categories
updated fetchCategories()
2024-07-05 12:04:32 +02:00
fe4f0a8d6b refactor: Add licence field to Dataset model 2024-07-05 11:31:22 +02:00
Erik Foris
f60ce5babf Merge branch '32-add-paging-functionality' into '22-integrate-api-and-frontend'
upvoting suppression by local storage now works, there is a bug however with...

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!33
2024-07-04 23:02:53 +02:00
c73f195c2a Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-07-04 22:59:19 +02:00
Erik Foris
61fccc924f Merge branch '33-add-ability-to-restrict-multiple-votes-in-frontend' into '32-add-paging-functionality'
Resolve "Add ability to restrict multiple votes in frontend"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!30
2024-07-04 21:19:48 +02:00