Commit Graph

173 Commits

Author SHA1 Message Date
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
Konstantinos Triantafyllou 2da590e0fc [Monitor Dashboard | Trunk]: Fix a bug when no category exists
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58908 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-12 14:46:23 +00:00
Argiro Kokogiannaki 09b8683328 [Monitor Dashboard|TRunk]
Topic - Icon:
	change topic.iconUrl to icon
	show it as inner html in sidebars
Create AdminDashboardGuard:
	use it in restricted parts
	check if portal admin, community curator or monitor curator





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58901 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-12 10:46:11 +00:00
Argiro Kokogiannaki 210d44764c [Monitor Dashboard|Trunk]
move css to styles.css :
	clean up index.html
	fixes in main.css and minify



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58895 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-12 09:34:03 +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 d39615beea [Monitor Dashboard | Trunk]: Add properties to enviroment.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58887 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-11 15:52:41 +00:00
Konstantinos Triantafyllou 2ea3faac05 [Monitor Dashboard | Trunk]: 1. Add icon SVG on topi's form. 2. Add sections' creation on number indicators
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58881 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-11 10:12:30 +00:00
Konstantinos Triantafyllou eb2ea8235a [Monitor Dashboard: Trunk]: Change indicators to active by default
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58876 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-10 15:30:43 +00:00
Konstantinos Triantafyllou bf58c1b7d5 [Monitor Dashboard | Trunk]: 1. Fix preview link 2. if stakeholder doesnt exist go to error page. 3. If stakeholder is inactive or private and user no admin go to error page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58875 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-10 14:03:28 +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 ec4fd8b175 [Monitor Dashboard | Trunk]: Add description input on stakeholder
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58865 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-05 14:49:12 +00:00
Argiro Kokogiannaki 5d4b62970f [Monitor Dashboard |Trunk]
Stakeholder Page: Update colors according to the mocks.




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58845 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-04 18:32:44 +00:00
Argiro Kokogiannaki c5b9345f02 [Monitor Dashboard | Trunk]
Update stakeholder page according to the new mocks
clean up monitor-custom.css 

add theme page route

App component: pass parameter for minimenu and front page



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58837 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-04 11:30:26 +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
Konstantina Galouni 7737ecaa42 [Trunk | Monitor Dashboard]: monitor.component: Show "style_switcher" (icon for administration portal), if user is logged in (not logged in and admin).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58725 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-19 16:38:01 +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