Commit Graph

45 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Konstantina Galouni 2fc7648980 [Trunk | Monitor Dashboard] : monitor.component: Add checks for description & loading & no indicators case.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58690 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-13 10:00:12 +00:00
Konstantina Galouni 98f8c36f06 [Trunk | Monitor Dashboard]: monitor.component: Add method "isPublicOrIsMember()" to check when to show public/ private entities.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58687 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-13 08:23:19 +00:00
Konstantinos Triantafyllou 7ba7798abb [Monitor Dashaboard | Fix some bugs with indicators saving]
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58683 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-12 11:05:53 +00:00
Konstantinos Triantafyllou 670fe26b55 [Monitor Dashboard | Trunk]: Change css for sidebar height
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58062 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-06 13:45:11 +00:00
Konstantinos Triantafyllou 0142ebb9ec [Monitor Dashboard | Trunk]: Clarify css of login button. Add section title.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57978 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-14 19:48:13 +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 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 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
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
Argiro Kokogiannaki 5fa7e7ce2a [Monitor_Dashboard|Trunk]
add routes for manage Admin tool common entities(pages, communities, helptexts, entities)
Stakeholder ddefault profile: update colors in charts

Input component: add type  checkbox






git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57929 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-20 11:48:35 +00:00
Konstantina Galouni f9f411970b [Trunk | Monitor Dashboard]:
1. app.module.ts: Import UserMiniModule.
2. app.component.html: Pass parameter [colors]="'light'" to <user-mini> component.
3. monitor.module.ts: Import UserMiniModule.
4. monitor.component: Add view and functionality for login/logout in non-administrator pages.
5. monitor-custom.css: Classes used by <user-mini> component added ('dark' on light background - 'light' on dark background).
	'loginLink.light', 'circle.userBox.light', 'text.userBox.light', 'svg .icon.userBox.light', 'svg .loginLink.userBox.light', 
	'.loginLink.dark', 'circle.userBox.dark', 'svg .icon.userBox.dark', 'svg .loginLink.userBox.dark', 'text.userBox.dark'


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57882 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-13 15:48:24 +00:00
Argiro Kokogiannaki ca7b309d67 [Monitor dashborad|Trunk]
Updates on funder default profile



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57839 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-09 10:41:58 +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 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 328ad3a73d [Monitor Dashboard]: Nothing to notice
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57815 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-05 09:01:22 +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
Konstantinos Triantafyllou bcdb3e4708 [MonitorDashboard]: Sidebar: add activeItem and subItem to check which element is active
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57805 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 11:47:20 +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
Argiro Kokogiannaki d8a57c8c1c -Add logo files for demo funders
-make changes to monitor component according to the mocks
-StakeHolder model:
	--add logoUrl
	--add recommenderFor in subCategory and Indicator level (for demo)
-StakeHolderCreator(for demo):
	--add h2020 & fp7 charts & categories
	-- use recommenderfor in order to indicators and subcategories to a stakeholder
-monitor-css: add doubleheader custom css and stakeholderPage 




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57757 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-28 16:27:49 +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 a1b3a40426 [Monitor Dashboard]: Add Topic page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57514 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-05 14:59:06 +00:00
Argiro Kokogiannaki cc18e55e52 [monitor_dashboard|Trunk]
-make header full
-add stakeholder name in the header



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57482 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-31 08:30:15 +00:00
Konstantinos Triantafyllou f5fce31d9f [Monitor Dashboard]: Fix satinizer of iframe
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57481 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-30 15:26:19 +00:00
Konstantinos Triantafyllou b12200fd12 [Monitor Dashboard]: Change uk-width to uikit version
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57473 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-30 09:38:54 +00:00
Argiro Kokogiannaki 9baec2fdbe [Monitor_Dashboard|Trunk]
svn ignore files
add uikit main css instead of limited theme css

 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57466 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-29 13:18:26 +00:00
Konstantinos Triantafyllou 576fac719c [Monitor Dashboard]: Add disable transitions on page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57465 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-29 11:35:13 +00:00
Konstantinos Triantafyllou 5d589efc55 [Monitor Dashboard]: Add open menu on main header. Click outside close sidebar.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57464 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-29 11:33:42 +00:00
Konstantinos Triantafyllou 9854298bac [Monitor-Dashboard]: Add new dashboard theme and make monitor page base on it.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57451 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-25 13:19:54 +00:00
Argiro Kokogiannaki efdd45fa14 [Monitor_Dashboard|Trunk]
Initial commit 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57449 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-24 07:44:29 +00:00