Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit 6c20b2c878dd17ce2c8c6c3f80ec94bab329aead

Authored by Imanol-Mikel Barba Sabariego
1 parent 822cb43a

FINAL CODE REVIEW

Inline Side-by-side
Showing 4 changed files with 38 additions and 121 deletions
DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @6c20b2c
No preview for this file type
DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @6c20b2c
@@ -26,27 +26,11 @@ @@ -26,27 +26,11 @@
26 ignoreCount = "0" 26 ignoreCount = "0"
27 continueAfterRunningActions = "No" 27 continueAfterRunningActions = "No"
28 filePath = "MenuTableViewController.m" 28 filePath = "MenuTableViewController.m"
29 - timestampString = "436467072.187571"  
30 - startingColumnNumber = "9223372036854775807"  
31 - endingColumnNumber = "9223372036854775807"  
32 - startingLineNumber = "1038"  
33 - endingLineNumber = "1038"  
34 - landmarkName = "-tableView:didSelectRowAtIndexPath:"  
35 - landmarkType = "5">  
36 - </BreakpointContent>  
37 - </BreakpointProxy>  
38 - <BreakpointProxy  
39 - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">  
40 - <BreakpointContent  
41 - shouldBeEnabled = "No"  
42 - ignoreCount = "0"  
43 - continueAfterRunningActions = "No"  
44 - filePath = "MenuTableViewController.m"  
45 - timestampString = "436467072.187571" 29 + timestampString = "436503914.715118"
46 startingColumnNumber = "9223372036854775807" 30 startingColumnNumber = "9223372036854775807"
47 endingColumnNumber = "9223372036854775807" 31 endingColumnNumber = "9223372036854775807"
48 - startingLineNumber = "940"  
49 - endingLineNumber = "940" 32 + startingLineNumber = "988"
  33 + endingLineNumber = "988"
50 landmarkName = "-tableView:didSelectRowAtIndexPath:" 34 landmarkName = "-tableView:didSelectRowAtIndexPath:"
51 landmarkType = "5"> 35 landmarkType = "5">
52 </BreakpointContent> 36 </BreakpointContent>
@@ -186,11 +170,11 @@ @@ -186,11 +170,11 @@
186 ignoreCount = "0" 170 ignoreCount = "0"
187 continueAfterRunningActions = "No" 171 continueAfterRunningActions = "No"
188 filePath = "MenuTableViewController.m" 172 filePath = "MenuTableViewController.m"
189 - timestampString = "436467072.187571" 173 + timestampString = "436503914.715118"
190 startingColumnNumber = "9223372036854775807" 174 startingColumnNumber = "9223372036854775807"
191 endingColumnNumber = "9223372036854775807" 175 endingColumnNumber = "9223372036854775807"
192 - startingLineNumber = "1143"  
193 - endingLineNumber = "1143" 176 + startingLineNumber = "1093"
  177 + endingLineNumber = "1093"
194 landmarkName = "-tableView:didSelectRowAtIndexPath:" 178 landmarkName = "-tableView:didSelectRowAtIndexPath:"
195 landmarkType = "5"> 179 landmarkType = "5">
196 </BreakpointContent> 180 </BreakpointContent>
@@ -234,27 +218,11 @@ @@ -234,27 +218,11 @@
234 ignoreCount = "0" 218 ignoreCount = "0"
235 continueAfterRunningActions = "No" 219 continueAfterRunningActions = "No"
236 filePath = "MenuTableViewController.m" 220 filePath = "MenuTableViewController.m"
237 - timestampString = "436467072.187571"  
238 - startingColumnNumber = "9223372036854775807"  
239 - endingColumnNumber = "9223372036854775807"  
240 - startingLineNumber = "945"  
241 - endingLineNumber = "945"  
242 - landmarkName = "-tableView:didSelectRowAtIndexPath:"  
243 - landmarkType = "5">  
244 - </BreakpointContent>  
245 - </BreakpointProxy>  
246 - <BreakpointProxy  
247 - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">  
248 - <BreakpointContent  
249 - shouldBeEnabled = "No"  
250 - ignoreCount = "0"  
251 - continueAfterRunningActions = "No"  
252 - filePath = "MenuTableViewController.m"  
253 - timestampString = "436467072.187571" 221 + timestampString = "436503914.715118"
254 startingColumnNumber = "9223372036854775807" 222 startingColumnNumber = "9223372036854775807"
255 endingColumnNumber = "9223372036854775807" 223 endingColumnNumber = "9223372036854775807"
256 - startingLineNumber = "1232"  
257 - endingLineNumber = "1232" 224 + startingLineNumber = "1182"
  225 + endingLineNumber = "1182"
258 landmarkName = "-numberOfSectionsInTableView:" 226 landmarkName = "-numberOfSectionsInTableView:"
259 landmarkType = "5"> 227 landmarkType = "5">
260 </BreakpointContent> 228 </BreakpointContent>
@@ -266,11 +234,11 @@ @@ -266,11 +234,11 @@
266 ignoreCount = "0" 234 ignoreCount = "0"
267 continueAfterRunningActions = "No" 235 continueAfterRunningActions = "No"
268 filePath = "MenuTableViewController.m" 236 filePath = "MenuTableViewController.m"
269 - timestampString = "436467072.187571" 237 + timestampString = "436503914.715118"
270 startingColumnNumber = "9223372036854775807" 238 startingColumnNumber = "9223372036854775807"
271 endingColumnNumber = "9223372036854775807" 239 endingColumnNumber = "9223372036854775807"
272 - startingLineNumber = "1233"  
273 - endingLineNumber = "1233" 240 + startingLineNumber = "1183"
  241 + endingLineNumber = "1183"
274 landmarkName = "-numberOfSectionsInTableView:" 242 landmarkName = "-numberOfSectionsInTableView:"
275 landmarkType = "5"> 243 landmarkType = "5">
276 </BreakpointContent> 244 </BreakpointContent>
@@ -298,11 +266,11 @@ @@ -298,11 +266,11 @@
298 ignoreCount = "0" 266 ignoreCount = "0"
299 continueAfterRunningActions = "No" 267 continueAfterRunningActions = "No"
300 filePath = "MenuTableViewController.m" 268 filePath = "MenuTableViewController.m"
301 - timestampString = "436467072.187571" 269 + timestampString = "436503914.715118"
302 startingColumnNumber = "9223372036854775807" 270 startingColumnNumber = "9223372036854775807"
303 endingColumnNumber = "9223372036854775807" 271 endingColumnNumber = "9223372036854775807"
304 - startingLineNumber = "1352"  
305 - endingLineNumber = "1352" 272 + startingLineNumber = "1302"
  273 + endingLineNumber = "1302"
306 landmarkName = "-tableView:cellForRowAtIndexPath:" 274 landmarkName = "-tableView:cellForRowAtIndexPath:"
307 landmarkType = "5"> 275 landmarkType = "5">
308 </BreakpointContent> 276 </BreakpointContent>
@@ -330,11 +298,11 @@ @@ -330,11 +298,11 @@
330 ignoreCount = "0" 298 ignoreCount = "0"
331 continueAfterRunningActions = "No" 299 continueAfterRunningActions = "No"
332 filePath = "MenuTableViewController.m" 300 filePath = "MenuTableViewController.m"
333 - timestampString = "436467072.187571" 301 + timestampString = "436503914.715118"
334 startingColumnNumber = "9223372036854775807" 302 startingColumnNumber = "9223372036854775807"
335 endingColumnNumber = "9223372036854775807" 303 endingColumnNumber = "9223372036854775807"
336 - startingLineNumber = "1437"  
337 - endingLineNumber = "1437" 304 + startingLineNumber = "1387"
  305 + endingLineNumber = "1387"
338 landmarkName = "-tableView:cellForRowAtIndexPath:" 306 landmarkName = "-tableView:cellForRowAtIndexPath:"
339 landmarkType = "5"> 307 landmarkType = "5">
340 </BreakpointContent> 308 </BreakpointContent>
@@ -346,11 +314,11 @@ @@ -346,11 +314,11 @@
346 ignoreCount = "0" 314 ignoreCount = "0"
347 continueAfterRunningActions = "No" 315 continueAfterRunningActions = "No"
348 filePath = "MenuTableViewController.m" 316 filePath = "MenuTableViewController.m"
349 - timestampString = "436467072.187571" 317 + timestampString = "436503914.715118"
350 startingColumnNumber = "9223372036854775807" 318 startingColumnNumber = "9223372036854775807"
351 endingColumnNumber = "9223372036854775807" 319 endingColumnNumber = "9223372036854775807"
352 - startingLineNumber = "1429"  
353 - endingLineNumber = "1429" 320 + startingLineNumber = "1379"
  321 + endingLineNumber = "1379"
354 landmarkName = "-tableView:cellForRowAtIndexPath:" 322 landmarkName = "-tableView:cellForRowAtIndexPath:"
355 landmarkType = "5"> 323 landmarkType = "5">
356 </BreakpointContent> 324 </BreakpointContent>
@@ -362,11 +330,11 @@ @@ -362,11 +330,11 @@
362 ignoreCount = "0" 330 ignoreCount = "0"
363 continueAfterRunningActions = "No" 331 continueAfterRunningActions = "No"
364 filePath = "MenuTableViewController.m" 332 filePath = "MenuTableViewController.m"
365 - timestampString = "436467072.187571" 333 + timestampString = "436503914.715118"
366 startingColumnNumber = "9223372036854775807" 334 startingColumnNumber = "9223372036854775807"
367 endingColumnNumber = "9223372036854775807" 335 endingColumnNumber = "9223372036854775807"
368 - startingLineNumber = "1224"  
369 - endingLineNumber = "1224" 336 + startingLineNumber = "1174"
  337 + endingLineNumber = "1174"
370 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" 338 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:"
371 landmarkType = "5"> 339 landmarkType = "5">
372 </BreakpointContent> 340 </BreakpointContent>
@@ -378,11 +346,11 @@ @@ -378,11 +346,11 @@
378 ignoreCount = "0" 346 ignoreCount = "0"
379 continueAfterRunningActions = "No" 347 continueAfterRunningActions = "No"
380 filePath = "MenuTableViewController.m" 348 filePath = "MenuTableViewController.m"
381 - timestampString = "436467072.187571" 349 + timestampString = "436503914.715118"
382 startingColumnNumber = "9223372036854775807" 350 startingColumnNumber = "9223372036854775807"
383 endingColumnNumber = "9223372036854775807" 351 endingColumnNumber = "9223372036854775807"
384 - startingLineNumber = "1222"  
385 - endingLineNumber = "1222" 352 + startingLineNumber = "1172"
  353 + endingLineNumber = "1172"
386 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" 354 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:"
387 landmarkType = "5"> 355 landmarkType = "5">
388 </BreakpointContent> 356 </BreakpointContent>
@@ -458,11 +426,11 @@ @@ -458,11 +426,11 @@
458 ignoreCount = "0" 426 ignoreCount = "0"
459 continueAfterRunningActions = "No" 427 continueAfterRunningActions = "No"
460 filePath = "MenuTableViewController.m" 428 filePath = "MenuTableViewController.m"
461 - timestampString = "436467072.187571" 429 + timestampString = "436503914.715118"
462 startingColumnNumber = "9223372036854775807" 430 startingColumnNumber = "9223372036854775807"
463 endingColumnNumber = "9223372036854775807" 431 endingColumnNumber = "9223372036854775807"
464 - startingLineNumber = "1553"  
465 - endingLineNumber = "1553" 432 + startingLineNumber = "1503"
  433 + endingLineNumber = "1503"
466 landmarkName = "-tableView:cellForRowAtIndexPath:" 434 landmarkName = "-tableView:cellForRowAtIndexPath:"
467 landmarkType = "5"> 435 landmarkType = "5">
468 </BreakpointContent> 436 </BreakpointContent>
@@ -474,11 +442,11 @@ @@ -474,11 +442,11 @@
474 ignoreCount = "0" 442 ignoreCount = "0"
475 continueAfterRunningActions = "No" 443 continueAfterRunningActions = "No"
476 filePath = "MenuTableViewController.m" 444 filePath = "MenuTableViewController.m"
477 - timestampString = "436467072.187571" 445 + timestampString = "436503914.715118"
478 startingColumnNumber = "9223372036854775807" 446 startingColumnNumber = "9223372036854775807"
479 endingColumnNumber = "9223372036854775807" 447 endingColumnNumber = "9223372036854775807"
480 - startingLineNumber = "1538"  
481 - endingLineNumber = "1538" 448 + startingLineNumber = "1488"
  449 + endingLineNumber = "1488"
482 landmarkName = "-tableView:cellForRowAtIndexPath:" 450 landmarkName = "-tableView:cellForRowAtIndexPath:"
483 landmarkType = "5"> 451 landmarkType = "5">
484 </BreakpointContent> 452 </BreakpointContent>
@@ -600,11 +568,11 @@ @@ -600,11 +568,11 @@
600 ignoreCount = "0" 568 ignoreCount = "0"
601 continueAfterRunningActions = "No" 569 continueAfterRunningActions = "No"
602 filePath = "MenuTableViewController.m" 570 filePath = "MenuTableViewController.m"
603 - timestampString = "436467072.187571" 571 + timestampString = "436503914.715118"
604 startingColumnNumber = "9223372036854775807" 572 startingColumnNumber = "9223372036854775807"
605 endingColumnNumber = "9223372036854775807" 573 endingColumnNumber = "9223372036854775807"
606 - startingLineNumber = "1210"  
607 - endingLineNumber = "1210" 574 + startingLineNumber = "1160"
  575 + endingLineNumber = "1160"
608 landmarkName = "-tableView:didSelectRowAtIndexPath:" 576 landmarkName = "-tableView:didSelectRowAtIndexPath:"
609 landmarkType = "5"> 577 landmarkType = "5">
610 </BreakpointContent> 578 </BreakpointContent>
DUREX Vendor Control/MenuTableViewController.h
  View file @6c20b2c
@@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
26 26
27 #define CELL_CARAT_TAG 100 27 #define CELL_CARAT_TAG 100
28 28
29 -#define MENU_ELEMENTS @"[1000]Maintenance",@"[1001]Basic Configuration",@"[1002]Sending a Report"  
30 -#define MENU_CELLS_PER_SECTION num(3) 29 +#define MENU_ELEMENTS @"[1000]Maintenance",@"[1001]Basic Configuration"
  30 +#define MENU_CELLS_PER_SECTION num(2)
31 #define MENU_HEADERS nil 31 #define MENU_HEADERS nil
32 32
33 #define MAINTENANCE_ELEMENTS @">[2000]Channels Present",@">[2001]Product Present in Channel",@">[2002]Channel Engine Status",@"[2003]Door Sensor",@"[2004]Coil Sensor",@">[2005]Money Collected",@">[2006]Money Returned",@">[2007]Products Sold",@">[2008]Change Available",@"[2009]Sales log",@"[2010]Incident report",@"[2011]Send report" 33 #define MAINTENANCE_ELEMENTS @">[2000]Channels Present",@">[2001]Product Present in Channel",@">[2002]Channel Engine Status",@"[2003]Door Sensor",@"[2004]Coil Sensor",@">[2005]Money Collected",@">[2006]Money Returned",@">[2007]Products Sold",@">[2008]Change Available",@"[2009]Sales log",@"[2010]Incident report",@"[2011]Send report"
@@ -74,7 +74,6 @@ enum { @@ -74,7 +74,6 @@ enum {
74 A5, 74 A5,
75 A6, 75 A6,
76 A7, 76 A7,
77 - //A9,  
78 BATCH_COMMANDS, 77 BATCH_COMMANDS,
79 INVALID_COMMAND, 78 INVALID_COMMAND,
80 NONE, 79 NONE,
DUREX Vendor Control/MenuTableViewController.m
  View file @6c20b2c
@@ -913,56 +913,6 @@ @@ -913,56 +913,6 @@
913 NSLog(@"[MenuTableViewController.m]: Changing to navLevel: BASIC_CONFIGURATION"); 913 NSLog(@"[MenuTableViewController.m]: Changing to navLevel: BASIC_CONFIGURATION");
914 [self changeNavLevel:BASIC_CONFIGURATION:TRUE]; 914 [self changeNavLevel:BASIC_CONFIGURATION:TRUE];
915 } 915 }
916 - else if([cellName isEqualToString:NSLocalizedString(@"Sending a Report", nil)])  
917 - {  
918 - /*NSMutableString *testString = [[NSMutableString alloc] init];  
919 - for(int i = 0; i < 300; i++)  
920 - {  
921 - [testString appendString:@"A"];  
922 - }  
923 - [_protocol testA9:testString];  
924 - [self setSentCommand:A9];  
925 - [self startTimeoutTimer];*/  
926 - [self setRequestedLog:SALES_LOG];  
927 - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)  
928 - {  
929 - if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))  
930 - {  
931 - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad_Landscape" bundle:nil];  
932 - self.dateRangePickerViewController.delegate = self;  
933 - self.dateRangePickerViewController.childDelegate = self;  
934 - [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];  
935 - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];  
936 - }  
937 - else  
938 - {  
939 - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad" bundle:nil];  
940 - self.dateRangePickerViewController.delegate = self;  
941 - self.dateRangePickerViewController.childDelegate = self;  
942 - [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];  
943 - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];  
944 - }  
945 - }  
946 - else  
947 - {  
948 - if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))  
949 - {  
950 - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_Landscape" bundle:nil];  
951 - self.dateRangePickerViewController.delegate = self;  
952 - self.dateRangePickerViewController.childDelegate = self;  
953 - [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];  
954 - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];  
955 - }  
956 - else  
957 - {  
958 - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController" bundle:nil];  
959 - self.dateRangePickerViewController.delegate = self;  
960 - self.dateRangePickerViewController.childDelegate = self;  
961 - [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];  
962 - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];  
963 - }  
964 - }  
965 - }  
966 } 916 }
967 //Cells in MAINTENANCE 917 //Cells in MAINTENANCE
968 else if([self currentNavLevel] == MAINTENANCE) 918 else if([self currentNavLevel] == MAINTENANCE)