Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

XFFruit/Utilities/IBTUIKit/IBTCommon.h

@@ -51,4 +51,6 @@
 + (NSInteger)getWeeks:(NSInteger)year;
 + (NSString*)weekdayStringFromDate:(NSDate*)inputDate;
 +(NSString *)countNumAndChangeformat:(NSString *)num;
++ (NSString *)getWeekFromDateStr:(NSString *)dataStr;
+
 @end

XFFruit/Utilities/IBTUIKit/IBTCommon.m

@@ -175,6 +175,11 @@
     [formatter setDateFormat:@"yyyy.MM.dd"];
     return [formatter dateFromString:dateString];
 }
++ (NSDate *)convertToDateFromStr:(NSString *)dateString{
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyy-MM-dd"];
+    return [formatter dateFromString:dateString];
+}
 + (NSString *)stringFromDate:(NSDate*)aDate{
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
     [formatter setDateFormat:@"yyyy-MM-dd "];
@@ -314,8 +319,10 @@
     NSString *yearWeek = @"";
     NSCalendar *greCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
     NSDateComponents *dateComponents = [greCalendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSWeekCalendarUnit | NSWeekdayCalendarUnit | NSWeekOfMonthCalendarUnit | NSWeekOfYearCalendarUnit fromDate:[NSDate date]];
-    NSString *year = [IBTCommon stringFromDateWithFormat:[NSDate date]  format:@"yyyy"];
-    if (dateComponents.weekOfYear == 1) {
+    NSString *yearStr = [IBTCommon stringFromDateWithFormat:[NSDate date]  format:@"yyyy-MM-dd"];
+    NSString *year = [yearStr substringToIndex:4];
+    NSString *month = [yearStr substringWithRange:NSMakeRange(5,2)];
+    if (dateComponents.weekOfYear == 1 && [month isEqualToString:@"12"]) {
         yearWeek = [NSString stringWithFormat:@"%ld-%ld", [year integerValue]+1
                     ,(long)dateComponents.weekOfYear];
     }else{

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -264,4 +264,15 @@
 //客单价
 #define PriceWebUrl     @"cruiser-web/chart/persalesdatachart.thor"
 
+#define OrderLastWeak        @"比上周同期"
+#define OrderLastMonth       @"比上月同期"
+#define LastWeak             @"比上周"
+#define LastMonth            @"比上月"
+#define AvgLabelDay          @"单店日均"
+#define AvgLabelWeek         @"单店周均"
+#define AvgLabelMonth        @"单店月均"
+
+
+
+
 #endif

XFFruit/ViewControllers/Report/Controllers/GrossRateViewController.h

@@ -12,7 +12,8 @@
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,assign)NSInteger count;
+@property (nonatomic,strong)NSString  *typeStr;
 
-- (void)setValueInGrossRate:(Compass *)compass;
+- (void)setValueInGrossRate:(Compass *)compass withType:(NSString *)type;
 
 @end

XFFruit/ViewControllers/Report/Controllers/GrossRateViewController.m

@@ -53,7 +53,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
     [self.view addSubview:self.tableView];
     
 }
-- (void)setValueInGrossRate:(Compass *)compass{
+- (void)setValueInGrossRate:(Compass *)compass withType:(NSString *)type{
+    self.rpassgerView.weekLabelStr = type;
     [self.rpassgerView setGrossprofitWithCompass:compass];
 }
 
@@ -112,6 +113,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
     
     [headerView buildLayout:@"毛利率"];
     [headerView setTotalValue:[NSString stringWithFormat:@"共%ld家",(long)self.count]];
+    [headerView changeTypeName:self.typeStr];
+
     return headerView;
 }
 

XFFruit/ViewControllers/Report/Controllers/PassengerViewController.h

@@ -12,7 +12,8 @@
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,assign)NSInteger count;
+@property (nonatomic,strong)NSString  *typeStr;
 
-- (void)setValueInPassenger:(Compass *)compass;
+- (void)setValueInPassenger:(Compass *)compass  withType:(NSString *)type;
 
 @end

XFFruit/ViewControllers/Report/Controllers/PassengerViewController.m

@@ -50,7 +50,8 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
     [self.view addSubview:self.tableView];
     
 }
-- (void)setValueInPassenger:(Compass *)compass{
+- (void)setValueInPassenger:(Compass *)compass  withType:(NSString *)type{
+    self.rpassgerView.weekLabelStr = type;
     [self.rpassgerView setPassengerWithCompass:compass];
 }
 
@@ -103,6 +104,7 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
     
     [headerView buildLayout:@"客流"];
     [headerView setTotalValue:[NSString stringWithFormat:@"共%ld家",(long)self.count]];
+    [headerView changeTypeName:self.typeStr];
     return headerView;
 }
 - (void)detailClick:(UIButton *)btn{

XFFruit/ViewControllers/Report/Controllers/PassgerPriceViewController.h

@@ -12,7 +12,8 @@
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,assign)NSInteger count;
+@property (nonatomic,strong)NSString  *typeStr;
 
-- (void)setValueInPassgerPrice:(Compass *)compass;
+- (void)setValueInPassgerPrice:(Compass *)compass  withType:(NSString *)type;
 
 @end

XFFruit/ViewControllers/Report/Controllers/PassgerPriceViewController.m

@@ -53,7 +53,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
     [self.view addSubview:self.tableView];
     
 }
-- (void)setValueInPassgerPrice:(id)compass{
+- (void)setValueInPassgerPrice:(id)compass  withType:(NSString *)type{
+    self.rpassgerView.weekLabelStr = type;
     [self.rpassgerView setPersalesWithCompass:compass];
 }
 
@@ -113,6 +114,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
     
     [headerView buildLayout:@"客单价"];
     [headerView setTotalValue:[NSString stringWithFormat:@"共%ld家",(long)self.count]];
+    [headerView changeTypeName:self.typeStr];
+
     return headerView;
 }
 

XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m

@@ -240,6 +240,10 @@
             [self.rpassgerView setPassengerWithCompass:self.compass];
             [self.rpriceView setPersalesWithCompass:self.compass];
             [self.rgrossView setGrossprofitWithCompass:self.compass];
+            self.rsaleView.weekLabelStr = self.dayType;
+            self.rpassgerView.weekLabelStr = self.dayType;
+            self.rpriceView.weekLabelStr = self.dayType;
+            self.rsaleView.weekLabelStr = self.dayType;
         }else{
             [IBTLoadingView showTips:message];
         }

XFFruit/ViewControllers/Report/Controllers/ReportViewController.m

@@ -198,10 +198,10 @@
     }
 }
 - (void)setValueInScrollView{
-    [svc setValueInSale:self.compass];
-    [pvc setValueInPassenger:self.compass];
-    [ppvc setValueInPassgerPrice:self.compass];
-    [gvc setValueInGrossRate:self.compass];
+    [svc setValueInSale:self.compass withType:self.dayType];
+    [pvc setValueInPassenger:self.compass withType:self.dayType];
+    [ppvc setValueInPassgerPrice:self.compass withType:self.dayType];
+    [gvc setValueInGrossRate:self.compass withType:self.dayType];
 }
 
 //获取底部详情数据
@@ -285,9 +285,13 @@
 #pragma mark - 刷新所有的tableView
 - (void)refreshAllTable{
     svc.count = self.storeCount;
+      svc.typeStr = self.dayType;
     pvc.count = self.storeCount;
+    pvc.typeStr = self.dayType;
     ppvc.count = self.storeCount;
+      ppvc.typeStr = self.dayType;
     gvc.count = self.storeCount;
+      gvc.typeStr = self.dayType;
     svc.dataArr = self.dataArr;
     pvc.dataArr = self.dataArr;
     ppvc.dataArr = self.dataArr;

XFFruit/ViewControllers/Report/Controllers/SaleViewController.h

@@ -12,6 +12,8 @@
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,assign)NSInteger count;
-- (void)setValueInSale:(Compass *)compass;
+@property (nonatomic,strong)NSString  *typeStr;
+
+- (void)setValueInSale:(Compass *)compass withType:(NSString *)type;
 
 @end

XFFruit/ViewControllers/Report/Controllers/SaleViewController.m

@@ -60,9 +60,11 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
     [self.view addSubview:self.tableView];
 
 }
-- (void)setValueInSale:(Compass *)compass{
+- (void)setValueInSale:(Compass *)compass  withType:(NSString *)type{
     self.compass = compass;
+    self.rsaleView.weekLabelStr = type;
     [self.rsaleView setValueInSaleView:compass];
+    
 }
 
 #pragma mark - tableViewDelegate
@@ -112,6 +114,8 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
     }
     [headerView buildLayout];
     headerView.totalLabel.text = [NSString stringWithFormat:@"共%ld家",(long)self.count];
+    [headerView changeTypeName:self.typeStr];
+
     return headerView;
 }
 

XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.h

@@ -12,4 +12,5 @@
 + (CGFloat)viewHeight;
 - (void)buildLayout:(NSString *)titleStr;
 - (void)setTotalValue:(NSString *)totalValue;
+- (void)changeTypeName:(NSString *)name;
 @end

XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.m

@@ -20,7 +20,7 @@
 @property (nonatomic, strong) UILabel *searchLabel;
 
 @property (nonatomic, strong) UIFont *textFont;
-
+@property (nonatomic, strong) UILabel *bszLabel;
 
 @end
 
@@ -71,6 +71,7 @@
     UILabel * bszLabel = [IBTCommon labelWithTitle:@"比上周" frame:rect textFont:self.textFont];
     bszLabel.textColor = ReportTitleColor;
     [self.contentView addSubview:bszLabel];
+    self.bszLabel = bszLabel;
     
     rect = CGRectMake(0, Sale_Header_Height-1, ScreenSize.width, 1);
     UILabel *lineTLabel = [[UILabel alloc]initWithFrame:rect];
@@ -81,4 +82,16 @@
 - (void)setTotalValue:(NSString *)totalValue{
     self.searchLabel.text = totalValue;
 }
+
+- (void)changeTypeName:(NSString *)name{
+    NSString *typeStr = @"";
+    if ([name isEqualToString:SaleEnMonth]) {
+        typeStr = LastMonth;
+    }else{
+        typeStr = LastWeak;
+    }
+    self.bszLabel.text = typeStr;
+}
+
+
 @end

XFFruit/ViewControllers/Report/Views/RPassgerView.h

@@ -15,6 +15,8 @@
 @property (nonatomic,strong)UIButton *lastYearLabel;
 @property (nonatomic,strong)UIImageView *bgImage;
 @property (nonatomic,strong)UIImageView *cenImage;
+@property (nonatomic,strong)NSString *weekLabelStr;
+@property (nonatomic,strong)UILabel *weekLabel;
 
 - (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage;
 

XFFruit/ViewControllers/Report/Views/RPassgerView.m

@@ -79,6 +79,7 @@
     weekLabel.textAlignment = NSTextAlignmentCenter;
     weekLabel.font = GXF_THREETEENTH_SIZE;
     [self addSubview:weekLabel];
+    self.weekLabel = weekLabel;
     
     
     rect = CGRectMake(self.lastWeekLabel.right,self.dateLabel.bottom,bottomWidth, ContentHeight);
@@ -105,8 +106,17 @@
     self.pageControl.indicatorDiameter = 10.0f;
     [self addSubview:self.pageControl];
 }
-
-
+- (void)setWeekLabelStr:(NSString *)weekLabelStr{
+    NSString *typeStr = @"";
+    if ([weekLabelStr isEqualToString:SaleEnDay]) {
+        typeStr = OrderLastWeak;
+    }else if([weekLabelStr isEqualToString:SaleEnWeek]){
+        typeStr = OrderLastWeak;
+    }else if([weekLabelStr isEqualToString:SaleEnMonth]){
+        typeStr = OrderLastMonth;
+    }
+    self.weekLabel.text = typeStr;
+}
 //客流
 - (void)setPassengerWithCompass:(Compass *)compass{
 

XFFruit/ViewControllers/Report/Views/RSaleView.h

@@ -12,6 +12,9 @@
 - (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage;
 @property (nonatomic,strong)UIImageView *bgImage;
 @property (nonatomic,strong)UIImageView *cenImage;
+@property (nonatomic,strong)NSString *weekLabelStr;
+@property (nonatomic,strong)UILabel *weekLabel;
+@property (nonatomic,strong)UILabel *avgLabel;
 
 - (void)setValueInSaleView:(Compass *)compass;
 @end

XFFruit/ViewControllers/Report/Views/RSaleView.m

@@ -89,6 +89,7 @@
     weekLabel.font = GXF_THREETEENTH_SIZE;
     weekLabel.textAlignment = NSTextAlignmentCenter;
     [self addSubview:weekLabel];
+    self.weekLabel = weekLabel;
     
     rect = CGRectMake(self.lastWeekLabel.right, self.lastWeekLabel.top,bottomWidth, ContentHeight);
      self.lastYearLabel = [IBTCommon buttonWithTitle:@"" Image:nil frame:rect fontSize:15 fontColor:[UIColor lightGrayColor]];
@@ -134,7 +135,7 @@
     avLabel.font = GXF_THREETEENTH_SIZE;
     avLabel.textAlignment = NSTextAlignmentCenter;
     [self addSubview:avLabel];
-    
+    self.avgLabel = avLabel;
     self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, avLabel.bottom+5, ScreenSize.width, 10)];
     self.pageControl.numberOfPages = 4;
     self.pageControl.currentPage = self.currentPage;
@@ -144,7 +145,23 @@
     self.pageControl.indicatorDiameter = 10.0f;
     [self addSubview:self.pageControl];
 }
-
+- (void)setWeekLabelStr:(NSString *)weekLabelStr{
+    
+    NSString *typeStr = @"";
+    NSString *avStr = @"";
+    if ([weekLabelStr isEqualToString:SaleEnDay]) {
+        typeStr = OrderLastWeak;
+        avStr = AvgLabelDay;
+    }else if([weekLabelStr isEqualToString:SaleEnWeek]){
+        typeStr = OrderLastWeak;
+        avStr = AvgLabelWeek;
+    }else if([weekLabelStr isEqualToString:SaleEnMonth]){
+        typeStr = OrderLastMonth;
+        avStr = AvgLabelMonth;
+    }
+    self.weekLabel.text = typeStr;
+    self.avgLabel.text = avStr;
+}
 - (void)setValueInSaleView:(Compass *)compass{
     //统计时间
     NSString *weekday = @"";

XFFruit/ViewControllers/Report/Views/SaleHeaderView.h

@@ -14,5 +14,6 @@
 
 + (CGFloat)viewHeight;
 - (void)buildLayout;
+- (void)changeTypeName:(NSString *)name;
 
 @end

XFFruit/ViewControllers/Report/Views/SaleHeaderView.m

@@ -17,6 +17,7 @@
 
 @property (nonatomic, strong) UILabel *label;
 @property (nonatomic, strong) UIFont *textFont;
+@property (nonatomic, strong) UILabel *bszLabel;
 
 @end
 
@@ -64,6 +65,7 @@
     UILabel * bszLabel = [IBTCommon labelWithTitle:@"比上周" frame:rect textFont:self.textFont];
     bszLabel.textColor = ReportTitleColor;
     [self.contentView addSubview:bszLabel];
+    self.bszLabel = bszLabel;
     
     rect = CGRectMake(bszLabel.right , 0, width-20, Sale_Header_Height);
     UILabel * sclLabel = [IBTCommon labelWithTitle:@"达成率" frame:rect textFont:self.textFont];
@@ -76,5 +78,13 @@
     [self.contentView addSubview:lineTLabel];
    
 }
-
+- (void)changeTypeName:(NSString *)name{
+    NSString *typeStr = @"";
+    if ([name isEqualToString:SaleEnMonth]) {
+        typeStr = LastMonth;
+    }else{
+        typeStr = LastWeak;
+    }
+    self.bszLabel.text = typeStr;
+}
 @end

XFFruit/ViewControllers/Report/Views/SaleViewCell.m

@@ -124,7 +124,7 @@
     //销售额
     self.saleLabel.text = sale.sales?[IBTCommon countNumAndChangeformat:[sale.sales stringValue]] : @"0";
     
-    NSString *salesYoStr = [NSString stringWithFormat:@"%@%%",sale.salesChainRate];
+    NSString *salesYoStr = [NSString stringWithFormat:@"%@%%",[sale.salesChainRate stringValue]];
     [self.lastWeekLabel setTitle:salesYoStr forState:UIControlStateNormal];
     //销售目标达成率
     NSString *salesTargetRateStr = [NSString stringWithFormat:@"%@%%",sale.salesTargetRate];