diff --git a/DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
index 58ca187..dc215e9 100644
--- a/DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/DUREX Vendor Control/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 5845103..7a954ee 100644
--- a/DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/DUREX Vendor Control/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -26,27 +26,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1038"
- endingLineNumber = "1038"
- landmarkName = "-tableView:didSelectRowAtIndexPath:"
- landmarkType = "5">
-
-
-
-
@@ -186,11 +170,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1143"
- endingLineNumber = "1143"
+ startingLineNumber = "1093"
+ endingLineNumber = "1093"
landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5">
@@ -234,27 +218,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "945"
- endingLineNumber = "945"
- landmarkName = "-tableView:didSelectRowAtIndexPath:"
- landmarkType = "5">
-
-
-
-
@@ -266,11 +234,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1233"
- endingLineNumber = "1233"
+ startingLineNumber = "1183"
+ endingLineNumber = "1183"
landmarkName = "-numberOfSectionsInTableView:"
landmarkType = "5">
@@ -298,11 +266,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1352"
- endingLineNumber = "1352"
+ startingLineNumber = "1302"
+ endingLineNumber = "1302"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -330,11 +298,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1437"
- endingLineNumber = "1437"
+ startingLineNumber = "1387"
+ endingLineNumber = "1387"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -346,11 +314,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1429"
- endingLineNumber = "1429"
+ startingLineNumber = "1379"
+ endingLineNumber = "1379"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -362,11 +330,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1224"
- endingLineNumber = "1224"
+ startingLineNumber = "1174"
+ endingLineNumber = "1174"
landmarkName = "-tableView:indentationLevelForRowAtIndexPath:"
landmarkType = "5">
@@ -378,11 +346,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1222"
- endingLineNumber = "1222"
+ startingLineNumber = "1172"
+ endingLineNumber = "1172"
landmarkName = "-tableView:indentationLevelForRowAtIndexPath:"
landmarkType = "5">
@@ -458,11 +426,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1553"
- endingLineNumber = "1553"
+ startingLineNumber = "1503"
+ endingLineNumber = "1503"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -474,11 +442,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1538"
- endingLineNumber = "1538"
+ startingLineNumber = "1488"
+ endingLineNumber = "1488"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -600,11 +568,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MenuTableViewController.m"
- timestampString = "436467072.187571"
+ timestampString = "436503914.715118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1210"
- endingLineNumber = "1210"
+ startingLineNumber = "1160"
+ endingLineNumber = "1160"
landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5">
diff --git a/DUREX Vendor Control/MenuTableViewController.h b/DUREX Vendor Control/MenuTableViewController.h
index 20d9b64..1ac5929 100644
--- a/DUREX Vendor Control/MenuTableViewController.h
+++ b/DUREX Vendor Control/MenuTableViewController.h
@@ -26,8 +26,8 @@
#define CELL_CARAT_TAG 100
-#define MENU_ELEMENTS @"[1000]Maintenance",@"[1001]Basic Configuration",@"[1002]Sending a Report"
-#define MENU_CELLS_PER_SECTION num(3)
+#define MENU_ELEMENTS @"[1000]Maintenance",@"[1001]Basic Configuration"
+#define MENU_CELLS_PER_SECTION num(2)
#define MENU_HEADERS nil
#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 {
A5,
A6,
A7,
- //A9,
BATCH_COMMANDS,
INVALID_COMMAND,
NONE,
diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m
index 8b0f327..1e9d875 100644
--- a/DUREX Vendor Control/MenuTableViewController.m
+++ b/DUREX Vendor Control/MenuTableViewController.m
@@ -913,56 +913,6 @@
NSLog(@"[MenuTableViewController.m]: Changing to navLevel: BASIC_CONFIGURATION");
[self changeNavLevel:BASIC_CONFIGURATION:TRUE];
}
- else if([cellName isEqualToString:NSLocalizedString(@"Sending a Report", nil)])
- {
- /*NSMutableString *testString = [[NSMutableString alloc] init];
- for(int i = 0; i < 300; i++)
- {
- [testString appendString:@"A"];
- }
- [_protocol testA9:testString];
- [self setSentCommand:A9];
- [self startTimeoutTimer];*/
- [self setRequestedLog:SALES_LOG];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
- {
- if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
- {
- self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad_Landscape" bundle:nil];
- self.dateRangePickerViewController.delegate = self;
- self.dateRangePickerViewController.childDelegate = self;
- [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];
- [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];
- }
- else
- {
- self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad" bundle:nil];
- self.dateRangePickerViewController.delegate = self;
- self.dateRangePickerViewController.childDelegate = self;
- [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];
- [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];
- }
- }
- else
- {
- if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
- {
- self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_Landscape" bundle:nil];
- self.dateRangePickerViewController.delegate = self;
- self.dateRangePickerViewController.childDelegate = self;
- [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];
- [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];
- }
- else
- {
- self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController" bundle:nil];
- self.dateRangePickerViewController.delegate = self;
- self.dateRangePickerViewController.childDelegate = self;
- [self.childViewControllers insertObject:self.dateRangePickerViewController atIndex:self.childViewControllers.count];
- [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES];
- }
- }
- }
}
//Cells in MAINTENANCE
else if([self currentNavLevel] == MAINTENANCE)