Commit Graph

294 Commits

Author SHA1 Message Date
konstantina.galouni 4d6d459f41 [Trunk | Library]:
1. community.service.ts: Mark unused method "isSubscribedToCommunity()" as "deprecated" (This service calls community API - made in Italy, not uoa-admin-tools - made in Greece).
2. connectSubscriber.guard.ts: Call "isSubscribedToCommunity()" method from "subscribe.service.ts" (not "community.service.ts").
3. curator.service.ts: getCurators(properties: EnvProperties, url: string) --> getCurators(properties: EnvProperties, emails: string): Build path for request in service.
4. email.service.ts: Build request path in service
	a. sendEmail(url: string, email: Email) --> sendEmail(properties: EnvProperties, email: Email)
	b. contact(url: string, email: Email, recaptcha: string = null) --> contact(properties: EnvProperties, email: Email, recaptcha: string = null)
	c. Create method "notifyForNewManagers(properties: EnvProperties, communityId: string, email: Email)" (sendEmail was used for everything).
5. subscribe.service.ts: 
	a. subscribeToCommunity(pid: string, email: string, url: string) --> subscribeToCommunity(properties: EnvProperties, pid: string, email: string)
	b. unSubscribeToCommunity(pid: string, email: string, url: string) --> unSubscribeToCommunity(properties: EnvProperties, pid: string, email: string)
6. layout.service.ts: getLayout(communityId: string, url: string) -->  getLayout(properties: EnvProperties, communityId: string): Build path for request in service.
7. feedback.component.ts: In method "contact" from "emailService", build request path in service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58420 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-07 14:57:26 +00:00
argiro.kokogiannaki 5a1f545b52 [Library|Trunk]
Search Find:
	count query: use /resources2, use newSearchPage method, for creating the parameters (DOI, orcid, quotes)
	count outcomes: add open access filter
	fix keyword parameters
	for the active tab, initialize results total number with null



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58416 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-07 11:11:31 +00:00
argiro.kokogiannaki 55c77ca0cb [Library|Trunk]
Apply changes from Elixir branch r58296
	add impact factors:
		parse DOI for search results
		make a call to bip finder API to get impact factors
		show impact factors in search results (for community elixir-gr & dev)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58413 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-06 14:49:38 +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 cd6642d7b2 [Trunk | Library]
1. result-preview.component.html: [Bug fix] fixes in spaces between comma separated values.
2. dataProviderInfo.ts & dataProvider.service.ts: Add and parse also acronym for "organizations".
3. searchProjects.service.ts & searchDataproviders.service.ts: If organization has no name, add "[no title available]".
4. dataProvider.component.ts: initialize "showNumOrganizations" to 20 | [Bug fix] Initialize and count all tabs no matter what the type is.
5. dataProvider.component.html: 
	a. Show acronym for organizations and name in tooltip | 
	b. [Bug fix] date for "Last update of records in OpenAIRE" under the card in right column of page.
	c. [Bug fix] In statisticsTab pass inputs for fetchSoftware and fetchOther.
6. statisticsTab.component.ts: [Bug fix] New inputs for fetchSoftware and fetchOther - pass their status in errorMessages | no checks for showing charts (needs more investigation).
7. project.component.html: 
	a. [Bug fix] date for "Last update of records in OpenAIRE" under the card in right column of page.
	b. [Bug fix] For statistics check also fetchSoftware and fetchOther.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58284 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-17 10:04:17 +00:00
k.triantafyllou 276e467b4f [Library | Trunk]: 1. Merge from landing redesign. 2. Close modal on show Authors.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58275 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-16 13:09:46 +00:00
argiro.kokogiannaki b28f08e4b8 [Library|Trunk]
Use searchDataproviders Component for Deposit, Registries, Journals and Compatible pages
Update searchDataproviders Component to support the above search pages

Entities autocomplete: show "no title available" when the entity with the selected id is not found  




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58244 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 17:03:35 +00:00
konstantina.galouni 3045d7afec [Trunk | Library]:
1. searchResearchResults.service.ts & resultLanding.service.ts: Do not stringify null or undefined value for description.
2. claimResultSearchForm.component.ts: Do not stringify null or undefined value for accessRights.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58234 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 10:46:02 +00:00
konstantina.galouni 0c2258e04d [Trunk | Library]:
1. searchResult.ts: "description" is parsed for all entities except from "organization".
2. searchProjects.service.ts & searchDataproviders.service.ts: Parse "description" (for "projects" it is "summary")
3. searchResult.component.ts: Default value for "showSubjects" set to true.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58233 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 10:44:51 +00:00
argiro.kokogiannaki 803826efd3 [Explore|Trunk]
New Search:
	search all: add back entites selection
	advanced search: 
		css changes for date field
		change result date query to " within "
		use new URL parameters - keep order
		




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58173 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-04 12:42:52 +00:00
argiro.kokogiannaki 1909165ad8 [Library | Trunk]
Search Queries for datasources & organizations: add Compatibility 4.0



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58143 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-26 11:24:50 +00:00
konstantina.galouni d292a3e1ed [Trunk | Library]:
1. searchDataproviders.service.ts & searchOrganizations.service.ts & searchProjects.service.ts: Remove 'type' parameter from request.
2. newSearchPage.component.ts: 'type' parameter is added for every type (not only for results).
3. entitiesSelection.component.ts: [Bug fix] For content providers: value="dataprovider".
4. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts: Initialize "csvParams" correctly according to queries built in search pages (search redesign).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58132 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-24 13:45:22 +00:00
konstantina.galouni e11f388087 [Trunk | Library]:
1. resultLanding.service.ts & searchResearchResults.service.ts: [Bug Fix] When parsing title, we stringify it. Make sure we do not stringify values: undefined.
2. searchResearchResults.service.ts: Changed "sortby" parameter to match /resources2 api format (search redesign).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58128 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-24 13:19:16 +00:00
argiro.kokogiannaki 0200a0922c [Library|Trunk]
New Search:
	add search All component 
	update Search pages to work from search all component



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58115 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-19 15:35:48 +00:00
konstantina.galouni 64df17d834 [Trunk | Library]: Filters according to new UI/UX design.
1. utils/rangeFilter/: range filters added to describe year range queries (currently used in types: result & project).
2. utils/properties/searchFields.ts: 
	'uniqueValue: boolean' changed to 'filterType: string' with value among: null (if this is not a range/refine filter), radio, checkbox, range.
	RANGE_FIELDS added for each type needed.
	'fieldHasUniqueValue()' method renamed to 'getFieldFilterType()' method.
	'getFieldParam()' method added.
3. utils/properties/searchFields.ts & services/servicesUtils/refineResults.class.ts & searchPages/searchUtils/searchHelperClasses.class.ts
   & searchPages/dataProviders/ & searchPages/searchDataProviders.component.ts & searchPages/searchOrganizations.component.ts: 'filterType' field is used.
4. searchPages/searchProjects.component.ts & searchPages/searchResearchResults.component.ts: Initialize and use in calculations range filters.
5. searchPages/searchUtils/searchFilter.component: Update filters to match redesign & use them everywhere (not special case if search or deposit).
6. searchPages/searchUtils/newSearchPage.component: Update filters to match redesign and add range filters.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58105 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-17 14:19:14 +00:00
k.triantafyllou c004a7939f [Library | Trunk]: Fix entity type in parse results.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58102 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-14 15:08:54 +00:00
argiro.kokogiannaki 9da07c3568 [Library|Trunk]
New Search pages:
	1. update queries to use new method in API /resources2?type={publications,datasets,software,other,projects,organizations, datasources}
	2. add Entities Selection component and add it Simple, Advanced pages
	3. Quick Selections update: add check for enabled entities 
	4. Update simple search form and advanced according to the mocks



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58093 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-13 14:44:51 +00:00
argiro.kokogiannaki cce694ca7f [Library|Trunk]
New Search:
	Create pages for project, organizations, datasources
	Add checks in new search page 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58073 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-11 14:56:20 +00:00
argiro.kokogiannaki 32e65be516 [Library|Trunk]
New search page:
	Search research outcomes page:
		 1. add selection for result types
		 2. add Open Access as quick filter
	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58072 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-11 11:58:51 +00:00
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
argiro.kokogiannaki 908712ed50 [Library|Trunk]
Search Pages:
	when refine filters have no result, Show them on the left
	create filters using the URL params



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58052 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-04 13:27:42 +00:00
argiro.kokogiannaki 07bdf020ba [Library|Trunk]
Create new search page with unified simple and advanced search pages
	- use  advanced search form 
	- add fields/ code in advance form to support simple view
	- add links for research result search pages in properties
	- searchResearchResults.service: add refine fields in advanced search



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58045 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-31 15:12:51 +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 66e46004b8 [Library| Trunk]
dashboard:
	move sidebar under library
	use menuItems class & add new fields needed


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57935 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 12:52:26 +00:00
k.triantafyllou 7737db5778 [Library | Trunk]: User Management service: Add a lock to allow only one call for get user info.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57933 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-23 10:18:57 +00:00
argiro.kokogiannaki e955a799e5 [Library| Trunk]
Transfer admin tool components in library & update the theme 
        - divId
        - entity
        - portals/communities



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57916 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-18 15:14:21 +00:00
k.triantafyllou a5d082d260 [Library | Trunk]: Fix a bug on user management service; Make dropdown on user menu same with indicator cards dropdown
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57885 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-15 12:44:20 +00:00
k.triantafyllou c6186bb738 [Library]: Change userInfo: Make request only if subject is null(and token exists). After every navigation check token existance
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57788 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-03 09:49:10 +00:00
argiro.kokogiannaki 91c596f37c [Library |Trunk]
add methods gor gettings total number of results linked with publications


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57551 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-08 13:44:00 +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 4316c70b9a [Library]: Add check if isClient to getUserInfo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57545 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-08 11:01:50 +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 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
k.triantafyllou 8e7a67932c [Library]: Layout Service: remove community from url in methods. Slould add it on the component.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57317 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-08 14:16:15 +00:00
k.triantafyllou 23cb60446a [Library]: Layout Service: Fix some issues.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57311 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-08 13:37:11 +00:00
k.triantafyllou 52b34e317d [Library]: Fix layout service with new methods.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57307 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-08 10:56:04 +00:00
argiro.kokogiannaki 09d5c5a6d6 [Library|Trunk]
Advance search Page: Refine Fields query 
	add special parameter "sf" for funding level fileds to get all values not only top-100



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57254 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-03 14:10:13 +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 d0afb3ab36 [Library remove isLoggedIn from user management Service]
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57065 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-13 08:35:03 +00:00
k.triantafyllou 69c86456b8 [Library]: Fortgot to add service on svn.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57059 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-13 07:03:07 +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 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
konstantina.galouni 245ae5cd9f [Trunk | Library]: refineResults.class.ts: Add check for not including filter value if it is "Undetermined" (for language).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57004 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-09 10:47:46 +00:00
k.triantafyllou 3d79e469ef Library: Remove console.log from localStorage service.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56836 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-02 11:45:14 +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 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 3cc7d3a98f [Library|Trunk]
new theme: more chnages regarding the margins
	Filters: fix filters for table view 
	LAyout service: remove unused import



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56682 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 08:05:04 +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
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 fc58f9ac80 [Trunk | Library]: reports.service: Fix requests for csv files.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56115 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-19 12:33:13 +00:00
argiro.kokogiannaki caa40ef87e [Library|Trunk]
make the new parameter refineQuery in numOfSearchDataproviders of SearchDataprovidersService not required


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56094 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-14 13:27:46 +00:00
argiro.kokogiannaki f32cb4735a [Library|Trunk]
Custom Filter:
		pass custom filter in organizations, content providers and projects search pages
		search/find:
			for aggregators filter show also projects/ datasources/ organizations and pass the parameter for the query


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56091 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-14 13:06:58 +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
k.triantafyllou f079122f18 1. Add at tinyUrl at properties.ts. 2. Renamed curatorPhotoService to utilitiesService. 3. Add a isTiny function on HelperFunctions.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56013 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-06 10:51:39 +00:00
argiro.kokogiannaki db67453565 [Library|Trunk]
Landing Page - Organization:
		use objIdentifier for relcan, parse it and add it in OrganizationInfo class

	Datasource Refine Fields: add country


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56005 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-06 09:15:54 +00:00
argiro.kokogiannaki f5d29ffc76 [Library|Trunk]
add cache in some services and pass properties as parameter

	initiate a searchResearchResultsService where it gets result type as parameter

	update navbar/bottom to get properties as parameter and remove attributes included in properties

	add spaces in search results & authors components



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55995 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-05 13:33:18 +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 e3d0462f9d [Trunk|Library]: Bug fix: In Landing and Search Pages for results (publ, datas, soft, orp), make title string necessarily (may be number).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55955 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-03 09:52:26 +00:00
k.triantafyllou 10ed032ead [Trunk|Library]: 1. Add a new service for curator photo. 2. Add at properties url for curator download and delete photo. 3. Add a parameter at modal alert to disable ok button. 4. Add CuratorInfo.ts with curator and affiliation classes. 5. Add methods at curators service.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55945 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-02 18:52:26 +00:00
konstantina.galouni 54bc77b446 [Trunk | Library]: Landing and Search pages (services): Do not check and cut prefix of ORCID if included.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55900 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-29 13:25:51 +00:00
konstantina.galouni adfd6b568d [Trunk | Library]:
1. Create 'authors' folder in 'utils' to show authors, including dropdown with their ORCID information if available (used by landing & search pages).
2. Landing & Search Pages (services): Parse ORCID information of authors (creators) & cut it, if prefix is included. 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55899 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-29 12:24:43 +00:00
konstantina.galouni 9719595300 [Trunk|Library]: Bug fix: In Landing and Search Pages for results (publ, datas, soft, orp), make description string necessarily (may be number).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55589 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-17 12:10:13 +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 8bb75a388d [Trunk|Library]: LayoutService: remove unnesserary import
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55009 d315682c-612b-4755-9ff5-7f18f6832af3
2019-03-18 15:09:51 +00:00
k.triantafyllou 55693142a7 [Trunk|Library]: Add LayoutService
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55008 d315682c-612b-4755-9ff5-7f18f6832af3
2019-03-18 15:02:46 +00:00
k.triantafyllou ea267d003b [Trunk|Library]: CustomOptions.class.ts: clear code
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55005 d315682c-612b-4755-9ff5-7f18f6832af3
2019-03-18 12:58:02 +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 07e6e91f2c [Trunk|Library]: #4207: Research Data service & Orp servie & Publication service & Software service for search pages: Set author info in 'rank' position of table (instead of 'rank-1').
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54888 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-22 12:19:37 +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
konstantina.galouni f57ad6940a [trunk]: Merging branch 'changeDeposit' into trunk for revisions 54355:54751
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54755 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-12 11:15:21 +00:00
argiro.kokogiannaki c6922230c3 Advanced Search
limit query for organizations & datasources similar to simple search & landing
Organization Autocomplete:
	show legalname (legal short name)
Css: change dashboard buttons focus & active 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54461 d315682c-612b-4755-9ff5-7f18f6832af3
2018-12-19 14:07:02 +00:00
argiro.kokogiannaki 549778c2eb Properties
add property environment
	remove unused property production mode
	in navbar and bottom use environment property to show links to beta or production
Images: remove old images


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54347 d315682c-612b-4755-9ff5-7f18f6832af3
2018-12-13 09:21:26 +00:00
konstantina.galouni eb6b2ee67c 1. Add 'sorting' option by 'relevance' or 'date' in advanced search pages for results (publications, datasets, software, orps).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53937 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-23 12:32:28 +00:00
konstantina.galouni 0886a26ac9 1. Add 'sorting' option by 'relevance' or 'date' in simple search pages for results (publications, datasets, software, orps).
2. Add 'results per page' option in all simple search, advanced search and search table view pages.
3. Add 'sortBy' field in 'searchUtils.class'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53919 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-21 15:28:38 +00:00
argiro.kokogiannaki f17d4735ea Search/find
Add communityId 
	add community filter in search queries
advanced search - autocomplete
	add acronym and grant id in autocomplete for projects


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53860 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-19 10:15:13 +00:00
konstantina.galouni 2ef3d1b2cd searchDownload.component: CSV Download changed for search pages - link (<a> tag) added in document when service request succeeds.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53675 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-08 15:27:19 +00:00
argiro.kokogiannaki 68770e1c2b Move customOptions.class.ts in services/servicesUtils/ update filepaths in services using it
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53668 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-08 13:49:40 +00:00
argiro.kokogiannaki 0b67a62e64 Fix issue #3985: add url encoding in "q" parameter
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53593 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-30 11:37:52 +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 a211cc0713 1. Organization Landing page: Added COMMENTED (currently not used) code for 'Research Data' tab.
2. searchDatasets.service, fetchDatasets.class: Added cases for getting dataset results/count for organization entity (currently not used - possible usage from organization landing page).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52871 d315682c-612b-4755-9ff5-7f18f6832af3
2018-08-02 10:02:31 +00:00
argiro.kokogiannaki 0c0147f408 ORP landing: change link button text to link this product to
Search Advanced: smaller remove filter buttons
Search: when there are no numbers in filter hide sorting options
Cookie law: change session cookie(default) to expire in 3 months
Metrics: change string to numbers to be able to use > or ==



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52824 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-26 10:09:06 +00:00
konstantina.galouni 2196741bc4 1. Add landing, search and advanced search page with appropriate services for 'Other Research Products'.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52817 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-25 13:30:12 +00:00
konstantina.galouni 4b7b13f8c7 1. env-properties.json: Add 'searchLinkToOrp', 'searchLinkToOrps', 'searchLinkToAdvancedOrps' for Other Research Products.
2. Add 'Other Research Products' in menu.
3. Add routing paths for landing, search, advanced search page of Other Research Products.
4. Add 'Other Research Products' tab in '/search/find'.
5. searchResult.component.ts, refineFieldResults.service.ts, searchFields.ts, ISVocabularies.service.ts: Add cases for 'Other Research Products'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52816 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-25 13:27:22 +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 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 b0323c3ca6 fix the query for searching software dois in claims| clear result before a new search is done
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52236 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-25 13:07:18 +00:00
argiro.kokogiannaki b60ae2d33c Change organization query for datasources with native compatibility #3577
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52016 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-14 11:42:38 +00:00
konstantina.galouni 4bd5470468 1. env-properties.ts: 'baseOpenaireLink' field added, which is base url for OpenAIRE portal.
2. searchResult.ts: 'subjects' and 'englishname' fields added (used by dataproviders).
3. searchDataproviders.service.ts: parse 'englishname'.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51558 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-28 14:00:42 +00:00
konstantina.galouni 09017aee04 1. Change of SearchResult field for funders (used for project results):
instead of funders: {"funderShortname": string, "funderName": string}[]
	now: funderShortname: string // only 1 funder per project and we don't use the full name
2. Addition of SearchResult field for project results: acronym: string, code: string
3. Parsing of funders changed (searchProjects.service): when more than 1 funders in 'fundingtree', keep 'shortname' of the first one
4. Parsing of project's acronym and code parsed and stored in corresponding fields (not in the title.name)
5. Adjust new fields display in 'tabResult.component' and 'searchResult.component'



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51317 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-16 14:54:44 +00:00
konstantina.galouni 410954e830 1. searchDataproviders.service: compatibility field always in results.
2. Bug fix in datatable of 'searchPageTableView' component.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50992 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-01 13:14:35 +00:00
konstantina.galouni 114c3b2004 1. Language parsed in 'Software' and 'Dataset' Landing
2. Added check if 'bestaccessright' is undefined in search pages and landing pages
3. Small fix in 'available on' component used by landing pages
4. Helper component and service updates - 'position' and 'before' inputs are for page contents, 'div' is for div contents
5. Search page gets page contents properly (check case if CSV button is shown)
6. Checks for functionality of div contents in 'claimContextSearchForm' component and 'claimProjectSearchForm' component


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50728 d315682c-612b-4755-9ff5-7f18f6832af3
2018-02-13 14:52:23 +00:00
argiro.kokogiannaki 91b7c11f0a USe a json file to read properties | replace openaire Properties | parameterize menu (use params, community, ) | parameterize search pages (hide community information)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50586 d315682c-612b-4755-9ff5-7f18f6832af3
2018-02-05 13:14:59 +00:00
argiro.kokogiannaki 86e750754b Commiting first draft of openaire library for angular portals
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50169 d315682c-612b-4755-9ff5-7f18f6832af3
2017-12-19 12:53:46 +00:00