From 83edcaf9555134c50bfb306794c97d64d97b6d76 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Thu, 31 Mar 2016 16:33:30 +0100 Subject: [PATCH] set the filters in Items and Sales/Takings on the right side (#116 #293) --- application/views/giftcards/manage.php | 11 +++++++-- application/views/item_kits/manage.php | 13 ++++++++--- application/views/items/manage.php | 23 ++++++++++--------- application/views/partial/daterangepicker.php | 1 - application/views/people/manage.php | 14 +++++++---- application/views/sales/manage.php | 15 ++++++------ application/views/suppliers/manage.php | 12 ++++++++-- 7 files changed, 58 insertions(+), 31 deletions(-) diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php index 5d1118b29..4696855a3 100644 --- a/application/views/giftcards/manage.php +++ b/application/views/giftcards/manage.php @@ -7,7 +7,7 @@ $(document).ready(function() enable_checkboxes(); enable_row_selection(); enable_search({suggest_url: '', - confirm_message: 'lang->line("common_confirm_search")?>'}); + confirm_message: 'lang->line("common_confirm_search")?>'}); enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); }); @@ -45,6 +45,9 @@ function post_giftcard_form_submit(response) } else //refresh entire table { + // reset page number when selecting a specific page number + $('#limit_from').val("0"); + do_search(true,function() { //highlight new row @@ -69,7 +72,11 @@ function post_giftcard_form_submit(response)
', array('id'=>'delete')); ?> -
    • + +
  • + 'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?> + 'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?> +
    • diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php index f48bae28d..3957848cb 100644 --- a/application/views/item_kits/manage.php +++ b/application/views/item_kits/manage.php @@ -7,8 +7,8 @@ $(document).ready(function() enable_select_all(); enable_checkboxes(); enable_row_selection(); - enable_search({suggest_url : '', - confirm_message : 'lang->line("common_confirm_search")?>'}); + enable_search({suggest_url: '', + confirm_message: 'lang->line("common_confirm_search")?>'}); enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); $('#generate_barcodes').click(function() @@ -58,6 +58,9 @@ function post_item_kit_form_submit(response) } else //refresh entire table { + // reset page number when selecting a specific page number + $('#limit_from').val("0"); + do_search(true,function() { //highlight new row @@ -83,7 +86,11 @@ function post_item_kit_form_submit(response) diff --git a/application/views/items/manage.php b/application/views/items/manage.php index 510e94a18..882e8cd9d 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -161,24 +161,25 @@ function post_bulk_form_submit(response)
  • ' . $this->lang->line("common_delete") . '', array('id'=>'delete')); ?>
  • ' . $this->lang->line("items_bulk_edit") . '', array('id'=>'bulk_edit', 'class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line('items_edit_multiple_items'))); ?>
  • ' . $this->lang->line("items_generate_barcodes") . '', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?>
    • + +
  • + 'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?> + 'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?> +
    • +
  • + 'daterangepicker', 'class'=>'form-control input-sm pull-right', 'id'=>'daterangepicker')); ?> + 'start_date', 'type'=>'hidden', 'id'=>'start_date')); ?> + 'end_date', 'type'=>'hidden', 'id'=>'end_date')); ?> +
    • +
  • 'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
    • 1) { ?> -
  • 'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
    • +
  • 'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
    • -
  • 'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
    • -
  • - 'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?> - 'start_date', 'type'=>'hidden', 'id'=>'start_date')); ?> - 'end_date', 'type'=>'hidden', 'id'=>'end_date')); ?> -
    • -
  • - - -
    • diff --git a/application/views/partial/daterangepicker.php b/application/views/partial/daterangepicker.php index 7cae8920c..2bdac0c86 100644 --- a/application/views/partial/daterangepicker.php +++ b/application/views/partial/daterangepicker.php @@ -87,7 +87,6 @@ $('#daterangepicker').daterangepicker({ "firstDay": lang->line("datepicker_weekstart"); ?> }, "alwaysShowCalendars": true, - "opens": "center", "startDate": "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>", "endDate": "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>", "minDate": "config->item('dateformat'), mktime(0,0,0,01,01,2010));?>", diff --git a/application/views/people/manage.php b/application/views/people/manage.php index a8797cde0..d903876de 100644 --- a/application/views/people/manage.php +++ b/application/views/people/manage.php @@ -6,8 +6,8 @@ $(document).ready(function() init_table_sorting(); enable_select_all(); enable_row_selection(); - enable_search({ suggest_url : '', - confirm_search_message : 'lang->line("common_confirm_search")?>'}); + enable_search({suggest_url: '', + confirm_search_message: 'lang->line("common_confirm_search")?>'}); enable_email(''); enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); }); @@ -25,7 +25,6 @@ function init_table_sorting() 0: { sorter: 'false'}, 5: { sorter: 'false'} } - }); } } @@ -47,6 +46,9 @@ function post_person_form_submit(response) } else //refresh entire table { + // reset page number when selecting a specific page number + $('#limit_from').val("0"); + do_search(true,function() { //highlight new row @@ -91,7 +93,11 @@ function post_person_form_submit(response) diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php index eb7ba2117..970e8d232 100755 --- a/application/views/sales/manage.php +++ b/application/views/sales/manage.php @@ -199,17 +199,16 @@ function init_table_sorting() diff --git a/application/views/suppliers/manage.php b/application/views/suppliers/manage.php index 1afd18066..ade26127d 100644 --- a/application/views/suppliers/manage.php +++ b/application/views/suppliers/manage.php @@ -6,7 +6,8 @@ $(document).ready(function() init_table_sorting(); enable_select_all(); enable_row_selection(); - enable_search({suggest_url : '', confirm_search_message : 'lang->line("common_confirm_search")?>'}); + enable_search({suggest_url: '', + confirm_search_message: 'lang->line("common_confirm_search")?>'}); enable_email(''); enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); }); @@ -46,6 +47,9 @@ function post_person_form_submit(response) } else //refresh entire table { + // reset page number when selecting a specific page number + $('#limit_from').val("0"); + do_search(true,function() { //highlight new row @@ -71,7 +75,11 @@ function post_person_form_submit(response)