Revision 50064
Added by Sandro La Bruzzo over 6 years ago
queryController.js | ||
---|---|---|
124 | 124 |
}; |
125 | 125 |
|
126 | 126 |
|
127 |
$scope.arguments = $location.$$search; |
|
128 |
|
|
129 |
$scope.pidQuery = null; |
|
130 |
|
|
131 |
if ('pid' in $scope.arguments) { |
|
132 |
$scope.pidQuery =$scope.arguments['pid'] |
|
133 |
} |
|
134 |
|
|
135 |
|
|
136 |
|
|
127 | 137 |
$scope.query = $routeParams['q']; |
138 |
$scope.searching = true; |
|
128 | 139 |
|
129 | 140 |
$scope.filterType = $routeParams['f']; |
130 | 141 |
$scope.filters = [] |
... | ... | |
188 | 199 |
return nArray; |
189 | 200 |
} |
190 | 201 |
|
191 |
queryService.query($scope.query, $scope.page, $scope.filter).success(function (data) { |
|
192 | 202 |
|
193 |
$scope.result_query = data['result']['hits']; |
|
194 |
$scope.facet = data['result']['facet']; |
|
195 |
$scope.total = data['result']['total']; |
|
203 |
if ($scope.pidQuery == null) { |
|
196 | 204 |
|
197 |
var totalPages = Math.round($scope.total / 10); |
|
205 |
queryService.query($scope.query, $scope.page, $scope.filter).success(function (data) { |
|
206 |
$scope.searching = false; |
|
198 | 207 |
|
199 |
if ($scope.total > 10 && $scope.total % 10) |
|
200 |
totalPages += 1; |
|
208 |
$scope.result_query = data['result']['hits']; |
|
209 |
$scope.facet = data['result']['facet']; |
|
210 |
$scope.total = data['result']['total']; |
|
201 | 211 |
|
202 |
$scope.totalPages = totalPages ;
|
|
212 |
var totalPages = Math.round($scope.total / 10);
|
|
203 | 213 |
|
204 |
$scope.lastPage = Math.min($scope.pageto, totalPages - 1); |
|
214 |
if ($scope.total > 10 && $scope.total % 10) |
|
215 |
totalPages += 1; |
|
205 | 216 |
|
217 |
$scope.totalPages = totalPages ; |
|
206 | 218 |
|
207 |
if ($scope.page != null) |
|
208 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), $scope.page); |
|
209 |
else { |
|
210 |
$scope.page = 1; |
|
211 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), 1); |
|
212 |
} |
|
213 |
$scope.pageRange = []; |
|
214 |
for (var i = $scope.pageFrom; i <= $scope.pageto; i++) { |
|
215 |
$scope.pageRange.push(i) |
|
216 |
} |
|
217 |
}).error(function (data) { |
|
219 |
$scope.lastPage = Math.min($scope.pageto, totalPages - 1); |
|
218 | 220 |
|
219 |
}) |
|
221 |
|
|
222 |
if ($scope.page != null) |
|
223 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), $scope.page); |
|
224 |
else { |
|
225 |
$scope.page = 1; |
|
226 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), 1); |
|
227 |
} |
|
228 |
$scope.pageRange = []; |
|
229 |
for (var i = $scope.pageFrom; i <= $scope.pageto; i++) { |
|
230 |
$scope.pageRange.push(i) |
|
231 |
} |
|
232 |
}).error(function (data) { |
|
233 |
|
|
234 |
}) |
|
235 |
|
|
236 |
} |
|
237 |
|
|
238 |
else { |
|
239 |
console.log("dovrei essere qui!") |
|
240 |
queryService.queryPid($scope.pidQuery).success(function (data) { |
|
241 |
$scope.searching = false; |
|
242 |
|
|
243 |
$scope.result_query = data['result']['hits']; |
|
244 |
$scope.facet = data['result']['facet']; |
|
245 |
$scope.total = data['result']['total']; |
|
246 |
|
|
247 |
var totalPages = Math.round($scope.total / 10); |
|
248 |
|
|
249 |
if ($scope.total > 10 && $scope.total % 10) |
|
250 |
totalPages += 1; |
|
251 |
|
|
252 |
$scope.totalPages = totalPages ; |
|
253 |
|
|
254 |
$scope.lastPage = Math.min($scope.pageto, totalPages - 1); |
|
255 |
|
|
256 |
|
|
257 |
if ($scope.page != null) |
|
258 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), $scope.page); |
|
259 |
else { |
|
260 |
$scope.page = 1; |
|
261 |
$scope.pageto = Math.max(Math.min($scope.pageFrom + 4, $scope.lastPage), 1); |
|
262 |
} |
|
263 |
$scope.pageRange = []; |
|
264 |
for (var i = $scope.pageFrom; i <= $scope.pageto; i++) { |
|
265 |
$scope.pageRange.push(i) |
|
266 |
} |
|
267 |
}) |
|
268 |
} |
|
269 |
|
|
270 |
|
|
271 |
|
|
220 | 272 |
}]); |
Also available in: Unified diff
made a new look