konstantina.galouni
6a94908622
[Trunk | Library]:
...
1. searchResult.component: Removed field 'dividerNotCard' added to show results in card or not (added in r58717) - result-preview is used instead.
2. tabs.component.ts: Removed class 'uk-width-3-4' from 'main-tabs'.
3. project.component: [Landing redesign]:
a. Add field 'public searchNuumber: number = 5;' to set how many results to search and display.
b. Use '<result-preview' instead of 'search-result'.
c. Fix margins and paddings in page to align app box with right column in tabs.
d. Show open access mandate (not in labels) only for 'No'.
e. Move update date next to openaire graph.
f. Add class 'user-actions' in ul in app box (right box of page) and set margins.
g. Add class 'basic-info' in ul for basic information (set margin).
h. Get indexUpdateDate from service if available.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58724 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-19 15:59:20 +00:00
konstantina.galouni
d1521f8802
[Trunk | Library]:
...
1. searchResult.component: Field 'dividerNotCard' added to show results in card or not.
2. project.component: Initial commit for landing pages redesign (more to follow).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58717 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-18 23:40:14 +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
argiro.kokogiannaki
680fd86008
[Library|Trunk]
...
Linking:
Display claims add card
last index info: update the service
Search:
update last index info link with "uk-button class"
Deposit:
smaller margin
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58666 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-11 11:05:02 +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
326a590743
[Library|Trunk]
...
Impact factors:
add url in property
add cache
if there is no property won't do the request
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58628 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-07 10:50:15 +00:00
argiro.kokogiannaki
bde482bd00
[Library|Trunk]
...
Search pages and table view components: add breadcrumb when it not only results displayed
Deposit: remocve a margin
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58625 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-07 10:26:38 +00:00
konstantina.galouni
dad915f543
[Trunk | Library]:
...
1. newSearchPage.component.html: [Bug fix] Remove <search-download> which was duplicate in small screens - Download visible above paging always.
2. rangeFilter.component.html: Range buttons changed to links - library.css changes needed (refactor code when possible).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58608 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-05 17:12:29 +00:00
argiro.kokogiannaki
c4addc2f13
[Library|Trunk]
...
Linking:
rename entity type to Result type
Deposit:
First page:
remove border
remove small text in first section paragraphs
remove padding from search form
Search:
go to first page when keyword changes
keep filters when keyword changes
Impact Factors:
update text (Exceptional,Substantial,Average)
Search bar:
pass parameters for advanced search
init keyword from params
if page not among search pages ignore keyword
when change to other entity clear parameters
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58606 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-05 16:21:31 +00:00
k.triantafyllou
81240f9325
[Library | Trunk]: Remove Unknown values for every enviroment. Also add this restriction to filters.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58602 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-05 14:09:18 +00:00
konstantina.galouni
d8e31242e8
[Trunk | Library]:
...
1. subscribe.service.ts: Remove unnecessary prints.
2. newSearchPage.component.ts: Set default value for field 'sort' to true.
3. newSearchPage.component.html: In <search-sorting> bind entityType parameter.
4. searchResearchResults.component.ts: Remove data binding for 'sort' in <new-search-page>.
5. searchProjects.component.ts & searchOrganizations.component.ts & searchDataProviders.component.ts: Add data binding [sort]="false"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@58594 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-05 08:46:10 +00:00
argiro.kokogiannaki
7b48445a55
[Library|Trunk]
...
Impact factors:
update according to the mocks
show them also in beta
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58591 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-04 14:11:50 +00:00
konstantina.galouni
b4fd5d7892
[Trunk | Library]:
...
1. dataProvider.component.html: Show 'Related Content Providers' only when there are results (publications and/or datasets and/or software and/or other).
2. searchFilter.component.html: Use 'filterValuesNum' field for method 'getSelectedAndTopValues()'.
3. searchFilter.component.ts: Default value for 'filterValuesNum' field changed from 4 to 6.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58568 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-28 10:07:53 +00:00
argiro.kokogiannaki
cc5813a5d6
[Library|Trunk]
...
New search page:
updates to work with communities (add search image, community-search-result)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58566 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-28 08:03:40 +00:00
argiro.kokogiannaki
f3c6ac3638
[Library|Trunk]
...
Deposit :
add breadcrumb
light blue background
title & forms changes
new zenodo button
Search pages: remove route from last breadcrumb
SearchBar: show advanced search only if tthe current route is search
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58563 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-27 12:54:48 +00:00
argiro.kokogiannaki
7f1862dbab
[Library|Trunk]
...
Search:
-Entities Selection: add check if route is enabled
-Delay in result types checkboxes to 2 s
-Use breadcrumb component
-add connect background
-remove space between names in showAuthors component
-Filters:
-message about top 100 always visible
-rename to view all
-change css for search input
-show 100 if results > 95
-view less under the 2nd list
-Search bar:
-select contains all avaliable entities not only search results
-
Landing pages:
-correct issue with pmid in landing
-correct issue with date in cite this
-Hide Addthis:
value in properties
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58552 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-27 08:14:05 +00:00
k.triantafyllou
221f37f360
[Library | Trunk]: Add height match on community results
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58551 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-26 09:14:59 +00:00
k.triantafyllou
6f5d69e61f
[Library | Trunk]: Change view of communities results base on mocks
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58547 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-24 16:32:00 +00:00
argiro.kokogiannaki
e142a4d6ab
[Library|Trunk]
...
Footer: options for centering contents and have dark or light background
Table View: change parameter to fv0
Searchbar, Entities Selection: clean up logs
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58530 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-23 13:21:39 +00:00
argiro.kokogiannaki
777074d274
[Library |Trunk]
...
Apply corrections after initial connect update :
Search all: remove quick selections as it is inside the search page
Search results: add option to show advanced search link
QuickSelections: fix widths and margins
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58525 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-23 07:33:23 +00:00
argiro.kokogiannaki
bfc49c0e18
[Library|Trunk]
...
Connect - Production release with links to beta: Connect helper ignore community id in domain if in production
Search Page:
option to include breadcrumb
show quickFilters for only results view
Quick Filters:
one line if they fit
Entities Selection Component:
add option to show only result types
add check if different result types are enabled
Add search bar component:
select different result types
Navbar: apply changes for searchbar to fit
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58517 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-22 13:00:13 +00:00
argiro.kokogiannaki
8eb43945ce
[Library|Trunk]
...
New Search pages: apply fixes for advanced search query
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58504 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-16 09:30:31 +00:00
konstantina.galouni
5bdb42f471
[Trunk | Library]:
...
1. entitiesAutoComplete.component.ts: [Bug fix] Add missing encoding in autocomplete term (problem when query uses cache).
2. newSearchPage.component.ts:
a. [Bug fix] Add missing keyword encoding for simple search form (problem when query uses cache).
b. [Bug fix] In advanced search, when "all fields" (field id="q") is added more than once in form, add both values (params "+=" and not "=" in "getSearchAPIQueryForAdvancedSearhField()" method).
3. searchAll.component.ts: Decode keyword parameter from url (to show it properly in search form).
4. searchAll.component.ts:
a. [Bug fix] Add missing encoding in search term, used by datacite, crossref and orcid search services (problem when query uses cache).
b. In methods of crossref service pass properties, instead of url - url will be built in service.
5. searchCrossref.service.ts:
a. In all methods, pass properties, instead of url.
b. Use cache when available.
6. ISVocabularies.service.ts: [Bug fix]: Return "accessMode.json" vocabulary when: entity == "result" (case added in if statement).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58497 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-15 18:54:56 +00:00
argiro.kokogiannaki
f1fa706299
[Library|Trunk]
...
Connect related changes:
1.community search results: production link goes to beta
2. add isActive fin stats display class
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58470 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-10 09:45:20 +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
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
a8cbb7e963
[Library|Trunk]
...
Result Landing: Fix link for softwrae
Search all: fix communityId typo
Advanced Search form: pass customFilter
Entities Selecton: pass custom Filter, add checks for RCD don't show drop down if only one option
Search page: link to openaire- pass same parameters as the filters
Search table view:
filters, paging, form similar to search pages, add entities selection
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58391 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-03 16:00:19 +00:00
argiro.kokogiannaki
5b6015f404
[Library|Trunk]
...
Table view:
apply changes of new search design (form, filters, mobile off-canvas view for filters)
fix issue with search utils exception
remove unused helper position, keep only top
Library.css: move there off-canvas-white css
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58377 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-02 09:52:57 +00:00
argiro.kokogiannaki
84cf96efa7
[Library|Trunk]
...
Search download component: remove private from downloadURLAPI variable (for build:ssr)
search page: remove depricated parameters for search download component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58358 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-31 09:07:21 +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
konstantina.galouni
fe4178cdca
[Trunk | Library]:
...
1. searchProjects.component.ts: Initialize range filters only on first load (bug fix for flickering range filtes on page/query change).
2. searchResearchResults.component.ts: Initialize range filters only on first load (bug fix for flickering range filtes on page/query change) | set "loadPaging" to true when params change.
3. searchDownload.component.ts: Added input field "isDisabled" and disable button when it is true (bug fix for missing or flickering button).
4. rangeFilter.component.html: Disable inputs and buttons when "isDisabled" is true.
5. newSearchPage.component.html: Update input parameters for <search-download>.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58351 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-28 00:33:55 +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
9be356020b
[Library|Trunk]
...
Search pages:
(completing previous commit) ... 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@58332 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-26 12:19:48 +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
6ea3e7c11f
[Trunk | Library]:
...
1. rangeFilter.component.html: Disable button if form is invalid or not dirty (unchanged).
2. loading.component.ts: Added loading gif and <ng-content>.
3. searchResult.component.html: Add class "uk-margin-top" in <ul> (in order to align filters and results).
4. searchFilter.component.html: [Bug fix] class in <ng-container> does nothing. Move class="uk-animation-fade filterItem searchFilterItem uk-text-small" to <div> element (in view more).
5. newSearchPage.component.ts: Close offcanvas for filters (in small screens) when query changes.
6. newSearchPage.component.html: Align filters and results | Use same code for filters in all screens (<ng-template #filters_column>).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58326 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-24 15:40:51 +00:00
k.triantafyllou
e5ef1ceaf7
[Library | Trunk]: Add external link on advanced buttons and open new tab
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58318 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-23 13:44:17 +00:00
argiro.kokogiannaki
0982dec4c3
[Library|Trunk]
...
Search all: use route instead of location.pathname in order to work when the base url is not "/"
Advanced search:
fix sizes and spaces
autocomplete margin
date filter sizes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58287 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-17 16:16:21 +00:00
konstantina.galouni
fce59b45d8
[Trunk | Library]:
...
1. project.component.html: [Bug fix] In <landing-header> if name but not acronym exists, do not show [no title available].
2. searchFilter.component.html: [Bug fix] In sorting filters, select and mat-select needs class "uk-width-expand".
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58277 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-16 14:42:11 +00:00
konstantina.galouni
3917ea8bb7
[Trunk | Library]:
...
1. newSearchPage.component.ts: [Bug fix] 'lastIndex' input field was missing.
2. rangeFilter.component: [Bug fix] Add method 'stringToNum()' for 'filter.selectedFromValue' and 'filter.selectedToValue'.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58268 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-16 10:06:47 +00:00
konstantina.galouni
aec9795ebd
[Trunk | Library]: searchFilter.component.html & searchResultsPerPage.component.ts & searchSorting.component.ts & citeThis.component.ts: [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@58258 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-13 16:11:36 +00:00
argiro.kokogiannaki
cea0278008
[Library|Trunk]
...
New search page:
remove class "uk-position-cover" for deposit search page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58254 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-13 15:30:48 +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
k.triantafyllou
91a6a82977
[Library | Trunk]: Merge search results from branch.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58241 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-12 13:49:10 +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
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
42cc5c66ee
[Library|Trunk]
...
Search:
Search all: update tabs css
Advanced Search Form:
change select to mat-select
changes for publication date field
Entities Selection: on simple search navigate when entity changes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58181 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-05 13:21:01 +00:00
konstantina.galouni
204ac6eed6
[Trunk | Library]: searchFilter.component.html: [Bug fix] search in filters (in view all functionality) was not working - results were not filtered.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58179 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-04 16:44:50 +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
2694761594
[Library|Trunk]
...
New search
update keywords query: identify PID, specific query for each pid
Entities selection: change select to angular material select
String utils - Identifiers:
add regex for more PIDs, create class Identifier
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58164 d315682c-612b-4755-9ff5-7f18f6832af3
2020-03-03 14:32:43 +00:00
argiro.kokogiannaki
c88ec8c54f
[Library|Trunk]
...
New search:
fix issue with quick selections
add Page URL resolver component: to properly redirect old routes to new research outcomes search page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58156 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-28 10:05:59 +00:00
konstantina.galouni
468e6e4b9b
[Trunk | Library]:
...
1. newSearchPage.module.ts: Use relative path for "RangeFilterModule" import.
2. newSearchPage.component.html: Remove <csv-download> from offcanvas (search filters in small screens) | Add "offcanvas-white" class together with "uk-offcanvas-bar" class (search filters in small screens).
3. searchFilter.component.html: Improve code for radio buttons | Add <label> in checkboxes and radio buttons to enable clicking on filter names.
4. searchPaging.component.ts: [Bug fix] remove "uk-flex uk-flex-middle" classes | Add check to hide paging (and its css) when not visible pages/results.
5. rangeFilter.component.html: Improve error messages & move them above buttons.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58148 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-26 15:01:16 +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
argiro.kokogiannaki
6e7a46b7a9
[Library|Trunk]
...
Search:
old datsource search pages & table view: remove map link
new Datasource search page:
able to use it for different types (compatible, journal, registries)
create a helper class for selecting proper query, filter, etc depending on the type
Advanced form:
remove [()] from html attributes
add check about showing advanced link & entites selection component
when only one advanced filed is left, change its operator to and
update according to the new UI
Autocomplete: on blur clear keyword
New Search PAge:
Handle Quotted queries for field with equality operator "="
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58138 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-25 15:40:56 +00:00
konstantina.galouni
6bf56acf93
[Trunk | Library]: searchFilter.component.ts: [Bug fix] event emitters were commented in previous commit for testing.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58137 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-25 12:36:30 +00:00
konstantina.galouni
7f83094e4f
[Trunk | Library]:
...
1. newSearchPage.component.ts: In year range filter show "from {year}" or "until {year}" if only one of the is selected.
2. searchFilter.component: (search redesign)
a. Do not show "+" after the values number if >=99
b. In view more results are sorted by name
c. Show always 6 more popular and all selected (all sorted by number).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58135 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-24 16:27:01 +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
b7d1f6bbb0
[Trunk | Library]:
...
1. advancedSearchForm.component.html & newSearchPage.component.html & searchDownload.component.ts &
searchPaging.component.ts & searchResultsPerPage.component.ts & searchSorting.component.ts & pagingFormatter.component.ts:
Fix margin, padding and new view according to search redesign.
2. searchDownload.component.ts: Remove 'type' parameter in request (in next commit, type is added from search pages).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58130 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-24 13:33:34 +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
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
7bcb79955d
[Library|Trunk]
...
New search page:
Clean up the code
remove queryParams - use parameterNames/Values instead
buildPageURLPArams: don't return URL path
remove method updateBaseURLParam
create method prepareSearchPage: gather in one method all initializations required for search page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58055 d315682c-612b-4755-9ff5-7f18f6832af3
2020-02-04 16:33:46 +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
argiro.kokogiannaki
95122e54a7
[Library|Trunk]
...
Advanced Search pages:
remove EventEmitter queryChange
Clean up goTo function
add documentation
remove unused functions/valiables
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58030 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-29 12:25:39 +00:00
argiro.kokogiannaki
100d120018
[Library|Trunk]
...
Simple search pages:
remove EventEmitter queryChange
Clean up goTo function
add documentation
remove unused functions/valiables
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58029 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-29 12:07:22 +00:00
argiro.kokogiannaki
103ee4c58f
{Library|Trunk]
...
Advanced search form: Update autocomplete selected value to look better with long values
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57800 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-03 14:31:08 +00:00
k.triantafyllou
2384c0380e
[Library]: Add csv button to download up to 2000 results
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57797 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-03 14:10:38 +00:00
argiro.kokogiannaki
ed0f47ad72
[Library|Trunk]
...
Update Search page to show funders:
update communitySearchResults.component to get also funders
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57791 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-03 10:45:28 +00:00
k.triantafyllou
0bb213622d
[Library]: modal replace isOpen = true with open function
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57663 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-22 08:42:36 +00:00
konstantina.galouni
8dbf6c5d76
[Trunk | Library]: Deposit Pages:
...
1. utils/properties/searchFields.ts: in 'DEPOSIT_DATASOURCE_KEYWORD_FIELDS' use field 'datasourcetypeuiname' instead of 'datasourcetypename' and use field 'datasourcesubject' with 'all' operator.
2. services/searchDataproviders.service.ts: [Bug fix]: Add subject only when there is some content.
3. searchPages/searchUtils/searchPage.component.ts: Add quotes in keyword for query (could cause problems with special keywords e.g. 'and and').
4. deposit/depositFirstPage.component.ts & deposit/searchDataprovidersToDeposit.component.ts: Use same placeholder in search form and add search by 'type'.
5. deposit/searchResultsInDeposit.component.html: Change 'NOT OPENAIRE COMPATIBLE' label with 'Not yet registered' and change tooltip from 'Compatibility' to 'OpenAIRE compatibility'.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57485 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-31 11:10:39 +00:00
konstantina.galouni
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
argiro.kokogiannaki
871e0559ba
[Library|Trunk]
...
Search pages:
change links hover colors
advance page: search button get portal color
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57024 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-10 13:14:40 +00:00
k.triantafyllou
8df218bff9
[Library]: Remove no filters available when results has not been loaded.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56892 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-26 10:42:57 +00:00
konstantina.galouni
e03d75cb51
[Trunk | Library]: searchPage.component.ts: Remove a console.log message.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56882 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-08 11:19:45 +00:00
k.triantafyllou
390ab2b072
Library: Add showType parameter on search components for communities.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56845 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-05 10:30:19 +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
k.triantafyllou
4ed1158758
[Library]: Fix modal on search communities result.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56813 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-30 15:24:32 +00:00
k.triantafyllou
36a9d1e672
[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@56810 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-30 13:29:23 +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
k.triantafyllou
a2b22fe48d
Library: Change path of search icon in search pages base on new folder connect-assets.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56778 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-26 11:22:16 +00:00
k.triantafyllou
3e5c6bae88
[Trunk|Library]: Search Communities results: Change card of community to be like card on home page.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56748 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-24 12:23:30 +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
k.triantafyllou
46ca524ce5
[Trunk|Library]: Add help texts top and bottom on advanced search.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56649 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-22 11:05:39 +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
konstantina.galouni
e490cc81fe
[Trunk | Library]: add background 'communityPanelBackground' in search Form in simple search pages.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56579 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-16 16:23:33 +00:00
konstantina.galouni
f8f821c393
[Trunk | Library]: Bug fix in deposit pages: Get information for zenodo communities in connect components.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56570 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-16 11:24:13 +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
k.triantafyllou
adb0df10f4
[Trunk|Library]: Search page larger top section.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56336 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-03 13:32:01 +00:00
k.triantafyllou
931527e91d
[Trunk|Library]: Remove grid small from gif slider.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56278 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-28 23:11:44 +00:00
k.triantafyllou
d17f5f77dc
[Trunk|Library]: 1. Search icon on communities search page. 2. Height match in gif slider texts.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56276 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-28 22:58:52 +00:00
k.triantafyllou
570f029cbc
[Trunk|Library]: Search Communities results add community Card class
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56190 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-24 20:10:23 +00:00
argiro.kokogiannaki
f1a97a93a4
[Library|Trunk]
...
For connect search pages, replace community Id with customFilter
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56070 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-13 12:31:39 +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
64eebccc47
[Library|Trunk]
...
User info:
add user information when user is logged in and there is no error or redirect parameters
Add spaces lost after ang 7 migration (funded by component, orcid dropdown, search results labels)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56056 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-12 11:50:48 +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
konstantina.galouni
cb691526c3
[Trunk | Library]: dateFilter.component: Bug fix: Do NOT set month of from date to getMonth()-1.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55979 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-03 16:06:23 +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
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
bb4d406a8f
[Trunk | Library]:
...
1. Add 'orcidURL' property
2. advancedSearchForm.component: Bug fix in definition of array
3. searchFields.ts: Add field in advanced search form of results to search by author's ORCID.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55898 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-29 12:20:18 +00:00
konstantina.galouni
d7eca8aa77
[Trunk|Library]: advancedSearchForm & dateFilter: Add error messages in case an invalid date is selected.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55667 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-22 10:50:32 +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
992a245ed0
[Trunk|Library]:
...
1. searchPage.component & advancedSearchPage.component:
goTo() function: use router.navigate instead of location.go (bug fix: error in paging because of false routerLinkActive class)
2. In all search (simple & dataproviders) and advanced search pages:
In queryChanged() function do not call getResuls() functions which queries api (goTo() of searchPage/advancedSearchPage.component reloads the page anyway).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55371 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-15 23:32:07 +00:00
k.triantafyllou
0bfad9455c
[Trunk|Library]: Communities Search Results: fix type when it is community
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55361 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-15 12:31:22 +00:00
k.triantafyllou
1e6df79b08
[Trunk|Library]: Add to usermenu navbar uk-position-top-right and make search-form width responsive
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55357 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-15 11:41:51 +00:00
k.triantafyllou
6af62973a8
[Trunk|Library]: Add at search page condition if total results in only an element change type to entityType
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55348 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-15 08:08:59 +00:00
k.triantafyllou
259dc565ff
[Trunk|Library]: Add at search page hasPrefix parameter with default value true
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55343 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-15 07:47:36 +00:00
k.triantafyllou
bb3a22be2b
[Trunk|Librady]: 1. Change color of Okbutton(when is right) to portal button. 2. Add isSubscribed and isManager to CommunityInfo and removed all from SearchResults.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55339 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-13 18:26:46 +00:00
k.triantafyllou
da10b4eea9
[Trunk|Library]: Private badge on the left and subscribed on the right
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55306 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-12 11:53:10 +00:00
k.triantafyllou
c156ac3b8f
[Trunk|Library]: 1. Compose email for request for new community. 2. Change community view on results
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55287 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-12 08:52:31 +00:00
k.triantafyllou
0c01cd65f7
[Trunk|Library]: 1. Add a new entity with fiels an email and recaptcha token. 2. Add a contact method on email service to send an email and recaptcha token to admin-tools
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55274 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-11 11:26:02 +00:00
argiro.kokogiannaki
ed5556933f
[Trunk|library]
...
Manage:
add a parameter for button size
Fearch form:
add a parameter to put form in the center
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55270 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-11 09:36:31 +00:00
k.triantafyllou
36f169572d
[Trunk|Library]: Community search results: Cut description on two lines
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55251 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-09 22:06:34 +00:00
k.triantafyllou
02fe5fb13e
[Trunk|Library]: 1. Move manage in library. 2. change community search result View. 3. search filter cannot be disabled when they are selected.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55234 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-08 14:53:09 +00:00
k.triantafyllou
b5998286a5
[Trunk|Library]: 1. Fix modal close button. 2. chance community search result view
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55223 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-08 12:43:04 +00:00
konstantina.galouni
afc1cca4fa
[Trunk|Library]: searchForm.component: 'link' input parameter type changed from 'boolean' to 'string'.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55220 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-08 12:11:54 +00:00
k.triantafyllou
826e084a2e
[Trunk|Library]: 1. Change Subscribed badge text to small and add manage button.
...
2. muted text if showResultsCount is true and value.number is zero, or isDisabled is true.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55211 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-07 15:52:15 +00:00
k.triantafyllou
2eef731273
[Trunk|Library]: 1. Create Community Search Results
...
2. Add in Search Page a new method for query params and lastIndex parameter with default value true
3. Add a new sorting field for communities in search sorting
4. Add parameter to modal-alert for position of okButton
5. Add COMMUNITIES_SEARCH_FIELDS in searchFields and searchLinkToCommunities in properties
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55209 d315682c-612b-4755-9ff5-7f18f6832af3
2019-04-05 17:21:23 +00:00
konstantina.galouni
780c5c15bd
[Trunk|Library]:
...
1. [new] #4216 : Create component for 'Other Versions' (deleted by inference) in research results (currently available only in Publication Landing Page).
2. publicationInfo.ts: Add field 'deletedByInferenceIds' (will be removed later possibly).
3. env-properties.json: change environment to 'development' and search service to 'rudie' local development machine.
4. publication.component: Add 'Other Versions' tab (section).
5. tabResult.component.html: Changes in css style and sequence of details in tab results according to search results.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54962 d315682c-612b-4755-9ff5-7f18f6832af3
2019-03-05 09:45:42 +00:00
konstantina.galouni
50c3d7db44
[Trunk|Library]: searchResult.component.html: Remove <approved-by-community> tag. This is useful only in deposit result page.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54919 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-27 12:03:16 +00:00
konstantina.galouni
bb24192b47
[Trunk|Library]: searchPageTableView.component.html: Bug fix: Format html to remove space aften opening and before closing parenthesis.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54889 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-22 12:31:25 +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
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
19877b3295
[Library] Search paging: add portal color in total results and pages numbers
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54774 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-14 09:57:47 +00:00
konstantina.galouni
93b760143a
[trunk]: searchPage.component.ts: Case for keyword search by DOI in software and other research data pages.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54762 d315682c-612b-4755-9ff5-7f18f6832af3
2019-02-12 14:33:00 +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
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
konstantina.galouni
13b8e99e91
Simple & Advanced Search pages: in sorting functionality for Date, rename 'oldest' with 'least recent' and 'newest' with 'most recent'.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54204 d315682c-612b-4755-9ff5-7f18f6832af3
2018-12-07 09:35:20 +00:00
konstantina.galouni
ca1e2b49cb
1. Simple & Advanced Search pages:
...
in sorting functionality for Date, add ascending (oldest) and descending (newest) options.
remove margin between paging and search results.
show and hide sorting and results per page functionalities (like paging) according to results and loading.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54075 d315682c-612b-4755-9ff5-7f18f6832af3
2018-12-03 12:32:33 +00:00
konstantina.galouni
8f926329c3
Move 'sorting' and 'results per page' options before 'paging' in simple search, advanced search and search table view pages.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54011 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-28 10:34:30 +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
konstantina.galouni
d17ca55f06
Add 'searchResultsPerPage' and 'searchSorting' components to be used in search pages.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53918 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-21 15:24:14 +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
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
ae21b00172
JSON-LD:
...
expand Dataset to use issn, headline, alternativeHeadline for dataset subtitle
fix Dataset issue to get the proper value when title is array
Add jsonld in search pages with potentialAction search to each page
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53733 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-13 13:01:38 +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
49952604f4
SearchPageTableViewComponent: Add a try catch in ngOnDestroy, ngAfterViewInit to avoid crash in server mode
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53642 d315682c-612b-4755-9ff5-7f18f6832af3
2018-11-07 09:11: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
konstantina.galouni
f81e2dc987
compatibleDataProvidersTable, entityRegistriesTable, searchPageTableView: bug fix in filtering for table view search pages.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53439 d315682c-612b-4755-9ff5-7f18f6832af3
2018-10-11 09:11:56 +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
8fbb704aa3
Claims: change the remove button to bin icon
...
Browse: add search and sort in view more
Download results link: make it a link
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53278 d315682c-612b-4755-9ff5-7f18f6832af3
2018-09-26 13:56:21 +00:00
konstantina.galouni
c946e668f1
Show CSV button always in search and advanced search pages. In case of >csvLimit results it is disabled (cursor: not-allowed) with appropriate tooltip.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53225 d315682c-612b-4755-9ff5-7f18f6832af3
2018-09-24 09:12:51 +00:00
konstantina.galouni
354c4eb835
searchTableView.component: Add '$.fn['dataTable'].ext.search.pop();' command in ngOnDestroy function to reinitialize filtering when re-routing to this page.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52833 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-27 23:13:40 +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
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
2bc93bba6f
Bug fix in sorting values in search filters.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52815 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-25 13:20:54 +00:00
argiro.kokogiannaki
8bdec079b8
Search Pages: change Filter title on the left, in filters view more modal add keyword filter and sort functionalities, changes in the selected filters under the form
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52770 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-19 10:52:29 +00:00
konstantina.galouni
fa78a1e6f9
1. claimsByToken.component: Show number of selected claims only when there is at least one selected.
...
2. dataProvider.component - #2514 : HostedBy resources - display aggregator's name for "collected from a compatible aggregator".
3. dataProvider.component: in relatedDatasourcesTab query & results for software too.
4. compatibleDataProviders & compatibleDataProvidersTable: Added "Software Repository", "Software Repository Aggregator" values in 'Type' filter.
5. compatibleDataProviders & entityRegistries & journals (+ table views): Added "collected from a compatible aggregator", "proprietary", "under validation" values in 'Compatibility' filter.
6. searchPageTableView.component: check exact match of a selected filter value with column value (filterData function).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52692 d315682c-612b-4755-9ff5-7f18f6832af3
2018-07-05 15:50:43 +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
argiro.kokogiannaki
8ce7227a49
add margin in after sign in link
...
tab results: remove extra > character, space before project code
search results: space before project code
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52431 d315682c-612b-4755-9ff5-7f18f6832af3
2018-06-11 09:46:59 +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
7ca752f345
1. Link for 'Results in OpenAIRE' added in table view pages (connect portal).
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52173 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-23 13:48:32 +00:00
konstantina.galouni
98aeab207b
1. Bug fix: when filtering has no results in table view pages do not crash - enableSearchView input parameter added in searchPageTableView.component.
...
(When status is not DONE, all forms and search view are disabled. When status is not LOADING or DONE, hide datatable and disable all forms but allow search view)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52163 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-23 13:24:13 +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
a5527e8fa4
add communityId parameter in advanced pages of results - for filtering results based on community id
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52027 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-15 08:48:39 +00:00
argiro.kokogiannaki
1cd923a372
change any component that uses path to assets, change loading.gif to be property in a class
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52004 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-11 11:33:50 +00:00
konstantina.galouni
787c81f4a6
1. bug fix in dataProvider.component.html to display properly 'Content Providers' tab.
...
2. bug fix in searchResult.component.html in 'Funder' label.
3. tabResult.component: show information the same way as searchResult.component.
4. 'getResultsForHome' function added in fetchDataproviders - currently not used, should be used by home.component of explore portal.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51996 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-10 14:36:33 +00:00
argiro.kokogiannaki
ad6b076cde
Fixing filtering issue in DP search pages when using resources query (after IE changes)
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51993 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-10 07:52:55 +00:00
argiro.kokogiannaki
d9e53942cf
layout changes in result landing pages (make it clear -use margin & paddings, use FAB for linkinf menu)| layout changes in search results, advanced search form | fix reading from url for creating the list with refine fields
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51984 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-09 13:54:30 +00:00
argiro.kokogiannaki
780bd5fa07
In searchpage change the url encoding to work for IE
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51967 d315682c-612b-4755-9ff5-7f18f6832af3
2018-05-08 10:36:42 +00:00
argiro.kokogiannaki
39d92e32f6
change the query for community in search pages of pub/data/soft
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51871 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-26 12:20:32 +00:00
konstantina.galouni
1034bfa117
1. connectHelper.ts: bug fix - return null if we are in explore domain.
...
2. searchPage.component.ts: bug fix - when filters or keyword changes (goTo function), call createIndexQueryParameters function and emit indexQuery as index for search pages that request resources.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51869 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-25 13:30:59 +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
konstantina.galouni
11cc80be32
1. In searchPage and searchPageTableView bug fixing in widths and help texts.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51757 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-11 13:52:51 +00:00
argiro.kokogiannaki
46a7803fd9
add piwikSiteId in properties | pass it as input in all components | in piwik service use it either from parameter pass if available or from properties
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51746 d315682c-612b-4755-9ff5-7f18f6832af3
2018-04-11 08:59:01 +00:00
konstantina.galouni
11d936d51b
1. approved.component.ts: component to check and show approval of content providers in share result pages by current community.
...
2. searchResult.component.html: approved.component moved to openaireLibrary: 'connect/approvedByCommunity/'.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51580 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-29 14:15:47 +00:00
konstantina.galouni
51cbc6e01f
1. searchResult.component.html: component from 'utils/approvedByCommunity/approved.component.ts' is called to show if a content provider is approved by current community.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51578 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-29 13:44:55 +00:00
argiro.kokogiannaki
f8f2270a78
move Connect helper in the library| change help service to get communityId by parameter/domain (for connect or properties for explore) | add helper before/after option in search/advanced/table pages
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51565 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-29 08:23:36 +00:00
konstantina.galouni
5dbf849a32
1. Columns changed from 4 to 3 for 'Search Projects' in community portals ('Acronym' and 'Name' merged to 'Project').
...
2. Links added to 'Search Projects' and 'Search Content Providers' in community portals.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51537 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-27 14:35:05 +00:00
konstantina.galouni
c77e5ee374
1. Bug fixes in "searchResult.component.html" and "tabResult.component.html"
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51345 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-20 12:11:27 +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
1a3179acf3
1. 'searchPageTableView' component updated: column's 'official name' contents for content providers gotten by community API added.
...
2. searchPageTableView: if no filters exist, do not contain this section in html template. (datatable expands)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51013 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-02 12:57:52 +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
1e4eab0ca6
1. Community API added in env properties.
...
2. 'columnNames' variable added in search table pages (e.g. OpenAIRE Journals Table) to describe column names of the datatable.
3. Input 'columnNames' variable added in 'searchPageTableView' compontent, its value comes from search table pages (e.g. OpenAIRE Journals Table).
4. 'searchPageTableView' component updated and parametrized, to have datatable's columns either for content providers gotten by search API, or for projects gotten by community API.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50991 d315682c-612b-4755-9ff5-7f18f6832af3
2018-03-01 12:03:40 +00:00
argiro.kokogiannaki
4fac0720b2
put the divids- helper for linking views, Fix the links in advanced search page, remove openaireProperties class change error codes path, add the
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50761 d315682c-612b-4755-9ff5-7f18f6832af3
2018-02-15 10:36:12 +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
5c641d6386
Refactoring - change file name of Meta service & module
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50684 d315682c-612b-4755-9ff5-7f18f6832af3
2018-02-12 13:38:30 +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
27794606e8
Clear some files | use new version of datatables for dataproviders tables
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50277 d315682c-612b-4755-9ff5-7f18f6832af3
2018-01-11 10:55:54 +00:00
argiro.kokogiannaki
fa98e7f34f
Fixing claim pages to be used as library cmponents - modules | use new version of datatables
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@50240 d315682c-612b-4755-9ff5-7f18f6832af3
2018-01-03 13:12:31 +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