Commit Graph

691 Commits

Author SHA1 Message Date
Argiro Kokogiannaki e179a6094c [Monitor Dashboard|Trunk]
Merge branch to trunk (59477:59555 https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/branches/themeChange/monitor_dashboard)
Changes applied: remove theme css and classes, update with new admin UI



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59556 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-12 12:54:57 +00:00
Argiro Kokogiannaki 98ced85b37 [Monitor|Dashboard]
Indicator utils:
	- enable named query numbers
	- fix adding filter in named query with default year range
	- when chart has year filter by default apply user year range if the range is stricter, else keep the default



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59511 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-06 12:22:59 +00:00
Konstantinos Triantafyllou f36cba5d4c [Monitor Dashboard | Trunk]: Add users admin page. Add verification modal
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59505 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-05 13:16:15 +00:00
Konstantinos Triantafyllou 21ed77a926 [Monitor Dashboard | Trunk]: Add upload image functionality for stakeholder's logo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59496 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-01 09:18:13 +00:00
Konstantinos Triantafyllou 5dec22375a [Monitor Dashboard | Trunk]: Change delete method url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59490 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-28 21:42:01 +00:00
Konstantinos Triantafyllou 1da99c1e03 [Monitor Dashboard | Trunk]: Add upload logo functionality
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59487 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-28 21:30:31 +00:00
Argiro Kokogiannaki 25053f5d84 [Monitor Dashboard|Trunk]
AdminDashboard Guard: correct query params for user nfo page



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59443 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-21 12:51:37 +00:00
Argiro Kokogiannaki 6a8ed470f7 [Monitor Dashboard|Trunk]
-apply changes for baseLink, domain properties

-add jsonld in monitor page
-add files for production version (robots.txt, index.html)




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59412 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 09:19:47 +00:00
Konstantinos Triantafyllou 3ed79c718a [Monitor Dashboard | Trunk]: Revert ckeditor
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59317 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-31 11:42:48 +00:00
Argiro Kokogiannaki bb23cae6d3 [Monitor Dashboard| Trunk]
Advanced Search pages: pass the  filter even if the reuslts cannot be filtered by stakeholder



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59289 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-17 11:10:34 +00:00
Konstantinos Triantafyllou a1d9a103c9 [Monitor Dashboard | Trunk]: Change ckeditor library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59273 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-14 09:56:34 +00:00
Argiro Kokogiannaki e1f8a5fe00 [Monitor Dashboard |Trunk]
Search pages: 
- update name and pass showSwitchSearchLink choice. 
- Remove error navigation for advanced pages for some types of stakeholder. links from landing should work
- set promptToAddFilter to true where needed


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59268 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-13 13:21:07 +00:00
Argiro Kokogiannaki 7d57db25e0 [Monitor Dashboard | Trunk]
Indicators Page: 
 - keep parameters 
 - add feadback link

Admin manage number indicators:

 - add message when stakeholder parameterization is not applied
 - preview the number API url (similar to charts)
 - json path: auto generate if the first one has comma separated values
 - fix stakeholder parameterization for numbers from stats-tool

Filtering:
 - fixes


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59224 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-06 07:34:41 +00:00
Argiro Kokogiannaki 9c93f0760a [Monitor Dashboard|Trunk]
- smaller screen show the mini sidebar
- with esc or click outside hide the filters
- set background
- Search Results/ Projects use the same index field as in the refine fields for funder and RI

- filters: 
	named queries - don't apply filter if already applied with different value
	for charts with multiple queries check if it is comparing query on different values of the same filter

- environments.beta/prod.ts: add reseach outcomes search routes 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59218 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-04 07:57:51 +00:00
Konstantinos Triantafyllou 3219e5bc3a [Monitor Dashboard | Trunk]: Fix not login menu item
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59215 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-03 10:59:56 +00:00
Konstantinos Triantafyllou d8f6a679d0 [Monitor Dashboard | Trunk]: Change login circle to be like other portals
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59213 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-03 10:40:32 +00:00
Konstantinos Triantafyllou 34eea15b6a [Monitor Dashboard | Trunk]: Change sidebar mini to 130px width
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59210 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-03 10:21:59 +00:00
Argiro Kokogiannaki 098af07766 [Monitor|Dashboard]
Filters: add co-funded filter



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59185 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-28 15:56:48 +00:00
Argiro Kokogiannaki 1c08f50c75 [Monitor Dashboard|Trunk]
Apply initial changes according to the latest mocks
Filters:
	hide filter icon when filter panel is open
	show an overlay film when at least one active filter cannot be applied to a chart
	when a filter is already applied by default to a chart (with multiple queries) with different value --> change the chart color to one with lower opacity





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59183 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-28 14:57:17 +00:00
Konstantinos Triantafyllou 4592f0760c [Monitor Dashboard | Trunk]: Change b2note property url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59128 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-15 11:35:36 +00:00
Argiro Kokogiannaki 60c74f8176 [Monitor| dashboard]
add filtering  fl0 for  parameterized named queries



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59122 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-15 10:06:15 +00:00
Argiro Kokogiannaki 7c9230c658 [Monitor dashboard | trunk]
monitor Component: Add fl0 filter


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59118 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 15:22:39 +00:00
Konstantinos Triantafyllou 29c98d8bcd [Monitor Dashboard | Trunk]: Fix langind modules imports
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59114 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 13:02:51 +00:00
Konstantinos Triantafyllou 70397bb5e7 [Monitor Dashboard | Trunk]: wait property initialization on search and langind pages
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59106 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 10:01:01 +00:00
Argiro Kokogiannaki d767faeecd [Monitor Dashboard|Trunk]
Search pages:
	update the custom filter: add name, organization custom filter is set to not hidden
Update filter icon css


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59104 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 08:25:59 +00:00
Konstantina Galouni 9e914f4c66 [Trunk | Monitor Dashboard]: environment.beta.ts & environment.prod.ts & environment.ts: Add "useLongCache" property (default to true) and set "useCache" to false.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59103 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 23:13:24 +00:00
Konstantina Galouni d351c5b00a [Trunk | Monitor Dashboard]: Remove IsRouteEnabled guard from landing pages (these pages should load even when not active - existing links from other pages).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59102 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 23:11:10 +00:00
Konstantinos Triantafyllou 37817eaf55 [Monitor Dashboard]: Add sherpa link property
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59091 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 14:42:58 +00:00
Konstantina Galouni 60fb369eb5 [Trunk | Monitor Dashboard]: environment.ts: [Bug fix] Set property "vocabulariesAPI" to use dev API (not beta - cors error).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59086 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 10:15:24 +00:00
Konstantinos Triantafyllou 243dfdf91e [Monitor Dashboard]: Change filter selected style on hover.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59083 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 09:53:30 +00:00
Argiro Kokogiannaki 49a41627b1 [Monitor|Dashboard | Trunk]
Sidebar menu: add link to search research outcomes - build parameters for each stakeholder
 

Search pages:
	add isHidden = false for the custom filter
	remove openaireSearchLink

CSS: 
	-add css for mini_title of sidebar
	-add selectedFilters css
		


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59079 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 09:23:04 +00:00
Konstantinos Triantafyllou ffc2fb3d71 [Monitor Dashboard | Trunk]: Remove unused js and css file of theme. Fix dropdown when animation exists. Remove tooltip custom css. Add missing properties
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59069 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 12:57:53 +00:00
Konstantinos Triantafyllou cffb3c87ae [Monitor_dashboard | Trunk]: Add search and langind pages to monitor dashboard
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59062 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:38:52 +00:00
Argiro Kokogiannaki 204cb9a597 [Monitor Dashboard|Trunk]
Indicators page - Filters:
	filters in burger menu on the right
	add range filter component
	
Indicator utils:
	AddFilter(): add filter for parameterized queries
	parameterizeDefaultQuery(): 
		for parameterized queries stakeholder position is not fixed in first place. parameters contain start/end year in first 2 places.
		make it work for double queries like "name":"monitor.funder.greenvsgold.name.type","parameters":["2020","2020","European Commission","dataset","2020","2020","European Commission","dataset"]
		


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59061 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:37:51 +00:00
Argiro Kokogiannaki 887884c260 [Monitor dashboard | Trunk]
Enable adding numbers from stats-tool

Adding filters not in the indicator object, but on demand when filters are applied
Use common code for charts and number objects from stats tool



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59056 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-07 14:08:47 +00:00
Konstantinos Triantafyllou b69e50e978 [Monitor Dashboard | Trunk]: Move sidebar and header to app component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59048 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-06 09:19:01 +00:00
Konstantinos Triantafyllou f87575779f [Monitor Dashboard | Trunk]: Generate alias fix / char
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59024 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 16:26:58 +00:00
Argiro Kokogiannaki 3797563b6d [Monitor Dashboard| Trunk]
- add link to monitor for Monitor logo
-Admin:
	-topics view: add public/private icon in md-card similar to stakeholders & indicators



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59009 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 13:31:38 +00:00
Argiro Kokogiannaki 9af3095840 [Monitor Dashboard|Trunk]
Admin:
-add monitor logo in left sidebar
-add stakeholder name and logo on the blue bar
-back button takes you to /admin



Monitor.component.html
-manage buttons takes you to /admin
- private preview to work if admin or curator




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58998 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-26 10:52:58 +00:00
Argiro Kokogiannaki da5dbee3aa [Monitor Dashboard |Trunk]
Admin and stakeholder page:
-update titles (use stakeholder.name)
-indicator description in the bottom


Admin: 
-rename stakeholder to profile
-update titles (use stakeholder.name)
-add name when there is no logo
-back button takes you to stakeholder page not /admin
-indicator description in the bottom
-Add sections for numbers is enabled only for administrators



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58990 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-25 08:10:42 +00:00
Argiro Kokogiannaki 286b82c01a [Monitor dashboard|Trunk]
For the menu use the stakeholder name instead of index_name

redirect to error pages changed:
	-private stakeholder -- > message private data
	-public stakeholder with no topic/category/subcategory to show (either because is private, inactive or simpe they don't exist) --> message no indicators yet
	-inactive stakeholder/topic/category/subcategory OR the alias from URL doesn't exist --> error page





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58986 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-24 13:36:00 +00:00
Konstantinos Triantafyllou 03879e7eeb [Monitor Dashboard | Trunk]: Fix bug with number indicators and with subcategory content while is recreated
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58985 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-24 10:13:29 +00:00
Konstantina Galouni 5a13ef0a57 [Trunk | Monitor Dashboard]:
1. stakeholder.componen & indicators.component & topic.component: Delete methods replaced from simple delete to delete default & related elements (for simple elements the result is the same).
2. topic.component.html: Commented code, to show in modal 3 different buttons according to the delete option we choose.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58980 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-23 08:33:13 +00:00
Argiro Kokogiannaki cdcf946958 [Monitor Dashboard| Trunk]
Admin: Enable Delete profiles  only for administrators
	Enable delete only for non-default elements
	Add tooltip for active/public status of topics/categories/subcategories in sidebars
	




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58960 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-18 12:03:26 +00:00
Konstantinos Triantafyllou e70567e079 [Monitor Dashboard | Trunk]: Fix a bug with reordering and chart options.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58952 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-17 10:37:04 +00:00
Konstantinos Triantafyllou 145f1676ca [Monitor Dashboard | Trunk]: Indicators: Add editing status to prevent actions while editing
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58933 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-16 08:23:51 +00:00
Konstantinos Triantafyllou ce1719504c [Monitor Dashboard | Trunk]: Fix a bug with the id of chart indicator
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58927 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-16 07:58:36 +00:00
Argiro Kokogiannaki 28e432bf54 [Monitor Dashboard|Trunk]
Number indicators: 
	edit available only for portal admins
	parsing the url to parameterize and work for other indicators
	when requesting to get the numbers use the getNumberUrl to properly set the stakeholder id
	



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58924 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-16 07:30:45 +00:00
Konstantinos Triantafyllou 89ab45bc63 [Monitor Dashboard | Trunk]: Fix a bug on number indicators reordering. Add reordering status during the request
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58918 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-15 16:58:06 +00:00
Argiro Kokogiannaki 06ec6b383f [MOnitor Dashboard|Trunk]
Indicator utils:
	support highmaps
	make code more generic (eliminate using library name in if-then-else)
properties:
	update with proper login service
remove routing to 'ec' when no stakeholder defined




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58909 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-12 17:32:41 +00:00