rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '444-resq-include-date-filter-in-hub-view' into '453-resq-july-30-release'

Browse source 
Add date filter for hub view. #444

See merge request jankstudio/resq!523
This commit is contained in:
Korina Cordero 2020-07-28 07:44:39 +00:00
commit a2b91818fb
2 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -2765,20 +2765,35 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->andWhere('h.flag_hub_view = :flag_hub_view')
->setParameter('flag_hub_view', true);
}
if (isset($datatable['query']['schedule_date']))
{
$start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00';
$end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00';
$date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start);
$date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end);
$query->andWhere('q.date_schedule >= :date_start')
->andWhere('q.date_schedule <= :date_end')
->setParameter('date_start', $date_start)
->setParameter('date_end', $date_end);
}
else
{
$c_date = new DateTime();
$start_curr_date = $c_date->format('Y-m-d') . ' ' . '00:00:00';
$end_curr_date = $c_date->format('Y-m-d') . ' ' . '23:59:00';
$c_date = new DateTime();
$start_curr_date = $c_date->format('Y-m-d') . ' ' . '00:00:00';
$end_curr_date = $c_date->format('Y-m-d') . ' ' . '23:59:00';
$start_current_date = DateTime::createFromFormat('Y-m-d H:i:s', $start_curr_date);
$end_current_date = DateTime::createFromFormat('Y-m-d H:i:s', $end_curr_date);
$start_current_date = DateTime::createFromFormat('Y-m-d H:i:s', $start_curr_date);
$end_current_date = DateTime::createFromFormat('Y-m-d H:i:s', $end_curr_date);
$query->andWhere('q.date_schedule >= :start_current_date')
->andWhere('q.date_schedule <= :end_current_date')
->andWhere('q.status IN (:statuses)')
->setParameter('start_current_date', $start_current_date)
->setParameter('end_current_date', $end_current_date)
->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY);
$query->andWhere('q.date_schedule >= :start_current_date')
->andWhere('q.date_schedule <= :end_current_date')
->andWhere('q.status IN (:statuses)')
->setParameter('start_current_date', $start_current_date)
->setParameter('end_current_date', $end_current_date)
->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY);
}
break;
default:
$query->where('q.status = :status')

31
templates/job-order/list.hubview.html.twig
View file

@ -42,6 +42,17 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div class="input-daterange input-group" id="date-range">
<input role="presentation" type="text" class="form-control m-input" id="date_start" name="date_start" placeholder="Start date" />
<div class="input-group-append">
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
</div>
<input role="presentation" type="text" class="form-control" id="date_end" name="date_end" placeholder="End date" />
</div>
</div>
</div>
</div>
</div>
</div>
@ -59,6 +70,10 @@
{% block scripts %}
<script>
$(function() {
$("#date-range").datepicker({
orientation: "bottom"
});
var options = {
data: {
type: 'remote',
@ -147,6 +162,22 @@
$("#hub_list").on("change", function() {
table.search($(this).val(), "hub");
});
$("#date_start").on("change", function() {
var date_start = $(this).val();
var date_end = $("[name='date_end']").val();
var date_array = [date_start, date_end];
table.search(date_array, "schedule_date");
});
$("#date_end").on("change", function() {
var date_end = $(this).val();
var date_start = $("[name='date_start']").val();
var date_array = [date_start, date_end];
table.search(date_array, "schedule_date");
});
});
</script>
{% endblock %}