Commit Graph

47 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou 032752f8a5 [Monitor Dashboard | Trunk]: Organize new dashboard theme to files
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59619 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-19 09:07:43 +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
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
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
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
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 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 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 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
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
Argiro Kokogiannaki 458fd8fb47 [Monitor|Trunk]
Update beta properties/environments

Add check for environment and show the proper badge

Smaller sizes for number indicators

Monitor Dashboard:
	changes in the top bar: update colors, fonts, alignment
	Manage button is moved to top menu bar
	Add filters button (no action)
	add bottom menu
	topic icons - use the saved svg

Add common assets as svn externals





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58893 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-11 17:06:45 +00:00
Konstantinos Triantafyllou e7d906c691 [Monitor Dashboard | Trunk]: Add edit and create number indicator for Administrators. Search by keyword: Check chart title also.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58870 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-09 14:49:52 +00:00
Konstantinos Triantafyllou 76f2dadc8e [Monitor_Dashboard | Trunk]: Move stakeholder class and service to library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58829 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-03 13:44:03 +00:00
Argiro Kokogiannaki 892251bbd5 [Monitor Dashboard| Trunk]
Indicator path type:
	if chart url is table -> set it to table
	if no type found in parameterization, allow to select type in the form
	if parameterized type is column, pie, bar, line don't allow to switch to table or other (will not be loaded properly)
	if parameterized type is table: don't allow to change to other types
	default type is "other"



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58824 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-02 15:44:45 +00:00
Argiro Kokogiannaki 31824bf208 [Monitor|Dashboard]
Links to Admin available for monitor Curators, Community Curators and portal administrators

Indicators page: 

Admin:
	Indicators: 
		add tooltips for active/public
		show message when stakeholder values couln't be parsed
		allow urls from different installations of stats-tool
	
	indicator Utils:
		add  parsing for echarts library
		build the chart url using the current stakeholder values (index_id, index_name, etc)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58823 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-02 12:45:08 +00:00
Argiro Kokogiannaki 7c72562336 [Monitor Dashboard|Trunk]
Indicators form: add input fields for data titles of the chart

indicator-utils: generateIndicatorByChartUrl:
	-more checks for library (Google/highcharts) and table/chart
	-parsing for Google charts (a little different schema than highcharts)
	-parsing for google tables (parse stakeholder filter)
	-make sure connect new charts work (the stakeholder should be ri)
	-prepare new parameterized queries (should be checked when available)
		-- if the format is monitor.funder/ri/organization parse only if the stakeholder is type funder/ri/organization
	-any other case just keep the url (won't work for default profile)
	-Simple Stats tool queries add check for stakeholder type
		-- if stakeholder is funder/ri/organization parse funder/ri/organization filter
	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58796 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-28 09:35:57 +00:00
Konstantinos Triantafyllou 2eb711011e [Monitor_Dashboard | Trunk]: Add default badge. Fix a bug with indicators deafultId. Add option to create a blank profile.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58707 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-15 12:26:59 +00:00
Argiro Kokogiannaki 3b8075b6b9 [Monitor Dashboard|Trunk]
StakeholderCreator:

	Update method  StakeholderCreator.updateECProfile with proper values

	update method that creates default profile to add only common things

Monitor Component:
	update section layout






git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57967 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-10 13:31:53 +00:00
Argiro Kokogiannaki e44d0a6392 [monitor dashboard]
Parameters:
	Update parameters names: use 'index_id', 'index_name', 'index_shortName' 
	change the way they are replaced
	update default 

EC creation: create a method that adds EC specific charts

Create StakeholderUtils.defaultProfiles to add ids for showcase default profile

monitor: get stakeholder from DB




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57965 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-10 11:32:23 +00:00
Argiro Kokogiannaki 004e5e9766 [Monitor Dashboard|Trunk]
App routing: remove admin menu when not needed
	add  '*pages*' route

App component: 
	set navbar in the middle
	add stakeholder name or title in blue bar when sidebar is closed 

Require login for admin parts
Require admin role for managing pages, entities, helptexts, etc

Monitor Component:
	change acive topic css
	



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57961 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-09 14:31:55 +00:00
Konstantinos Triantafyllou 946ca64bb7 [Monitor Dashboard | Trunk]: Change functions for default profile
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57960 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-09 13:15:39 +00:00
Konstantinos Triantafyllou f7da8c52ae [Monitor Dashboard | Trunk]: Change default -> dedaultId. Add section on stakeholder model. Change reorderto be suitable for sections. Create types for stakeholder fixed values.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57959 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-08 11:00:50 +00:00
Konstantinos Triantafyllou 3fcc64f060 [Monitor Dashboard | Trunk]: Move Option to library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57942 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 15:18:15 +00:00
Argiro Kokogiannaki a1cff21086 [Monitor Dashboard]
move sidebar in library
add 'hasAdminMenu' in routes
update sidebar using class MenuItems

StakeHolder:
	update generateIndicatorByChartUrl
		-parameterize default query
		-add stakeholder
		-add subtitle
	update colors in default stakeholder method


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57936 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 13:54:37 +00:00
Konstantinos Triantafyllou 90b5ce8db1 [Monitor Dashboard]: Handle alias. There is a bug with observables, need to be checked
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57831 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-06 13:52:26 +00:00
Argiro Kokogiannaki 529c9ce933 [Monitor-Dashboard|Trunk]
add more charts about Open science.

Get full url: replace parameters more than once
add subtitle in indicator parameters/form




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57821 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-05 16:10:00 +00:00
Argiro Kokogiannaki e852d4302c Badge add rotated badge in admin pages
Set _id null when create a profile from default one
Set sidebar default option to open





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57818 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-05 12:01:27 +00:00
Konstantinos Triantafyllou aac3e3d55f [MonitorDashboard]: Fix a bug with header and sidebar. Save sidebar open status per topic
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57814 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 18:25:36 +00:00
Argiro Kokogiannaki c3838e06b8 Funder page:
add message when there are no indicators & description
	hide search & menu items
	match height for indicators: title & frame stays at the bottom
	add link to admin
	add prototype badge

Indicator Creator:
	add more categories



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57812 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 17:01:55 +00:00
Argiro Kokogiannaki f9cf6c3d24 update method extractOldToolYTitle: add check if fieldsheaders is array
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57773 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-29 14:58:52 +00:00
Konstantinos Triantafyllou 390a205580 [MonitorDashboard]: Save stakeholder
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57772 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-29 14:46:40 +00:00
Konstantinos Triantafyllou 9d10f6e745 [Monitor Dashnoard]: Add stakeholder utils and move function from stakeholderCreator.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57770 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-29 13:35:13 +00:00
Konstantinos Triantafyllou b3fdeb99c5 [MonitorDashboard]: Add edit stakeholder modal
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57768 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-29 12:14:49 +00:00
Konstantinos Triantafyllou 8204b4ba3b [Monitor Dashboard]: Customize loading component. Make input pristine if the value is equal to initial value
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57735 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-28 10:30:56 +00:00
Konstantinos Triantafyllou e8e95da10f [Monitor-Dashboard]: Rename home -> stakeholder. Add custom classes to chart Icons
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57708 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-27 12:14:14 +00:00
Konstantinos Triantafyllou 14c32e0f4c [Monitor Dashboard]: Complete indicator save and reorder.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57673 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-24 16:30:04 +00:00
Argiro Kokogiannaki 7ed0964b38 StakeholderCreator:
initialize filters where is posible
monitor page: 
	apply filters when available
	add filters section in html for testing (commented)
Indicator-utils:
	create IndicatorPath from URL:
		add checks if filters & queries exist
		apply parameters when there are more than one queries
		add Indicator filters if possible 
		old Tool: 
			add basic fields in parameters
			fix url


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57647 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-20 12:55:23 +00:00
Konstantinos Triantafyllou a5cc8f6fdb [Monitor Dashboard]: Add form builder for edit indicator
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57644 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-20 10:32:28 +00:00
Konstantinos Triantafyllou ea9e6f3d9b [Monitor Dashboard]: 1. Create indicator Modal 2. Add new fields on stakeholder elements. 3. Add getFullUrl on indicatorUtils.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57639 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-19 14:25:19 +00:00
Konstantinos Triantafyllou 0738f2eed7 [Monitor Dashboard]: Fix validation of names in dropdown edit. Move getFullUrl on inidicator Utils
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57618 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-14 15:20:51 +00:00
Argiro Kokogiannaki 68006a73a1 [Monitor_dashboard| Trunk]
IdicatorUtils: add method that creates stakeholder from a url
Update default profile - add parameters




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57601 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-13 14:27:07 +00:00
Konstantinos Triantafyllou 8210fe3e37 [MonitorDashboard]: Add service of stakeholder. Move copy to Library. Change name of Tools to IndicatorUtils.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57574 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-11 13:28:36 +00:00