Commit Graph

56 Commits

Author SHA1 Message Date
argiro.kokogiannaki 2286e2a0d7 [Library|Trunk]
Claims: Bunk upload: make alert close to work



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58698 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-14 14:40:20 +00:00
argiro.kokogiannaki a142f0e457 [Library|Trunk]
Claims:
	update search forms and filters according to the new design (Projects, Results)
	add result type as Refine field
	add range filter component
	make basket stiky
	make alert close to work
	change research results -> research outcomes

Range Filters:
	add showQuickButtons
	smaller input, - between the inputs
	

Search:
	change research results -> research outcomes in placeholder
	NewSearchPage: make static method that creates range query 

Fields:
	add resulttypeId
	change Year range to Active within for projects

	



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58697 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-14 14:38:50 +00:00
k.triantafyllou e2f91200cf [Library | Trunk]: Change search form to have borders
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58662 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-11 09:37:00 +00:00
konstantina.galouni b6f936868e [Trunk | Library]: (Changes needed for community background in connect portal)
1. directLinking.component.html & myClaims.component.ts & errorPage.component.ts: Move 'uk-margin-small-top' class inside id="tm-main".
2. linkingGeneric.component.html: Add class 'white-box-with-border uk-padding-small'.
3. depositFirstPage.component.ts: Remove class 'communityBackground' | Move helptext inside <div class="uk-section">.
4. searchDataprovidersToDeposit.component.ts: Remove 'communityBackground' class | Remove 'uk-margin-top' from tag with class 'communityPanelBackground'.
5. dataProvider.component.html & organization.component.html & project.component.html & resultLanding.component.html: Remove 'uk-margin-small-top' class from id="tm-main" | Add 'uk-margin-medium-top' in container.
6. newSearchPage.component.html & searchPageTableView.component.html: Remove class 'communityBackground'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58649 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-07 17:20:33 +00:00
argiro.kokogiannaki 0b5cf0f6f8 [Trunk|Library]
Linking: bulk claims service: pass properties instead of crossref url


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58576 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-28 13:08:08 +00:00
konstantina.galouni a040fc6bdb [Trunk | Library]:
1. configuration.service.ts:
        a. Mark unused methods as "deprecated".
        b. isRouteEnabled.guard.ts --> isPageEnabled() method: Extract page_route from url in service.
2. helper.service.ts:
        a. Mark unused methods as "deprecated".
        b. searchPageTableView.component.ts & searchPage.component.ts & newSearchPage.component.ts & advancedSearchPage.component.ts &
           resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts & htmlProjectReport.component.ts &
           depositFirstPage.component.ts & linkingGeneric.component.ts & displayClaims.component.ts:
                "properties" as first parameter in methods.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58417 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-07 11:15:28 +00:00
argiro.kokogiannaki 59753e1eeb [Library|Trunk]
Claims:
	bulk linking ignore empty lines and check exceed on valid DOIs

Search:
	all:    don't do double  request: call component destroy method when the active tab changes.
		reset result types when active tab changes
	search pages: when setting the filters, set properly the total number of results 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58354 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-30 14:24:56 +00:00
argiro.kokogiannaki cad0fe9061 [Trunk|Library]
Search pages:
	remove logs
	fix issue in /search/find when switch access mode filter
	search all: don't hide number when change tabs 
	deposit results add space between cards
	



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58348 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-27 12:39:18 +00:00
argiro.kokogiannaki 3c9d72a8d4 [Library | Trunk]
Claims:
	add more checks and redirect to login if the session is expired

Sherpa/Romeo:
	update with new link

Search pages:
	hide table view link
	update placeholders in simple search form
	update Advanced search form width, date filter
	simple search form for smaller devices



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58331 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-26 12:18:18 +00:00
konstantina.galouni 44d73bae31 [Trunk | Library]: claimResultSearchForm.component.html & displayClaims.component.html & linkingGeneric.component.html & metadataPreview.component.html: [Bug fix] Fix <mat-select> elements.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58263 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-15 23:08:45 +00:00
argiro.kokogiannaki 7021de1932 [Library|Trunk]
Claims:
	Search: remove class from filters to look like the search filters
	Display claims list: add "no title available" when it is not
	Direct index: don't make the direct index API call in development 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58246 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-13 09:16:44 +00:00
konstantina.galouni 4059e6fa32 [Trunk | Library]: metadataPreview.module.ts: [Bug fix] Missing file changes from previous commit.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58236 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 10:48:53 +00:00
konstantina.galouni 2cc64b9e4e [Trunk | Library]:
searchSorting.module - searchSorting.component.ts & searchResultsPerPage.component.ts & searchFilter.module.ts - searchFilter.component.html & 
browseStatistic.component.html - browseEntities.module.ts & citeThis.module.ts - citeThis.component.ts & 
metadataPreview.module.ts - metadataPreview.component.html & linkingGeneric.module.ts - linkingGeneric.component.html & 
displayClaims.module.ts - displayClaims.component.html & claimResultSearchForm.module.ts - claimResultSearchForm.component.html: 
	Use material select (<select> to <mat-select>)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58235 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 10:48:04 +00:00
k.triantafyllou eee4f0807e [Library | Trunk]: Change getUserInfo to be suitable for guards too.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57939 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 15:09:17 +00:00
argiro.kokogiannaki 47031fbba1 Linking:
update field claimedInDashboard to get the communityId in case of connect dashboard



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57390 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-16 10:58:04 +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
argiro.kokogiannaki bb1b22c15b [Library|Trunk]
Claims: when selecting the next entity to link, use the click-outside event that closes the modal


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57263 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-04 09:21:16 +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 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
k.triantafyllou efcb959e28 [Library]: BulkComponent: add on allowed file types applicaton/vnd.ms-excel for csv.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56955 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-03 13:11:20 +00:00
argiro.kokogiannaki 1f942d09dd [Library|Trunk]
Linking:
	rename attribute title to pageTitle or sectionTitle to avoid showing default html tooltip 
	use default or communty colors for the linking banner
	Search datacite: 
		fix bug when searching with DOIs
		enable searching with more than one DOI




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56908 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-27 13:19:58 +00:00
konstantina.galouni 30bc39aa22 [Trunk | Library]: Fix and add when missing: schema2jsonld, canonincal url, meta tags, piwik call.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56840 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-02 14:55:32 +00:00
argiro.kokogiannaki c6e0a5f165 [Library|Trunk]
Helptexts: add in linking pages



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56756 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-24 15:46:49 +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
k.triantafyllou 3405681ac7 [Trunk|Library]: Remove uploadService property
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56263 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-28 10:28:39 +00:00
argiro.kokogiannaki f8913dfdbd [Library|Trunk]
Merge into trunk branch angular7 rev 55729




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55964 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-03 13:20:36 +00:00
konstantina.galouni 8641787688 [Trunk|Library]
Fix error logs in Claims Pages and remaining components (approvedByCommunity, userEmailPreferences, navigationBar).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54848 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-18 14:00:43 +00:00
argiro.kokogiannaki 01a945b226 [Trunk|Library]
Server Side errors: Add missing checks before using document, fix SEO rel canonical issue 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54829 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-15 15:03:48 +00:00
konstantina.galouni c6b84c171e [trunk]: Remove unnecessary logs from library.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54775 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-14 10:15:44 +00:00
argiro.kokogiannaki dfdc601812 [Library] update SEO service: rel canonical tag work also for server side| update method signature
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54748 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-11 15:03:38 +00:00
argiro.kokogiannaki 78d4bb3f7d JSONLD:
add jsonld in all pages (advance, table view, link, deposit)
	for search pages assign SearchResultsPage representation
	for other pages assign Website

SEO service:
	add a service that updates the rel canonical url (in client side)
	call the service in each page



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53740 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-14 10:38:53 +00:00
argiro.kokogiannaki f86a8891df jsonld:
move files in  sharedComponents/schema2jsonld/model - not used only in 
	add Organization,  use JsonldDocument as the default class and extend Dataset and Organization
	add jsonld in  search-find, org/datasource/project landing

Claims: add limit in the number of results allowed to add in the basket 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53724 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-12 15:36:20 +00:00
konstantina.galouni 9f688a2946 Rename 'ErrorCodes' class to 'LoginErrorCodes' of login/utils/guardHelper.class.ts
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53612 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-01 17:20:05 +00:00
argiro.kokogiannaki b0b1af6a04 Linking:
1. When linking is from connect, add community in the basket if there is not
	2. My links add separate section with the recent claims (24h)
	3. In recent claims add tooltip with information about the link visiblility in the index
	4. Add section on the right with the link to create more and a link to claims information article
	5. Add link to claims information article to the properties



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53553 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-25 09:33:56 +00:00
argiro.kokogiannaki 6fe9bad457 submit facelift css changes part 2
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53379 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-03 14:12:42 +00:00
argiro.kokogiannaki deffcceed8 Changes in claim componets to support ORP
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52837 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-30 14:22:19 +00:00
argiro.kokogiannaki 19a26a399b Claims:
change forms layout (context, projects)
   apply layout changes in direct linking page
   add localstorage prefix for saving the user selected list
   when removing a selection- also update localstorage lists
   add helpers as a tooltip in projects, context and result forms
   smaller table in display claims components
   


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52820 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-25 13:56:02 +00:00
argiro.kokogiannaki fa10080fb0 Claims: Context Search form:
alphabetical order for communities
	preselect community id for connect 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52704 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-06 13:35:03 +00:00
argiro.kokogiannaki 420b3cefd6 Claims:
Change add more links to claim more links
Claims Administrator to manage claims
Use searchTermStream and delay when type keywords to search for claims -> avoid errors in API
Bulk Claim: add line info for duplicate, not found and invalid ids.

Add a check for reload after login


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52613 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-29 11:01:48 +00:00
argiro.kokogiannaki 31614c2cb5 Bulk claim:
add filetype ckecks
	correct messages
	add more checks when the file has no valid format

Login: add a check for empty cookie



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52501 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-15 12:58:58 +00:00
argiro.kokogiannaki d5b745fc65 Single Sign On: Changing cookie names, format, remove unused methods
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52451 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-12 11:15:42 +00:00
argiro.kokogiannaki aa6d6d8b49 Layout Changes in claims
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52426 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-11 08:20:32 +00:00
argiro.kokogiannaki e392e754fc Natalias layout changes| change buttons to uk-button-danger|
Check for title in landing pages before update page title
In claims: add no title avalable check in selected results | add a label 'added' when a result/concept is selected



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52309 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-01 12:28:49 +00:00
konstantina.galouni 16406f04d4 1. Add pipe for numbers.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52096 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-18 12:47:26 +00:00
argiro.kokogiannaki a1c223bd78 Claim Search: add parse method(optionally) in all search services for claim search(orcid, datacite, crossref), use common response as an array of ClaimResult | use common component to show those results | transform openaire results to ClaimResult class | enhance Orcid result with DOI with info got from crossref
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51910 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-03 09:58:30 +00:00
argiro.kokogiannaki 8167f5411c Change Orcid API, parsing and display
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51902 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-02 12:26:54 +00:00
argiro.kokogiannaki 2c201089be add piwikId in missing deposit components | remove class from div ids
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51858 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-21 15:20:09 +00:00
sofia.baltzi 881ea5443d Replace meta service import and use with meta and title from angular/platform-browser for user, publication, claimAdmin,claimsByToken, directLinking, linkingGeneric, myClaims, depositBySubject, depositBySubjectResult, deposit, depositResult, dataProvider, htmlProjectReport, organization, project, software, search, advancedSearchPage, searchPage and searchPageTableView component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51835 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-17 13:00:23 +00:00