Commit Graph

48 Commits

Author SHA1 Message Date
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 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 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 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 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
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 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
Konstantina Galouni a08453d950 [Trunk | Monitor Dashboard]: monitor.component.ts: Initialize activeTopic, activeCategory, activeSubCategory when url path changes (Bug fix: When a topic has no content do not show previous content).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58692 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-13 13:08:17 +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
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 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 7813307992 [Monitor Dashboard | Trunk]: Remove url from getUserInfo.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57940 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 15:10:27 +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
Konstantinos Triantafyllou 5da23e9673 [Monitor Dashboard | Trunk]: Reset user menu items before build
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57884 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-15 12:38:09 +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 321c59aaa1 [MonitorDashboard]: Fix a bug with subscriptions
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57835 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-06 15:46:38 +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 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
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
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
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 ba4dee6d5f [Monitor Dashboard]: Change monitor route to / and / to admin
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57707 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-27 10:51:21 +00:00
Konstantinos Triantafyllou bd82b388ef [Monitor Dashboard]: Merge create and edit modals. Rename SidebarService to LayoutService and add hasSidebar on it
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57706 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-27 10:09:14 +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 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
Argiro Kokogiannaki 1c80a95291 [Monitor_Dashboard|Trunk]
update default profile with more number indicators
	monitor.component: get stakeholder from subject



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57550 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-08 13:05:25 +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
Konstantinos Triantafyllou c7ed05cf99 [Monitor Dashboard]: Add topic page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57506 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-04 11:50:25 +00:00
Argiro Kokogiannaki 5b540516a3 Update model with parameters, filters & jsonObject
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57504 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-04 10:13:39 +00:00
Konstantinos Triantafyllou 6398c1f5d6 [Monitor_dashboard]:Initialize monitor admin. Home page has been created.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57496 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-01 18:30:11 +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 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