Commit Graph

224 Commits

Author SHA1 Message Date
k.triantafyllou 955464fdca [Library]: Add copy function on HelperFunctions
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57573 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-11 13:27:18 +00:00
k.triantafyllou 68ebe44682 [Library]: Check if is Client on userInfo method.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57547 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-08 12:07:39 +00:00
k.triantafyllou 3c044f5b79 [Library]: Change dataprovider model.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57515 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-05 15:18:08 +00:00
k.triantafyllou b63587943b [Library]: Add monitor service on properties
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57511 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-05 14:27:13 +00:00
konstantina.galouni 6327e1916d [Trunk | Library]: number-utils.class.ts: [Bug fix]: thousands (K) calculation: if num greater or equal to 1000 & 'mi' renamed to 'M'.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57499 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-02 01:27:34 +00:00
konstantina.galouni 8dbf6c5d76 [Trunk | Library]: Deposit Pages:
1. utils/properties/searchFields.ts: in 'DEPOSIT_DATASOURCE_KEYWORD_FIELDS' use field 'datasourcetypeuiname' instead of 'datasourcetypename' and use field 'datasourcesubject' with 'all' operator.
2. services/searchDataproviders.service.ts: [Bug fix]: Add subject only when there is some content.
3. searchPages/searchUtils/searchPage.component.ts: Add quotes in keyword for query (could cause problems with special keywords e.g. 'and and').
4. deposit/depositFirstPage.component.ts & deposit/searchDataprovidersToDeposit.component.ts: Use same placeholder in search form and add search by 'type'. 
5. deposit/searchResultsInDeposit.component.html: Change 'NOT OPENAIRE COMPATIBLE' label with 'Not yet registered' and change tooltip from 'Compatibility' to 'OpenAIRE compatibility'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57485 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-31 11:10:39 +00:00
konstantina.galouni bb731fe686 [Trunk | Library]:
1. resultLandingInfo.ts & resultLanding.service.ts & parsingFunctions.class.ts & resultLanding.component: Relations 'isSupplementTo' and 'isSupplementedBy' parsed and added as accordion items.
2. resultLanding.component: After title, a link to scroll into accordion items added (this may be removed).
3. landind-utils/tabTable.component.ts: Special icon removed from each type of research results and type name added before each result.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57404 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-17 13:24:09 +00:00
argiro.kokogiannaki 42663a15ea [Library|Trunk]
Properties: add "dashboard" property

Linking:
	add field claimedInDashboard in the claim object send to service in post


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57385 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-16 10:40:19 +00:00
argiro.kokogiannaki 351f5ebaa2 [Library|Trunk]
Claims:
	change type of openaire results to "Entity type"
	add link to the landing page of  Openaire results 
	remove cursor-pointer in Basket Title of Sources in the 1st step

Autocomplete / entity search service remove unused method (used in old linking UI)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57384 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-16 10:18:32 +00:00
k.triantafyllou 299a2bbb61 [Library]: Change dataProvider class base on new API call
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57354 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-13 20:08:47 +00:00
k.triantafyllou 1b6eb9cdd0 [Library]: Modal remove stopPropagation on modal open
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57342 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-10 22:18:56 +00:00
konstantina.galouni 988ac23708 [Trunk | Library]: click-outside-or-esc.directive.ts: [Bug Fix] Property 'id' does not exist on type 'EventTarget' - tricked with ['id'] instead of .id.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57341 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-10 16:38:20 +00:00
k.triantafyllou 8bca7dbdbd [Library]: Fix Modal to close on click in target with specific id
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57336 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-10 12:13:01 +00:00
konstantina.galouni eea9c25108 [Trunk | Library]: deletedByInference: [Bug fix] Remove parsing and view of 'fundedByProjects' field ('projectsProvenanceVocabulary' which was used is deleted).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57335 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-10 11:59:50 +00:00
konstantina.galouni 93f9b9ef7d [Trunk | Library]:
1. resultLandingInfo.ts: Remove 'projectsProvenanceVocabulary' and 'researchResultsProvenanceVocabulary' - vocabulary API is used now.
2. resultLanding.service.ts: Create method 'getProvenanceActionVocabulary()' to get provenance action term from vocabulary and use it in 'parseResultLandingInfo()'.
3. resultLanding.component.ts: Before the request of 'ResultLandingInfo', request 'provenance action terms' from vocabulary API.
4. fundedBy.component.ts: Add provenance action label as is in tooltip & add class 'uk-light' in tooltip & use 'uk-text-small' instead of 'uk-text-meta' for provenance label.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57330 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-09 13:28:23 +00:00
k.triantafyllou f07c3b6f1f [Library]: Fix directive click outside for server mode.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57325 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-09 09:53:59 +00:00
k.triantafyllou 90cb8cc007 [Library]: Add ContentProvider class. Add directive to close modal on click outside or esc.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57261 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-04 08:45:51 +00:00
konstantina.galouni 6105b39302 [Trunk | Library]: showAuthors.component.ts: Show modal with ORCID only if available and only on client mode (on server just the name).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57239 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-02 14:17:31 +00:00
konstantina.galouni a8f4a8f438 [Trunk | Library]: Original versions in Organization Landing Page
1. landingPages/organization/deletedByInference: Create folder and files for organizations deleted by Inference (original versions).
2. organizationInfo.ts: Add string array field 'deletedByInferenceIds'.
3. organization.service.ts: Parse deletedByInferenceIds (children which are organizations).
4. organization.component: Show (only in 'non production' environments) original versions and request them on click.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57238 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-02 14:15:08 +00:00
k.triantafyllou c09ad8d257 [Library]: Display Claims: Disable inputs and pages while data are loading
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57209 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-01 08:26:17 +00:00
konstantina.galouni 7fcbea2b5a [Trunk | Library]: original versions of results - deletedByInference:
1. Move 'landingPages/landing-utils/deletedByInference' folder to 'landingPages/result/deletedByInference'.
2. For original versions of results use 'ResultLandingInfo' entity instead of 'DeletedByInferenceResult' since the second is a subset.
3. Query original versions of results only on click.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57201 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-30 11:02:06 +00:00
k.triantafyllou ff8b909be6 Upgrade version of enviroment properties file from 1->2.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57140 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-25 13:38:55 +00:00
k.triantafyllou 98c98e6625 [Library]: Add user management service and change all session methods with new ones.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57058 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-13 07:01:19 +00:00
konstantina.galouni b1fb4e7a3e [Trunk | Library]:
1. searchFields.ts: Method 'getFieldOperator()' added, to return operator (and/or) for a given 'fieldId'.
2. refineResults.class.ts: Use 'getFieldOperator()' method of 'searchFields.ts' to fill value of 'filter.filterOperator'.
3. searchPage.component.ts: Use 'getFieldOperator()' method of 'searchFields.ts' to get operator (and/or) for a given 'fieldId' and use this operator in the search query.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57048 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-12 10:30:48 +00:00
konstantina.galouni 7065cda22e [Trunk | Library]: app-routing.module & entities.module: Bug fixes in imports after merging research results.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57034 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-11 11:45:35 +00:00
konstantina.galouni 32b3c3f6c0 [Trunk | Library]: Delete all unnecessary files (simple search, advanced search, search service, landing entity-info, fetch class), after merging research results (publication, dataset, software, other).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57033 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-11 11:26:06 +00:00
konstantina.galouni cde4550dfc [Trunk | Library]:
Merge services, fetchClasses, simple and advanced search pages for research results (publications, datasets, software, other):

1. advancedSearchResearchResults.component & advancedSearchResearchResults.module: New common advanced search page for research results.
2. searchResearchResults.component & searchResearchResults.module: New common simple search page for research results.
3. fetchResearchResults.class: New common fetch class for research results.
4. searchResearchResults.service: Update existing service to satisfy merge of research results services.
5. app.module.ts: Import one common simple and one common advanced search page for search results.
6. claimResultSearchForm & directLinking &
        advancedSearchDatasets & advancedSearchOrps & advancedSearchPublications & advancedSearchSoftware &
        searchDatasets & searchOrps & searchPublications & searchSoftware &
        fetchDatasets.class & fetchOrps.class & fetchPublications.class & fetchSoftware.class: Use common service for research results (searchResearchResults.service).
7. datasetsTab & orpsTab & publicationsTab & softwareTab & relatedDatasourcesTab & statisticsTab:  Use common fetch class for research results (fetchResearchResults.class).
8. dataProvider & organization & project & search : Use common service and common fetch class for research results (searchResearchResults.service, fetchResearchResults.class).
9. linkingGeneric.component: Remove import of services for publications and datasets.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57027 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-11 09:45:54 +00:00
argiro.kokogiannaki af30b6981e [Library|Trunk]
Charts - Iframes:
	decrease width, increase height, set chart size parameters to &w=90%&h=90%




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57016 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-10 11:47:22 +00:00
konstantina.galouni f34e657f99 [Trunk | Library]:
1. dataProvider.component.html: Add label "OpenAIRE Text Mining" if aggregationStatus.fulltexts > 0.
2. dataProvider.component.html & dataProvider.service.ts & dataProviderInfo.ts: Parse and show aggregationStatus.lastUpdateDate (last index date).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57003 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-09 10:45:35 +00:00
k.triantafyllou 9f3dafd895 Fix bug on adminLoginGuard wrong redirectedUrl on canLoad.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56976 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-05 14:02:18 +00:00
argiro.kokogiannaki 71d0c3ae4f [Library|Trunk]
Alert modal  buttons: add ignoreCommunityPanelBackground  to not override button colors




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56973 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-05 13:03:57 +00:00
konstantina.galouni 3b849c78d6 [Trunk | Library]: Merging branch "mergeResultLandingPages" into Trunk 56883:56968
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56969 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-05 08:49:33 +00:00
konstantina.galouni 72ebe262af [Trunk | Library]: showAuthors.component: Add classes 'uk-margin-small-bottom uk-margin-small-top' in 'ORCID' label.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56957 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-03 14:19:57 +00:00
k.triantafyllou 6e415283cc Add version on properties file.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56938 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-30 14:30:18 +00:00
k.triantafyllou b1110aca0d Add property afterLoginRedirect and use it user-mini to redirect after login.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56922 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-29 09:49:40 +00:00
konstantina.galouni 0e59e7b6b4 [Trunk | Library]: piwik.service.ts: Change responseType from default (json) to blob (piwik returns image/gif)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56843 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-02 15:49:41 +00:00
k.triantafyllou 5a7f37302b [Library]: Remove unused properties(admin,connect,explore).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56824 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-01 11:53:17 +00:00
konstantina.galouni 016e90a894 [Trunk | Library]: Add properties 'depositLearnHowPage' and 'depositSearchPage' and use properties for urls.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56816 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-31 10:41:06 +00:00
k.triantafyllou de87c5506b [Library]: Modal: Add option to have a dont show message again checkbox. Add service to save on localStorage user's choices(only communityDireckLink now). Change search Communities result with new functionality.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56808 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-30 13:26:31 +00:00
argiro.kokogiannaki 322492af79 Linking:
Basket Limit:
		set to 100
		don't allow to add  more through search forms
		don't allow more in bulk
	Bulk - access mode and date: fix getting info from csv
	Add margins
	Display claims; remove showLatestClaims attribute

Landing   pub - HelpeTexts: remove doule quote and helper




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56750 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-24 12:46:29 +00:00
argiro.kokogiannaki e422f5fe77 [Library|Trunk]
Merging branch newlinking into Trunk 55132:56708



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56714 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 12:23:12 +00:00
argiro.kokogiannaki 8101d3ef2a [Library|Trunk]
Layout Changes according to the new theme (containers margins, header fonts size)

Search: Update search filters layout: don't crop the text with css, but count the characters

LayoutService: create a mock method



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56677 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-22 14:15:23 +00:00
k.triantafyllou 11cf47ac5a [Trunk|Library]: Add Helper on search Page, landings and deposit first page.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56644 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-22 09:16:50 +00:00
k.triantafyllou df37f2328f [Trunk|Library]: 1. Helper Service: Add two new functions to get page contents of a page, mapping by posistion, and div contents, mapping by id. 2. Helper Component: Remove call to api to avoid multi requests. Make texts as parameters.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56620 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-18 11:34:19 +00:00
konstantina.galouni 7f08d988c5 [Trunk | Library]: Add deletedByInference (other versions) in software, dataset, other landing pages
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56598 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-17 19:48:19 +00:00
konstantina.galouni a4d51b6d7f [Trunk | Library]:
1. compatibleDataProviders.component & compatibleDataProvidersTable.component & entityRegistries.component & entityRegistriesTable.component & journals.component & journalsTable.component:
	Add 'valueIsUnique' field in 'Filter'.
2. searchFilter.component: Add case when filter has unique value (radio button) | Show more values either in modal or inline (new mocks for connect)
3. searchHelperClasses.class: Add 'valueIsUnique' field.
4. searchPage.component: 
	Add title in Filters & show download-map-table options above selected filters
	Keyword query in specific fields (defined in properties/searchFields) when used by new deposit pages
5. searchDataproviders.service: Add method 'searchDataprovidersForDepositSearch()'
6. refineResults.class: Fill "valueIsUnique" field of filter.
7. properties/searchFields: Add 'uniqueValue: boolean' (default false) field in 'FieldDetails' class and 'fieldHasUniqueValue()' function which checks 'fieldType' and 'usedBy'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56562 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-15 16:11:07 +00:00
konstantina.galouni c90a895e07 [Trunk | Library]:
1. library.css: Add class "cursor-default".
2. showAuthors.component.ts: Use "cursor-default" class for clicking in authors with orcid.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56513 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-12 13:08:05 +00:00
konstantina.galouni a0b9e62c00 [Trunk | Library]:
approved.component & connectSubscriber.guard & mailPrefs.component & isRouteEnabled.guardisRouteEnabled.guard & helper.componenthelper.component: 
	Priority to get communityId from domain (if not exists, check url parameter)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56330 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-03 10:14:24 +00:00
k.triantafyllou d7daedd5f3 [Library]: Gif-slider: Change margin top and bottom
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56324 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-02 15:20:02 +00:00
k.triantafyllou 590d09455e [Trunk|Library]: Remove null default value on id of curator.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56313 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-02 10:27:09 +00:00