1

handlers/PitcherPanelHandler.py

@@ -13,15 +13,13 @@ class PitcherPanelChannel(BaseHandler):
         channel = args.get("channel", '')
         start = args.get("start", du.get_n_days(-1))
         end = args.get("end", du.get_n_days(0))
-        date_range = args.get("date_range", '')
         page = args.get("page",'1')
         page_size = args.get("page_size",'10')
         order_by=args.get("order_by",'date')
         order=args.get("order", 'desc')
-
-        if date_range!='':
-            end=du.get_n_days(0)
-            start=du.get_n_days(-int(date_range))
+        if args.has_key('date_range'):
+            end = du.get_n_days(0)
+            start = du.get_n_days(-int(args['date_range']))
         data,total=get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)
         self.write_json(data=data,total=total)
 
@@ -32,14 +30,13 @@ class PitcherPanelDaily(BaseHandler):
         pitcher = args.get("pitcher", '')
         start = args.get("start", du.get_n_days(-1))
         end = args.get("end", du.get_n_days(0))
-        date_range = args.get("date_range", '')
         page = args.get("page", '1')
         page_size = args.get("page_size", '10')
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
-        if date_range != '':
+        if args.has_key('date_range'):
             end = du.get_n_days(0)
-            start = du.get_n_days(-int(date_range))
+            start = du.get_n_days(-int(args['date_range']))
 
         data,total = get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, order)
         self.write_json(data=data,total=total)
@@ -61,14 +58,13 @@ class ChannelOverview(BaseHandler):
         pitcher=args.get("pitcher",'')
         start=args.get("start",'')
         end=args.get("end",'')
-        date_range=args.get("date_range",'')
         page = args.get("page", '1')
         page_size = args.get("page_size", '10')
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
-        if isinstance(date_range,int):
+        if args.has_key('date_range'):
             end = du.get_n_days(0)
-            start = du.get_n_days(-date_range)
+            start = du.get_n_days(-int(args['date_range']))
         data,total =get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)
 
@@ -93,14 +89,13 @@ class ChannelActive(BaseHandler):
         channel = args.get("channel", '')
         start = args.get("start", du.get_n_days(-30))
         end = args.get("end", du.get_n_days(0))
-        date_range = args.get("date_range", '')
         page = args.get("page", '1')
         page_size = args.get("page_size", '10')
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
-        if isinstance(date_range, int):
+        if args.has_key('date_range'):
             end = du.get_n_days(0)
-            start = du.get_n_days(-date_range)
+            start = du.get_n_days(-int(args['date_range']))
         data,total=get_channel_active(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)
 
@@ -113,14 +108,13 @@ class ChannelOrderTrend(BaseHandler):
         channel = arg.get("channel", '')
         start = arg.get("start", du.get_n_days(-7))
         end = arg.get("end", du.get_n_days(0))
-        date_range = arg.get("date_range", '')
         page = arg.get("page", '1')
         page_size = arg.get("page_size", '10')
         order_by = arg.get("order_by", 'date')
         order = arg.get("order", 'desc')
-        if isinstance(date_range, int):
+        if arg.has_key('date_range'):
             end = du.get_n_days(0)
-            start = du.get_n_days(-date_range)
+            start = du.get_n_days(-int(arg['date_range']))
         data,total=get_channel_order_trend(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)