diff --git a/app/models/business.rb b/app/models/business.rb
index 68cac67..df6acf2 100644
--- a/app/models/business.rb
+++ b/app/models/business.rb
@@ -1,7 +1,7 @@
 class Business < ActiveRecord::Base
   include RailsSettings::Extend
   include BusinessDefault
-
+
   has_one :call_in_setting
   has_one :text_in_setting

@@ -14,6 +14,7 @@ class Business < ActiveRecord::Base
   has_many  :settings,dependent: :delete_all
   has_many  :survey_questions,dependent: :delete_all
   has_many :alert_settings, dependent: :delete_all
+  has_many :order_items, through: :orders

   mount_uploader :logo, LogoUploader

@@ -46,4 +47,4 @@ class Business < ActiveRecord::Base
     self.host = "127.0.0.1"
   end
 end
-
+
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index 952a76a..1a71447 100644
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -12,6 +12,7 @@ class OrderItem < ActiveRecord::Base
   scope :by_eta,->(date=Time.zone.today){where(eta: date)}
   scope :delivered,->{where(status: "Delivered")}
   scope :active_quantity, -> { where('quantity > ?', 0) }
+  scope :last_four_days, -> { where(:updated_at => (Date.today)..(Date.today - 4.days)) }

   scope :items_delivered_query, ->(type) { select("#{type.upcase}(orders.schedule_date) AS #{type}, SUM(quantity) AS total_quantity, SUM(delivered_quantity) AS total_delivered_quantity, ((1.0 * SUM(delivered_quantity))*100/NULLIF(1.0*SUM(quantity),0)) AS total_delivered_quantity_percent").group("#{type.upcase}(orders.schedule_date)").active_quantity.charts_date_range(6, type).joins(:order).order("#{type.upcase}(orders.schedule_date)") }
   scope :charts_date_range, -> (range, type){ where("orders.schedule_date between ? and ?", range.send(type == 'date' ? 'day' : type ).ago.beginning_of_day, 0.day.ago)}
@@ -40,13 +41,6 @@ class OrderItem < ActiveRecord::Base
     self[:updated_at].strftime("%B %d,%Y %I:%M %p")
   end

-  def status
-    return "Exception" if (super == "Refused") || (delivered_quantity != quantity)
-    return "Picked up" if (quantity < 0) && (delivered_quantity == quantity)
-
-    super
-  end
-
   def status_from_sync_data(item)
     item["delivered_quantity"], item["quantity"] = [item["delivered_quantity"], item["quantity"]].map(&:to_i)

diff --git a/app/views/reports/_average_delivery_duration.html.erb b/app/views/reports/_average_delivery_duration.html.erb
index 81d77d6..788df69 100644
--- a/app/views/reports/_average_delivery_duration.html.erb
+++ b/app/views/reports/_average_delivery_duration.html.erb
@@ -9,7 +9,7 @@
                 <!-- <button data-url="/reports/average_delivery_duration/daily" class="btn rbtn">
                   Daily
                 </button> -->
-                <button data-url="/reports/average_delivery_duration/weekly" class="btn rbtn">
+                <button data-url="/reports/average_delivery_duration/weekly" class="btn rbtn first">
                   Weekly
                 </button>
                 <button data-url="/reports/average_delivery_duration/monthly" class="btn rbtn">
@@ -24,6 +24,7 @@
           </a>
         </div>
     </div>
+    <div class="loader average_delivery_duration_loader" style="display:none;text-align:center"><%= image_tag 'loading.gif' %></div>
     <div class="box-content" id="average_delivery_duration">

     </div>
diff --git a/app/views/reports/delivery.html.erb b/app/views/reports/delivery.html.erb
index 8aca1bb..240bdbb 100644
--- a/app/views/reports/delivery.html.erb
+++ b/app/views/reports/delivery.html.erb
@@ -23,7 +23,7 @@
                   <i class="icon-truck"></i>
                       On Time %
                       <div style="padding-left:10px" class="btn-group rbtn-group col-sm-9 pull-right">
-                        <button data-url="/reports/on-time/daily" class="btn rbtn">
+                        <button data-url="/reports/on-time/daily" class="btn rbtn first">
                           Daily
                         </button>
                         <button data-url="/reports/on-time/weekly" class="btn rbtn">
@@ -42,6 +42,7 @@
                   </a>
                 </div>
             </div>
+            <div class="loader" id="on-time_loader" style="display:none;text-align:center"><%= image_tag 'loading.gif' %></div>
             <div class="box-content" id="on-time">
             </div>
           </div>
@@ -54,7 +55,7 @@
                   <i class="icon-truck"></i>
                       Items Delivered %
                       <div style="padding-left:10px" class="btn-group rbtn-group col-sm-9 pull-right">
-                        <button data-url="/reports/completion/daily" class="btn rbtn">
+                        <button data-url="/reports/completion/daily" class="btn rbtn first">
                           Daily
                         </button>
                         <button data-url="/reports/completion/weekly" class="btn rbtn">
@@ -73,6 +74,7 @@
                   </a>
                 </div>
             </div>
+            <div class="loader" id="completion_loader" style="display:none;text-align:center"><%= image_tag 'loading.gif' %></div>
             <div class="box-content" id="completion">
             </div>
           </div>
@@ -121,14 +123,25 @@
         else
           loadData(thisObj.data().url+"/"+store_id);
       });
+
+      setTimeout(function(){
+        $(".btn-group.rbtn-group > .first").each(function(){
+          $(this).click();
+        })
+      }, 5000)
+
   });


 function loadData(url){
+  target = url.split('/')[2];
+  loader = "#" + target + "_loader";
+  $(loader).show();
   $.ajax({
     url: url,
     success: function(response){
-      $("div#"+url.split("/")[2]).html(response)
+      $("div#"+target).html(response);
+      $(loader).hide();
     }
   })
 }
diff --git a/lib/tasks/update_status_for_old_records_order_items.rake b/lib/tasks/update_status_for_old_records_order_items.rake
index e69de29..829050c 100644
--- a/lib/tasks/update_status_for_old_records_order_items.rake
+++ b/lib/tasks/update_status_for_old_records_order_items.rake
@@ -0,0 +1,29 @@
+namespace :dtv do
+  desc 'update status for old records order items'
+  task :update_status_for_old_records_order_items => :environment do
+    module StatusRefresh
+      def status
+        return "Exception" if (delivered_quantity != quantity)
+        return "Picked up" if (quantity < 0) && (delivered_quantity == quantity)
+
+        super
+      end
+
+      def update_status_for_old_records
+        return if Date.parse(self.updated_at) > Date.parse('26/07/2016')
+        self.status= self.status
+        puts "working"
+        self.save if self.changed?
+      end
+    end
+
+
+    Business.all.each do |b|
+      b.set_scoped_db
+      b.order_items.last_four_days.each do |item|
+        item.extend(StatusRefresh1)
+        item.update_status_for_old_records
+      end
+    end
+  end
+end