Commit Graph

93 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou 94fe49e7b7 Fix manager condition in stakeholder service method. 2024-03-12 17:56:49 +02:00
Konstantinos Triantafyllou a7a3970c79 Merge branch 'irish-monitor-service' 2024-02-29 11:53:51 +02:00
Konstantinos Triantafyllou 5bad820e3d Add authorization in check deploy of library 2024-02-20 10:55:00 +02:00
Konstantinos Triantafyllou e92739091f Move some stakeholder functions to the service. 2024-02-20 09:10:41 +02:00
Konstantina Galouni 1461f1851e [master | DONE | CHANGED]: IndicatorController.java: Completing previous commit - In method "createSectionsAndSaveBulk()", on createSection() call, always set title parameter to section.getTitle() (even if it is null). 2024-01-24 17:39:37 +02:00
Konstantina Galouni 52c760af1c [master | DONE | CHANGED]: IndicatorController.java: Removed "imported from service" from section name in method "createSectionsAndSaveBulk()". 2024-01-24 17:16:57 +02:00
Konstantinos Triantafyllou 4be89eab36 Merge branch 'irish-monitor-service' of code-repo.d4science.org:MaDgIK/uoa-monitor-service into irish-monitor-service 2023-12-14 15:48:40 +02:00
Konstantinos Triantafyllou f85a2202ab Import Notification and Authorization Configuration only in application. 2023-12-14 15:48:33 +02:00
Konstantina Galouni 8d19c242e7 Merge remote-tracking branch 'origin/master' into irish-monitor-service 2023-12-13 15:13:06 +02:00
Konstantina Galouni 420e6f46fb [master | DONE | FIXED]: IndicatorController.java: In method "parameterMapping()" set in parameter index_shortName the shortname of the stakeholder, not the name. 2023-12-13 15:10:13 +02:00
Konstantina Galouni c55d2836d7 [irish-monitor-service | WIP | CHANGED]: Monitor Service to work as standalone and as library (classifier library) at the same time.
1. pom.xml: Added plugin "maven-jar-plugin" and an <execution> with <classifier> library which creates a jar and excluded files from library setup.
2. UoaMonitorServiceApplication.java: Moved to package application and removed @EnableConfigurationProperties and @Import of other configurations (moved to UoaMonitorServiceConfiguration.java).
3. UoaMonitorServiceConfiguration.java: Added @EnableConfigurationProperties and @Import of configurations and @ComponentScan.
4. ServletInitializer.java: Moved to package application.
5. MonitorLibraryCheckDeployController.java: Added this copy of MonitorServiceCheckDeployController.java to be used only in library setup with @RequestMapping("/monitor-library").
2023-12-01 10:19:20 +02:00
Konstantinos Triantafyllou 9d585f12e0 Update admin-tools-library 2023-11-14 13:21:15 +02:00
Konstantinos Triantafyllou 615da7f3c2 Add funderType field in stakeholder. 2023-11-09 15:02:11 +02:00
Konstantinos Triantafyllou c8adee576e Add support for country reasearcher and datasource 2023-10-16 12:42:49 +03:00
Konstantinos Triantafyllou 8446c19ea9 Fix section default Id null exception in save default indicator 2023-07-31 10:59:03 +03:00
Konstantina Galouni 648803a30c [Monitor Service | master]: Stakeholder.java: Added field "private Date projectUpdateDate = null;" to expose the last update date in the UI. 2023-07-17 17:06:52 +03:00
Konstantina Galouni fc2010e530 [Monitor Service | master]: IndicatorController.java: In method "createSectionsAndSaveBulk()" -on import indicators- check if a section or an indicator is null, and ignore them. 2023-07-10 18:00:27 +03:00
Konstantinos Triantafyllou 7b4f0a9eec Fix role utils methods 2023-07-04 16:02:34 +03:00
Konstantina Galouni 09b8d2188f [Monitor Service | master]: Indicator.java: In method "copyFromDefault()", get visibility as parameter and set the visibility of the new-copied indicator accordingly | IndicatorController.java: When creating indicators copied from a new default indicator, set the visibility of each new indicator same as of its parent subcategory. 2023-07-03 10:42:46 +03:00
Konstantina Galouni 0184da8a8e [Monitor Service | master]: Stakeholder.java: Added field private Locale locale = Locale.EU; (Local is enum with values: EN("en"), EU("eu")) and getter/setter methods. 2023-06-19 13:28:32 +03:00
Konstantinos Triantafyllou f246e4d6b8 Fix script for add funding stream in default msca 2023-06-09 13:35:03 +03:00
Konstantinos Triantafyllou 273858cc2c Replace let with var in update.js 2023-05-31 16:27:15 +03:00
Konstantinos Triantafyllou 06be4d37ce Update script with alias of default-fl1. 2023-05-31 14:07:56 +03:00
Konstantinos Triantafyllou 31f758d534 Add addFundingStreamInDefaultMSCA in migration script. 2023-05-30 16:26:45 +03:00
Konstantinos Triantafyllou e363a04f84 Pom: Add spring-boot-version in maven-plugin 2023-05-19 16:47:19 +03:00
Konstantina Galouni 1119c1fdcf [Monitor Service | master]: Stakeholder.java: Added field private String statsProfile = "monitor"; and getter/setter methods | IndicatorPath.java: Added field private Format format = Format.NUMBER; where Format is enum {NUMBER, PERCENTAGE} and getter/setter methods | IndicatorController.java: On method "onUpdateDefaultIndicator()" check if format was changed | update_db.js: Added method "statsProfileOfIndicatorsAsVariable()". 2023-05-03 13:02:56 +03:00
Konstantina Galouni 806e1e16d8 [Monitor Service | master]: MonitorController.java: In method "updatePortal()" call also pageService.updatePid if pid was changed | pom.xml: Updated version of uoa-admin-tools-library to 1.0.7 (previous was 1.0.6). 2023-05-03 12:58:13 +03:00
Konstantinos Triantafyllou 29cc52a65f Merge branch 'log4j2' 2022-11-22 17:43:46 +02:00
Konstantina Galouni 4080c5326e StakeholderController.java: update return type of 'changeStakeholderVisibility()' and 'changeStakeholderVisibilityTree()' from Visibility to Stakeholder. 2022-10-21 17:24:49 +03:00
Konstantina Galouni 5d46d84a96 [Monitor Service | log4j]: SwaggerConfig.java: Updated swagger to add separate folders for libraries. 2022-10-20 10:40:08 +03:00
Konstantina Galouni 05aec3af4a StakeholderController.java: update return type of 'changeStakeholderVisibility()' and 'changeStakeholderVisibilityTree()' from Visibility to Stakeholder. 2022-10-16 11:41:19 +03:00
Konstantina Galouni 637554d3e8 [Monitor Service | log4j2] pom.xml: Removed groupid 2022-10-10 15:29:34 +03:00
Konstantina Galouni adf8cb5e70 pom.xml: Updated parent and versions of libraries | Moved to log4j2 & set spring log file as default | Added swagger 2022-10-10 15:27:17 +03:00
Konstantina Galouni 82a8f8ad56 [Trunk | Monitor Service]: StakeholderController.java & TopicController.java & CategoryController.java & SubCategoryController.java & SectionController.java & IndicatorController.java: Updated /change-visibility methods and added @RequestParam(required = false) Boolean propagate, to allow changing visibility of all contents of the updated entity too & updated return type to return the entity instead its visibility & added everywhere method "changeVisibilityTree()". 2022-09-14 18:02:47 +03:00
Konstantinos Triantafyllou 902a666c8e [maven-release-plugin] rollback the release of uoa-monitor-service-1.0.4 2022-09-14 11:19:09 +03:00
Konstantinos Triantafyllou d274c2e95a [maven-release-plugin] prepare for next development iteration 2022-09-14 11:18:43 +03:00
Konstantinos Triantafyllou edba8457d1 [maven-release-plugin] prepare release uoa-monitor-service-1.0.4 2022-09-14 11:18:38 +03:00
Konstantinos Triantafyllou e473740e9c Add info messages during merge 2022-09-13 13:01:53 +03:00
Konstantinos Triantafyllou c6d613eb64 Increase snapshot version for next release 2022-09-13 12:20:08 +03:00
Konstantinos Triantafyllou e7c32e0efc Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-13 12:06:54 +03:00
Konstantinos Triantafyllou e95ebbdb87 Add merge.sh 2022-09-13 12:06:45 +03:00
Konstantina Galouni dd7537f5d0 [Trunk | Monitor Service]: IndicatorController.java: Updated methods "saveBulkIndicators()" and "createSectionsAndSaveBulk()" to import List<Section<Indicator>> instead of List<Indicator> | pom.xml: Inreased version. 2022-09-08 23:37:03 +03:00
Konstantina Galouni 61b947737b Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-08 23:35:20 +03:00
Konstantina Galouni cddb8a2de1 [Trunk | Monitor Service]: Updated methods "saveBulkIndicators()" and "createSectionsAndSaveBulk()" to import List<Section<Indicator>> instead of List<Indicator>. 2022-09-08 23:34:25 +03:00
Konstantinos Triantafyllou d4381c3a46 Remove HEAD from scm info 2022-09-02 16:15:31 +03:00
Konstantinos Triantafyllou 64e61e8a0e Revert "Revert "Change scm info to ssh url""
This reverts commit 3e2922581b.
2022-09-01 22:19:39 +03:00
Konstantinos Triantafyllou 3e2922581b Revert "Change scm info to ssh url"
This reverts commit 43c8e471c7.
2022-09-01 14:10:33 +03:00
Konstantinos Triantafyllou 43c8e471c7 Change scm info to ssh url 2022-09-01 13:49:25 +03:00
Konstantinos Triantafyllou 2d0209d3e8 Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-01 13:43:03 +03:00
Konstantinos Triantafyllou 75716a0f10 Add scm information in pom.xml 2022-09-01 13:42:56 +03:00