diff --git a/DUREX Vendor Control/Base.lproj/Localizable.strings b/DUREX Vendor Control/Base.lproj/Localizable.strings index a516cfa..19ba2b1 100644 --- a/DUREX Vendor Control/Base.lproj/Localizable.strings +++ b/DUREX Vendor Control/Base.lproj/Localizable.strings @@ -100,4 +100,5 @@ "Product name changed successfully" = "Product name changed successfully"; "Product name change returned error" = "Product name change returned error"; "Error occurred while reading answer from device" = "Error occurred while reading answer from device"; -"Error occurred while sending command to device" = "Error occurred while sending command to device"; \ No newline at end of file +"Error occurred while sending command to device" = "Error occurred while sending command to device"; +"Connection lost" = "Connection lost"; \ No newline at end of file diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index dc4a73e..af25ee5 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 146e053..c2aa62e 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "774" - endingLineNumber = "774" + startingLineNumber = "776" + endingLineNumber = "776" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "716" - endingLineNumber = "716" + startingLineNumber = "718" + endingLineNumber = "718" landmarkName = "@implementation MenuTableViewController" landmarkType = "3"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "575" - endingLineNumber = "575" + startingLineNumber = "577" + endingLineNumber = "577" landmarkName = "@implementation MenuTableViewController" landmarkType = "3"> @@ -180,11 +180,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "825" - endingLineNumber = "825" + startingLineNumber = "827" + endingLineNumber = "827" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -260,11 +260,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "701" - endingLineNumber = "701" + startingLineNumber = "703" + endingLineNumber = "703" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -276,11 +276,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "721" - endingLineNumber = "721" + startingLineNumber = "723" + endingLineNumber = "723" landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" landmarkType = "5"> @@ -292,11 +292,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "914" - endingLineNumber = "914" + startingLineNumber = "916" + endingLineNumber = "916" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -308,11 +308,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "915" - endingLineNumber = "915" + startingLineNumber = "917" + endingLineNumber = "917" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -340,11 +340,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1034" - endingLineNumber = "1034" + startingLineNumber = "1036" + endingLineNumber = "1036" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -356,11 +356,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "505" - endingLineNumber = "505" + startingLineNumber = "507" + endingLineNumber = "507" landmarkName = "-toggleDropList:" landmarkType = "5"> @@ -372,11 +372,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1119" - endingLineNumber = "1119" + startingLineNumber = "1121" + endingLineNumber = "1121" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -388,11 +388,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1111" - endingLineNumber = "1111" + startingLineNumber = "1113" + endingLineNumber = "1113" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -404,11 +404,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "906" - endingLineNumber = "906" + startingLineNumber = "908" + endingLineNumber = "908" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -420,11 +420,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "904" - endingLineNumber = "904" + startingLineNumber = "906" + endingLineNumber = "906" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -436,11 +436,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "765" - endingLineNumber = "765" + startingLineNumber = "767" + endingLineNumber = "767" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -516,11 +516,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1235" - endingLineNumber = "1235" + startingLineNumber = "1237" + endingLineNumber = "1237" landmarkName = "-passDateRangeViewController:didFinishEnteringItem::" landmarkType = "5"> @@ -532,11 +532,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434133664.559575" + timestampString = "434383367.854724" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1220" - endingLineNumber = "1220" + startingLineNumber = "1222" + endingLineNumber = "1222" landmarkName = "-passNameViewController:didFinishEnteringItem:" landmarkType = "5"> diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m index 6ebe2af..9c0e077 100644 --- a/DUREX Vendor Control/MenuTableViewController.m +++ b/DUREX Vendor Control/MenuTableViewController.m @@ -403,6 +403,8 @@ if ([[EMConnectionManager sharedManager] connectionState] == EMConnectionStateDisrupted) { UIViewController *previous = [[[self navigationController] viewControllers] objectAtIndex:[[[self navigationController] viewControllers] count]-2]; + UIAlertView* alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Communication error",nil) message:NSLocalizedString(@"Connection lost",nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"OK",nil) otherButtonTitles:nil]; + [alert show]; [[self navigationController] popToViewController:previous animated:YES]; } } diff --git a/DUREX Vendor Control/en.lproj/Localizable.strings b/DUREX Vendor Control/en.lproj/Localizable.strings index 5515505..527f3f0 100644 --- a/DUREX Vendor Control/en.lproj/Localizable.strings +++ b/DUREX Vendor Control/en.lproj/Localizable.strings @@ -100,4 +100,5 @@ "Product name changed successfully" = "Product name changed successfully"; "Product name change returned error" = "Product name change returned error"; "Error occurred while reading answer from device" = "Error occurred while reading answer from device"; -"Error occurred while sending command to device" = "Error occurred while sending command to device"; \ No newline at end of file +"Error occurred while sending command to device" = "Error occurred while sending command to device"; +"Connection lost" = "Connection lost"; \ No newline at end of file diff --git a/DUREX Vendor Control/es.lproj/Localizable.strings b/DUREX Vendor Control/es.lproj/Localizable.strings index 96fa772..7cea80a 100644 --- a/DUREX Vendor Control/es.lproj/Localizable.strings +++ b/DUREX Vendor Control/es.lproj/Localizable.strings @@ -100,4 +100,5 @@ "Product name changed successfully" = "El nombre del producto se cambió con éxito"; "Product name change returned error" = "Error al cambiar el nombre del producto"; "Error occurred while reading answer from device" = "Error al leer la respuesta del dispositivo"; -"Error occurred while sending command to device" = "Error al mandar el comando al dispositivo"; \ No newline at end of file +"Error occurred while sending command to device" = "Error al mandar el comando al dispositivo"; +"Connection lost" = "Conexión perdida"; \ No newline at end of file diff --git a/TODO b/TODO index 54705ef..fcf7c9e 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ TESTS: -- Test disconnection +- Multiple fragments BUGS: - On date change, response is overwritten by previous query, trimming needed according to numBytes