Commit Graph

69 Commits

Author SHA1 Message Date
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
Argiro Kokogiannaki 82c9d21e07 [Monitor | Trunk]
- fix issue losing the active topic - when changing the sub categeries
- add property disableFrameLoad in dev, and disable loading frames when the property exists and is true
- remove checks about recommnededFor stakeholders


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60117 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-11 10:14:27 +00:00
Konstantinos Triantafyllou 747085c70f [Monitor Dashboard | Trunk]: Some UI changes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60005 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-01 15:52:03 +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
Konstantinos Triantafyllou 3e1634b6b1 [Monitor Dashboard]: 1. Fix error if not topics are available. 2. Remove development for user role verification
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59830 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-12 17:50:24 +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
Konstantina Galouni d4d41adcfc [Trunk | Monitor Dashboard]: monitor.component.html: Show message "Send us your feedback" not only when no indicators in activeSubCategory, but also when activeTopic has no categories.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59786 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-05 11:26:52 +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
Konstantinos Triantafyllou 3b094da655 [Monitor Dashboard]: 1. Finish manage stakeholders. 2. Remove logos.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59732 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-01 15:41:56 +00:00
Konstantinos Triantafyllou 0d59ccee27 [Monitor Dashboard]: 1. Change menus. 2. Fix visibility edit options. 3. add page_content_header on css
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59729 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-31 16:02:30 +00:00
Argiro Kokogiannaki df36b36b5d [Monitor Dashboard|Trunk]
Description:
	add additional description field
	add tooltip to  show description
Manage stakeholders: 
	add checks for roles


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59713 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-29 09:17:39 +00:00
Argiro Kokogiannaki f68b7187e9 [Monitor Dashboard|Trunk]
-add tabs for manage profiles page
- update css for admin tabs
- add css for visibility quick menu



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59693 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-26 13:53:07 +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 e179a6094c [Monitor Dashboard|Trunk]
Merge branch to trunk (59477:59555 https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/branches/themeChange/monitor_dashboard)
Changes applied: remove theme css and classes, update with new admin UI



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