Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated Facet.Field issue and Move Filter code to DocumentSearchResultsController from FieldFacetController #13

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Updated Facet.Field issue and Move Filter code to DocumentSearchResultsController from FieldFacetController #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53556c0
remove UI code from solr.js and place it into DocumentSearchResultsCo…
maheshpatel89 Feb 28, 2019
296850d
Updated Facet.Field issue and Move Filter code to DocumentSearchResu…
maheshpatel89 Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@

<div class="container-fluid">
<div class="row">
<div class="col-lg-3">

<div class="col-lg-3">
<section id="content" class="mobileview">
<div class="container-fluid">
<div class="row-fluid">
Expand Down Expand Up @@ -292,9 +292,11 @@
<section id="content">
<div class="container-fluid">
<div class="row-fluid">
<form ng-controller="FieldFacetController" ng-submit="filterByword()" data-near-match="true" data-search-hints-field="" data-source="{{appleseedsSearchSolrProxy}}">
<input name="q" class="form-control searchbox" type="text" placeholder="Keyword or placename" ng-model="userquery" id="userquery" searchbox />
<form ng-controller="DocumentSearchResultsController" ng-submit="filterByword()" data-near-match="true" data-search-hints-field="" data-source="{{appleseedsSearchSolrProxy}}">

<input name="q" class="form-control searchbox" type="text" placeholder="Keyword or placename" ng-model="userquery" id="userquery" searchbox"/>
<i class="fa fa-search searchbutton" ng-click="filterByword()" searchbutton aria-hidden="true"></i>

</form>
</div>
</div>
Expand All @@ -309,12 +311,12 @@
<div class="row-fluid row">
<div class="col-lg-3"></div>
<div class="col-lg-3">
<div ng-controller="FieldFacetController" ng-hide="selected" data-field="Any_Words" data-exclusive="true" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-field="content" data-exclusive="true" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<input id="Any_Words" type="radio" name="Words" ng-click="filterByword()" checked /> Match Any Words
</div>
</div>
<div class="col-lg-3">
<div ng-controller="FieldFacetController" ng-hide="selected" data-field="All_Words" data-exclusive="true" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-field="title" data-exclusive="true" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<input id="All_Words" type="radio" name="Words" ng-click="filterByword()" /> Match All Words
</div>
</div>
Expand All @@ -328,7 +330,7 @@
<div class="row">
<div class="col-lg-2 ipad-controler">
<div class="facets unstyled">
<div ng-controller="FieldFacetController" ng-hide="selected" data-exclusive="true" data-field="user_name" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak id="ddl_user">
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="user_name" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak id="ddl_user">
<select class="form-control" ng-model="user_name" ng-change="filterByUser()" id="user_name">
<option value="">All User</option>
<option value="0">admin</option>
Expand All @@ -339,7 +341,7 @@
</div>

<div class="col-lg-2 ipad-controler">
<div ng-controller="FieldFacetController" ng-hide="selected" data-exclusive="true" data-field="createdDate" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="*" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<select class="form-control" ng-change="filterByDay()" ng-model="days" id="created_at">
<option value=""> All Time </option>
<option value="0">Today</option>
Expand All @@ -354,18 +356,18 @@
</div>

<div class="col-lg-3 ipad-controler">
<div ng-controller="FieldFacetController" ng-hide="selected" data-exclusive="true" data-field="startDate" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="*" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<input id="fromDate" name="startDate" class="form-control" type="text" size="4" onchange="onChangeDate()" placeholder="From : mm-dd-yyyy" readonly />
</div>
</div>
<div class="col-lg-3 ipad-controler">
<div ng-controller="FieldFacetController" ng-hide="selected" data-exclusive="true" data-field="endDate" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="*" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<input id="endDate" name="endDate" class="form-control" type="text" size="4" onchange="onChangeDate()" placeholder="To : mm-dd-yyyy" readonly />
<label id="errorMsg" class="errorMsg">Todate should be less than From date</label>
</div>
</div>
<div class="col-lg-2 ipad-controler">
<div ng-controller="FieldFacetController" ng-hide="selected" data-exclusive="true" data-field="rows" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<div ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="user_id" data-source="{{appleseedsSearchSolrProxy}}" ng-cloak>
<select class="form-control" ng-change="filterbyrow()" ng-model="rows" id="perpage">
<option value="" selected="selected">Items Per Page</option>
<option value="20">20</option>
Expand Down Expand Up @@ -436,13 +438,7 @@ <h5 class="summary"><span count-to="{{totalResults}}" duration="1" count-from="1
</div>

<div class="col-lg-3">
<div id="search-results"
class=""
ng-controller="FieldFacetController"
data-fields="*"
data-source="{{appleseedsSearchSolrProxy}}"
documents-per-page="25"
ng-cloak>
<div id="search-results_Date" ng-controller="DocumentSearchResultsController" ng-hide="selected" data-exclusive="true" data-field="*" data-source="{{appleseedsSearchSolrProxy}}" documents-per-page="25" ng-cloak>
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-secondary">
<a ng-click="sortdate('asc')" autocomplete="off">Date&nbsp; <i class="fa fa-angle-double-up"></i></a>
Expand All @@ -454,13 +450,7 @@ <h5 class="summary"><span count-to="{{totalResults}}" duration="1" count-from="1
</div>
</div>
<div class="col-lg-3">
<div id="search-results"
class=""
ng-controller="FieldFacetController"
data-fields="*"
data-source="{{appleseedsSearchSolrProxy}}"
documents-per-page="25"
ng-cloak>
<div id="search-results_glossary" ng-controller="DocumentSearchResultsController" data-field="content_text" data-source="{{appleseedsSearchSolrProxy}}" documents-per-page="25" ng-cloak>
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-secondary" id="AZ">
<a ng-click="sortchar('asc')">(A-Z)</a>
Expand Down
Loading