Commit 6c20b2c878dd17ce2c8c6c3f80ec94bab329aead
1 parent
822cb43a
FINAL CODE REVIEW
Showing
4 changed files
with
38 additions
and
121 deletions
DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
... | ... | @@ -26,27 +26,11 @@ |
26 | 26 | ignoreCount = "0" |
27 | 27 | continueAfterRunningActions = "No" |
28 | 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 | 30 | startingColumnNumber = "9223372036854775807" |
47 | 31 | endingColumnNumber = "9223372036854775807" |
48 | - startingLineNumber = "940" | |
49 | - endingLineNumber = "940" | |
32 | + startingLineNumber = "988" | |
33 | + endingLineNumber = "988" | |
50 | 34 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
51 | 35 | landmarkType = "5"> |
52 | 36 | </BreakpointContent> |
... | ... | @@ -186,11 +170,11 @@ |
186 | 170 | ignoreCount = "0" |
187 | 171 | continueAfterRunningActions = "No" |
188 | 172 | filePath = "MenuTableViewController.m" |
189 | - timestampString = "436467072.187571" | |
173 | + timestampString = "436503914.715118" | |
190 | 174 | startingColumnNumber = "9223372036854775807" |
191 | 175 | endingColumnNumber = "9223372036854775807" |
192 | - startingLineNumber = "1143" | |
193 | - endingLineNumber = "1143" | |
176 | + startingLineNumber = "1093" | |
177 | + endingLineNumber = "1093" | |
194 | 178 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
195 | 179 | landmarkType = "5"> |
196 | 180 | </BreakpointContent> |
... | ... | @@ -234,27 +218,11 @@ |
234 | 218 | ignoreCount = "0" |
235 | 219 | continueAfterRunningActions = "No" |
236 | 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 | 222 | startingColumnNumber = "9223372036854775807" |
255 | 223 | endingColumnNumber = "9223372036854775807" |
256 | - startingLineNumber = "1232" | |
257 | - endingLineNumber = "1232" | |
224 | + startingLineNumber = "1182" | |
225 | + endingLineNumber = "1182" | |
258 | 226 | landmarkName = "-numberOfSectionsInTableView:" |
259 | 227 | landmarkType = "5"> |
260 | 228 | </BreakpointContent> |
... | ... | @@ -266,11 +234,11 @@ |
266 | 234 | ignoreCount = "0" |
267 | 235 | continueAfterRunningActions = "No" |
268 | 236 | filePath = "MenuTableViewController.m" |
269 | - timestampString = "436467072.187571" | |
237 | + timestampString = "436503914.715118" | |
270 | 238 | startingColumnNumber = "9223372036854775807" |
271 | 239 | endingColumnNumber = "9223372036854775807" |
272 | - startingLineNumber = "1233" | |
273 | - endingLineNumber = "1233" | |
240 | + startingLineNumber = "1183" | |
241 | + endingLineNumber = "1183" | |
274 | 242 | landmarkName = "-numberOfSectionsInTableView:" |
275 | 243 | landmarkType = "5"> |
276 | 244 | </BreakpointContent> |
... | ... | @@ -298,11 +266,11 @@ |
298 | 266 | ignoreCount = "0" |
299 | 267 | continueAfterRunningActions = "No" |
300 | 268 | filePath = "MenuTableViewController.m" |
301 | - timestampString = "436467072.187571" | |
269 | + timestampString = "436503914.715118" | |
302 | 270 | startingColumnNumber = "9223372036854775807" |
303 | 271 | endingColumnNumber = "9223372036854775807" |
304 | - startingLineNumber = "1352" | |
305 | - endingLineNumber = "1352" | |
272 | + startingLineNumber = "1302" | |
273 | + endingLineNumber = "1302" | |
306 | 274 | landmarkName = "-tableView:cellForRowAtIndexPath:" |
307 | 275 | landmarkType = "5"> |
308 | 276 | </BreakpointContent> |
... | ... | @@ -330,11 +298,11 @@ |
330 | 298 | ignoreCount = "0" |
331 | 299 | continueAfterRunningActions = "No" |
332 | 300 | filePath = "MenuTableViewController.m" |
333 | - timestampString = "436467072.187571" | |
301 | + timestampString = "436503914.715118" | |
334 | 302 | startingColumnNumber = "9223372036854775807" |
335 | 303 | endingColumnNumber = "9223372036854775807" |
336 | - startingLineNumber = "1437" | |
337 | - endingLineNumber = "1437" | |
304 | + startingLineNumber = "1387" | |
305 | + endingLineNumber = "1387" | |
338 | 306 | landmarkName = "-tableView:cellForRowAtIndexPath:" |
339 | 307 | landmarkType = "5"> |
340 | 308 | </BreakpointContent> |
... | ... | @@ -346,11 +314,11 @@ |
346 | 314 | ignoreCount = "0" |
347 | 315 | continueAfterRunningActions = "No" |
348 | 316 | filePath = "MenuTableViewController.m" |
349 | - timestampString = "436467072.187571" | |
317 | + timestampString = "436503914.715118" | |
350 | 318 | startingColumnNumber = "9223372036854775807" |
351 | 319 | endingColumnNumber = "9223372036854775807" |
352 | - startingLineNumber = "1429" | |
353 | - endingLineNumber = "1429" | |
320 | + startingLineNumber = "1379" | |
321 | + endingLineNumber = "1379" | |
354 | 322 | landmarkName = "-tableView:cellForRowAtIndexPath:" |
355 | 323 | landmarkType = "5"> |
356 | 324 | </BreakpointContent> |
... | ... | @@ -362,11 +330,11 @@ |
362 | 330 | ignoreCount = "0" |
363 | 331 | continueAfterRunningActions = "No" |
364 | 332 | filePath = "MenuTableViewController.m" |
365 | - timestampString = "436467072.187571" | |
333 | + timestampString = "436503914.715118" | |
366 | 334 | startingColumnNumber = "9223372036854775807" |
367 | 335 | endingColumnNumber = "9223372036854775807" |
368 | - startingLineNumber = "1224" | |
369 | - endingLineNumber = "1224" | |
336 | + startingLineNumber = "1174" | |
337 | + endingLineNumber = "1174" | |
370 | 338 | landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" |
371 | 339 | landmarkType = "5"> |
372 | 340 | </BreakpointContent> |
... | ... | @@ -378,11 +346,11 @@ |
378 | 346 | ignoreCount = "0" |
379 | 347 | continueAfterRunningActions = "No" |
380 | 348 | filePath = "MenuTableViewController.m" |
381 | - timestampString = "436467072.187571" | |
349 | + timestampString = "436503914.715118" | |
382 | 350 | startingColumnNumber = "9223372036854775807" |
383 | 351 | endingColumnNumber = "9223372036854775807" |
384 | - startingLineNumber = "1222" | |
385 | - endingLineNumber = "1222" | |
352 | + startingLineNumber = "1172" | |
353 | + endingLineNumber = "1172" | |
386 | 354 | landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" |
387 | 355 | landmarkType = "5"> |
388 | 356 | </BreakpointContent> |
... | ... | @@ -458,11 +426,11 @@ |
458 | 426 | ignoreCount = "0" |
459 | 427 | continueAfterRunningActions = "No" |
460 | 428 | filePath = "MenuTableViewController.m" |
461 | - timestampString = "436467072.187571" | |
429 | + timestampString = "436503914.715118" | |
462 | 430 | startingColumnNumber = "9223372036854775807" |
463 | 431 | endingColumnNumber = "9223372036854775807" |
464 | - startingLineNumber = "1553" | |
465 | - endingLineNumber = "1553" | |
432 | + startingLineNumber = "1503" | |
433 | + endingLineNumber = "1503" | |
466 | 434 | landmarkName = "-tableView:cellForRowAtIndexPath:" |
467 | 435 | landmarkType = "5"> |
468 | 436 | </BreakpointContent> |
... | ... | @@ -474,11 +442,11 @@ |
474 | 442 | ignoreCount = "0" |
475 | 443 | continueAfterRunningActions = "No" |
476 | 444 | filePath = "MenuTableViewController.m" |
477 | - timestampString = "436467072.187571" | |
445 | + timestampString = "436503914.715118" | |
478 | 446 | startingColumnNumber = "9223372036854775807" |
479 | 447 | endingColumnNumber = "9223372036854775807" |
480 | - startingLineNumber = "1538" | |
481 | - endingLineNumber = "1538" | |
448 | + startingLineNumber = "1488" | |
449 | + endingLineNumber = "1488" | |
482 | 450 | landmarkName = "-tableView:cellForRowAtIndexPath:" |
483 | 451 | landmarkType = "5"> |
484 | 452 | </BreakpointContent> |
... | ... | @@ -600,11 +568,11 @@ |
600 | 568 | ignoreCount = "0" |
601 | 569 | continueAfterRunningActions = "No" |
602 | 570 | filePath = "MenuTableViewController.m" |
603 | - timestampString = "436467072.187571" | |
571 | + timestampString = "436503914.715118" | |
604 | 572 | startingColumnNumber = "9223372036854775807" |
605 | 573 | endingColumnNumber = "9223372036854775807" |
606 | - startingLineNumber = "1210" | |
607 | - endingLineNumber = "1210" | |
574 | + startingLineNumber = "1160" | |
575 | + endingLineNumber = "1160" | |
608 | 576 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
609 | 577 | landmarkType = "5"> |
610 | 578 | </BreakpointContent> | ... | ... |
DUREX Vendor Control/MenuTableViewController.h
... | ... | @@ -26,8 +26,8 @@ |
26 | 26 | |
27 | 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 | 31 | #define MENU_HEADERS nil |
32 | 32 | |
33 | 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 | 74 | A5, |
75 | 75 | A6, |
76 | 76 | A7, |
77 | - //A9, | |
78 | 77 | BATCH_COMMANDS, |
79 | 78 | INVALID_COMMAND, |
80 | 79 | NONE, | ... | ... |
DUREX Vendor Control/MenuTableViewController.m
... | ... | @@ -913,56 +913,6 @@ |
913 | 913 | NSLog(@"[MenuTableViewController.m]: Changing to navLevel: BASIC_CONFIGURATION"); |
914 | 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 | 917 | //Cells in MAINTENANCE |
968 | 918 | else if([self currentNavLevel] == MAINTENANCE) | ... | ... |