From f2e7288291b52b0c33c00794b078ce4c1a69f883 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Sat, 25 Oct 2014 18:19:17 +0000 Subject: [PATCH] --- DUREX Vendor Control/Base.lproj/DatePickerViewController.xib | 19 ++++++++++--------- DUREX Vendor Control/Base.lproj/DatePickerViewController_Landscape.xib | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib | 13 +++++-------- DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad_Landscape.xib | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib | 50 +++++++++++++++++++++++++++----------------------- DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib | 20 ++++++++++++-------- DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/EMConnectingView_Landscape.xib | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib | 2 +- DUREX Vendor Control/Base.lproj/EMConnectingView_iPad_Landscape.xib | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/NameChangerViewController_Landscape.xib | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad_Landscape.xib | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/PriceChangerViewController_Landscape.xib | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad_Landscape.xib | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/ChildViewController.h | 24 ++++++++++++++++++++++++ DUREX Vendor Control/ChildViewController.m | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/CommunicationProtocol.h | 3 ++- DUREX Vendor Control/CommunicationProtocol.m | 8 ++++++++ DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 157049 -> 0 bytes DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 328 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------- DUREX Vendor Control/DateRangePickerViewController.h | 3 ++- DUREX Vendor Control/DateRangePickerViewController.m | 30 +++++++++++++++++++++++++++++- DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib | 18 +++++++++++++----- DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard | 41 +++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/FirstAppExample/DUREX Vendor Control-Info.plist | 3 +++ DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m | 20 +++++++++++++++++--- DUREX Vendor Control/IncidentLog.m | 16 ++++++++-------- DUREX Vendor Control/MenuTableViewController.h | 6 ++++-- DUREX Vendor Control/MenuTableViewController.m | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- DUREX Vendor Control/en.lproj/DatePickerViewController_Landscape.strings | 3 +++ DUREX Vendor Control/en.lproj/DatePickerViewController_iPad_Landscape.strings | 3 +++ DUREX Vendor Control/en.lproj/DateRangePickerViewController_Landscape.strings | 9 +++++++++ DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad_Landscape.strings | 9 +++++++++ DUREX Vendor Control/en.lproj/EMConnectingView_Landscape.strings | 3 +++ DUREX Vendor Control/en.lproj/EMConnectingView_iPad_Landscape.strings | 3 +++ DUREX Vendor Control/en.lproj/NameChangerViewController_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/en.lproj/NameChangerViewController_iPad_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/en.lproj/PriceChangerViewController_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/en.lproj/PriceChangerViewController_iPad_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/es.lproj/DatePickerViewController_Landscape.strings | 3 +++ DUREX Vendor Control/es.lproj/DatePickerViewController_iPad_Landscape.strings | 3 +++ DUREX Vendor Control/es.lproj/DateRangePickerViewController_Landscape.strings | 9 +++++++++ DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad_Landscape.strings | 9 +++++++++ DUREX Vendor Control/es.lproj/EMConnectingView_Landscape.strings | 3 +++ DUREX Vendor Control/es.lproj/EMConnectingView_iPad_Landscape.strings | 3 +++ DUREX Vendor Control/es.lproj/NameChangerViewController.strings | 8 ++++---- DUREX Vendor Control/es.lproj/NameChangerViewController_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/es.lproj/NameChangerViewController_iPad_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/es.lproj/PriceChangerViewController_Landscape.strings | 12 ++++++++++++ DUREX Vendor Control/es.lproj/PriceChangerViewController_iPad_Landscape.strings | 12 ++++++++++++ TODO | 19 ++++--------------- 53 files changed, 2164 insertions(+), 255 deletions(-) create mode 100644 DUREX Vendor Control/Base.lproj/DatePickerViewController_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/EMConnectingView_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/EMConnectingView_iPad_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/NameChangerViewController_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/PriceChangerViewController_Landscape.xib create mode 100644 DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad_Landscape.xib create mode 100644 DUREX Vendor Control/ChildViewController.h create mode 100644 DUREX Vendor Control/ChildViewController.m create mode 100644 DUREX Vendor Control/en.lproj/DatePickerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/DatePickerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/DateRangePickerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/EMConnectingView_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/EMConnectingView_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/NameChangerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/NameChangerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/PriceChangerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/en.lproj/PriceChangerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/DatePickerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/DatePickerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/DateRangePickerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/EMConnectingView_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/EMConnectingView_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/NameChangerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/NameChangerViewController_iPad_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/PriceChangerViewController_Landscape.strings create mode 100644 DUREX Vendor Control/es.lproj/PriceChangerViewController_iPad_Landscape.strings diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib index 3041189..2d2118c 100644 --- a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib @@ -17,11 +17,11 @@ - + - - + @@ -62,18 +62,19 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - - + + + + + - - + diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController_Landscape.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController_Landscape.xib new file mode 100644 index 0000000..4798830 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController_Landscape.xib @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ +y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ +5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g +8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ +AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg +DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ +HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g +KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ +OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg +Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ +VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg +Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ +cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg +f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib index cca877e..8320152 100644 --- a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib @@ -1,5 +1,5 @@ - + @@ -24,9 +24,7 @@ - - - + @@ -66,12 +64,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - - - + + + diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad_Landscape.xib new file mode 100644 index 0000000..aab2a23 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad_Landscape.xib @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ +y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ +5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g +8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ +AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg +DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ +HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g +KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ +OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg +Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ +VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg +Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ +cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg +f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA +AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib index 59e7328..1817892 100644 --- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib +++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib @@ -23,11 +23,11 @@ - - + + - + @@ -44,8 +44,8 @@ - - - - + - + + + + + + + + - + - + diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib new file mode 100644 index 0000000..1e334ea --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib index 5a5c26e..45b0471 100644 --- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib +++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib @@ -23,7 +23,7 @@ - + @@ -44,14 +44,14 @@ - - + diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib new file mode 100644 index 0000000..9acc45d --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/EMConnectingView_Landscape.xib b/DUREX Vendor Control/Base.lproj/EMConnectingView_Landscape.xib new file mode 100644 index 0000000..a2ad04e --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/EMConnectingView_Landscape.xib @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib index 517d5b8..24ff55d 100644 --- a/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib +++ b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib @@ -1,5 +1,5 @@ - + diff --git a/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad_Landscape.xib new file mode 100644 index 0000000..d94f2db --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad_Landscape.xib @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/NameChangerViewController_Landscape.xib b/DUREX Vendor Control/Base.lproj/NameChangerViewController_Landscape.xib new file mode 100644 index 0000000..ef8a3fa --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/NameChangerViewController_Landscape.xib @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad_Landscape.xib new file mode 100644 index 0000000..4180225 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad_Landscape.xib @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/PriceChangerViewController_Landscape.xib b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_Landscape.xib new file mode 100644 index 0000000..d7838d2 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_Landscape.xib @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad_Landscape.xib new file mode 100644 index 0000000..3f8d17e --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad_Landscape.xib @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/ChildViewController.h b/DUREX Vendor Control/ChildViewController.h new file mode 100644 index 0000000..54b47b3 --- /dev/null +++ b/DUREX Vendor Control/ChildViewController.h @@ -0,0 +1,24 @@ +// +// ChildViewController.h +// DUREX Vendor Control +// +// Created by Imanol Barba on 10/10/14. +// Copyright (c) 2014 Emmoco. All rights reserved. +// + +@class ChildViewController; + +#import + +@protocol ChildViewControllerDelegate +- (void)removeChildFromParentController:(ChildViewController*)controller; + +@end + +@interface ChildViewController : UIViewController + +- (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation; +- (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration; + +@property (nonatomic, strong) id childDelegate; +@end diff --git a/DUREX Vendor Control/ChildViewController.m b/DUREX Vendor Control/ChildViewController.m new file mode 100644 index 0000000..bb14e53 --- /dev/null +++ b/DUREX Vendor Control/ChildViewController.m @@ -0,0 +1,49 @@ +// +// ChildViewController.m +// DUREX Vendor Control +// +// Created by Imanol Barba on 10/10/14. +// Copyright (c) 2014 Emmoco. All rights reserved. +// + +#import "ChildViewController.h" + +@interface ChildViewController () + +@end + +@implementation ChildViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender +{ + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/DUREX Vendor Control/CommunicationProtocol.h b/DUREX Vendor Control/CommunicationProtocol.h index fcebb5a..f69bb85 100644 --- a/DUREX Vendor Control/CommunicationProtocol.h +++ b/DUREX Vendor Control/CommunicationProtocol.h @@ -11,7 +11,7 @@ #import #import "EMFramework.h" -#define SLEEP_TIME ((NSTimeInterval)0.1) +#define SLEEP_TIME ((NSTimeInterval)1) #define MAX_STRING_LENGTH ((int)200) #define MAX_RETRIES ((int)3) #define MAX_PRODUCT_NAME_LENGTH ((int)64) @@ -43,6 +43,7 @@ -(void) readSensorData; -(void) readSalesLog: (NSDateComponents*) start : (NSDateComponents*) end; -(void) readIncidentLog: (NSDateComponents*) start : (NSDateComponents*) end; +//-(void) testA9 : (NSMutableString*) testString; +(id) sharedProtocol; @end diff --git a/DUREX Vendor Control/CommunicationProtocol.m b/DUREX Vendor Control/CommunicationProtocol.m index 5105392..47fa530 100644 --- a/DUREX Vendor Control/CommunicationProtocol.m +++ b/DUREX Vendor Control/CommunicationProtocol.m @@ -352,7 +352,15 @@ [command appendString:@"-"]; [command appendString:endDate]; [self writeMessage:command]; + + //@"P3140816103600012222P3140910093600023333P3140921103600034444P3140927103600045555P3P3" } +/*-(void) testA9:(NSMutableString *)testString +{ + NSMutableString *messageA9 = [[NSMutableString alloc] initWithString:@"A9"]; + [messageA9 appendString:testString]; + [self writeMessage:messageA9]; +}*/ @end diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj index 861e90e..ce4c6fc 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj @@ -27,10 +27,21 @@ F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F569419B7665F00A1EACA /* NameChangerViewController.xib */; }; F92F569B19B76A5D00A1EACA /* NameChangerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */; }; F933F80419B6819400521B90 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F933F80219B6819400521B90 /* DatePickerViewController.m */; }; + F95C3F2B19E87B8700C040C0 /* ChildViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F95C3F2A19E87B8700C040C0 /* ChildViewController.m */; }; F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F961D806199A5F1000E9282C /* MainStoryboard.storyboard */; }; F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F961D80E199A5F2D00E9282C /* back_arrow.png */; }; F961D816199A5FA000E9282C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F961D814199A5FA000E9282C /* Localizable.strings */; }; F961D819199A711300E9282C /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D81B199A711300E9282C /* EMConnectingView.xib */; }; + F975ADAC19E8248000CA4442 /* DatePickerViewController_iPad_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADAE19E8248000CA4442 /* DatePickerViewController_iPad_Landscape.xib */; }; + F975ADBB19E827EC00CA4442 /* EMConnectingView_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADBD19E827EC00CA4442 /* EMConnectingView_Landscape.xib */; }; + F975ADC219E827F500CA4442 /* EMConnectingView_iPad_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADC419E827F500CA4442 /* EMConnectingView_iPad_Landscape.xib */; }; + F975ADD519E82B7D00CA4442 /* DatePickerViewController_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADD719E82B7D00CA4442 /* DatePickerViewController_Landscape.xib */; }; + F975ADDC19E82B9800CA4442 /* PriceChangerViewController_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADDE19E82B9800CA4442 /* PriceChangerViewController_Landscape.xib */; }; + F975ADE719E82C5D00CA4442 /* PriceChangerViewController_iPad_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADE919E82C5D00CA4442 /* PriceChangerViewController_iPad_Landscape.xib */; }; + F975ADEE19E82D1400CA4442 /* NameChangerViewController_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADF019E82D1400CA4442 /* NameChangerViewController_Landscape.xib */; }; + F975ADF519E82D9F00CA4442 /* NameChangerViewController_iPad_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADF719E82D9F00CA4442 /* NameChangerViewController_iPad_Landscape.xib */; }; + F975ADFC19E8347700CA4442 /* DateRangePickerViewController_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975ADFE19E8347700CA4442 /* DateRangePickerViewController_Landscape.xib */; }; + F975AE0319E8359B00CA4442 /* DateRangePickerViewController_iPad_Landscape.xib in Resources */ = {isa = PBXBuildFile; fileRef = F975AE0519E8359B00CA4442 /* DateRangePickerViewController_iPad_Landscape.xib */; }; F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90C919B859F500DDA9EF /* icon_checkmark.png */; }; F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90CA19B859F500DDA9EF /* icon_delete.png */; }; F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; }; @@ -110,6 +121,8 @@ F92F56A119B76A6400A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad.strings; sourceTree = ""; }; F933F80119B6819400521B90 /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePickerViewController.h; sourceTree = SOURCE_ROOT; }; F933F80219B6819400521B90 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatePickerViewController.m; sourceTree = SOURCE_ROOT; }; + F95C3F2919E87B8700C040C0 /* ChildViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildViewController.h; sourceTree = SOURCE_ROOT; }; + F95C3F2A19E87B8700C040C0 /* ChildViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChildViewController.m; sourceTree = SOURCE_ROOT; }; F961D807199A5F1800E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainStoryboard.storyboard; sourceTree = ""; }; F961D809199A5F2200E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainStoryboard.strings; sourceTree = ""; }; F961D80B199A5F2300E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainStoryboard.strings; sourceTree = ""; }; @@ -122,6 +135,36 @@ F961D81A199A711300E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView.xib; sourceTree = ""; }; F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = ""; }; F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = ""; }; + F975ADAD19E8248000CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad_Landscape.xib; sourceTree = ""; }; + F975ADB019E8248200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADB219E8248300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADBC19E827EC00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_Landscape.xib; sourceTree = ""; }; + F975ADBF19E827F000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_Landscape.strings; sourceTree = ""; }; + F975ADC119E827F100CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_Landscape.strings; sourceTree = ""; }; + F975ADC319E827F500CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_iPad_Landscape.xib; sourceTree = ""; }; + F975ADC619E827F900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = ""; }; + F975ADC819E827F900CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = ""; }; + F975ADD619E82B7D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_Landscape.xib; sourceTree = ""; }; + F975ADD919E82B8000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_Landscape.strings; sourceTree = ""; }; + F975ADDB19E82B8100CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_Landscape.strings; sourceTree = ""; }; + F975ADDD19E82B9800CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_Landscape.xib; sourceTree = ""; }; + F975ADE419E82BE200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_Landscape.strings; sourceTree = ""; }; + F975ADE619E82BE300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_Landscape.strings; sourceTree = ""; }; + F975ADE819E82C5D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_iPad_Landscape.xib; sourceTree = ""; }; + F975ADEB19E82C6200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADED19E82C6200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADEF19E82D1400CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_Landscape.xib; sourceTree = ""; }; + F975ADF219E82D1600CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_Landscape.strings; sourceTree = ""; }; + F975ADF419E82D1600CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_Landscape.strings; sourceTree = ""; }; + F975ADF619E82D9F00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_iPad_Landscape.xib; sourceTree = ""; }; + F975ADF919E82DA100CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADFB19E82DA200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975ADFD19E8347700CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_Landscape.xib; sourceTree = ""; }; + F975AE0019E8347900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = ""; }; + F975AE0219E8347A00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = ""; }; + F975AE0419E8359B00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad_Landscape.xib; sourceTree = ""; }; + F975AE0719E8359D00CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F975AE0919E8359E00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F97B90C919B859F500DDA9EF /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; F97B90CA19B859F500DDA9EF /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; }; F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; }; @@ -226,6 +269,7 @@ F989B60119BCE28C00657DD9 /* SalesLog.m */, F9B9100B19E5A0A1006D4D06 /* Incident.m */, F9B9100819E59773006D4D06 /* IncidentLog.m */, + F95C3F2A19E87B8700C040C0 /* ChildViewController.m */, ); name = "DUREX Vendor Control"; path = TestAppExample; @@ -277,7 +321,9 @@ isa = PBXGroup; children = ( F961D81B199A711300E9282C /* EMConnectingView.xib */, + F975ADBD19E827EC00CA4442 /* EMConnectingView_Landscape.xib */, F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */, + F975ADC419E827F500CA4442 /* EMConnectingView_iPad_Landscape.xib */, 34AAB879189804FF0019860D /* EMDevicePickerViewController.h */, 34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */, ); @@ -306,13 +352,21 @@ children = ( F961D806199A5F1000E9282C /* MainStoryboard.storyboard */, F9015D9219B73052006C7882 /* DatePickerViewController.xib */, + F975ADD719E82B7D00CA4442 /* DatePickerViewController_Landscape.xib */, F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */, + F975ADAE19E8248000CA4442 /* DatePickerViewController_iPad_Landscape.xib */, F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */, + F975ADDE19E82B9800CA4442 /* PriceChangerViewController_Landscape.xib */, F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */, + F975ADE919E82C5D00CA4442 /* PriceChangerViewController_iPad_Landscape.xib */, F92F569419B7665F00A1EACA /* NameChangerViewController.xib */, + F975ADF019E82D1400CA4442 /* NameChangerViewController_Landscape.xib */, F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */, + F975ADF719E82D9F00CA4442 /* NameChangerViewController_iPad_Landscape.xib */, F90416FE19CC776E00333AD8 /* DateRangePickerViewController.xib */, + F975ADFE19E8347700CA4442 /* DateRangePickerViewController_Landscape.xib */, F996591419CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib */, + F975AE0519E8359B00CA4442 /* DateRangePickerViewController_iPad_Landscape.xib */, ); name = Views; sourceTree = ""; @@ -334,6 +388,7 @@ F989B60019BCE28C00657DD9 /* SalesLog.h */, F9B9100A19E5A0A1006D4D06 /* Incident.h */, F9B9100719E59773006D4D06 /* IncidentLog.h */, + F95C3F2919E87B8700C040C0 /* ChildViewController.h */, ); name = Headers; sourceTree = ""; @@ -406,18 +461,27 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + F975ADC219E827F500CA4442 /* EMConnectingView_iPad_Landscape.xib in Resources */, + F975ADF519E82D9F00CA4442 /* NameChangerViewController_iPad_Landscape.xib in Resources */, + F975AE0319E8359B00CA4442 /* DateRangePickerViewController_iPad_Landscape.xib in Resources */, + F975ADD519E82B7D00CA4442 /* DatePickerViewController_Landscape.xib in Resources */, F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */, F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */, F9E4D8FD19B8FD32009A7359 /* EMConnectingView_iPad.xib in Resources */, + F975ADDC19E82B9800CA4442 /* PriceChangerViewController_Landscape.xib in Resources */, F98356D8192E906600EA6821 /* bluetooth.png in Resources */, F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */, F961D819199A711300E9282C /* EMConnectingView.xib in Resources */, + F975ADE719E82C5D00CA4442 /* PriceChangerViewController_iPad_Landscape.xib in Resources */, F9C77F50192CDE30002DBE8A /* system.json in Resources */, F989B5FC19BBC80300657DD9 /* carat.png in Resources */, F92F569B19B76A5D00A1EACA /* NameChangerViewController_iPad.xib in Resources */, F92F567D19B7609C00A1EACA /* PriceChangerViewController.xib in Resources */, F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */, F90416FC19CC776E00333AD8 /* DateRangePickerViewController.xib in Resources */, + F975ADFC19E8347700CA4442 /* DateRangePickerViewController_Landscape.xib in Resources */, + F975ADAC19E8248000CA4442 /* DatePickerViewController_iPad_Landscape.xib in Resources */, + F975ADEE19E82D1400CA4442 /* NameChangerViewController_Landscape.xib in Resources */, F996591219CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib in Resources */, F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */, F961D816199A5FA000E9282C /* Localizable.strings in Resources */, @@ -425,6 +489,7 @@ 34AAB88D189805300019860D /* Images.xcassets in Resources */, F989B5FB19BBC80300657DD9 /* carat-open.png in Resources */, F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */, + F975ADBB19E827EC00CA4442 /* EMConnectingView_Landscape.xib in Resources */, F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -447,6 +512,7 @@ 34AAB885189804FF0019860D /* EMDevicePickerViewController.m in Sources */, F9B9100919E59773006D4D06 /* IncidentLog.m in Sources */, F989B60219BCE28C00657DD9 /* SalesLog.m in Sources */, + F95C3F2B19E87B8700C040C0 /* ChildViewController.m in Sources */, F92F567919B75F5E00A1EACA /* PriceChangerViewController.m in Sources */, 34AAB883189804FF0019860D /* DUREXAppDelegate.m in Sources */, F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */, @@ -571,6 +637,106 @@ path = FirstAppExample; sourceTree = SOURCE_ROOT; }; + F975ADAE19E8248000CA4442 /* DatePickerViewController_iPad_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADAD19E8248000CA4442 /* Base */, + F975ADB019E8248200CA4442 /* en */, + F975ADB219E8248300CA4442 /* es */, + ); + name = DatePickerViewController_iPad_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADBD19E827EC00CA4442 /* EMConnectingView_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADBC19E827EC00CA4442 /* Base */, + F975ADBF19E827F000CA4442 /* en */, + F975ADC119E827F100CA4442 /* es */, + ); + name = EMConnectingView_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADC419E827F500CA4442 /* EMConnectingView_iPad_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADC319E827F500CA4442 /* Base */, + F975ADC619E827F900CA4442 /* en */, + F975ADC819E827F900CA4442 /* es */, + ); + name = EMConnectingView_iPad_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADD719E82B7D00CA4442 /* DatePickerViewController_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADD619E82B7D00CA4442 /* Base */, + F975ADD919E82B8000CA4442 /* en */, + F975ADDB19E82B8100CA4442 /* es */, + ); + name = DatePickerViewController_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADDE19E82B9800CA4442 /* PriceChangerViewController_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADDD19E82B9800CA4442 /* Base */, + F975ADE419E82BE200CA4442 /* en */, + F975ADE619E82BE300CA4442 /* es */, + ); + name = PriceChangerViewController_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADE919E82C5D00CA4442 /* PriceChangerViewController_iPad_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADE819E82C5D00CA4442 /* Base */, + F975ADEB19E82C6200CA4442 /* en */, + F975ADED19E82C6200CA4442 /* es */, + ); + name = PriceChangerViewController_iPad_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADF019E82D1400CA4442 /* NameChangerViewController_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADEF19E82D1400CA4442 /* Base */, + F975ADF219E82D1600CA4442 /* en */, + F975ADF419E82D1600CA4442 /* es */, + ); + name = NameChangerViewController_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADF719E82D9F00CA4442 /* NameChangerViewController_iPad_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADF619E82D9F00CA4442 /* Base */, + F975ADF919E82DA100CA4442 /* en */, + F975ADFB19E82DA200CA4442 /* es */, + ); + name = NameChangerViewController_iPad_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975ADFE19E8347700CA4442 /* DateRangePickerViewController_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975ADFD19E8347700CA4442 /* Base */, + F975AE0019E8347900CA4442 /* en */, + F975AE0219E8347A00CA4442 /* es */, + ); + name = DateRangePickerViewController_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; + F975AE0519E8359B00CA4442 /* DateRangePickerViewController_iPad_Landscape.xib */ = { + isa = PBXVariantGroup; + children = ( + F975AE0419E8359B00CA4442 /* Base */, + F975AE0719E8359D00CA4442 /* en */, + F975AE0919E8359E00CA4442 /* es */, + ); + name = DateRangePickerViewController_iPad_Landscape.xib; + sourceTree = SOURCE_ROOT; + }; F996591419CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib */ = { isa = PBXVariantGroup; children = ( 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 fc0a123..3b563ec 100644 Binary files a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ 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 33c7df4..eb75504 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,12 +26,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "776" - endingLineNumber = "776" - landmarkName = "-numberOfSectionsInTableView:" + startingLineNumber = "928" + endingLineNumber = "928" + landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "718" - endingLineNumber = "718" + startingLineNumber = "830" + endingLineNumber = "830" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -58,13 +58,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435854984.608419" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "577" - endingLineNumber = "577" - landmarkName = "@implementation MenuTableViewController" - landmarkType = "3"> + startingLineNumber = "623" + endingLineNumber = "623" + landmarkName = "-toggleDropList:" + landmarkType = "5"> @@ -202,12 +202,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434127499.570083" + timestampString = "435854984.608419" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "101" - endingLineNumber = "101" - landmarkName = "-generateMaintenanceLevel" + startingLineNumber = "212" + endingLineNumber = "212" + landmarkName = "-generateIncidentListNavLevel" landmarkType = "5"> @@ -218,12 +218,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434127499.570083" + timestampString = "435854984.608419" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "104" - endingLineNumber = "104" - landmarkName = "-generateMaintenanceLevel" + startingLineNumber = "749" + endingLineNumber = "749" + landmarkName = "-tableView:numberOfRowsInSection:" landmarkType = "5"> @@ -234,12 +234,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434127499.570083" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "112" - endingLineNumber = "112" - landmarkName = "-generateSaleListNavLevel" + startingLineNumber = "835" + endingLineNumber = "835" + landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -250,12 +250,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434127499.570083" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "184" - endingLineNumber = "184" - landmarkName = "-changeNavLevel::" + startingLineNumber = "1122" + endingLineNumber = "1122" + landmarkName = "-numberOfSectionsInTableView:" landmarkType = "5"> @@ -266,13 +266,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "703" - endingLineNumber = "703" - landmarkName = "-tableView:didSelectRowAtIndexPath:" - landmarkType = "5"> + startingLineNumber = "1123" + endingLineNumber = "1123" + landmarkName = "@implementation MenuTableViewController" + landmarkType = "3"> @@ -298,11 +298,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "916" - endingLineNumber = "916" + startingLineNumber = "1242" + endingLineNumber = "1242" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -314,12 +314,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435854984.608419" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "917" - endingLineNumber = "917" - landmarkName = "-tableView:cellForRowAtIndexPath:" + startingLineNumber = "553" + endingLineNumber = "553" + landmarkName = "-willRotateToInterfaceOrientation:duration:" landmarkType = "5"> @@ -329,13 +329,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "SalesLog.m" - timestampString = "431870901.753946" + filePath = "MenuTableViewController.m" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "51" - endingLineNumber = "51" - landmarkName = "-parseResponse" + startingLineNumber = "1327" + endingLineNumber = "1327" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -346,11 +346,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1036" - endingLineNumber = "1036" + startingLineNumber = "1319" + endingLineNumber = "1319" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -362,12 +362,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "507" - endingLineNumber = "507" - landmarkName = "-toggleDropList:" + startingLineNumber = "1114" + endingLineNumber = "1114" + landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" landmarkType = "5"> @@ -378,12 +378,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1121" - endingLineNumber = "1121" - landmarkName = "-tableView:cellForRowAtIndexPath:" + startingLineNumber = "1112" + endingLineNumber = "1112" + landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" landmarkType = "5"> @@ -393,13 +393,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + filePath = "PriceChangerViewController.m" + timestampString = "432259134.170788" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1113" - endingLineNumber = "1113" - landmarkName = "-tableView:cellForRowAtIndexPath:" + startingLineNumber = "48" + endingLineNumber = "48" + landmarkName = "-dismissKeyboard" landmarkType = "5"> @@ -409,13 +409,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + filePath = "DateRangePickerViewController.m" + timestampString = "435674474.73691" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "908" - endingLineNumber = "908" - landmarkName = "-tableView:cellForRowAtIndexPath:" + startingLineNumber = "150" + endingLineNumber = "150" + landmarkName = "-resizeViewHeight:::" landmarkType = "5"> @@ -425,13 +425,29 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + filePath = "DateRangePickerViewController.m" + timestampString = "435674474.73691" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "906" - endingLineNumber = "906" - landmarkName = "-tableView:cellForRowAtIndexPath:" + startingLineNumber = "176" + endingLineNumber = "176" + landmarkName = "-toggleFromDate:" + landmarkType = "5"> + + + + @@ -442,12 +458,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "767" - endingLineNumber = "767" - landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" + startingLineNumber = "1443" + endingLineNumber = "1443" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -457,13 +473,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "PriceChangerViewController.m" - timestampString = "432259134.170788" + filePath = "MenuTableViewController.m" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "48" - endingLineNumber = "48" - landmarkName = "-dismissKeyboard" + startingLineNumber = "1428" + endingLineNumber = "1428" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -474,11 +490,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "433360688.202825" + timestampString = "435674474.73691" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" + startingLineNumber = "158" + endingLineNumber = "158" landmarkName = "-toggleFromDate:" landmarkType = "5"> @@ -489,13 +505,27 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" + filePath = "CommunicationProtocol.m" + timestampString = "433434179.370975" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "21" + endingLineNumber = "21"> + + + + @@ -505,13 +535,61 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "DateRangePickerViewController.m" - timestampString = "433360688.202825" + filePath = "MenuTableViewController.m" + timestampString = "435854984.608419" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "522" + endingLineNumber = "522" + landmarkName = "-viewDidLoad" + landmarkType = "5"> + + + + + + + + + + + + @@ -522,12 +600,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1237" - endingLineNumber = "1237" - landmarkName = "-passPriceViewController:didFinishEnteringItem:" + startingLineNumber = "806" + endingLineNumber = "806" + landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -538,12 +616,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "434383367.854724" + timestampString = "435859231.211213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1222" - endingLineNumber = "1222" - landmarkName = "-passPriceViewController:didFinishEnteringItem:" + startingLineNumber = "1100" + endingLineNumber = "1100" + landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -553,13 +631,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "DateRangePickerViewController.m" - timestampString = "433360688.202825" + filePath = "MenuTableViewController.m" + timestampString = "435855046.616674" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "141" - endingLineNumber = "141" - landmarkName = "-toggleFromDate:" + startingLineNumber = "780" + endingLineNumber = "780" + landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -569,12 +647,30 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "CommunicationProtocol.m" - timestampString = "433434179.370975" + filePath = "MenuTableViewController.m" + timestampString = "435855046.616674" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "21" - endingLineNumber = "21"> + startingLineNumber = "779" + endingLineNumber = "779" + landmarkName = "-tableView:didSelectRowAtIndexPath:" + landmarkType = "5"> + + + + diff --git a/DUREX Vendor Control/DateRangePickerViewController.h b/DUREX Vendor Control/DateRangePickerViewController.h index f16af2b..04e384f 100644 --- a/DUREX Vendor Control/DateRangePickerViewController.h +++ b/DUREX Vendor Control/DateRangePickerViewController.h @@ -19,13 +19,14 @@ #import #import #import "DUREXAppDelegate.h" +#import "ChildViewController.h" @protocol DateRangePickerViewControllerDelegate - (void)passDateRangeViewController:(DateRangePickerViewController*)controller didFinishEnteringItem:(NSDate*) from : (NSDate*) to; @end -@interface DateRangePickerViewController : UIViewController +@interface DateRangePickerViewController : ChildViewController @property (strong, nonatomic) IBOutlet UIView *dateRangePickerView; @property (strong, nonatomic) IBOutlet UIDatePicker *fromDate; diff --git a/DUREX Vendor Control/DateRangePickerViewController.m b/DUREX Vendor Control/DateRangePickerViewController.m index 1803ec1..0dc22ed 100644 --- a/DUREX Vendor Control/DateRangePickerViewController.m +++ b/DUREX Vendor Control/DateRangePickerViewController.m @@ -12,6 +12,7 @@ @property uint8_t isExtended; @property NSUInteger currentHeight; +@property NSUInteger currentWidth; @end @@ -21,7 +22,7 @@ { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { - // Custom initialization + } return self; } @@ -42,6 +43,10 @@ [self setIsExtended:0]; [self setCurrentHeight:[self scrollView].frame.size.height]; + [self setCurrentWidth:[self scrollView].frame.size.width]; + + [self.scrollView setAutoresizesSubviews:YES]; + [self.scrollView setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight]; [super viewDidLoad]; // Do any additional setup after loading the view from its nib. @@ -58,6 +63,28 @@ // Dispose of any resources that can be recreated. } +- (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation +{ + NSLog(@"[DateRangePickerViewController.m]: Screen did rotate"); + [UIView beginAnimations:nil context:NULL]; + [UIView setAnimationDuration:0.25]; + [self expandScrollView]; + self.scrollView.frame = CGRectMake(self.scrollView.frame.origin.x, self.scrollView.frame.origin.y, self.currentWidth,self.currentHeight); + [UIView commitAnimations]; + [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self currentHeight])]; +} + +- (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration +{ + NSLog(@"[DateRangePickerViewController.m]: Screen will rotate"); + [self.scrollView setNeedsUpdateConstraints]; +} + +- (void) expandScrollView +{ + +} + - (void)showAnimate { self.view.transform = CGAffineTransformMakeScale(1.3, 1.3); @@ -186,6 +213,7 @@ to = [[self toDate] date]; } [self.delegate passDateRangeViewController:self didFinishEnteringItem:from : to]; + [self.childDelegate removeChildFromParentController:self]; [self removeAnimate]; } diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib b/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib index 7e84038..c6ced56 100644 --- a/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib @@ -1,7 +1,7 @@ - + - + @@ -16,8 +16,8 @@ - - + + + + + + + + + + - \ No newline at end of file + diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard index f22cf5b..4c52fae 100644 --- a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard @@ -160,6 +160,47 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/FirstAppExample/DUREX Vendor Control-Info.plist b/DUREX Vendor Control/FirstAppExample/DUREX Vendor Control-Info.plist index c189583..6d98a63 100644 --- a/DUREX Vendor Control/FirstAppExample/DUREX Vendor Control-Info.plist +++ b/DUREX Vendor Control/FirstAppExample/DUREX Vendor Control-Info.plist @@ -33,6 +33,9 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight diff --git a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m index fd7cd66..6f5ec4f 100644 --- a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m +++ b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m @@ -42,11 +42,25 @@ { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_iPad" owner:self options:nil]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_iPad_Landscape" owner:self options:nil]; + } + else + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_iPad" owner:self options:nil]; + } } else { - [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil]; + } + else + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_Landscape" owner:self options:nil]; + } } [[[self popoverView] layer] setCornerRadius:10.0f]; [[self view] addSubview:[self connectingView]]; @@ -106,7 +120,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - //[self performSegueWithIdentifier:@"ConnectionSegue" sender:self]; + [self performSegueWithIdentifier:@"ConnectionSegue" sender:self]; if(![[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:NSLocalizedString(@"Searching for devices...",nil)]) { [self _showConnectingView]; diff --git a/DUREX Vendor Control/IncidentLog.m b/DUREX Vendor Control/IncidentLog.m index 04be29e..f1c5bdc 100644 --- a/DUREX Vendor Control/IncidentLog.m +++ b/DUREX Vendor Control/IncidentLog.m @@ -33,17 +33,17 @@ while(![[[self response] substringWithRange:NSMakeRange((currentIncident*INCIDENT_STRING_LENGTH), 4)] isEqualToString:@"P3P3"]) { Incident *incident = [[Incident alloc] init]; - [incidentDate setYear:(currentYear + [[[self response] substringWithRange:NSMakeRange(2 + currentIncident*SALE_STRING_LENGTH, 2)] intValue])]; - [incidentDate setMonth:[[[self response] substringWithRange:NSMakeRange(4 + currentIncident*SALE_STRING_LENGTH, 2)] intValue]]; - [incidentDate setDay:[[[self response] substringWithRange:NSMakeRange(6 + currentIncident*SALE_STRING_LENGTH, 2)] intValue]]; - [incidentDate setHour:[[[self response] substringWithRange:NSMakeRange(8 + currentIncident*SALE_STRING_LENGTH, 2)] intValue]]; - [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentIncident*SALE_STRING_LENGTH, 2)] intValue]]; - [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(12 + currentIncident*SALE_STRING_LENGTH, 2)] intValue]]; + [incidentDate setYear:(currentYear + [[[self response] substringWithRange:NSMakeRange(2 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue])]; + [incidentDate setMonth:[[[self response] substringWithRange:NSMakeRange(4 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; + [incidentDate setDay:[[[self response] substringWithRange:NSMakeRange(6 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; + [incidentDate setHour:[[[self response] substringWithRange:NSMakeRange(8 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; + [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; + [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(12 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; [incident setIncidentTime:[calendar dateFromComponents:incidentDate]]; NSLog(@"date: %@",[calendar dateFromComponents:incidentDate]); - [incident setErrorCode:[[self response] substringWithRange:NSMakeRange(14 + currentIncident*SALE_STRING_LENGTH, 2)]]; + [incident setErrorCode:[[self response] substringWithRange:NSMakeRange(14 + currentIncident*INCIDENT_STRING_LENGTH, 2)]]; NSLog(@"errorCode: %@",[incident errorCode]); - [incident setErrorValue:[[self response] substringWithRange:NSMakeRange(16 + currentIncident*SALE_STRING_LENGTH, 4)]]; + [incident setErrorValue:[[self response] substringWithRange:NSMakeRange(16 + currentIncident*INCIDENT_STRING_LENGTH, 4)]]; NSLog(@"errorValue: %@",[incident errorValue]); [[self incidents] insertObject:incident atIndex:currentIncident]; currentIncident++; diff --git a/DUREX Vendor Control/MenuTableViewController.h b/DUREX Vendor Control/MenuTableViewController.h index 7576ae0..3ad65df 100644 --- a/DUREX Vendor Control/MenuTableViewController.h +++ b/DUREX Vendor Control/MenuTableViewController.h @@ -18,6 +18,7 @@ #import "SalesLog.h" #import "IncidentLog.h" #import "UIView+Toast.h" +#import "ChildViewController.h" #define num(x) [NSNumber numberWithUnsignedInt:x] @@ -50,7 +51,7 @@ #define CONFIGURATION_CELLS_PER_SECTION num(3) #define CONFIGURATION_HEADERS nil -#define CELL_IDENTIFIERS @"MenuCell",@"MaintenanceCell",@"SaleListCell",@"SaleCell",@"ConfigCell",@"ReportCell" +#define CELL_IDENTIFIERS @"MenuCell",@"MaintenanceCell",@"SaleListCell",@"SaleCell",@"IncidentListCell",@"IncidentCell",@"ConfigCell",@"ReportCell" enum { MENU = 0, @@ -71,6 +72,7 @@ enum { A5, A6, A7, + //A9, INVALID_COMMAND, NONE, } commandTypes; @@ -80,7 +82,7 @@ enum { INCIDENT_LOG, } logType; -@interface MenuTableViewController : UITableViewController +@interface MenuTableViewController : UITableViewController - (void) navBack; diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m index a27e35b..8233a58 100644 --- a/DUREX Vendor Control/MenuTableViewController.m +++ b/DUREX Vendor Control/MenuTableViewController.m @@ -59,7 +59,9 @@ @property uint8_t requestedLog; @property uint8_t sentCommand; +@property (strong,nonatomic) NSMutableArray *childViewControllers; @property uint8_t currentNavLevel; +@property Boolean showIndexes; @property (strong,nonatomic) NSString *currentCellIdentifier; @property (strong,nonatomic) const NSMutableArray *currentElements; @property (strong,nonatomic) const NSMutableArray *currentStructure; @@ -119,17 +121,43 @@ - (void) generateSaleListNavLevel { NSMutableArray *dateArray = [[NSMutableArray alloc] init]; + NSMutableArray *dateHeaderArray = [[NSMutableArray alloc] init]; + NSMutableArray *dateStructure = [[NSMutableArray alloc] init]; + NSUInteger headerPos = 0; + NSUInteger headerCount = 0; + NSString *lastDate = @""; + NSString *currentDate; + NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit; for(int i = 0; i < [[[self salesLog] sales]count]; i++) { Sale *currentSale = [[[self salesLog] sales]objectAtIndex:i]; - NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; - NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit; NSDateComponents *components = [calendar components:units fromDate:[currentSale saleTime]]; [dateArray insertObject:[NSString stringWithFormat:@"[%d%d%d%d%d]%02d/%02d/%d %02d:%02d",[components day],[components month],[components year],[components hour],[components minute],[components day],[components month],[components year],[components hour],[components minute]] atIndex:i]; + currentDate = [NSString stringWithFormat:@"%02d/%d",[components month],[components year]]; + if([lastDate isEqualToString:@""]) + { + headerCount = 1; + lastDate = currentDate; + } + else if(![currentDate isEqualToString:lastDate]) + { + [dateStructure insertObject:[NSNumber numberWithInt:headerCount] atIndex:headerPos]; + [dateHeaderArray insertObject:lastDate atIndex:headerPos]; + headerCount = 1; + headerPos++; + lastDate = currentDate; + } + else + { + headerCount++; + } } + [dateStructure insertObject:[NSNumber numberWithInt:headerCount] atIndex:headerPos]; + [dateHeaderArray insertObject:lastDate atIndex:headerPos]; [self setSaleListElements:[[NSMutableArray alloc] initWithArray:dateArray]]; - [self setSaleListStructure:[[NSMutableArray alloc] initWithObjects:[NSNumber numberWithInt:[dateArray count]], nil]]; - [self setSaleListHeaders:nil]; + [self setSaleListStructure:[[NSMutableArray alloc] initWithArray:dateStructure]]; + [self setSaleListHeaders:[[NSMutableArray alloc] initWithArray:dateHeaderArray]]; } - (Boolean) generateSaleNavLevel : (NSInteger) numSale @@ -151,17 +179,42 @@ - (void) generateIncidentListNavLevel { NSMutableArray *dateArray = [[NSMutableArray alloc] init]; + NSMutableArray *dateHeaderArray = [[NSMutableArray alloc] init]; + NSMutableArray *dateStructure = [[NSMutableArray alloc] init]; + NSUInteger headerPos = 0; + NSUInteger headerCount = 0; + NSString *lastDate = @""; + NSString *currentDate; + NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit; for(int i = 0; i < [[[self incidentLog] incidents]count]; i++) { Incident *currentIncident = [[[self incidentLog] incidents]objectAtIndex:i]; - NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; - NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit; NSDateComponents *components = [calendar components:units fromDate:[currentIncident incidentTime]]; [dateArray insertObject:[NSString stringWithFormat:@"[%d%d%d%d%d]%02d/%02d/%d %02d:%02d",[components day],[components month],[components year],[components hour],[components minute],[components day],[components month],[components year],[components hour],[components minute]] atIndex:i]; + currentDate = [NSString stringWithFormat:@"%02d/%d",[components month],[components year]]; + if([lastDate isEqualToString:@""]) + { + headerCount = 1; + lastDate = currentDate; + } + else if(![currentDate isEqualToString:lastDate]) + { + [dateStructure insertObject:[NSNumber numberWithInt:headerCount] atIndex:headerPos]; + [dateHeaderArray insertObject:lastDate atIndex:headerPos]; + headerCount = 1; + headerPos++; + lastDate = currentDate; + } + else + { + headerCount++; + } } - [self setIncidentListElements:[[NSMutableArray alloc] initWithArray:dateArray]]; - [self setIncidentListStructure:[[NSMutableArray alloc] initWithObjects:[NSNumber numberWithInt:[dateArray count]], nil]]; - [self setIncidentListHeaders:nil]; + [dateStructure insertObject:[NSNumber numberWithInt:headerCount] atIndex:headerPos]; + [dateHeaderArray insertObject:lastDate atIndex:headerPos]; [self setIncidentListElements:[[NSMutableArray alloc] initWithArray:dateArray]]; + [self setIncidentListStructure:[[NSMutableArray alloc] initWithArray:dateStructure]]; + [self setIncidentListHeaders:[[NSMutableArray alloc] initWithArray:dateHeaderArray]]; } - (Boolean) generateIncidentNavLevel : (NSInteger) numIncident @@ -183,6 +236,7 @@ - (void) changeNavLevel: (uint8_t) level : (BOOL) push { NSLog(@"[MenuTableViewController.m]: navLevel is %d",level); + self.showIndexes = FALSE; if(push) { [[self parentLayout] push: [NSNumber numberWithUnsignedChar:self.currentNavLevel]]; @@ -206,6 +260,7 @@ } else if([self currentNavLevel] == SALE_LIST) { + self.showIndexes = TRUE; [[self navigationItem] setTitle:NSLocalizedString(@"Sales log", nil)]; [self setCurrentElements:[self saleListElements]]; [self setCurrentStructure:[self saleListStructure]]; @@ -223,6 +278,7 @@ } else if([self currentNavLevel] == INCIDENT_LIST) { + self.showIndexes = TRUE; [[self navigationItem] setTitle:NSLocalizedString(@"Incident log", nil)]; [self setCurrentElements:[self incidentListElements]]; [self setCurrentStructure:[self incidentListStructure]]; @@ -427,7 +483,7 @@ } else { - [self setSentCommand:INVALID_COMMAND]; + [self setSentCommand:NONE]; [self.view makeToast:NSLocalizedString(@"Device answer timeout occurred", nil) duration:3 position:[NSValue valueWithCGPoint:CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2)] title:NSLocalizedString(@"Error", nil) image:[UIImage imageNamed:@"icon_delete"]]; } } @@ -462,8 +518,10 @@ [self initializeMenuEntries]; self.currentNavLevel = 255; [_protocol establishConnection]; - [self setSentCommand:HELLO]; - [self startTimeoutTimer]; + //[self setSentCommand:HELLO]; + //[self startTimeoutTimer]; + [self changeNavLevel:MENU :FALSE]; + [self setChildViewControllers:[[NSMutableArray alloc]init]]; } -(void)didReceiveNotification:(NSNotification*) notification @@ -483,6 +541,30 @@ // Dispose of any resources that can be recreated. } +- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation +{ + for(int i = 0; i < self.childViewControllers.count; i++) + { + ChildViewController *childController = [self.childViewControllers objectAtIndex:i]; + [childController parentViewControllerDidRotateWithOrientation: [[UIDevice currentDevice] orientation]]; + } +} + +- (void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration +{ + for(int i = 0; i < self.childViewControllers.count; i++) + { + ChildViewController *childController = [self.childViewControllers objectAtIndex:i]; + [childController parentViewControllerWillRotateToInterfaceOrientation:toInterfaceOrientation duration:duration]; + } +} + +- (void)removeChildFromParentController:(ChildViewController*)controller +{ + [self.childViewControllers removeObject:controller]; + NSLog(@"[MenuTableViewController]: %d childViewControllers left",self.childViewControllers.count); +} + -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { if (object == [EMConnectionManager sharedManager]) @@ -669,12 +751,38 @@ return [[[self currentStructure] objectAtIndex:section] intValue]; } +- (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView +{ + if(self.showIndexes) + { + return self.currentHeaders; + } + return nil; +} + +- (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index +{ + if(self.showIndexes) + { + return [self.currentHeaders indexOfObject:title]; + } + return 0; +} + - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { NSLog(@"Section: %ld Row: %ld",(long)[indexPath section],(long)[indexPath row]); [tableView deselectRowAtIndexPath:indexPath animated:YES]; UITableViewCell *cell = [[self tableView] cellForRowAtIndexPath:indexPath]; NSString *cellName = [[cell textLabel]text]; + uint8_t offset = 0; + if([indexPath section]) + { + for (int i = 0; i < [indexPath section]; i++) + { + offset += [[[self currentStructure] objectAtIndex:i] unsignedCharValue]; + } + } //Cells in MENU if([self currentNavLevel] == MENU) { @@ -695,12 +803,52 @@ } else if([cellName isEqualToString:NSLocalizedString(@"Sending a Report", nil)]) { - //TEST TIMEOUT - if(self.sentCommand == NONE) + /*NSMutableString *testString = [[NSMutableString alloc] init]; + for(int i = 0; i < 300; i++) { - [_protocol writeMessage:@"A9"]; - [self setSentCommand:INVALID_COMMAND]; - [self startTimeoutTimer]; + [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]; + } } } } @@ -724,15 +872,41 @@ [self setRequestedLog:SALES_LOG]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad" bundle:nil]; - self.dateRangePickerViewController.delegate = self; - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES]; + 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 { - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController" bundle:nil]; - self.dateRangePickerViewController.delegate = self; - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES]; + 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]; + } } } } @@ -743,15 +917,41 @@ [self setRequestedLog:INCIDENT_LOG]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController_iPad" bundle:nil]; - self.dateRangePickerViewController.delegate = self; - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES]; + 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 { - self.dateRangePickerViewController = [[DateRangePickerViewController alloc] initWithNibName:@"DateRangePickerViewController" bundle:nil]; - self.dateRangePickerViewController.delegate = self; - [self.dateRangePickerViewController showInView:self.navigationController.view animated:YES]; + 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]; + } } } } @@ -774,15 +974,33 @@ { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_iPad" bundle:nil]; - self.datePickerViewController.delegate = self; - [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_iPad_Landscape" bundle:nil]; + self.datePickerViewController.delegate = self; + [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_iPad" bundle:nil]; + self.datePickerViewController.delegate = self; + [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + } } else { - self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController" bundle:nil]; - self.datePickerViewController.delegate = self; - [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController" bundle:nil]; + self.datePickerViewController.delegate = self; + [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_Landscape" bundle:nil]; + self.datePickerViewController.delegate = self; + [self.datePickerViewController showInView:self.navigationController.view animated:YES]; + } } } } @@ -793,15 +1011,33 @@ { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_iPad" bundle:nil]; - self.priceChangerViewController.delegate = self; - [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_iPad_Landscape" bundle:nil]; + self.priceChangerViewController.delegate = self; + [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_iPad" bundle:nil]; + self.priceChangerViewController.delegate = self; + [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + } } else { - self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController" bundle:nil]; - self.priceChangerViewController.delegate = self; - [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController" bundle:nil]; + self.priceChangerViewController.delegate = self; + [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_Landscape" bundle:nil]; + self.priceChangerViewController.delegate = self; + [self.priceChangerViewController showInView:self.navigationController.view animated:YES]; + } } } } @@ -812,22 +1048,40 @@ { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController_iPad" bundle:nil]; - self.nameChangerViewController.delegate = self; - [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController_iPad_Landscape" bundle:nil]; + self.nameChangerViewController.delegate = self; + [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController_iPad" bundle:nil]; + self.nameChangerViewController.delegate = self; + [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + } } else { - self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController" bundle:nil]; - self.nameChangerViewController.delegate = self; - [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) + { + self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController_Landscape" bundle:nil]; + self.nameChangerViewController.delegate = self; + [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + } + else + { + self.nameChangerViewController = [[NameChangerViewController alloc] initWithNibName:@"NameChangerViewController" bundle:nil]; + self.nameChangerViewController.delegate = self; + [self.nameChangerViewController showInView:self.navigationController.view animated:YES]; + } } } } } else if([self currentNavLevel] == SALE_LIST) { - if([self generateSaleNavLevel: [indexPath row]]) + if([self generateSaleNavLevel: [indexPath row] + offset]) { [self changeNavLevel:SALE:TRUE]; } @@ -843,7 +1097,7 @@ } else if([self currentNavLevel] == INCIDENT_LIST) { - if([self generateIncidentNavLevel: [indexPath row]]) + if([self generateIncidentNavLevel: [indexPath row] + offset]) { [self changeNavLevel:INCIDENT:TRUE]; } @@ -1289,7 +1543,7 @@ } else if([[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Error Value",nil)]) { - [[cell detailTextLabel] setText:[self.currentIncident errorCode]]; + [[cell detailTextLabel] setText:[self.currentIncident errorValue]]; [cell setAccessoryView:nil]; } } diff --git a/DUREX Vendor Control/en.lproj/DatePickerViewController_Landscape.strings b/DUREX Vendor Control/en.lproj/DatePickerViewController_Landscape.strings new file mode 100644 index 0000000..1e1f995 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/DatePickerViewController_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */ +"SLt-EA-xM9.normalTitle" = "Done"; diff --git a/DUREX Vendor Control/en.lproj/DatePickerViewController_iPad_Landscape.strings b/DUREX Vendor Control/en.lproj/DatePickerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..6c603a3 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/DatePickerViewController_iPad_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */ +"JbU-pO-d9E.normalTitle" = "Done"; diff --git a/DUREX Vendor Control/en.lproj/DateRangePickerViewController_Landscape.strings b/DUREX Vendor Control/en.lproj/DateRangePickerViewController_Landscape.strings new file mode 100644 index 0000000..1c9c171 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/DateRangePickerViewController_Landscape.strings @@ -0,0 +1,9 @@ + +/* Class = "IBUILabel"; text = "From:"; ObjectID = "Ses-ng-Dli"; */ +"Ses-ng-Dli.text" = "From:"; + +/* Class = "IBUILabel"; text = "To:"; ObjectID = "WCO-rz-s5y"; */ +"WCO-rz-s5y.text" = "To:"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */ +"nfK-Us-pVk.normalTitle" = "Done"; diff --git a/DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad_Landscape.strings b/DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..360c45f --- /dev/null +++ b/DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad_Landscape.strings @@ -0,0 +1,9 @@ + +/* Class = "IBUILabel"; text = "From:"; ObjectID = "7sY-pS-rR6"; */ +"7sY-pS-rR6.text" = "From:"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hDh-hS-ruL"; */ +"hDh-hS-ruL.normalTitle" = "Done"; + +/* Class = "IBUILabel"; text = "To:"; ObjectID = "z8k-7k-O2i"; */ +"z8k-7k-O2i.text" = "To:"; diff --git a/DUREX Vendor Control/en.lproj/EMConnectingView_Landscape.strings b/DUREX Vendor Control/en.lproj/EMConnectingView_Landscape.strings new file mode 100644 index 0000000..a8b4ee8 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/EMConnectingView_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "J1X-2s-Ung"; */ +"J1X-2s-Ung.text" = "Connecting to device"; diff --git a/DUREX Vendor Control/en.lproj/EMConnectingView_iPad_Landscape.strings b/DUREX Vendor Control/en.lproj/EMConnectingView_iPad_Landscape.strings new file mode 100644 index 0000000..2314f47 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/EMConnectingView_iPad_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "X5Q-qk-1n6"; */ +"X5Q-qk-1n6.text" = "Connecting to device"; diff --git a/DUREX Vendor Control/en.lproj/NameChangerViewController_Landscape.strings b/DUREX Vendor Control/en.lproj/NameChangerViewController_Landscape.strings new file mode 100644 index 0000000..5d33219 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/NameChangerViewController_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ZH7-mZ-Jfc"; */ +"ZH7-mZ-Jfc.normalTitle" = "Done"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "ZzG-qH-dln"; */ +"ZzG-qH-dln.text" = "Channel"; + +/* Class = "IBUILabel"; text = "New Name"; ObjectID = "gIa-c0-uyh"; */ +"gIa-c0-uyh.text" = "New Name"; + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */ +"z9N-z7-JyV.text" = "Product Code"; diff --git a/DUREX Vendor Control/en.lproj/NameChangerViewController_iPad_Landscape.strings b/DUREX Vendor Control/en.lproj/NameChangerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..41be93d --- /dev/null +++ b/DUREX Vendor Control/en.lproj/NameChangerViewController_iPad_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "85G-KF-Rny"; */ +"85G-KF-Rny.text" = "Product Code"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "MUO-8b-DhH"; */ +"MUO-8b-DhH.text" = "Channel"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "q3O-jD-tjP"; */ +"q3O-jD-tjP.normalTitle" = "Done"; + +/* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */ +"zj0-M4-cAO.text" = "New Name"; diff --git a/DUREX Vendor Control/en.lproj/PriceChangerViewController_Landscape.strings b/DUREX Vendor Control/en.lproj/PriceChangerViewController_Landscape.strings new file mode 100644 index 0000000..874b6b8 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/PriceChangerViewController_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "0G8-sN-Hfg"; */ +"0G8-sN-Hfg.text" = "Channel"; + +/* Class = "IBUILabel"; text = "New Price"; ObjectID = "UrS-qz-jRa"; */ +"UrS-qz-jRa.text" = "New Price"; + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "neg-KG-oQC"; */ +"neg-KG-oQC.text" = "Product Code"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ubO-fy-Tcd"; */ +"ubO-fy-Tcd.normalTitle" = "Done"; diff --git a/DUREX Vendor Control/en.lproj/PriceChangerViewController_iPad_Landscape.strings b/DUREX Vendor Control/en.lproj/PriceChangerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..ab18f05 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/PriceChangerViewController_iPad_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "GCF-GY-CN1"; */ +"GCF-GY-CN1.text" = "Product Code"; + +/* Class = "IBUILabel"; text = "New Price"; ObjectID = "eXX-xf-h6G"; */ +"eXX-xf-h6G.text" = "New Price"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hdn-qQ-8np"; */ +"hdn-qQ-8np.normalTitle" = "Done"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "z9V-5B-LtD"; */ +"z9V-5B-LtD.text" = "Channel"; diff --git a/DUREX Vendor Control/es.lproj/DatePickerViewController_Landscape.strings b/DUREX Vendor Control/es.lproj/DatePickerViewController_Landscape.strings new file mode 100644 index 0000000..f5cff71 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/DatePickerViewController_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */ +"SLt-EA-xM9.normalTitle" = "Aceptar"; diff --git a/DUREX Vendor Control/es.lproj/DatePickerViewController_iPad_Landscape.strings b/DUREX Vendor Control/es.lproj/DatePickerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..4fda1e8 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/DatePickerViewController_iPad_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */ +"JbU-pO-d9E.normalTitle" = "Aceptar"; diff --git a/DUREX Vendor Control/es.lproj/DateRangePickerViewController_Landscape.strings b/DUREX Vendor Control/es.lproj/DateRangePickerViewController_Landscape.strings new file mode 100644 index 0000000..c37077d --- /dev/null +++ b/DUREX Vendor Control/es.lproj/DateRangePickerViewController_Landscape.strings @@ -0,0 +1,9 @@ + +/* Class = "IBUILabel"; text = "From:"; ObjectID = "Ses-ng-Dli"; */ +"Ses-ng-Dli.text" = "Desde:"; + +/* Class = "IBUILabel"; text = "To:"; ObjectID = "WCO-rz-s5y"; */ +"WCO-rz-s5y.text" = "Hasta:"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */ +"nfK-Us-pVk.normalTitle" = "Aceptar"; diff --git a/DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad_Landscape.strings b/DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..6f7cbbd --- /dev/null +++ b/DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad_Landscape.strings @@ -0,0 +1,9 @@ + +/* Class = "IBUILabel"; text = "From:"; ObjectID = "7sY-pS-rR6"; */ +"7sY-pS-rR6.text" = "Desde:"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hDh-hS-ruL"; */ +"hDh-hS-ruL.normalTitle" = "Aceptar"; + +/* Class = "IBUILabel"; text = "To:"; ObjectID = "z8k-7k-O2i"; */ +"z8k-7k-O2i.text" = "Hasta:"; diff --git a/DUREX Vendor Control/es.lproj/EMConnectingView_Landscape.strings b/DUREX Vendor Control/es.lproj/EMConnectingView_Landscape.strings new file mode 100644 index 0000000..2cc7b00 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/EMConnectingView_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "J1X-2s-Ung"; */ +"J1X-2s-Ung.text" = "Realizando conexión"; diff --git a/DUREX Vendor Control/es.lproj/EMConnectingView_iPad_Landscape.strings b/DUREX Vendor Control/es.lproj/EMConnectingView_iPad_Landscape.strings new file mode 100644 index 0000000..148fa14 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/EMConnectingView_iPad_Landscape.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "X5Q-qk-1n6"; */ +"X5Q-qk-1n6.text" = "Realizando conexión"; diff --git a/DUREX Vendor Control/es.lproj/NameChangerViewController.strings b/DUREX Vendor Control/es.lproj/NameChangerViewController.strings index 1b12c50..dd54c46 100644 --- a/DUREX Vendor Control/es.lproj/NameChangerViewController.strings +++ b/DUREX Vendor Control/es.lproj/NameChangerViewController.strings @@ -1,12 +1,12 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "Y9f-BL-5ZB"; */ -"Y9f-BL-5ZB.normalTitle" = "Done"; +"Y9f-BL-5ZB.normalTitle" = "Aceptar"; /* Class = "IBUILabel"; text = "New Name"; ObjectID = "Zfh-RB-roO"; */ -"Zfh-RB-roO.text" = "New Name"; +"Zfh-RB-roO.text" = "Nuevo Nombre"; /* Class = "IBUILabel"; text = "Channel"; ObjectID = "u0t-Gj-gKZ"; */ -"u0t-Gj-gKZ.text" = "Channel"; +"u0t-Gj-gKZ.text" = "Canal"; /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "zk3-Qc-MYf"; */ -"zk3-Qc-MYf.text" = "Product Code"; +"zk3-Qc-MYf.text" = "Código del Producto"; diff --git a/DUREX Vendor Control/es.lproj/NameChangerViewController_Landscape.strings b/DUREX Vendor Control/es.lproj/NameChangerViewController_Landscape.strings new file mode 100644 index 0000000..0ff7fea --- /dev/null +++ b/DUREX Vendor Control/es.lproj/NameChangerViewController_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ZH7-mZ-Jfc"; */ +"ZH7-mZ-Jfc.normalTitle" = "Aceptar"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "ZzG-qH-dln"; */ +"ZzG-qH-dln.text" = "Canal"; + +/* Class = "IBUILabel"; text = "New Name"; ObjectID = "gIa-c0-uyh"; */ +"gIa-c0-uyh.text" = "Nuevo Nombre"; + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */ +"z9N-z7-JyV.text" = "Código del Producto"; diff --git a/DUREX Vendor Control/es.lproj/NameChangerViewController_iPad_Landscape.strings b/DUREX Vendor Control/es.lproj/NameChangerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..2745ff0 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/NameChangerViewController_iPad_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "85G-KF-Rny"; */ +"85G-KF-Rny.text" = "Código del Producto"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "MUO-8b-DhH"; */ +"MUO-8b-DhH.text" = "Canal"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "q3O-jD-tjP"; */ +"q3O-jD-tjP.normalTitle" = "Aceptar"; + +/* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */ +"zj0-M4-cAO.text" = "Nuevo Nombre"; diff --git a/DUREX Vendor Control/es.lproj/PriceChangerViewController_Landscape.strings b/DUREX Vendor Control/es.lproj/PriceChangerViewController_Landscape.strings new file mode 100644 index 0000000..39435bd --- /dev/null +++ b/DUREX Vendor Control/es.lproj/PriceChangerViewController_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "0G8-sN-Hfg"; */ +"0G8-sN-Hfg.text" = "Canal"; + +/* Class = "IBUILabel"; text = "New Price"; ObjectID = "UrS-qz-jRa"; */ +"UrS-qz-jRa.text" = "Nuevo Precio"; + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "neg-KG-oQC"; */ +"neg-KG-oQC.text" = "Código del Producto"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ubO-fy-Tcd"; */ +"ubO-fy-Tcd.normalTitle" = "Aceptar"; diff --git a/DUREX Vendor Control/es.lproj/PriceChangerViewController_iPad_Landscape.strings b/DUREX Vendor Control/es.lproj/PriceChangerViewController_iPad_Landscape.strings new file mode 100644 index 0000000..ff00a19 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/PriceChangerViewController_iPad_Landscape.strings @@ -0,0 +1,12 @@ + +/* Class = "IBUILabel"; text = "Product Code"; ObjectID = "GCF-GY-CN1"; */ +"GCF-GY-CN1.text" = "Código del Producto"; + +/* Class = "IBUILabel"; text = "New Price"; ObjectID = "eXX-xf-h6G"; */ +"eXX-xf-h6G.text" = "Nuevo Precio"; + +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hdn-qQ-8np"; */ +"hdn-qQ-8np.normalTitle" = "Aceptar"; + +/* Class = "IBUILabel"; text = "Channel"; ObjectID = "z9V-5B-LtD"; */ +"z9V-5B-LtD.text" = "Canal"; diff --git a/TODO b/TODO index c8b59e2..dd37a30 100644 --- a/TODO +++ b/TODO @@ -1,25 +1,14 @@ TESTS: -- Multiple fragments -- Timeout - A3 command -- A2 command -- Prevent multiple commands sending BUGS: - On date change, response is overwritten by previous query, trimming needed according to numBytes +- daterangepicker regression on landscape TODO: -- Channels and codes to 2 ciphers -- Add landscape layout and inverted layout -- Month/Year headers on sale list +- Solve bugs +OPTIONAL: - Batch command files, definition, parsing and pushing them to the app -- Implement user auth. Server authenticates the app ONCE on install and allows to control ONE machine (key gets validated on server and then stored on app) -- Implement master key. -- App in background operations (scan and connect, if success get maintenance and sales data and send it) - - - - - +- Month/Year headers on sale list and incident list -- libgit2 0.22.2