From 0e1b3048ce52fe6b954e9eb042e0817e0c0d1945 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Thu, 4 Sep 2014 08:28:15 +0200 Subject: [PATCH] venue in schedule now shows correctly --- FestivalHelper.xcodeproj/project.pbxproj | 6 ++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 46 +++++++++++----- FestivalHelper/Base.lproj/Main.storyboard | 55 +++++++++++++++++-- FestivalHelper/schedule/FESScheduleFilmCell.h | 18 ++++++ FestivalHelper/schedule/FESScheduleFilmCell.m | 39 +++++++++++++ .../schedule/FESScheduleFilmsViewController.m | 21 +++++-- .../schedule/FESScheduleTableViewController.m | 5 ++ 7 files changed, 164 insertions(+), 26 deletions(-) create mode 100644 FestivalHelper/schedule/FESScheduleFilmCell.h create mode 100644 FestivalHelper/schedule/FESScheduleFilmCell.m diff --git a/FestivalHelper.xcodeproj/project.pbxproj b/FestivalHelper.xcodeproj/project.pbxproj index 1768db2..9b19bec 100644 --- a/FestivalHelper.xcodeproj/project.pbxproj +++ b/FestivalHelper.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 3068700D19B5AB16007E4A0E /* FESScheduleTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068700C19B5AB16007E4A0E /* FESScheduleTableViewController.m */; }; 3068701319B6301C007E4A0E /* FESScheduleEntryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701219B6301C007E4A0E /* FESScheduleEntryCell.m */; }; 3068701619B6DA8D007E4A0E /* FESScheduleFilmsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701519B6DA8D007E4A0E /* FESScheduleFilmsViewController.m */; }; + 3068701919B6F135007E4A0E /* FESScheduleFilmCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701819B6F135007E4A0E /* FESScheduleFilmCell.m */; }; 3CEA73BD19B1A86D00076FC5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73BC19B1A86C00076FC5 /* Foundation.framework */; }; 3CEA73BF19B1A86D00076FC5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73BE19B1A86D00076FC5 /* CoreGraphics.framework */; }; 3CEA73C119B1A86D00076FC5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73C019B1A86D00076FC5 /* UIKit.framework */; }; @@ -48,6 +49,8 @@ 3068701219B6301C007E4A0E /* FESScheduleEntryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESScheduleEntryCell.m; path = schedule/FESScheduleEntryCell.m; sourceTree = ""; }; 3068701419B6DA8D007E4A0E /* FESScheduleFilmsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESScheduleFilmsViewController.h; path = schedule/FESScheduleFilmsViewController.h; sourceTree = ""; }; 3068701519B6DA8D007E4A0E /* FESScheduleFilmsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESScheduleFilmsViewController.m; path = schedule/FESScheduleFilmsViewController.m; sourceTree = ""; }; + 3068701719B6F135007E4A0E /* FESScheduleFilmCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESScheduleFilmCell.h; path = schedule/FESScheduleFilmCell.h; sourceTree = ""; }; + 3068701819B6F135007E4A0E /* FESScheduleFilmCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESScheduleFilmCell.m; path = schedule/FESScheduleFilmCell.m; sourceTree = ""; }; 3CEA73B919B1A86C00076FC5 /* FestivalHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FestivalHelper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3CEA73BC19B1A86C00076FC5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 3CEA73BE19B1A86D00076FC5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -104,6 +107,8 @@ 3068701219B6301C007E4A0E /* FESScheduleEntryCell.m */, 3068701419B6DA8D007E4A0E /* FESScheduleFilmsViewController.h */, 3068701519B6DA8D007E4A0E /* FESScheduleFilmsViewController.m */, + 3068701719B6F135007E4A0E /* FESScheduleFilmCell.h */, + 3068701819B6F135007E4A0E /* FESScheduleFilmCell.m */, ); name = schedule; sourceTree = ""; @@ -281,6 +286,7 @@ 3068700D19B5AB16007E4A0E /* FESScheduleTableViewController.m in Sources */, 3CEA73C919B1A86D00076FC5 /* main.m in Sources */, 3068701319B6301C007E4A0E /* FESScheduleEntryCell.m in Sources */, + 3068701919B6F135007E4A0E /* FESScheduleFilmCell.m in Sources */, 3068700719B2D6B1007E4A0E /* FESSCheduleEntry.m in Sources */, 3CEA73CD19B1A86D00076FC5 /* FESAppDelegate.m in Sources */, 3068701619B6DA8D007E4A0E /* FESScheduleFilmsViewController.m in Sources */, diff --git a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ff02dde..d99e47a 100644 --- a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,11 +10,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431372782.77244" + timestampString = "431422378.990975" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "97" - endingLineNumber = "97" + startingLineNumber = "98" + endingLineNumber = "98" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431372782.77244" + timestampString = "431422378.990975" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "74" - endingLineNumber = "74" + startingLineNumber = "75" + endingLineNumber = "75" landmarkName = "-getScheduleDataFromServer" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431372782.77244" + timestampString = "431422378.990975" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "86" - endingLineNumber = "86" + startingLineNumber = "87" + endingLineNumber = "87" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431372782.77244" + timestampString = "431422378.990975" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "100" - endingLineNumber = "100" + startingLineNumber = "101" + endingLineNumber = "101" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -74,14 +74,30 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431372782.77244" + timestampString = "431422378.990975" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "98" - endingLineNumber = "98" + startingLineNumber = "99" + endingLineNumber = "99" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> + + + + diff --git a/FestivalHelper/Base.lproj/Main.storyboard b/FestivalHelper/Base.lproj/Main.storyboard index 86dd82a..98a9c0f 100644 --- a/FestivalHelper/Base.lproj/Main.storyboard +++ b/FestivalHelper/Base.lproj/Main.storyboard @@ -73,22 +73,65 @@ - + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FestivalHelper/schedule/FESScheduleFilmCell.h b/FestivalHelper/schedule/FESScheduleFilmCell.h new file mode 100644 index 0000000..763383a --- /dev/null +++ b/FestivalHelper/schedule/FESScheduleFilmCell.h @@ -0,0 +1,18 @@ +// +// FESScheduleFilmCell.h +// FestivalHelper +// +// Created by Hamo Hapic on 03/09/14. +// Copyright (c) 2014 Senad Uka. All rights reserved. +// + +#import + +@interface FESScheduleFilmCell : UITableViewCell + +@property (weak, nonatomic)IBOutlet UILabel *scheduleFilmTime; +@property (weak, nonatomic)IBOutlet UILabel *scheduleFilmTitle; +@property (weak, nonatomic)IBOutlet UILabel *scheduleFilmVenue; +@property (weak, nonatomic)IBOutlet UILabel *scheduleFilmDuration; + +@end diff --git a/FestivalHelper/schedule/FESScheduleFilmCell.m b/FestivalHelper/schedule/FESScheduleFilmCell.m new file mode 100644 index 0000000..28e2379 --- /dev/null +++ b/FestivalHelper/schedule/FESScheduleFilmCell.m @@ -0,0 +1,39 @@ +// +// FESScheduleFilmCell.m +// FestivalHelper +// +// Created by Hamo Hapic on 03/09/14. +// Copyright (c) 2014 Senad Uka. All rights reserved. +// + +#import "FESScheduleFilmCell.h" + +@implementation FESScheduleFilmCell + +@synthesize scheduleFilmTitle; +@synthesize scheduleFilmDuration; +@synthesize scheduleFilmTime; +@synthesize scheduleFilmVenue; + +- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; + if (self) { + // Initialization code + } + return self; +} + +- (void)awakeFromNib +{ + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated +{ + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/FestivalHelper/schedule/FESScheduleFilmsViewController.m b/FestivalHelper/schedule/FESScheduleFilmsViewController.m index dc9c1d7..e9d002a 100644 --- a/FestivalHelper/schedule/FESScheduleFilmsViewController.m +++ b/FestivalHelper/schedule/FESScheduleFilmsViewController.m @@ -8,6 +8,7 @@ #import "FESScheduleFilmsViewController.h" #import "FESScheduleFilm.h" +#import "FESScheduleFilmCell.h" @interface FESScheduleFilmsViewController () @@ -55,16 +56,26 @@ return [scheduleFilmsArray count]; } -/* + - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:<#@"reuseIdentifier"#> forIndexPath:indexPath]; - - // Configure the cell... + UITableViewCell *retrievedCell = [tableView dequeueReusableCellWithIdentifier:@"scheduleFilmCell" forIndexPath:indexPath]; + FESScheduleFilmCell *cell = (FESScheduleFilmCell *)retrievedCell; + if(cell) + { + //The beauty of this is that you have all your data in one object and grab WHATEVER you like + //This way in the future you can add another field without doing much. + FESScheduleFilm *scheduleFilm = [scheduleFilmsArray objectAtIndex:indexPath.row]; + cell.scheduleFilmTime.text = scheduleFilm.scheduleFilmTime; + cell.scheduleFilmDuration.text = scheduleFilm.scheduleFilmDuration; + cell.scheduleFilmTitle.text = scheduleFilm.scheduleFilmTitle; + cell.scheduleFilmVenue.text = scheduleFilm.scheduleFilmVenue; + + } + return cell; } -*/ /* // Override to support conditional editing of the table view. diff --git a/FestivalHelper/schedule/FESScheduleTableViewController.m b/FestivalHelper/schedule/FESScheduleTableViewController.m index d9d6536..fc7572d 100644 --- a/FestivalHelper/schedule/FESScheduleTableViewController.m +++ b/FestivalHelper/schedule/FESScheduleTableViewController.m @@ -9,6 +9,7 @@ #import "FESScheduleTableViewController.h" #import "FESSCheduleEntry.h" #import "FESScheduleEntryCell.h" +#import "FESScheduleFilmsViewController.h" @interface FESScheduleTableViewController () @@ -166,7 +167,11 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { // Get the new view controller using [segue destinationViewController]. + FESScheduleFilmsViewController *destination = (FESScheduleFilmsViewController *) [segue destinationViewController]; + FESSCheduleEntry *entry = (FESSCheduleEntry *)[self.scheduleArray objectAtIndex:self.tableView.indexPathForSelectedRow.row]; + // Pass the selected object to the new view controller. + destination.scheduleFilmsArray = entry.scheduleFilms; }