2020-07-13 11:15:00 +02:00
|
|
|
<ng-template #selected_filters_pills>
|
|
|
|
|
<div class="uk-grid uk-grid-small uk-text-small" uk-grid>
|
2020-07-13 17:23:20 +02:00
|
|
|
<ng-container *ngIf="customFilterEnabled && customFilter && refineFields.indexOf(customFilter.queryFieldName) ==
|
|
|
|
|
-1 ">
|
2020-07-14 17:18:14 +02:00
|
|
|
<span class="uk-grid-margin">
|
2020-07-13 17:23:20 +02:00
|
|
|
<span class="selectedFilterLabel uk-disabled ">
|
|
|
|
|
<span class="">{{customFilter.valueName}}</span>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
</ng-container>
|
2020-07-13 11:15:00 +02:00
|
|
|
<ng-container *ngIf="selectedTypesNum > 0 && resultTypes">
|
|
|
|
|
<ng-container *ngFor="let type of resultTypeOptions; let i = index; let end = last; ">
|
|
|
|
|
<ng-container *ngIf="resultTypes[type.id] == true">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<span [title]="'Remove '+ type.name" (click)="removeResultType(type.id) "
|
|
|
|
|
[class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
|
2020-07-13 11:15:00 +02:00
|
|
|
<span class="selectedFilterLabel ">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<a class="uk-link-text">
|
|
|
|
|
<span aria-hidden="true">
|
2020-07-13 11:15:00 +02:00
|
|
|
<span class="uk-icon">
|
|
|
|
|
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close"
|
|
|
|
|
ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path
|
|
|
|
|
fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
<span class="uk-margin-small-left">{{type.name}}</span>
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ng-container>
|
|
|
|
|
<ng-container *ngIf="selectedRangeFilters > 0">
|
|
|
|
|
<ng-container *ngFor="let filter of rangeFilters ">
|
|
|
|
|
<ng-container *ngIf="filter.selectedFromAndToValues">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<span [title]="'Remove '+ filter.selectedFromAndToValues" (click)="removeRangeFilter(filter) "
|
|
|
|
|
[class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
|
2020-07-13 11:15:00 +02:00
|
|
|
<span class="selectedFilterLabel ">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<a class="uk-link-text">
|
|
|
|
|
<span aria-hidden="true">
|
2020-07-13 11:15:00 +02:00
|
|
|
<span class="uk-icon">
|
|
|
|
|
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
|
|
|
|
|
icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6"
|
|
|
|
|
d="M16,16 L4,4"></path><path fill="none"
|
|
|
|
|
stroke="#000"
|
|
|
|
|
stroke-width="1.6"
|
|
|
|
|
d="M16,4 L4,16"></path></svg>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
<span class="uk-margin-small-left">{{filter.selectedFromAndToValues}}</span>
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ng-container>
|
|
|
|
|
<ng-container *ngFor="let filter of filters ">
|
|
|
|
|
<ng-container *ngIf="filter.countSelectedValues > 0">
|
|
|
|
|
<span *ngFor="let value of getSelectedValues(filter); let i = index; let end = last; "
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
[title]="'Remove '+value.name" (click)="removeFilter(value, filter) "
|
|
|
|
|
[class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
|
2020-07-13 11:15:00 +02:00
|
|
|
<!-- if no grid on the div above, remove it and move class 'selectedFilterLabel' on top span -->
|
|
|
|
|
<span class="selectedFilterLabel ">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<a class="uk-link-text">
|
|
|
|
|
<span aria-hidden="true">
|
2020-07-13 11:15:00 +02:00
|
|
|
<span class="uk-icon">
|
|
|
|
|
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
|
|
|
|
|
icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6"
|
|
|
|
|
d="M16,16 L4,4"></path><path fill="none"
|
|
|
|
|
stroke="#000"
|
|
|
|
|
stroke-width="1.6"
|
|
|
|
|
d="M16,4 L4,16"></path></svg>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
<span class="uk-margin-small-left"
|
|
|
|
|
[innerHtml]="(value.name.length > 34)?value.name.substring(0,34)+'...':value.name"></span>
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</div>
|
|
|
|
|
</ng-template>
|
2020-03-24 16:40:51 +01:00
|
|
|
<ng-template #filters_column>
|
2020-07-15 16:11:49 +02:00
|
|
|
<div class="uk-width-1-1 uk-margin-top">
|
2020-06-05 14:56:28 +02:00
|
|
|
<div class="uk-grid uk-flex uk-flex-bottom">
|
2020-07-24 13:21:22 +02:00
|
|
|
<!-- *ngIf="(selectedRangeFilters+selectedFilters + selectedTypesNum > 0)
|
|
|
|
|
|| (filters.length > 0 && (results.length > 0 || disableForms))"-->
|
2020-10-13 21:04:50 +02:00
|
|
|
<h6 class="uk-text-bold">
|
2020-07-15 16:11:49 +02:00
|
|
|
Filters
|
2020-10-13 21:04:50 +02:00
|
|
|
</h6>
|
2020-06-05 14:56:28 +02:00
|
|
|
<a *ngIf="(selectedRangeFilters+selectedFilters + selectedTypesNum)>1" (click)="clearFilters()"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
[class]="((disableForms || disableRefineForms)?'uk-disabled uk-link-muted':'')+' portal-link ' + 'uk-width-1-2'">
|
2020-06-05 14:56:28 +02:00
|
|
|
Clear All
|
|
|
|
|
</a>
|
|
|
|
|
</div>
|
2020-08-04 09:25:32 +02:00
|
|
|
<div *ngIf="selectedRangeFilters+selectedFilters + selectedTypesNum > 0 || (customFilter && customFilter.selected
|
|
|
|
|
== true)"
|
2020-07-15 16:11:49 +02:00
|
|
|
class="uk-margin-small-top uk-margin-medium-bottom">
|
2020-07-14 00:22:23 +02:00
|
|
|
<ng-container *ngTemplateOutlet="selected_filters_pills; context: {}"></ng-container>
|
|
|
|
|
</div>
|
2020-03-24 16:40:51 +01:00
|
|
|
</div>
|
2020-07-24 13:21:22 +02:00
|
|
|
<div *ngIf="searchUtils.refineStatus == errorCodes.LOADING && existingFiltersWithValues === 0"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
class="'uk-animation-fade uk-margin-top uk-width-1-1" role="alert">
|
|
|
|
|
<span class="loading-gif uk-align-center" ></span>
|
|
|
|
|
</div>
|
2020-07-24 13:21:22 +02:00
|
|
|
<div *ngIf="searchUtils.refineStatus != errorCodes.LOADING && existingFiltersWithValues === 0 && results.length > 0" class="uk-margin-top">
|
2020-06-05 14:56:28 +02:00
|
|
|
<span class="uk-text-meta">No filters available</span>
|
|
|
|
|
</div>
|
|
|
|
|
<ul *ngIf="!showUnknownFilters"
|
|
|
|
|
[class]="'uk-list uk-list-divider' + (selectedRangeFilters == 0 && selectedFilters == 0 ? ' uk-margin-small-top' : '')">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<!-- searchUtils.refineStatus == errorCodes.DONE &&-->
|
|
|
|
|
<ng-container *ngIf="filters.length > 0 && filters[0].values.length >0 && filters[0].filterId == 'resultbestaccessright'">
|
2020-06-29 13:10:32 +02:00
|
|
|
<li>
|
|
|
|
|
<search-filter [filterValuesNum]="filterValuesNum" [showMoreInline]="showMoreFilterValuesInline"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
[isDisabled]="disableForms || disableRefineForms"
|
|
|
|
|
[filter]="filters[0]" [showResultCount]=showResultCount
|
2020-06-29 13:10:32 +02:00
|
|
|
(onFilterChange)="filterChanged($event)"></search-filter>
|
|
|
|
|
</li>
|
|
|
|
|
</ng-container>
|
|
|
|
|
<li *ngIf="resultTypes && (filters.length > 0)">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<quick-selections [resultTypes]="resultTypes" (typeChange)="queryChanged()"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms"
|
|
|
|
|
[quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null"
|
|
|
|
|
[properties]="properties" [vertical]="true" [delayTime]="0">
|
|
|
|
|
</quick-selections>
|
2020-06-29 13:10:32 +02:00
|
|
|
</li>
|
2020-06-05 14:56:28 +02:00
|
|
|
<ng-container *ngFor="let filter of rangeFilters">
|
|
|
|
|
<li>
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<range-filter [isDisabled]="disableForms || disableRefineForms" [filter]="filter"
|
2020-06-05 14:56:28 +02:00
|
|
|
(onFilterChange)="filterChanged($event)"></range-filter>
|
|
|
|
|
</li>
|
|
|
|
|
</ng-container>
|
|
|
|
|
<ng-container *ngFor="let filter of filters ">
|
2020-07-15 16:11:49 +02:00
|
|
|
<li *ngIf="filter.values && filter.filterId != 'resultbestaccessright'">
|
2020-06-05 14:56:28 +02:00
|
|
|
<search-filter [filterValuesNum]="filterValuesNum" [showMoreInline]="showMoreFilterValuesInline"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
[isDisabled]="disableForms || disableRefineForms"
|
|
|
|
|
[filter]="filter" [showResultCount]=showResultCount
|
2020-06-05 14:56:28 +02:00
|
|
|
(onFilterChange)="filterChanged($event)"></search-filter>
|
|
|
|
|
</li>
|
|
|
|
|
</ng-container>
|
|
|
|
|
</ul>
|
2020-03-24 16:40:51 +01:00
|
|
|
</ng-template>
|
|
|
|
|
|
2020-01-31 16:12:51 +01:00
|
|
|
|
2020-06-05 14:56:28 +02:00
|
|
|
<div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
2020-08-17 10:51:46 +02:00
|
|
|
' image-front-topbar ' + (stickyForm?'':' uk-position-relative ') :
|
|
|
|
|
(+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom uk-padding-remove-top ' + (usedBy
|
|
|
|
|
|
2020-03-12 18:03:35 +01:00
|
|
|
== 'deposit' ? ' uk-padding-remove-top ' : ' '))"
|
2020-08-17 10:51:46 +02:00
|
|
|
[attr.uk-sticky]="(stickyForm?'{animation:false;offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+(usedBy !=
|
|
|
|
|
'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
|
|
|
|
' uk-position-relative ' :(' uk-section ' ))+'}':null)"
|
|
|
|
|
uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}"
|
|
|
|
|
tm-header-transparent="light" id="searchFormPanel" >
|
2020-06-05 14:56:28 +02:00
|
|
|
<div style="box-sizing: border-box; "
|
|
|
|
|
[class]="' uk-background-norepeat uk-background-bottom-center uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass
|
2020-07-10 10:37:17 +02:00
|
|
|
+ (usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') && !dashboard ?
|
|
|
|
|
' searchFormMinHeight uk-padding-remove-bottom uk-section' : '')
|
2020-03-12 18:03:35 +01:00
|
|
|
+(simpleView?'':' advancedSearchFormBackground ')">
|
|
|
|
|
|
2020-06-05 14:56:28 +02:00
|
|
|
<div
|
|
|
|
|
[class]="(usedBy!='deposit' && (!customFilter || customFilter.queryFieldName != 'communityId'))?'uk-position-cover':''"></div>
|
2020-01-31 16:12:51 +01:00
|
|
|
<div class="uk-width-1-1">
|
2020-05-07 12:26:38 +02:00
|
|
|
<breadcrumbs *ngIf="showBreadcrumb && entityType!='community'"
|
2020-06-05 14:56:28 +02:00
|
|
|
addClass=" uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
|
|
|
|
|
[breadcrumbs]="breadcrumbs"></breadcrumbs>
|
|
|
|
|
<div class="uk-position-relative">
|
|
|
|
|
<div [class]="'uk-container '+(customFilter && customFilter.queryFieldName ==
|
2020-08-17 10:51:46 +02:00
|
|
|
'communityId'?' uk-margin-large-bottom ':'uk-margin-top')+
|
2020-06-05 14:56:28 +02:00
|
|
|
(entityType === 'community' ||entityType === 'stakeholder'?' uk-position-relative':'')" id="searchForm">
|
|
|
|
|
<advanced-search-form
|
2020-08-13 13:15:10 +02:00
|
|
|
[entityType]="entityType"
|
|
|
|
|
[fieldIds]="fieldIds"
|
|
|
|
|
[fieldIdsMap]="fieldIdsMap"
|
|
|
|
|
[selectedFields]="selectedFields"
|
|
|
|
|
(queryChange)="queryChanged()"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms"
|
|
|
|
|
[simpleSearchLink]="simpleSearchLink"
|
|
|
|
|
[advancedSearchLink]="advancedSearchLink"
|
|
|
|
|
[advancedSearchLinkParameters]
|
2020-06-05 14:56:28 +02:00
|
|
|
="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
|
2020-08-13 13:15:10 +02:00
|
|
|
[pageTitle]=pageTitle [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText"
|
|
|
|
|
[resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
|
|
|
|
|
[showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter"
|
2020-06-05 14:56:28 +02:00
|
|
|
>
|
|
|
|
|
</advanced-search-form>
|
2020-06-29 15:15:52 +02:00
|
|
|
<div *ngIf="entityType === 'community' || entityType === 'stakeholder' " class="uk-position-center-right uk-visible@m">
|
2020-06-05 14:56:28 +02:00
|
|
|
<img src="assets/common-assets/common/search.png" class="uk-align-center" width="141" height="171">
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
</div>
|
2020-06-05 14:56:28 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-06-05 14:56:28 +02:00
|
|
|
<schema2jsonld *ngIf="!includeOnlyResultsAndFilter && url" [URL]="url" type="search" [name]=pageTitle
|
2020-07-21 14:41:08 +02:00
|
|
|
[searchAction]=false [description]="metaDescription" ></schema2jsonld>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
|
|
|
|
|
2020-08-17 10:51:46 +02:00
|
|
|
<div id="tm-main" class=" tm-middle" [class.uk-margin-top]="stickyForm">
|
2020-02-04 14:27:42 +01:00
|
|
|
<div uk-grid>
|
2020-01-31 16:12:51 +01:00
|
|
|
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first ">
|
2020-06-05 14:56:28 +02:00
|
|
|
<!-- <breadcrumbs *ngIf="showBreadcrumb && entityType!='community'"-->
|
|
|
|
|
<!-- addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>-->
|
2020-04-23 09:33:23 +02:00
|
|
|
<div class="uk-container uk-container-large">
|
2020-01-31 16:12:51 +01:00
|
|
|
<div>
|
2020-04-28 10:03:40 +02:00
|
|
|
<breadcrumbs *ngIf="showBreadcrumb && entityType=='community'"
|
|
|
|
|
addClass=" " [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
2020-06-05 14:56:28 +02:00
|
|
|
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
|
|
|
|
|
[texts]="pageContents['top']"></helper>
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div [class]="(showRefine && !properties.isDashboard)? 'uk-width-4-5@m uk-width-4-5@l uk-width-1-1@s' :'uk-width-1-1'">
|
2020-10-12 14:39:42 +02:00
|
|
|
<div *ngIf="showRefine && !dashboard" class="uk-offcanvas-content uk-hidden@m uk-margin-top">
|
2020-01-31 16:12:51 +01:00
|
|
|
|
2020-02-24 14:33:34 +01:00
|
|
|
<a href="#offcanvas-usage" uk-toggle>
|
|
|
|
|
<span class="uk-icon uk-margin-small-right uk-margin-small-left">
|
2020-06-05 14:56:28 +02:00
|
|
|
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
|
|
|
|
|
data-svg="settings">
|
2020-02-24 14:33:34 +01:00
|
|
|
<ellipse fill="none" stroke="#000" cx="6.11" cy="3.55" rx="2.11" ry="2.15"></ellipse>
|
|
|
|
|
<ellipse fill="none" stroke="#000" cx="6.11" cy="15.55" rx="2.11" ry="2.15"></ellipse>
|
|
|
|
|
<circle fill="none" stroke="#000" cx="13.15" cy="9.55" r="2.15"></circle>
|
|
|
|
|
<rect x="1" y="3" width="3" height="1"></rect>
|
|
|
|
|
<rect x="10" y="3" width="8" height="1"></rect>
|
|
|
|
|
<rect x="1" y="9" width="8" height="1"></rect>
|
|
|
|
|
<rect x="15" y="9" width="3" height="1"></rect>
|
|
|
|
|
<rect x="1" y="15" width="3" height="1"></rect>
|
|
|
|
|
<rect x="10" y="15" width="8" height="1"></rect>
|
|
|
|
|
</svg>
|
|
|
|
|
</span>
|
2020-06-05 14:56:28 +02:00
|
|
|
<span>Filters <span
|
|
|
|
|
*ngIf="(selectedRangeFilters+selectedFilters) > 0">({{(selectedRangeFilters + selectedFilters)}}
|
|
|
|
|
)</span></span>
|
|
|
|
|
<!-- <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1">-->
|
|
|
|
|
<!-- <rect x="6" y="4" width="12" height="1"></rect><rect x="6" y="9" width="12" height="1"></rect>-->
|
|
|
|
|
<!-- <rect x="6" y="14" width="12" height="1"></rect>-->
|
|
|
|
|
<!-- <rect x="2" y="4" width="2" height="1"></rect>-->
|
|
|
|
|
<!-- <rect x="2" y="9" width="2" height="1"></rect>-->
|
|
|
|
|
<!-- <rect x="2" y="14" width="2" height="1"></rect>-->
|
|
|
|
|
<!-- </svg>-->
|
2020-02-24 14:33:34 +01:00
|
|
|
</a>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
2020-03-24 16:40:51 +01:00
|
|
|
<div #offcanvas_element id="offcanvas-usage" uk-offcanvas overlay style="z-index:10000;">
|
2020-02-26 16:01:16 +01:00
|
|
|
<div class="uk-offcanvas-bar offcanvas-white">
|
2020-01-31 16:12:51 +01:00
|
|
|
<button class="uk-offcanvas-close" type="button" uk-close></button>
|
2020-06-05 14:56:28 +02:00
|
|
|
<div class="uk-width-1-1">
|
2020-03-24 16:40:51 +01:00
|
|
|
<ng-container *ngTemplateOutlet="filters_column; context: {}"></ng-container>
|
2020-01-31 16:12:51 +01:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-06-01 11:02:16 +02:00
|
|
|
<div *ngIf="includeOnlyResultsAndFilter "
|
2020-04-23 09:33:23 +02:00
|
|
|
class="uk-margin-medium-top uk-margin-medium-bottom">
|
2020-08-13 13:15:10 +02:00
|
|
|
<a *ngIf="showSwitchSearchLink && advancedSearchLink" routerLinkActive="router-link-active"
|
2020-06-05 14:56:28 +02:00
|
|
|
[routerLink]="advancedSearchLink" style="z-index:1;"
|
|
|
|
|
[queryParams]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
[class]="((disableForms || disableRefineForms)?' uk-disabled uk-link-muted ':'') +' portal-link uk-float-right '">Advanced
|
2020-06-05 14:56:28 +02:00
|
|
|
search
|
2020-04-22 15:00:13 +02:00
|
|
|
</a>
|
2020-06-05 14:56:28 +02:00
|
|
|
<!-- <quick-selections [resultTypes]="resultTypes"
|
|
|
|
|
(typeChange)="queryChanged()"
|
|
|
|
|
[isDisabled]="disableForms"
|
|
|
|
|
[quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null"
|
|
|
|
|
[properties]="properties">
|
|
|
|
|
</quick-selections>-->
|
2020-04-22 15:00:13 +02:00
|
|
|
|
|
|
|
|
</div>
|
2020-06-05 14:56:28 +02:00
|
|
|
<div class="uk-grid helper-grid uk-padding-small uk-padding-remove-vertical uk-margin-large-bottom">
|
2020-07-24 13:21:22 +02:00
|
|
|
<!-- <div *ngIf="searchUtils.status == errorCodes.LOADING && filters.length == 0;-->
|
|
|
|
|
<!-- else elseGridBlock"-->
|
|
|
|
|
<!-- class="'uk-animation-fade uk-margin-top uk-width-1-1" role="alert">-->
|
|
|
|
|
<!-- <span class="loading-gif uk-align-center" ></span>-->
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
<!-- <div>-->
|
|
|
|
|
<!-- <ng-template #elseGridBlock>-->
|
|
|
|
|
<div *ngIf="showRefine && !properties.isDashboard
|
|
|
|
|
&& (results.length > 0
|
|
|
|
|
|| (!hideFilters &&
|
|
|
|
|
(existingFiltersWithValues > 0 || (selectedRangeFilters + selectedFilters + selectedTypesNum) > 0)
|
|
|
|
|
)
|
|
|
|
|
)"
|
|
|
|
|
class="uk-width-1-4@m search-filters uk-visible@m">
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<ng-container *ngTemplateOutlet="filters_column; context: {}"></ng-container>
|
2020-07-13 11:15:00 +02:00
|
|
|
</div>
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div class="uk-width-expand@m uk-with-1-1@s">
|
2020-08-04 09:25:32 +02:00
|
|
|
<div *ngIf="properties.isDashboard"
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
class="uk-width-1-1 uk-margin-top uk-margin-medium-bottom ">
|
|
|
|
|
<div class="uk-flex uk-flex-bottom">
|
|
|
|
|
<span class="uk-margin-small-right">Filters: </span>
|
|
|
|
|
<ng-container *ngTemplateOutlet="selected_filters_pills; context: {}"></ng-container>
|
|
|
|
|
</div>
|
2020-02-24 14:33:34 +01:00
|
|
|
</div>
|
2020-08-04 09:25:32 +02:00
|
|
|
<div *ngIf="customFilter && !customFilter.isHiddenFilter &&
|
2020-08-13 13:15:10 +02:00
|
|
|
customFilter.selected == false && customFilter.promptToAddFilter"
|
2020-08-04 09:25:32 +02:00
|
|
|
class="uk-alert uk-animation-slide-top-small">
|
|
|
|
|
Do you want to see results only for {{customFilter.valueName}}? <a
|
|
|
|
|
(click)="addCustomFilter();">Click
|
|
|
|
|
here {{customFilterEnabled}}</a>.
|
|
|
|
|
</div>
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !loadPaging )"><a
|
|
|
|
|
class="uk-margin-top uk-button uk-button-text"
|
|
|
|
|
[href]="openaireLink+this.routerHelper.createQueryParamsString(this.parameterNames, this.parameterValues)"
|
|
|
|
|
target="_blank">Results in OpenAIRE</a></div>
|
|
|
|
|
<div class="uk-align-center uk-margin-remove-bottom">
|
|
|
|
|
<div
|
|
|
|
|
*ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"
|
|
|
|
|
class="uk-grid uk-margin-top uk-margin-bottom">
|
|
|
|
|
<div class="uk-width-expand@m uk-grid uk-grid-medium uk-margin-small-bottom">
|
|
|
|
|
<search-results-per-page [size]="searchUtils.size"
|
|
|
|
|
(sizeChange)="sizeChanged($event)"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms">
|
|
|
|
|
</search-results-per-page>
|
|
|
|
|
<search-sorting *ngIf="sort"
|
|
|
|
|
[entityType]="entityType" [sortBy]="searchUtils.sortBy"
|
|
|
|
|
(sortByChange)="sortByChanged($event)"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms">
|
|
|
|
|
</search-sorting>
|
|
|
|
|
</div>
|
2020-06-05 14:56:28 +02:00
|
|
|
<!-- uk-flex uk-flex-middle-->
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div class="uk-width-auto@m uk-margin-small-bottom">
|
|
|
|
|
<!-- !showUnknownFilters && (searchUtils.totalResults > 0 || !loadPaging)-->
|
|
|
|
|
<search-download
|
|
|
|
|
*ngIf="( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms"
|
|
|
|
|
[type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults">
|
|
|
|
|
</search-download>
|
2020-03-12 18:03:35 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<!--<span *ngIf="tableViewLink">
|
|
|
|
|
<a uk-tooltip="title: Table view" routerLinkActive="router-link-active"
|
|
|
|
|
[class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-link-text uk-margin-small-left'"
|
|
|
|
|
[routerLink]=tableViewLink >
|
|
|
|
|
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
|
|
|
|
|
Table view
|
|
|
|
|
</a>
|
|
|
|
|
<!– <span uk-tooltip="title: List view" class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>–>
|
|
|
|
|
</span>-->
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<search-paging [type]="type" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults"
|
|
|
|
|
[(searchUtils)]="searchUtils" [(results)]="results" [(baseUrl)]="searchUtils.baseUrl"
|
|
|
|
|
[(parameterNames)]="parameterNames" [(parameterValues)]="parameterValues"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms">
|
|
|
|
|
</search-paging>
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<!-- <search-download *ngIf= "( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'"-->
|
|
|
|
|
<!-- class="uk-width-1-1@s uk-hidden@m"-->
|
|
|
|
|
<!-- [isDisabled]="disableForms"-->
|
|
|
|
|
<!-- [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults">-->
|
|
|
|
|
<!-- </search-download>-->
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div *ngIf="(searchUtils.page <= pagingLimit)" class="uk-margin-large-bottom">
|
|
|
|
|
<search-result *ngIf="( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'"
|
|
|
|
|
[results]="results"
|
|
|
|
|
[status]=searchUtils.status
|
|
|
|
|
[type]="entityType"
|
|
|
|
|
[showLoading]="true" [properties]=properties [showImpactFactors]="(customFilter &&
|
|
|
|
|
customFilter.queryFieldName == 'communityId' && customFilter.valueId == 'elixir-gr')">
|
|
|
|
|
</search-result>
|
|
|
|
|
<deposit-result *ngIf="usedBy == 'deposit'"
|
|
|
|
|
[results]="results"
|
|
|
|
|
[status]="searchUtils.status"
|
|
|
|
|
[type]="entityType"
|
|
|
|
|
[zenodoInformation]="zenodoInformation"
|
|
|
|
|
[properties]=properties>
|
|
|
|
|
</deposit-result>
|
|
|
|
|
<portal-search-result
|
|
|
|
|
*ngIf="(entityType == 'community' || entityType == 'stakeholder') && usedBy == 'search'"
|
|
|
|
|
[results]="results"
|
|
|
|
|
[status]="searchUtils.status"
|
|
|
|
|
[type]="entityType"
|
|
|
|
|
[showType]="false"
|
|
|
|
|
[showLoading]="true" [properties]=properties>
|
|
|
|
|
</portal-search-result>
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div [class]="searchUtils.page > pagingLimit ? 'search-results' : ''"
|
|
|
|
|
*ngIf="(searchUtils.page >= pagingLimit) && (searchUtils.totalResults > searchUtils.size*pagingLimit)">
|
|
|
|
|
<p class="uk-alert-warning" uk-alert>For more results please try a new, more specific query</p>
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<div class="uk-align-center uk-margin-remove-bottom">
|
|
|
|
|
<!-- <div *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"-->
|
|
|
|
|
<!-- class="uk-grid uk-margin-top uk-margin-bottom">-->
|
|
|
|
|
<!-- <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"></search-results-per-page>-->
|
|
|
|
|
<!-- <search-sorting class="uk-width-1-2@m uk-width-1-1" *ngIf="sort" [(sortBy)]="searchUtils.sortBy" (sortByChange)="sortByChanged($event)"></search-sorting>-->
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
<search-paging [type]="type" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults"
|
|
|
|
|
[(searchUtils)]="searchUtils" [(results)]="results" [(baseUrl)]="searchUtils.baseUrl"
|
|
|
|
|
[(parameterNames)]="parameterNames" [(parameterValues)]="parameterValues"
|
|
|
|
|
[isDisabled]="disableForms || disableRefineForms">
|
|
|
|
|
</search-paging>
|
|
|
|
|
</div>
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<a *ngIf="properties.showLastIndexInformationLink && lastIndex && searchUtils.status !== errorCodes.LOADING"
|
|
|
|
|
class="last_index_info uk-button-text uk-button"
|
|
|
|
|
[href]="properties.lastIndexInformationLink" target="_blank">
|
|
|
|
|
Last index information
|
|
|
|
|
</a>
|
|
|
|
|
</div>
|
2020-07-24 13:21:22 +02:00
|
|
|
<!-- </ng-template>-->
|
2020-06-05 14:56:28 +02:00
|
|
|
<!-- <div class="uk-visible@m uk-margin-top uk-width-1-5">-->
|
|
|
|
|
<!-- <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>-->
|
|
|
|
|
<!-- </div>-->
|
2020-01-31 16:12:51 +01:00
|
|
|
<!-- <helper *ngIf="searchUtils.totalResults > csvLimit" class="uk-margin-top helper-left-right uk-visible@m" position="right"></helper> -->
|
2020-07-24 13:21:22 +02:00
|
|
|
<!-- </div>-->
|
2020-01-31 16:12:51 +01:00
|
|
|
|
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
|
|
|
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
2020-06-05 14:56:28 +02:00
|
|
|
[texts]="pageContents['bottom']"></helper>
|
2020-01-31 16:12:51 +01:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-10-12 14:39:42 +02:00
|
|
|
<div *ngIf="properties.isDashboard" id="filters_switcher_toggle" href="#style_switcher" uk-toggle="" >
|
|
|
|
|
<i class=" uk-text-muted">
|
|
|
|
|
<svg style="margin-top: 8px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24"
|
|
|
|
|
viewBox="0 0 20 20"
|
|
|
|
|
fill="white" width="24px" height="16px">
|
|
|
|
|
<g>
|
|
|
|
|
<path d="M0,0h24 M24,24H0" fill="none"/>
|
|
|
|
|
<path
|
|
|
|
|
d="M4.25,5.61C6.57,8.59,10,13,10,13v5c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-5c0,0,3.43-4.41,5.75-7.39 C20.26,4.95,19.79,4,18.95,4H5.04C4.21,4,3.74,4.95,4.25,5.61z"/>
|
|
|
|
|
<path d="M0,0h24v24H0V0z" fill="none"/>
|
|
|
|
|
</g>
|
|
|
|
|
</svg>
|
|
|
|
|
</i>
|
|
|
|
|
</div>
|
|
|
|
|
<div *ngIf="properties.isDashboard" id="style_switcher" class=" uk-offcanvas filters_switcher"
|
|
|
|
|
uk-offcanvas="flip:true" mode="slide" overlay="" style="z-index:982;" >
|
|
|
|
|
|
|
|
|
|
<div class="uk-offcanvas-bar offcanvas-white">
|
|
|
|
|
<div class="uk-float-right" >
|
|
|
|
|
<button class="uk-offcanvas-close uk-close uk-icon" type="button" uk-close=""></button>
|
|
|
|
|
|
|
|
|
|
</div>
|
2020-08-04 09:25:32 +02:00
|
|
|
<div class="uk-padding uk-padding-remove-top uk-overflow-auto" style="height:calc(100vh - 100px);">
|
2020-07-13 11:15:00 +02:00
|
|
|
<ng-container *ngTemplateOutlet="filters_column; context: {}"></ng-container>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-07-24 13:21:22 +02:00
|
|
|
</div>
|
2020-08-04 09:25:32 +02:00
|
|
|
<modal-alert #removeCustomFilter (alertOutput)="closeCustomFilterModal()"></modal-alert>
|
