Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit 19dba45934b294b1ad6b15d79ab08ef72a253b2f

Authored by Imanol-Mikel Barba Sabariego
1 parent e13e76e3

--no commit message

Inline Side-by-side
Showing 7 changed files with 60 additions and 55 deletions
DUREX Vendor Control/Base.lproj/Localizable.strings
  View file @19dba45
@@ -100,4 +100,5 @@ @@ -100,4 +100,5 @@
100 "Product name changed successfully" = "Product name changed successfully"; 100 "Product name changed successfully" = "Product name changed successfully";
101 "Product name change returned error" = "Product name change returned error"; 101 "Product name change returned error" = "Product name change returned error";
102 "Error occurred while reading answer from device" = "Error occurred while reading answer from device"; 102 "Error occurred while reading answer from device" = "Error occurred while reading answer from device";
103 -"Error occurred while sending command to device" = "Error occurred while sending command to device";  
104 \ No newline at end of file 103 \ No newline at end of file
  104 +"Error occurred while sending command to device" = "Error occurred while sending command to device";
  105 +"Connection lost" = "Connection lost";
105 \ No newline at end of file 106 \ No newline at end of file
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @19dba45
No preview for this file type
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @19dba45
@@ -26,11 +26,11 @@ @@ -26,11 +26,11 @@
26 ignoreCount = "0" 26 ignoreCount = "0"
27 continueAfterRunningActions = "No" 27 continueAfterRunningActions = "No"
28 filePath = "MenuTableViewController.m" 28 filePath = "MenuTableViewController.m"
29 - timestampString = "434133664.559575" 29 + timestampString = "434383367.854724"
30 startingColumnNumber = "9223372036854775807" 30 startingColumnNumber = "9223372036854775807"
31 endingColumnNumber = "9223372036854775807" 31 endingColumnNumber = "9223372036854775807"
32 - startingLineNumber = "774"  
33 - endingLineNumber = "774" 32 + startingLineNumber = "776"
  33 + endingLineNumber = "776"
34 landmarkName = "-tableView:cellForRowAtIndexPath:" 34 landmarkName = "-tableView:cellForRowAtIndexPath:"
35 landmarkType = "5"> 35 landmarkType = "5">
36 </BreakpointContent> 36 </BreakpointContent>
@@ -42,11 +42,11 @@ @@ -42,11 +42,11 @@
42 ignoreCount = "0" 42 ignoreCount = "0"
43 continueAfterRunningActions = "No" 43 continueAfterRunningActions = "No"
44 filePath = "MenuTableViewController.m" 44 filePath = "MenuTableViewController.m"
45 - timestampString = "434133664.559575" 45 + timestampString = "434383367.854724"
46 startingColumnNumber = "9223372036854775807" 46 startingColumnNumber = "9223372036854775807"
47 endingColumnNumber = "9223372036854775807" 47 endingColumnNumber = "9223372036854775807"
48 - startingLineNumber = "716"  
49 - endingLineNumber = "716" 48 + startingLineNumber = "718"
  49 + endingLineNumber = "718"
50 landmarkName = "@implementation MenuTableViewController" 50 landmarkName = "@implementation MenuTableViewController"
51 landmarkType = "3"> 51 landmarkType = "3">
52 </BreakpointContent> 52 </BreakpointContent>
@@ -58,11 +58,11 @@ @@ -58,11 +58,11 @@
58 ignoreCount = "0" 58 ignoreCount = "0"
59 continueAfterRunningActions = "No" 59 continueAfterRunningActions = "No"
60 filePath = "MenuTableViewController.m" 60 filePath = "MenuTableViewController.m"
61 - timestampString = "434133664.559575" 61 + timestampString = "434383367.854724"
62 startingColumnNumber = "9223372036854775807" 62 startingColumnNumber = "9223372036854775807"
63 endingColumnNumber = "9223372036854775807" 63 endingColumnNumber = "9223372036854775807"
64 - startingLineNumber = "575"  
65 - endingLineNumber = "575" 64 + startingLineNumber = "577"
  65 + endingLineNumber = "577"
66 landmarkName = "@implementation MenuTableViewController" 66 landmarkName = "@implementation MenuTableViewController"
67 landmarkType = "3"> 67 landmarkType = "3">
68 </BreakpointContent> 68 </BreakpointContent>
@@ -180,11 +180,11 @@ @@ -180,11 +180,11 @@
180 ignoreCount = "0" 180 ignoreCount = "0"
181 continueAfterRunningActions = "No" 181 continueAfterRunningActions = "No"
182 filePath = "MenuTableViewController.m" 182 filePath = "MenuTableViewController.m"
183 - timestampString = "434133664.559575" 183 + timestampString = "434383367.854724"
184 startingColumnNumber = "9223372036854775807" 184 startingColumnNumber = "9223372036854775807"
185 endingColumnNumber = "9223372036854775807" 185 endingColumnNumber = "9223372036854775807"
186 - startingLineNumber = "825"  
187 - endingLineNumber = "825" 186 + startingLineNumber = "827"
  187 + endingLineNumber = "827"
188 landmarkName = "-tableView:cellForRowAtIndexPath:" 188 landmarkName = "-tableView:cellForRowAtIndexPath:"
189 landmarkType = "5"> 189 landmarkType = "5">
190 </BreakpointContent> 190 </BreakpointContent>
@@ -260,11 +260,11 @@ @@ -260,11 +260,11 @@
260 ignoreCount = "0" 260 ignoreCount = "0"
261 continueAfterRunningActions = "No" 261 continueAfterRunningActions = "No"
262 filePath = "MenuTableViewController.m" 262 filePath = "MenuTableViewController.m"
263 - timestampString = "434133664.559575" 263 + timestampString = "434383367.854724"
264 startingColumnNumber = "9223372036854775807" 264 startingColumnNumber = "9223372036854775807"
265 endingColumnNumber = "9223372036854775807" 265 endingColumnNumber = "9223372036854775807"
266 - startingLineNumber = "701"  
267 - endingLineNumber = "701" 266 + startingLineNumber = "703"
  267 + endingLineNumber = "703"
268 landmarkName = "-tableView:didSelectRowAtIndexPath:" 268 landmarkName = "-tableView:didSelectRowAtIndexPath:"
269 landmarkType = "5"> 269 landmarkType = "5">
270 </BreakpointContent> 270 </BreakpointContent>
@@ -276,11 +276,11 @@ @@ -276,11 +276,11 @@
276 ignoreCount = "0" 276 ignoreCount = "0"
277 continueAfterRunningActions = "No" 277 continueAfterRunningActions = "No"
278 filePath = "MenuTableViewController.m" 278 filePath = "MenuTableViewController.m"
279 - timestampString = "434133664.559575" 279 + timestampString = "434383367.854724"
280 startingColumnNumber = "9223372036854775807" 280 startingColumnNumber = "9223372036854775807"
281 endingColumnNumber = "9223372036854775807" 281 endingColumnNumber = "9223372036854775807"
282 - startingLineNumber = "721"  
283 - endingLineNumber = "721" 282 + startingLineNumber = "723"
  283 + endingLineNumber = "723"
284 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" 284 landmarkName = "-tableView:indentationLevelForRowAtIndexPath:"
285 landmarkType = "5"> 285 landmarkType = "5">
286 </BreakpointContent> 286 </BreakpointContent>
@@ -292,11 +292,11 @@ @@ -292,11 +292,11 @@
292 ignoreCount = "0" 292 ignoreCount = "0"
293 continueAfterRunningActions = "No" 293 continueAfterRunningActions = "No"
294 filePath = "MenuTableViewController.m" 294 filePath = "MenuTableViewController.m"
295 - timestampString = "434133664.559575" 295 + timestampString = "434383367.854724"
296 startingColumnNumber = "9223372036854775807" 296 startingColumnNumber = "9223372036854775807"
297 endingColumnNumber = "9223372036854775807" 297 endingColumnNumber = "9223372036854775807"
298 - startingLineNumber = "914"  
299 - endingLineNumber = "914" 298 + startingLineNumber = "916"
  299 + endingLineNumber = "916"
300 landmarkName = "-tableView:cellForRowAtIndexPath:" 300 landmarkName = "-tableView:cellForRowAtIndexPath:"
301 landmarkType = "5"> 301 landmarkType = "5">
302 </BreakpointContent> 302 </BreakpointContent>
@@ -308,11 +308,11 @@ @@ -308,11 +308,11 @@
308 ignoreCount = "0" 308 ignoreCount = "0"
309 continueAfterRunningActions = "No" 309 continueAfterRunningActions = "No"
310 filePath = "MenuTableViewController.m" 310 filePath = "MenuTableViewController.m"
311 - timestampString = "434133664.559575" 311 + timestampString = "434383367.854724"
312 startingColumnNumber = "9223372036854775807" 312 startingColumnNumber = "9223372036854775807"
313 endingColumnNumber = "9223372036854775807" 313 endingColumnNumber = "9223372036854775807"
314 - startingLineNumber = "915"  
315 - endingLineNumber = "915" 314 + startingLineNumber = "917"
  315 + endingLineNumber = "917"
316 landmarkName = "-tableView:cellForRowAtIndexPath:" 316 landmarkName = "-tableView:cellForRowAtIndexPath:"
317 landmarkType = "5"> 317 landmarkType = "5">
318 </BreakpointContent> 318 </BreakpointContent>
@@ -340,11 +340,11 @@ @@ -340,11 +340,11 @@
340 ignoreCount = "0" 340 ignoreCount = "0"
341 continueAfterRunningActions = "No" 341 continueAfterRunningActions = "No"
342 filePath = "MenuTableViewController.m" 342 filePath = "MenuTableViewController.m"
343 - timestampString = "434133664.559575" 343 + timestampString = "434383367.854724"
344 startingColumnNumber = "9223372036854775807" 344 startingColumnNumber = "9223372036854775807"
345 endingColumnNumber = "9223372036854775807" 345 endingColumnNumber = "9223372036854775807"
346 - startingLineNumber = "1034"  
347 - endingLineNumber = "1034" 346 + startingLineNumber = "1036"
  347 + endingLineNumber = "1036"
348 landmarkName = "-tableView:cellForRowAtIndexPath:" 348 landmarkName = "-tableView:cellForRowAtIndexPath:"
349 landmarkType = "5"> 349 landmarkType = "5">
350 </BreakpointContent> 350 </BreakpointContent>
@@ -356,11 +356,11 @@ @@ -356,11 +356,11 @@
356 ignoreCount = "0" 356 ignoreCount = "0"
357 continueAfterRunningActions = "No" 357 continueAfterRunningActions = "No"
358 filePath = "MenuTableViewController.m" 358 filePath = "MenuTableViewController.m"
359 - timestampString = "434133664.559575" 359 + timestampString = "434383367.854724"
360 startingColumnNumber = "9223372036854775807" 360 startingColumnNumber = "9223372036854775807"
361 endingColumnNumber = "9223372036854775807" 361 endingColumnNumber = "9223372036854775807"
362 - startingLineNumber = "505"  
363 - endingLineNumber = "505" 362 + startingLineNumber = "507"
  363 + endingLineNumber = "507"
364 landmarkName = "-toggleDropList:" 364 landmarkName = "-toggleDropList:"
365 landmarkType = "5"> 365 landmarkType = "5">
366 </BreakpointContent> 366 </BreakpointContent>
@@ -372,11 +372,11 @@ @@ -372,11 +372,11 @@
372 ignoreCount = "0" 372 ignoreCount = "0"
373 continueAfterRunningActions = "No" 373 continueAfterRunningActions = "No"
374 filePath = "MenuTableViewController.m" 374 filePath = "MenuTableViewController.m"
375 - timestampString = "434133664.559575" 375 + timestampString = "434383367.854724"
376 startingColumnNumber = "9223372036854775807" 376 startingColumnNumber = "9223372036854775807"
377 endingColumnNumber = "9223372036854775807" 377 endingColumnNumber = "9223372036854775807"
378 - startingLineNumber = "1119"  
379 - endingLineNumber = "1119" 378 + startingLineNumber = "1121"
  379 + endingLineNumber = "1121"
380 landmarkName = "-tableView:cellForRowAtIndexPath:" 380 landmarkName = "-tableView:cellForRowAtIndexPath:"
381 landmarkType = "5"> 381 landmarkType = "5">
382 </BreakpointContent> 382 </BreakpointContent>
@@ -388,11 +388,11 @@ @@ -388,11 +388,11 @@
388 ignoreCount = "0" 388 ignoreCount = "0"
389 continueAfterRunningActions = "No" 389 continueAfterRunningActions = "No"
390 filePath = "MenuTableViewController.m" 390 filePath = "MenuTableViewController.m"
391 - timestampString = "434133664.559575" 391 + timestampString = "434383367.854724"
392 startingColumnNumber = "9223372036854775807" 392 startingColumnNumber = "9223372036854775807"
393 endingColumnNumber = "9223372036854775807" 393 endingColumnNumber = "9223372036854775807"
394 - startingLineNumber = "1111"  
395 - endingLineNumber = "1111" 394 + startingLineNumber = "1113"
  395 + endingLineNumber = "1113"
396 landmarkName = "-tableView:cellForRowAtIndexPath:" 396 landmarkName = "-tableView:cellForRowAtIndexPath:"
397 landmarkType = "5"> 397 landmarkType = "5">
398 </BreakpointContent> 398 </BreakpointContent>
@@ -404,11 +404,11 @@ @@ -404,11 +404,11 @@
404 ignoreCount = "0" 404 ignoreCount = "0"
405 continueAfterRunningActions = "No" 405 continueAfterRunningActions = "No"
406 filePath = "MenuTableViewController.m" 406 filePath = "MenuTableViewController.m"
407 - timestampString = "434133664.559575" 407 + timestampString = "434383367.854724"
408 startingColumnNumber = "9223372036854775807" 408 startingColumnNumber = "9223372036854775807"
409 endingColumnNumber = "9223372036854775807" 409 endingColumnNumber = "9223372036854775807"
410 - startingLineNumber = "906"  
411 - endingLineNumber = "906" 410 + startingLineNumber = "908"
  411 + endingLineNumber = "908"
412 landmarkName = "-tableView:cellForRowAtIndexPath:" 412 landmarkName = "-tableView:cellForRowAtIndexPath:"
413 landmarkType = "5"> 413 landmarkType = "5">
414 </BreakpointContent> 414 </BreakpointContent>
@@ -420,11 +420,11 @@ @@ -420,11 +420,11 @@
420 ignoreCount = "0" 420 ignoreCount = "0"
421 continueAfterRunningActions = "No" 421 continueAfterRunningActions = "No"
422 filePath = "MenuTableViewController.m" 422 filePath = "MenuTableViewController.m"
423 - timestampString = "434133664.559575" 423 + timestampString = "434383367.854724"
424 startingColumnNumber = "9223372036854775807" 424 startingColumnNumber = "9223372036854775807"
425 endingColumnNumber = "9223372036854775807" 425 endingColumnNumber = "9223372036854775807"
426 - startingLineNumber = "904"  
427 - endingLineNumber = "904" 426 + startingLineNumber = "906"
  427 + endingLineNumber = "906"
428 landmarkName = "-tableView:cellForRowAtIndexPath:" 428 landmarkName = "-tableView:cellForRowAtIndexPath:"
429 landmarkType = "5"> 429 landmarkType = "5">
430 </BreakpointContent> 430 </BreakpointContent>
@@ -436,11 +436,11 @@ @@ -436,11 +436,11 @@
436 ignoreCount = "0" 436 ignoreCount = "0"
437 continueAfterRunningActions = "No" 437 continueAfterRunningActions = "No"
438 filePath = "MenuTableViewController.m" 438 filePath = "MenuTableViewController.m"
439 - timestampString = "434133664.559575" 439 + timestampString = "434383367.854724"
440 startingColumnNumber = "9223372036854775807" 440 startingColumnNumber = "9223372036854775807"
441 endingColumnNumber = "9223372036854775807" 441 endingColumnNumber = "9223372036854775807"
442 - startingLineNumber = "765"  
443 - endingLineNumber = "765" 442 + startingLineNumber = "767"
  443 + endingLineNumber = "767"
444 landmarkName = "-tableView:cellForRowAtIndexPath:" 444 landmarkName = "-tableView:cellForRowAtIndexPath:"
445 landmarkType = "5"> 445 landmarkType = "5">
446 </BreakpointContent> 446 </BreakpointContent>
@@ -516,11 +516,11 @@ @@ -516,11 +516,11 @@
516 ignoreCount = "0" 516 ignoreCount = "0"
517 continueAfterRunningActions = "No" 517 continueAfterRunningActions = "No"
518 filePath = "MenuTableViewController.m" 518 filePath = "MenuTableViewController.m"
519 - timestampString = "434133664.559575" 519 + timestampString = "434383367.854724"
520 startingColumnNumber = "9223372036854775807" 520 startingColumnNumber = "9223372036854775807"
521 endingColumnNumber = "9223372036854775807" 521 endingColumnNumber = "9223372036854775807"
522 - startingLineNumber = "1235"  
523 - endingLineNumber = "1235" 522 + startingLineNumber = "1237"
  523 + endingLineNumber = "1237"
524 landmarkName = "-passDateRangeViewController:didFinishEnteringItem::" 524 landmarkName = "-passDateRangeViewController:didFinishEnteringItem::"
525 landmarkType = "5"> 525 landmarkType = "5">
526 </BreakpointContent> 526 </BreakpointContent>
@@ -532,11 +532,11 @@ @@ -532,11 +532,11 @@
532 ignoreCount = "0" 532 ignoreCount = "0"
533 continueAfterRunningActions = "No" 533 continueAfterRunningActions = "No"
534 filePath = "MenuTableViewController.m" 534 filePath = "MenuTableViewController.m"
535 - timestampString = "434133664.559575" 535 + timestampString = "434383367.854724"
536 startingColumnNumber = "9223372036854775807" 536 startingColumnNumber = "9223372036854775807"
537 endingColumnNumber = "9223372036854775807" 537 endingColumnNumber = "9223372036854775807"
538 - startingLineNumber = "1220"  
539 - endingLineNumber = "1220" 538 + startingLineNumber = "1222"
  539 + endingLineNumber = "1222"
540 landmarkName = "-passNameViewController:didFinishEnteringItem:" 540 landmarkName = "-passNameViewController:didFinishEnteringItem:"
541 landmarkType = "5"> 541 landmarkType = "5">
542 </BreakpointContent> 542 </BreakpointContent>
DUREX Vendor Control/MenuTableViewController.m
  View file @19dba45
@@ -403,6 +403,8 @@ @@ -403,6 +403,8 @@
403 if ([[EMConnectionManager sharedManager] connectionState] == EMConnectionStateDisrupted) 403 if ([[EMConnectionManager sharedManager] connectionState] == EMConnectionStateDisrupted)
404 { 404 {
405 UIViewController *previous = [[[self navigationController] viewControllers] objectAtIndex:[[[self navigationController] viewControllers] count]-2]; 405 UIViewController *previous = [[[self navigationController] viewControllers] objectAtIndex:[[[self navigationController] viewControllers] count]-2];
  406 + UIAlertView* alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Communication error",nil) message:NSLocalizedString(@"Connection lost",nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"OK",nil) otherButtonTitles:nil];
  407 + [alert show];
406 [[self navigationController] popToViewController:previous animated:YES]; 408 [[self navigationController] popToViewController:previous animated:YES];
407 } 409 }
408 } 410 }
DUREX Vendor Control/en.lproj/Localizable.strings
  View file @19dba45
@@ -100,4 +100,5 @@ @@ -100,4 +100,5 @@
100 "Product name changed successfully" = "Product name changed successfully"; 100 "Product name changed successfully" = "Product name changed successfully";
101 "Product name change returned error" = "Product name change returned error"; 101 "Product name change returned error" = "Product name change returned error";
102 "Error occurred while reading answer from device" = "Error occurred while reading answer from device"; 102 "Error occurred while reading answer from device" = "Error occurred while reading answer from device";
103 -"Error occurred while sending command to device" = "Error occurred while sending command to device";  
104 \ No newline at end of file 103 \ No newline at end of file
  104 +"Error occurred while sending command to device" = "Error occurred while sending command to device";
  105 +"Connection lost" = "Connection lost";
105 \ No newline at end of file 106 \ No newline at end of file
DUREX Vendor Control/es.lproj/Localizable.strings
  View file @19dba45
@@ -100,4 +100,5 @@ @@ -100,4 +100,5 @@
100 "Product name changed successfully" = "El nombre del producto se cambió con éxito"; 100 "Product name changed successfully" = "El nombre del producto se cambió con éxito";
101 "Product name change returned error" = "Error al cambiar el nombre del producto"; 101 "Product name change returned error" = "Error al cambiar el nombre del producto";
102 "Error occurred while reading answer from device" = "Error al leer la respuesta del dispositivo"; 102 "Error occurred while reading answer from device" = "Error al leer la respuesta del dispositivo";
103 -"Error occurred while sending command to device" = "Error al mandar el comando al dispositivo";  
104 \ No newline at end of file 103 \ No newline at end of file
  104 +"Error occurred while sending command to device" = "Error al mandar el comando al dispositivo";
  105 +"Connection lost" = "Conexión perdida";
105 \ No newline at end of file 106 \ No newline at end of file
1 TESTS: 1 TESTS:
2 -- Test disconnection 2 +- Multiple fragments
3 3
4 BUGS: 4 BUGS:
5 - On date change, response is overwritten by previous query, trimming needed according to numBytes 5 - On date change, response is overwritten by previous query, trimming needed according to numBytes