From de3f2e5e9032a71db0c7f389c0c69307cbefd12c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 15 Nov 2017 09:44:52 +0630 Subject: [PATCH] clear buttom in datepickere --- app/views/reports/credit_payment/index.html.erb | 12 ++++++++---- app/views/reports/payment_method/index.html.erb | 13 +++++++------ app/views/reports/receipt_no/index.html.erb | 12 ++++++++---- app/views/reports/saleitem/index.html.erb | 10 ++++++---- app/views/reports/shiftsale/index.html.erb | 13 ++++++++----- app/views/reports/void_sale/index.html.erb | 10 ++++++---- 6 files changed, 43 insertions(+), 27 deletions(-) diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 2eed1622..8becb13c 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -83,17 +83,21 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); + + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + var period = 0; var period_type = 1; diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb index 40036a37..fa32f91c 100755 --- a/app/views/reports/payment_method/index.html.erb +++ b/app/views/reports/payment_method/index.html.erb @@ -141,20 +141,21 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); - console.log(from); - console.log(to); + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + var period = 0; var period_type = 1; if(to != '' && from != ''){ diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 32d4df12..76756e0f 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -147,17 +147,21 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); + + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + var period = 0; var period_type = 1; diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 587d7c52..8fc915c9 100755 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -211,17 +211,19 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); var period = 0; var period_type = 1; diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index d8d814b8..09a238d3 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -145,18 +145,21 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - console.log(date); - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); + + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + var period = 0; var period_type = 1; diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 3b240c2d..2302e373 100755 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -105,17 +105,19 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date.format("DD-MM-YYYY")) + $('#from').val(date) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date.format("DD-MM-YYYY")) + $('#to').val(date) search_by_date(); }); function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); + var to_date = new Date($('#to').val()); + var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); + var from_date = new Date($('#from').val()); + var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); var period = 0; var period_type = 1;