Ray Zhang 8 лет назад
Родитель
Сommit
90786f4d58

BIN
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 21 - 5
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -202,7 +202,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m"
-            timestampString = "528189242.946771"
+            timestampString = "528358029.469208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1225"
@@ -262,11 +262,11 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m"
-            timestampString = "528189242.947856"
+            timestampString = "528358029.469353"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "504"
@@ -298,7 +298,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m"
-            timestampString = "528189242.948116"
+            timestampString = "528358029.469471"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1134"
@@ -314,7 +314,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m"
-            timestampString = "528189242.948283"
+            timestampString = "528358029.469619"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1212"
@@ -323,5 +323,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ACNetwork.m"
+            timestampString = "528342038.80194"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "363"
+            endingLineNumber = "363"
+            landmarkName = "+parse_authinfo:user:password:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 159 - 155
Ants Contract/Granite Expo eSign/GEIC - Home Improvement Contract 2017 Desktop.json

@@ -1,24 +1,25 @@
 {
     "page_0": {
-        "control_22": {
-            "height": 11,
-            "textAlignment": "center",
-            "pos_x": 523,
-            "width": 104,
-            "size": "8",
-            "field": "doc_number",
-            "pos_y": 917,
-            "type": "Label",
+        "control_20": {
             "required": true,
+            "width": 30,
+            "dirty": false,
+            "aname": "Initial",
+            "linewidth": 8,
             "value": "",
-            "dirty": false
+            "pos_y": 881,
+            "type": "Signature",
+            "height": 15,
+            "can_fill": "true",
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_1": {
             "width": 225,
             "tv_vmargin": 0.4,
             "aname": "Invoice Number",
             "type": "TextView",
-            "size": "12",
+            "size": "11",
             "pos_y": 33,
             "field": "invoice_number",
             "value": "",
@@ -90,23 +91,37 @@
             "required": true
         },
         "count": 23,
+        "control_22": {
+            "height": 11,
+            "textAlignment": "center",
+            "pos_x": 523,
+            "width": 104,
+            "size": "8",
+            "field": "doc_number",
+            "pos_y": 917,
+            "type": "Label",
+            "required": true,
+            "value": "",
+            "dirty": false
+        },
         "control_21": {
             "height": 22,
             "pos_x": 500,
-            "required": true,
+            "type": "Image",
             "width": 150,
             "value": "",
             "pos_y": 898,
+            "required": true,
             "dirty": false,
-            "name": "BarCode",
-            "type": "Image"
+            "name": "BarCode"
         },
         "control_10": {
-            "value": "",
+            "pos_x": 215,
             "dirty": false,
             "width": 170,
             "pos_y": 368,
             "aname": "Contract Price",
+            "value": "",
             "type": "TextView",
             "size": "12",
             "keyboard": "number",
@@ -130,16 +145,16 @@
                     }
                 }
             },
-            "required": true,
-            "pos_x": 215
+            "required": true
         },
         "control_11": {
-            "value": "",
+            "pos_x": 463,
             "disable": true,
             "dirty": false,
             "width": 88,
             "pos_y": 368,
             "aname": "Labor Deposit",
+            "value": "",
             "type": "TextView",
             "size": "10",
             "keyboard": "number",
@@ -159,8 +174,7 @@
                     }
                 }
             },
-            "required": true,
-            "pos_x": 463
+            "required": true
         },
         "control_19": {
             "width": 40,
@@ -222,7 +236,7 @@
             "tv_vmargin": 0.4,
             "aname": "Sales Person",
             "type": "TextView",
-            "size": "12",
+            "size": "11",
             "pos_y": 19,
             "field": "sales_person",
             "value": "",
@@ -230,7 +244,7 @@
             "height": 14,
             "margin_left": "4",
             "margin_top": "1",
-            "required": false,
+            "required": true,
             "pos_x": 205
         },
         "control_2": {
@@ -491,7 +505,7 @@
             "pos_x": 122
         },
         "control_14": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 30,
             "dirty": false,
             "aname": "Initial",
@@ -501,11 +515,11 @@
             "type": "Signature",
             "height": 15,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_15": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 30,
             "dirty": false,
             "aname": "Initial",
@@ -515,11 +529,11 @@
             "type": "Signature",
             "height": 15,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_16": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 30,
             "dirty": false,
             "aname": "Initial",
@@ -529,11 +543,11 @@
             "type": "Signature",
             "height": 15,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_17": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 30,
             "dirty": false,
             "aname": "Initial",
@@ -543,11 +557,11 @@
             "type": "Signature",
             "height": 15,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_18": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 30,
             "dirty": false,
             "aname": "Initial",
@@ -557,27 +571,13 @@
             "type": "Signature",
             "height": 15,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
-        },
-        "control_20": {
             "name": "Customer Initial",
-            "width": 30,
-            "dirty": false,
-            "aname": "Initial",
-            "linewidth": 8,
-            "value": "",
-            "pos_y": 881,
-            "type": "Signature",
-            "height": 15,
-            "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "pos_x": 616
         }
     },
     "page_1": {
         "control_1": {
-            "name": "Decision Maker",
+            "pos_x": 230,
             "width": 200,
             "tv_vmargin": 0.6,
             "aname": "Decision Maker",
@@ -590,11 +590,11 @@
             "height": 20,
             "margin_left": "4",
             "margin_top": "1",
-            "required": true,
-            "pos_x": 230
+            "name": "Decision Maker",
+            "required": true
         },
         "control_3": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -604,11 +604,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_5": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -618,11 +618,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_7": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -632,8 +632,8 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_9": {
             "width": 464,
@@ -656,7 +656,7 @@
                            ],
                           [
                            147,
-                           502
+                           504
                            ]
                           ],
                          [
@@ -685,7 +685,7 @@
         },
         "count": 22,
         "control_21": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -695,11 +695,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_20": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -709,11 +709,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_10": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -723,11 +723,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_0": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -737,11 +737,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_2": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -751,11 +751,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_4": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -765,11 +765,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_6": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -779,11 +779,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_8": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -793,11 +793,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_11": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -807,11 +807,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_12": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -821,11 +821,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_13": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -835,11 +835,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_14": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -849,11 +849,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_15": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -863,11 +863,11 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_16": {
-            "name": "Customer Initial",
+            "required": true,
             "width": 29,
             "dirty": false,
             "aname": "Initial",
@@ -877,8 +877,8 @@
             "type": "Signature",
             "height": 14,
             "can_fill": "true",
-            "pos_x": 616,
-            "required": true
+            "name": "Customer Initial",
+            "pos_x": 616
         },
         "control_19": {
             "height": 11,
@@ -896,13 +896,13 @@
         "control_18": {
             "height": 22,
             "pos_x": 500,
-            "required": true,
+            "type": "Image",
             "width": 150,
             "value": "",
             "pos_y": 898,
+            "required": true,
             "dirty": false,
-            "name": "BarCode",
-            "type": "Image"
+            "name": "BarCode"
         }
     },
     "signature_name": [
@@ -938,7 +938,7 @@
             "field": "owner_name",
             "value": "",
             "dirty": false,
-            "height": 13,
+            "height": 14,
             "margin_top": "2",
             "required": true,
             "pos_x": 474
@@ -950,11 +950,11 @@
             "aname": "Print Name",
             "type": "TextView",
             "size": "10",
-            "pos_y": 809,
+            "pos_y": 808,
             "field": "customer_name_1",
             "value": "",
             "dirty": false,
-            "height": 13,
+            "height": 14,
             "margin_top": "2",
             "required": true,
             "pos_x": 474
@@ -962,27 +962,27 @@
         "control_1": {
             "height": 23,
             "pos_x": 405,
-            "required": true,
+            "type": "Signature",
             "linewidth": 8,
             "aname": "Homeowner Signature",
             "width": 145,
             "value": "",
             "pos_y": 762,
+            "required": true,
             "dirty": false,
-            "name": "Homeowner",
-            "type": "Signature"
+            "name": "Homeowner"
         },
         "count": 10,
         "control_8": {
             "height": 22,
             "pos_x": 500,
-            "required": true,
+            "type": "Image",
             "width": 150,
             "value": "",
             "pos_y": 898,
+            "required": true,
             "dirty": false,
-            "name": "BarCode",
-            "type": "Image"
+            "name": "BarCode"
         },
         "control_6": {
             "textAlignment": "center",
@@ -1020,11 +1020,11 @@
             "aname": "Agent Name",
             "type": "TextView",
             "size": "10",
-            "pos_y": 809,
+            "pos_y": 808,
             "field": "agent_name",
             "value": "",
             "dirty": false,
-            "height": 13,
+            "height": 14,
             "margin_top": "2",
             "required": true,
             "pos_x": 193
@@ -1032,7 +1032,7 @@
         "control_0": {
             "required_validation": true,
             "validation_code": "1111",
-            "name": "Agent Of Contractor",
+            "pos_x": 163,
             "width": 145,
             "pos_y": 762,
             "aname": "Agent Signature",
@@ -1041,8 +1041,8 @@
             "value": "",
             "dirty": false,
             "height": 23,
-            "required": true,
-            "pos_x": 163
+            "name": "Agent Of Contractor",
+            "required": true
         }
     },
     "page_3": {
@@ -1060,6 +1060,7 @@
             "dirty": false
         },
         "control_7": {
+            "textAlignment": "center",
             "disable": true,
             "width": 62,
             "pos_y": 261,
@@ -1075,7 +1076,7 @@
             "pos_x": 564
         },
         "control_5": {
-            "name": "Homeowner",
+            "required": true,
             "disable": true,
             "width": 145,
             "dirty": false,
@@ -1085,11 +1086,11 @@
             "type": "Signature",
             "value": "",
             "height": 23,
-            "pos_x": 150,
-            "required": true
+            "name": "Homeowner",
+            "pos_x": 150
         },
         "control_3": {
-            "name": "Customer Initial",
+            "pos_x": 616,
             "disable": true,
             "width": 29,
             "pos_y": 176,
@@ -1100,11 +1101,11 @@
             "dirty": false,
             "height": 14,
             "can_fill": "true",
-            "required": true,
-            "pos_x": 616
+            "name": "Customer Initial",
+            "required": true
         },
         "control_1": {
-            "name": "Customer Initial",
+            "pos_x": 616,
             "disable": true,
             "width": 29,
             "pos_y": 112,
@@ -1115,22 +1116,23 @@
             "dirty": false,
             "height": 14,
             "can_fill": "true",
-            "required": true,
-            "pos_x": 616
+            "name": "Customer Initial",
+            "required": true
         },
         "count": 10,
         "control_8": {
             "height": 22,
             "pos_x": 500,
-            "required": true,
+            "type": "Image",
             "width": 150,
             "value": "",
             "pos_y": 898,
+            "required": true,
             "dirty": false,
-            "name": "BarCode",
-            "type": "Image"
+            "name": "BarCode"
         },
         "control_6": {
+            "textAlignment": "center",
             "disable": true,
             "width": 194,
             "pos_y": 261,
@@ -1146,7 +1148,7 @@
             "pos_x": 345
         },
         "control_4": {
-            "name": "Customer Initial",
+            "pos_x": 616,
             "disable": true,
             "width": 29,
             "pos_y": 214,
@@ -1157,11 +1159,11 @@
             "dirty": false,
             "height": 14,
             "can_fill": "true",
-            "required": true,
-            "pos_x": 616
+            "name": "Customer Initial",
+            "required": true
         },
         "control_2": {
-            "name": "Customer Initial",
+            "pos_x": 616,
             "disable": true,
             "width": 29,
             "pos_y": 139,
@@ -1172,11 +1174,11 @@
             "dirty": false,
             "height": 14,
             "can_fill": "true",
-            "required": true,
-            "pos_x": 616
+            "name": "Customer Initial",
+            "required": true
         },
         "control_0": {
-            "name": "Customer Initial",
+            "pos_x": 616,
             "disable": true,
             "width": 29,
             "pos_y": 95,
@@ -1187,8 +1189,8 @@
             "dirty": false,
             "height": 14,
             "can_fill": "true",
-            "required": true,
-            "pos_x": 616
+            "name": "Customer Initial",
+            "required": true
         }
     },
     "count": 5,
@@ -1207,7 +1209,8 @@
             "dirty": false
         },
         "control_1": {
-            "name": "Homeowner Print Name",
+            "textAlignment": "center",
+            "required": true,
             "dirty": false,
             "width": 148,
             "aname": "Handwrite Print Name",
@@ -1217,12 +1220,13 @@
             "type": "TextView",
             "value": "",
             "height": 23,
-            "pos_x": 318,
-            "required": true
+            "name": "Homeowner Print Name",
+            "pos_x": 318
         },
         "count": 5,
         "control_2": {
-            "name": "Date",
+            "textAlignment": "center",
+            "required": true,
             "dirty": false,
             "width": 70,
             "aname": "Handwrite date",
@@ -1232,32 +1236,32 @@
             "type": "DatePicker",
             "value": "",
             "height": 23,
-            "pos_x": 528,
-            "required": true
+            "name": "Date",
+            "pos_x": 528
         },
         "control_3": {
             "height": 22,
             "pos_x": 500,
-            "required": true,
+            "type": "Image",
             "width": 150,
             "value": "",
             "pos_y": 898,
+            "required": true,
             "dirty": false,
-            "name": "BarCode",
-            "type": "Image"
+            "name": "BarCode"
         },
         "control_0": {
             "height": 23,
             "pos_x": 126,
-            "required": true,
+            "type": "Signature",
             "linewidth": 8,
             "aname": "Homeowner Signature",
             "width": 145,
             "value": "",
             "pos_y": 501,
+            "required": true,
             "dirty": false,
-            "name": "Homeowner",
-            "type": "Signature"
+            "name": "Homeowner"
         }
     }
 }

+ 1 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m

@@ -510,7 +510,7 @@
     
     [str writeToFile:path atomically:true encoding:NSUTF8StringEncoding error:&error];
     
-    
+    NSLog(path);
     
     
 //    [self.controlTemplate writeToFile:path atomically:NO];

+ 3 - 3
Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.33</string>
+	<string>1.34</string>
 	<key>CFBundleVersion</key>
 	<string>32465</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
@@ -50,6 +50,8 @@
 	<string>Scan barcode, take photos as contract asset</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>select photos, upload as contract asset</string>
+	<key>UIFileSharingEnabled</key>
+	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -67,7 +69,5 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>UIFileSharingEnabled</key>
-	<false/>
 </dict>
 </plist>

+ 1 - 1
Ants Contract/common/DocumentPageViewController.m

@@ -139,7 +139,7 @@
             else if([type isEqualToString:@"DatePicker"])
             {
                 NSString* name =control[@"aname"];
-                if([name isEqualToString:@"Today's Date"]||[name isEqualToString:@"Handwrite date"])
+                if([name isEqualToString:@"Today's Date"]/*||[name isEqualToString:@"Handwrite date"]*/)
                 {
                     NSDateFormatter * formatter = [[NSDateFormatter alloc]init];
                     [formatter setDateFormat:@"MM/dd/yyyy"];