161128

offline sales order add general notes
create pdf tabledrawable support separator
fix so_thumb template

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4,13 +4,163 @@
    version = "2.0">
    <Breakpoints>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TextDrawable.m"
+            timestampString = "501753905.380716"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "457"
+            endingLineNumber = "457"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "502012890.409592"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1560"
+            endingLineNumber = "1560"
+            landmarkName = "+offline_request_salesorder:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "502012018.011745"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1543"
+            endingLineNumber = "1543"
+            landmarkName = "+offline_request_salesorder:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
+            filePath = "common/ActiveViewController.m"
+            timestampString = "502011953.552295"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderDetailViewController.m"
+            timestampString = "502012409.402866"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "904"
+            endingLineNumber = "904"
+            landmarkName = "-loaddata"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "502012307.012428"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "35"
+            endingLineNumber = "35"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "502012845.249783"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1558"
+            endingLineNumber = "1558"
+            landmarkName = "+offline_request_salesorder:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TableDrawable.m"
+            timestampString = "502015026.660141"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "258"
+            endingLineNumber = "258"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TableDrawable.m"
+            timestampString = "502015026.660141"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/GroupDrawable.m"
+            timestampString = "502013962.916099"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -20,11 +170,43 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TextDrawable.m"
-            timestampString = "501753905.380716"
+            timestampString = "502014005.341012"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "457"
-            endingLineNumber = "457"
+            startingLineNumber = "231"
+            endingLineNumber = "231"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TableDrawable.m"
+            timestampString = "502015230.728214"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/LineDrawable.m"
+            timestampString = "502015343.621354"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "41"
+            endingLineNumber = "41"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -2,6 +2,14 @@
 <VariablesViewState
    version = "1.0">
    <ContextStates>
+      <ContextState
+         contextName = "-[TextDrawable Draw:dataSource:ParentRect:startX:startY:flipHeight:range:]:TextDrawable.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "data[@&quot;gnotes&quot;]">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "+[RAUtils arr2string:separator:trim:]:RAUtils.m">
       </ContextState>
@@ -20,10 +28,10 @@
          contextName = "-[NSData(LowLevelCommonCryptor) dataEncryptedUsingAlgorithm:key:initializationVector:options:error:]:NSData+CommonCrypto.m">
       </ContextState>
       <ContextState
-         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
+         contextName = "-[PDFDrawable DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:]:PDFDrawable.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.cqty">
+               value = "self.drawableTemplate[@&quot;draw_bound&quot;]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -31,10 +39,10 @@
          contextName = "-[PDFDrawable to_parent_rect:pos:offsetX:offsetY:]:PDFDrawable.m">
       </ContextState>
       <ContextState
-         contextName = "-[PDFDrawable DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:]:PDFDrawable.m">
+         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.drawableTemplate[@&quot;draw_bound&quot;]">
+               value = "self.cqty">
             </PersistentString>
          </PersistentStrings>
       </ContextState>

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -396,8 +396,6 @@
                                             @"order_code" : self.order_code,
                                             } mutableCopy];
             NSData *dicData = [OLDataProvider  offline_request_salesorder:params];
-            if(dicData==nil)
-                return;
             NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:dicData options:NSJSONReadingMutableContainers error:nil];
             if ([dic[@"result"] integerValue] == RESULT_TRUE) {
                 NSString *path = dic[@"pdf_path"];

RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m

@@ -8,6 +8,8 @@
 
 #import "TableDrawable.h"
 #import "GroupDrawable.h"
+#import "LineDrawable.h"
+
 
 @implementation TableDrawable
 -(void) setDrawableTemplate:(NSMutableDictionary *)drawableTemplate
@@ -259,6 +261,14 @@
         NSMutableDictionary * rowjson =rows[ [NSString stringWithFormat:@"row_%d",i ] ];
         PDFDrawable* drawable_obj= [[GroupDrawable alloc] init:rowjson];
         drawable_obj.delegate = self.delegate;
+        
+        
+        if(rowjson[@"separator"]!=nil)
+        {
+        PDFDrawable* separator_obj= [[LineDrawable alloc] init:rowjson[@"separator"]];
+        separator_obj.delegate = self.delegate;
+        [separator_obj Draw:context dataSource:nil ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
+        }
         NSMutableDictionary* rows_data = table_data[rowjson[@"data_source"]];
         int row_data_count=[rows_data[@"count"] intValue];
         

RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -809,7 +809,7 @@
                                 "height": 120,
                                 "draw_bound": true,
                                 "line_width": [
-                                               0,
+                                               1,
                                                0,
                                                0,
                                                1
@@ -884,10 +884,17 @@
                             },
                             "item_3": {
                                 "type": "group",
-                                "x": 3,
-                                "y": 1,
-                                "width": 386,
-                                "height": 77
+                                "x": 0,
+                                "y": 0,
+                                "width": 391,
+                                "height": 77,
+                                "draw_bound": true,
+                                "line_width": [
+                                               1,
+                                               0,
+                                               0,
+                                               0
+                                               ],
                             },
                             "item_4": {
                                 "type": "text",
@@ -931,11 +938,11 @@
                     "line_width": [
                                    1,
                                    1,
-                                   1,
+                                   0,
                                    1
                                    ],
                     "rows": {
-                        "count": 1,
+                        "count": 2,
                         "header": {
                             "data_source": "row0",
                             "type": "group",
@@ -1278,6 +1285,49 @@
                                     "height": 69
                                 }
                             }
+                        },
+                        "row_1": {
+                            "data_source": "row2",
+                            "repeat": "horizontal",
+                            "type": "group",
+                            "separator":{
+                                "type": "line",
+                                "x0": 0,
+                                "y0": 0,
+                                "x1": 571,
+                                "y1": 0,
+                                "line_width": 1
+                            },
+                            "x": 0,
+                            "y": 0,
+                            "width": 571,
+                            "height": 69,
+                            "draw_bound": true,
+                            "line_width": [
+                                           0,
+                                           1,
+                                           0,
+                                           1
+                                           ],
+                            "items": {
+                                "count": 1,
+                                "item_0": {
+                                    "type": "text",
+                                    "source": "g_notes",
+                                    "source_type": "data",
+                                    "margin_left":2,
+                                    "margin_top":2,
+                                    "source_isexpression": false,
+
+                                    "textAlignment": "left",
+                                    "size": "10",
+                                    "vAlign": "top",
+                                    "x": 0,
+                                    "y": 0,
+                                    "width": 571,
+                                    "height": 69
+                                }
+                            }
                         }
                     }
                 }