Commit Graph

77 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou 9ee588df82 Change description overlay. Fix a bug in case of more than one sections has no indicators. Make numbers with fixed width 2021-10-19 15:30:17 +03:00
Argiro Kokogiannaki be871e043b [Monitor Dashboard | trunk]
app: for Default profiles remove  menu for users and pages 
add properties for monitor stats tool
stats tool: apply new schema changes
	in indicator form add method to check for schema enhancements and update the url


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60258 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-15 16:02:30 +00:00
Argiro Kokogiannaki 2071d524d2 [Monitor Dashboard|Trunk]
- package.json: clean up citation.js + wikidata
- Admin tools: 
	remove components- use directly library components
- Properties: updates for helptexts




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60203 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-11 09:28:34 +00:00
Argiro Kokogiannaki 20ef481a4a [Monitor dashboard | Trunk]
Admin tools:
	- move amdin tool components underadmin-tool folder
	- create admin tool routing module
	- remove guard from each module and put it in admin tool routing module

Piwik:
	- add piwik from configuration service and pass it in search, landing, monitor

App component:
	- when stakeholder changes: update or reset properties adminToolsCommunity, adminToolsPortalType and init community information


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60171 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-18 15:31:21 +00:00
Konstantinos Triantafyllou 1f953e598c [Monitor Dashboard | Trunk]: Add note for https on edit-stakeholder. Change number indicator form logic
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60161 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-17 15:39:31 +00:00
Konstantinos Triantafyllou 479463ca63 [Monitor Dashboard | Trunk]: Some UI changes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60004 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-01 15:43:43 +00:00
Argiro Kokogiannaki f51535542e [Monitor Dashboard|Trunk]
-Search pages: 
	-updates for custom filter
	-add
	-remove custom filter parameters

-Monitor component:
	- apply height sizes
	- put indicator title inside the card
	- add link to graph
	- add last update of statistics date
	- encode and handle filter parameters similar to search pages

-Indicators: add height in the form


 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59980 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-27 10:46:58 +00:00
Konstantinos Triantafyllou cdc417b60c [Monitor Dashaboard | Trunk]: 1. Add window resize method. 2. Some changes on stakeholder's page. 3. Make width of sidebar smaller.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59976 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-26 16:23:21 +00:00
Argiro Kokogiannaki 086992a91b [Monitor|Trunk]
-edit numbers:
	- create url: parse the index id properly
	- save url: keep only the path from url
	- set stat-tool the default option
	- hide other options for non admins
	- set default json paths for stats-tool

-search link: pass the stakeholder filter in parameters


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59920 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-19 16:16:36 +00:00
Argiro Kokogiannaki 5404b8575a [Monitor Dashboard | Trunk]
code cleaning:
-remove unused imports, files
- add unsubscribe calls



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59847 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-13 16:42:12 +00:00
Argiro Kokogiannaki 2ce065b70e [Monitor Dashboard | Trunk]
-call setSidebar when stakeholder is already available from admin
-hide section title when there are no indicators
-


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59789 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-05 16:50:06 +00:00
Argiro Kokogiannaki 62fbea02fa [Monitor Dashboard|Trunk]
- remove helptexts call from monitor
- updates for sidebar



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59777 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-05 08:26:05 +00:00
Argiro Kokogiannaki 5f6c0884b5 [Monitor Dashboard|Trunk]
-set SEO titles also for private view
- add check in getTypesByUserRoles


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59771 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-04 16:04:29 +00:00
Argiro Kokogiannaki 6302cce3e9 [Monitor Dashboard|Trunk]
preview:
	move preview button to topic.component
monitor.component, app
	update methods to show the profile based on the preview value and the visibility



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59765 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-04 11:16:47 +00:00
Konstantinos Triantafyllou bd7925772f [Monitor Dashboard | Trunk]: Add footer on front page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59762 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-04 09:10:54 +00:00
Argiro Kokogiannaki 63e5b51dcd [Monitor Dashboard|Trunk]
- update checks for roles
- Stakeholder form: create stakeholder type if curator of that type of portal administrator



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59747 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-03 09:42:47 +00:00
Argiro Kokogiannaki 264a16c9bf [Monitor|Trunk]
-remove isPublic/isActive and their funtionalities
-add visibility
-update stakeholder and indicator cards

-add beta version of stats tool



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59675 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-23 13:58:16 +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
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 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
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
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 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