Commit Graph

59 Commits

Author SHA1 Message Date
k.triantafyllou 8b6b61f9c3 [Library | Trunk]: 1. New view for search results. 2. Add highlight component but currently is not enabled. 3. Change access mode value from classid to classname
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58064 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-07 13:05:07 +00:00
konstantina.galouni 9dea633bd8 [Trunk | Library]: project.component: [Bug fix]: In widget (functionality to import research results - right column of page), fix content for software and other (src without line change).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57855 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-11 11:13:57 +00:00
konstantina.galouni 7157e358a2 [Trunk | Library]:
1. Project Landing Page: Add all types of research results (publication, dataset, software, other) in the box, in the right column of page and redesign it (UI/UX).
2. common-assets/library.css: Add classes 'researchResultTypeSelected' and 'researchResultTypeNotSelected'. Used by Project Landing Page.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57853 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-10 14:45:13 +00:00
argiro.kokogiannaki e3722b648d [Library|Trunk]
SEO:
   revove 'OpenaAIRE | ' prefix from page title and metatags
   don't truncate the title
   truncate description to 160 characters




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57820 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-05 16:07:07 +00:00
argiro.kokogiannaki 2e7f7d7c38 [Library|Trunk]
Metric charts: 
	increase values number from 30 to 80, 
	IN X-AXIS show the date every 6 values


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57806 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 12:56:37 +00:00
konstantina.galouni 90f748f8e6 [Trunk | Library]:
1. error.module & errorPage.component: Set canonical url to '/error'.
2. dataProvider.component & organization.component & project.component & resultLanding.component: Use 'location.path(true)' for page parameter in error navigation.
3. organization.service: [Bug fix]: Initialize 'objIdentifier' field only when an organization was found.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57536 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-07 09:51:09 +00:00
konstantina.galouni 9a6031d28e [Trunk | Library]:
1. landingPages/: When no id is specified or id is not found (search service returns 404), redirect to /error with more specific message.
2. error/errorPage.component.ts: When the error was caused by landing pages, add more specific message - suggest to search again.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57494 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-31 11:39:23 +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 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 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 2c715bdb62 [Library|Trunk]
LAnding pages:
	SEO - css changes :
		remove width-expand: not working for bots/no js)
		add margins where needed (mobile screen)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56759 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-25 10:43:08 +00:00
k.triantafyllou 7ec51c1a83 [Trunk|Library]: Landing pages: move helpers out of the grid.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56735 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 14:04:49 +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
argiro.kokogiannaki e06cc5ae70 [Library|Trunk]
Project landing: correct new line in the code of  widget script



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56510 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-12 12:27:32 +00:00
argiro.kokogiannaki 873f0dccb4 [Library|Trunk]
landing pages:
	in isRouteAvailable method pass correctly the route --> link to reappear for explore




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56136 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-20 11:29:37 +00:00
argiro.kokogiannaki 504fdfaa3c [Library|Trunk]
Changes for Aggregator portal:
	use a customFilter in search pages, and pass it through the components
	for landing  pages check if a route is available in order to add linking and deposit links



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56059 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-12 14:13:56 +00:00
argiro.kokogiannaki 39bd1e836c [Library|Trunk]
add spaces {{" "}} in landing page (lost in ang 7)
	add icon for sherpa information
	Orcid: add icon, show when != production, mode on click



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56008 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-06 10:02:37 +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
argiro.kokogiannaki 2dd9935734 [Library|Trunk]
Properties
	add link to software landing page

Rel Canonical change:
In landing pages:
	for results: use the objIdentifier in relcan (in case the request is from a dedup id)
	in all landing: when the record not found use the simple search link tfor the relcan
	



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55949 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-03 08:53:57 +00:00
konstantina.galouni c3ab3b18fa [Trunk|Library]: Use scroll function from 'HelperFunctions' class (utils folder).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55418 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-24 12:31:01 +00:00
konstantina.galouni 0095d9c832 [Trunk|Library]:
1. #4256: Organization Landing Page: Bug fix in request of "Project Publications CSV file" - use double quots instead of single.
2. Organization Landing Page: Projects section: Bug fix in "View all" link - link to projects advanced search page instead of publications.
3. htmlProjectReport.service & organization.component & project.component & 
   searchDataproviders.service & searchDatasets.service & searchOrps.service & searchPublications.service & searchSoftware.service:
	Add double quots in requests with "exact" matching.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55158 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-02 15:33:01 +00:00
k.triantafyllou 9627d08570 Duplicated code blocks has been cleaned in library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54903 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-25 15:28:14 +00:00
konstantina.galouni 8c25f2bd27 [trunk]: Library:
1. Fix error logs in Landing, Deposit and Search Pages.
2. errorMessages.component: Add method to check status of response and return error code according to 'ErrorCodes' class.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54825 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-15 12:50:24 +00:00
konstantina.galouni f980a6cbe3 [trunk]: Explore: bug fixes for previous commit (remove logs)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54779 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-14 10:52:06 +00:00
konstantina.galouni c96508cc15 [trunk]: Library + Explore: Remove unnecessary logs.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54778 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-14 10:44:30 +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 8cf5067803 Update meta descriptions in landing pages
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54737 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-08 12:19:26 +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
konstantina.galouni 7d6f6f5297 Organization & Project landing page: change how CSV buttons/links work to set filename and avoid browser popup blocker.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53731 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-13 10:28:27 +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 604b1235be Project Entity (landing & search): Add 'Open Access Mandate' information for Research Data (field 'ecarticle29_3') & specify when 'Open Access Mandate' refers to Publications or Datasets.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53543 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-23 13:11:25 +00:00
konstantina.galouni fc82a3719a 1. Add 'lastIndexInformationLink', 'showLastIndexInformationLink', 'widgetLink' properties.
2. depositPublications.component, dataProvider.component, project.component: Use 'statisticsFrameAPIURL' for map and statistics tab instead of raw url.
3. project.component: Use 'widgetLink' for dynamic html in appbox instead of raw url.
4. Add 'lastIndexInformationLink' button when 'showLastIndexInformationLink' is true in search pages (Search Find, Search {Entity}, Advanced Search {Entity}, Search table view).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53475 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-16 11:21:56 +00:00
argiro.kokogiannaki 723ce9adf9 set properly footer images, update charts size to fit in the tabs, rephrase to 'Select this citation style'
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53456 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-15 10:47:43 +00:00
argiro.kokogiannaki 85cfbd56b8 submit facelift css changes part 6
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53392 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-04 18:33:16 +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 b0193ef255 submit initial facelift css changes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53353 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-01 15:02:14 +00:00
argiro.kokogiannaki e14e81269d check before unsubscribe in landing and search/find, change the cookie link in app component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53026 d315682c-612b-4755-9ff5-7f18f6832af3
2018-09-05 12:37:47 +00:00
konstantina.galouni 5ccba9adaf 1. Dataprovider Landing Page: Add 'Other Research Products' tab | Add request for 'Other Research Products' in 'Related Content Providers' tab
| Bug fix of operators in links to Advanced Search Pages | Bug fix in map of 'Related Content Providers' tab.
2. searchFields.ts: Bug fix in operators.
3. htmlProjectReport.component: Add case for 'Other Research Products'.
4. Publication & Dataset & Software & Other Research Product Landing Pages: add case for 'Other Research Products' in 'Similar Research Results' and 'Related Research Results' tabs.
5. Project Landing Page: Add 'Other Research Products' tab.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52828 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-26 16:38:59 +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 eef4be71f2 Landing Pages changes: info titles on right, hide metrics short version, show message no metrics available when numbers are zeroes, parse contexts of type community OR RI, change linking FAB set in the middle
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52769 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-19 10:47:21 +00:00
argiro.kokogiannaki f3c0682eb2 Clean up utils/properties/searchFields.ts
Add operator for each parameter
change the way operators were produced: use 1st and 3rd letter if the operator is unique
Change the operator parameter in all pages that have links to advanced search



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52676 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-05 10:52:42 +00:00
konstantina.galouni 2220677d99 1. Landing pages: before a request for the main content (e.g. publicationInfo) is executed, make this content null.
2. Landing pages: 'Available on' and 'Funded by' (Decapitalize first letter of second word).
3. Landing pages: Add 'Related identifiers' label for identifiers information.
4. Landing pages: 'OPEN', 'OPEN SOURCE', 'EMBARGO', 'RESTRICTED', 'Closed' accessmodes are acceptable for 'Available on' section. Otherwise show 'UNKNOWN ACCESSMODE'. 
5. Publication & Dataset & Software landing pages: remove url from title - use separate variable for best accessmode, add country information.
6. Software landing: Add 'programmingLanguage' information.
7. SearchResult & TabResult: Add country information for Publication & Dataset & Software type of results, add programmingLanguage for Software type. 
8. TabResult: Show language and types information.  
9. Bug fix in 'dateofacceptance' parsing for relates/similar research results (landing pages).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52606 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-28 14:52:45 +00:00
konstantina.galouni e30d69993f 1. Landing pages: Rename 'Other Metrics' to 'Metrics' in appbox.
2. Landing pages: In tabs which need extra query, do not show 'view all' option until status is DONE (not as soon as totalResults > 0 -> set by count query).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52424 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-10 23:25:33 +00:00
konstantina.galouni 03b8781720 1. Landing pages: tabs changed to 'uk-accordion' with custom css.
2. Remove 'uk-animation-fade' class from tabResult.component.
3. When errorMessages.component is used in landing pages' tabs, remove 'uk-animation-fade' class and add 'uk-margin-top' class.
4. First tab with extra query is closed too -> count query first -> add method in fetchPublications.class and case in searchPublications.service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52401 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-08 11:21:42 +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