Save list clear button to add prompt -- 保存列表清除按钮增加提示 resolve: #62

The problem that the save list clear icon is not displayed -- 保存列表清除图标没有显示的问题 resolve: #61
The format of the result request uplink parameter columns is wrong -- result 请求上行参数columns格式错误 resolve: #60
saved search / detail did not consider the company parameter when saving -- saved search / detail 保存时没有考虑company 参数 resolve: #59
About ver is generated based on the app version information -- About ver 根据app 版本信息生成 resolve: #57
My->saved search crashes when loading search -- My->saved search 加载search时闪退 resolve: #56
ISF result cell add display ISF Import No -- ISF result cell 增加显示 ISF Import No resolve: #54

RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -795,11 +795,6 @@
 		3C0CB395255E819700718A03 /* Result */ = {
 			isa = PBXGroup;
 			children = (
-				3C5F8D0F257A265500CFD26A /* result_acem1.json */,
-				3C5F8D12257A265500CFD26A /* result_aci.json */,
-				3C5F8D10257A265500CFD26A /* result_emanifest.json */,
-				3C5F8D11257A265500CFD26A /* result_isf.json */,
-				3C243185258B019B00555555 /* result_customer.json */,
 				3C5F8CF3257A1EE100CFD26A /* ResultViewController+TableDelegate.h */,
 				3C5F8CF4257A1EE100CFD26A /* ResultViewController+TableDelegate.m */,
 				3C5F8CEE257A1DC900CFD26A /* ResultViewController+TableDataSource.h */,
@@ -950,6 +945,11 @@
 		3C5F8C822567B72800CFD26A /* FAKE_DATA */ = {
 			isa = PBXGroup;
 			children = (
+				3C5F8D0F257A265500CFD26A /* result_acem1.json */,
+				3C5F8D12257A265500CFD26A /* result_aci.json */,
+				3C5F8D10257A265500CFD26A /* result_emanifest.json */,
+				3C5F8D11257A265500CFD26A /* result_isf.json */,
+				3C243185258B019B00555555 /* result_customer.json */,
 				3C833CD125CBF10A006F9BEF /* fake_export.pdf */,
 				3C5F8CB22574C92200CFD26A /* home.json */,
 				3C5F8D1A257A2BCB00CFD26A /* searchresult_aci.json */,
@@ -1621,7 +1621,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.01;
+				MARKETING_VERSION = 1.02;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1642,7 +1642,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.01;
+				MARKETING_VERSION = 1.02;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,8 +26,8 @@
             filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "319"
-            endingLineNumber = "319"
+            startingLineNumber = "331"
+            endingLineNumber = "331"
             landmarkName = "+updateFunctionPanel"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,8 +74,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "227"
-            endingLineNumber = "227"
+            startingLineNumber = "229"
+            endingLineNumber = "229"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
             <Locations>
@@ -138,8 +138,8 @@
             filePath = "RA TradeFiling/Result/ResultPresenter.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "355"
-            endingLineNumber = "355"
+            startingLineNumber = "357"
+            endingLineNumber = "357"
             landmarkName = "-loadData"
             landmarkType = "7">
          </BreakpointContent>
@@ -170,8 +170,8 @@
             filePath = "RA TradeFiling/Result/ResultPresenter.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
-            endingLineNumber = "339"
+            startingLineNumber = "341"
+            endingLineNumber = "341"
             landmarkName = "-loadData"
             landmarkType = "7">
          </BreakpointContent>
@@ -186,8 +186,8 @@
             filePath = "RA TradeFiling/Result/ResultPresenter.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "416"
-            endingLineNumber = "416"
+            startingLineNumber = "418"
+            endingLineNumber = "418"
             landmarkName = "-saveSearchParameters:"
             landmarkType = "7">
          </BreakpointContent>
@@ -474,8 +474,8 @@
             filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "451"
-            endingLineNumber = "451"
+            startingLineNumber = "463"
+            endingLineNumber = "463"
             landmarkName = "+json2DetailContent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,8 +762,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "229"
-            endingLineNumber = "229"
+            startingLineNumber = "231"
+            endingLineNumber = "231"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
          </BreakpointContent>
@@ -970,8 +970,8 @@
             filePath = "RA TradeFiling/About/AboutViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "25"
-            endingLineNumber = "25"
+            startingLineNumber = "32"
+            endingLineNumber = "32"
             landmarkName = "-viewWillAppear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -986,8 +986,8 @@
             filePath = "RA TradeFiling/About/AboutViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "27"
-            endingLineNumber = "27"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
             landmarkName = "-viewWillAppear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1018,8 +1018,8 @@
             filePath = "RA TradeFiling/My/SavedSearchViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
+            startingLineNumber = "168"
+            endingLineNumber = "168"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1034,8 +1034,8 @@
             filePath = "RA TradeFiling/My/SavedDetailViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
-            endingLineNumber = "140"
+            startingLineNumber = "146"
+            endingLineNumber = "146"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1116,7 +1116,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "95"
                   endingLineNumber = "95"
-                  offsetFromSymbolStart = "852">
+                  offsetFromSymbolStart = "1022">
                </Location>
                <Location
                   uuid = "1A82154B-E529-468C-9650-0F348DFF0677 - 845561727e52cadd"
@@ -1131,7 +1131,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "97"
                   endingLineNumber = "97"
-                  offsetFromSymbolStart = "100">
+                  offsetFromSymbolStart = "54">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -1146,8 +1146,8 @@
             filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "473"
-            endingLineNumber = "473"
+            startingLineNumber = "485"
+            endingLineNumber = "485"
             landmarkName = "RADataProvider"
             landmarkType = "3">
          </BreakpointContent>
@@ -1178,8 +1178,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "208"
-            endingLineNumber = "208"
+            startingLineNumber = "210"
+            endingLineNumber = "210"
             landmarkName = "+prepare_additional_params:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1376,5 +1376,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "923EC5EF-5B3E-4E39-AEFB-3FAFA29D6B34"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "269"
+            endingLineNumber = "269"
+            landmarkName = "+updateFieldsjson:subtype:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E7778274-1D35-41ED-90FD-81A961C9FF11"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/My/SavedSearchViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "224"
+            endingLineNumber = "224"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A5BD0877-FE88-4C63-9027-1EC6BD55FBF1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Result/ResultPresenter.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "370"
+            endingLineNumber = "370"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/About/About.storyboard

@@ -134,6 +134,9 @@ Email :</string>
                     </view>
                     <tabBarItem key="tabBarItem" title="ABOUT" image="tab_about" id="EaZ-pp-4cm"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="labelVer" destination="9BN-Zo-ol7" id="cLa-mE-U1v"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="5In-gK-nPy" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>

RA TradeFiling/RA TradeFiling/About/AboutViewController.h

@@ -10,6 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface AboutViewController : UIViewController
+@property (weak, nonatomic) IBOutlet UILabel *labelVer;
 
 @end
 

RA TradeFiling/RA TradeFiling/About/AboutViewController.m

@@ -17,6 +17,13 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
+    NSString* shortNum =[infoDict objectForKey:@"CFBundleShortVersionString"];
+    NSString* versionNum =[infoDict objectForKey:@"CFBundleVersion"];
+    versionNum = [NSString stringWithFormat:@"VER:%@.%@",shortNum,versionNum];
+    
+    self.labelVer.text = versionNum;
     // Do any additional setup after loading the view.
 }
 - (void)viewWillAppear:(BOOL)animated

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -202,9 +202,11 @@
 #endif
     
     
-    if(RASingleton.sharedInstance.companylist.count>0)
+    if(RASingleton.sharedInstance.companylist.count>0 && [params[@"company"] stringValue].length==0)
+    {
+        
         params[@"company"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
-    
+    }
     params[@"os"]=@"iOS";
     return params;
 }

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.m

@@ -189,6 +189,11 @@
     
     NSMutableDictionary* item = [NSMutableDictionary new];
     
+    if(RASingleton.sharedInstance.companylist.count>0)
+    {
+    param[@"company"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
+        item[@"company_name"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"name"];
+    }
     item[@"module"]=module;
     item[@"name"]=name;
     item[@"actions"]=actions;
@@ -206,10 +211,11 @@
 + (bool)saveSearchParameters:(NSMutableDictionary *)param forModule:(NSString *)module withName:(NSString *)name 
 {
     if (param==nil || module==nil) {
-        return @{
-                 @"result" : @RESULT_FALSE,
-                 @"err_msg" : @"Sorry, cannot save search, please contact admin."
-                 };
+        return false;
+//        return @{
+//                 @"result" : @RESULT_FALSE,
+//                 @"err_msg" : @"Sorry, cannot save search, please contact admin."
+//                 };
     }
     
  
@@ -237,9 +243,15 @@
 //        [array removeObjectAtIndex:19];
         [array removeLastObject];
     }
+
+    NSMutableDictionary* item = [NSMutableDictionary new];
     
     
-    NSMutableDictionary* item = [NSMutableDictionary new];
+    if(RASingleton.sharedInstance.companylist.count>0)
+    {
+    param[@"company"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
+    item[@"company_name"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"name"];
+    }
     item[@"module"]=module;
     item[@"name"]=name;
     item[@"param"]=param;

RA TradeFiling/RA TradeFiling/Info.plist

@@ -20,6 +20,11 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -36,11 +41,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

RA TradeFiling/RA TradeFiling/My/CellItemHistory.h

@@ -13,5 +13,6 @@
 @property (strong, nonatomic) IBOutlet UILabel *time;
 @property (strong, nonatomic) IBOutlet UIImageView *icon;
 @property (weak, nonatomic) IBOutlet UILabel *type;
+@property (weak, nonatomic) IBOutlet UILabel *company;
 
 @end

RA TradeFiling/RA TradeFiling/My/My.storyboard

@@ -155,8 +155,8 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qdz-Qv-zue">
-                                                    <rect key="frame" x="70" y="7.5" width="334" height="23"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                                                    <rect key="frame" x="70" y="7.5" width="50.5" height="23"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="19"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -172,25 +172,35 @@
                                                         <constraint firstAttribute="width" constant="50" id="eii-XO-Qza"/>
                                                     </constraints>
                                                 </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="company " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="01b-w9-dez">
+                                                    <rect key="frame" x="70" y="39.5" width="67" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="teU-Lm-VWP">
-                                                    <rect key="frame" x="70" y="39.5" width="30.5" height="18"/>
+                                                    <rect key="frame" x="373.5" y="7.5" width="30.5" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Qdz-Qv-zue" firstAttribute="top" secondItem="fVM-m7-JHO" secondAttribute="top" id="0bp-Bn-YhC"/>
-                                                <constraint firstAttribute="trailing" secondItem="Qdz-Qv-zue" secondAttribute="trailing" constant="10" id="2FL-qF-djX"/>
                                                 <constraint firstItem="Qdz-Qv-zue" firstAttribute="leading" secondItem="fVM-m7-JHO" secondAttribute="trailing" constant="10" id="51b-kO-Fwa"/>
                                                 <constraint firstItem="fVM-m7-JHO" firstAttribute="bottom" secondItem="izK-sd-3Dg" secondAttribute="bottom" id="5pP-GO-g6O"/>
-                                                <constraint firstItem="izK-sd-3Dg" firstAttribute="trailing" secondItem="Qdz-Qv-zue" secondAttribute="trailing" id="IoO-1Y-MiZ"/>
-                                                <constraint firstItem="teU-Lm-VWP" firstAttribute="leading" secondItem="Qdz-Qv-zue" secondAttribute="leading" id="eFh-bf-SYB"/>
+                                                <constraint firstItem="01b-w9-dez" firstAttribute="bottom" secondItem="fVM-m7-JHO" secondAttribute="bottom" id="DG3-5y-LDQ"/>
+                                                <constraint firstItem="teU-Lm-VWP" firstAttribute="top" secondItem="Qdz-Qv-zue" secondAttribute="top" id="FWA-cI-ZvZ"/>
+                                                <constraint firstItem="izK-sd-3Dg" firstAttribute="trailing" secondItem="teU-Lm-VWP" secondAttribute="trailing" id="ViK-zy-Zk7"/>
                                                 <constraint firstItem="fVM-m7-JHO" firstAttribute="leading" secondItem="kVm-Hi-bFu" secondAttribute="leading" constant="10" id="gzI-lU-0Ls"/>
+                                                <constraint firstAttribute="trailing" secondItem="izK-sd-3Dg" secondAttribute="trailing" constant="10" id="iFl-OM-BcC"/>
                                                 <constraint firstItem="fVM-m7-JHO" firstAttribute="centerY" secondItem="kVm-Hi-bFu" secondAttribute="centerY" id="ohM-G7-E5t"/>
-                                                <constraint firstItem="fVM-m7-JHO" firstAttribute="bottom" secondItem="teU-Lm-VWP" secondAttribute="bottom" id="svu-gP-Fc8"/>
+                                                <constraint firstItem="teU-Lm-VWP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Qdz-Qv-zue" secondAttribute="trailing" constant="10" id="ouh-bt-yTl"/>
+                                                <constraint firstItem="01b-w9-dez" firstAttribute="leading" secondItem="Qdz-Qv-zue" secondAttribute="leading" id="rAe-Ts-eWl"/>
+                                                <constraint firstItem="izK-sd-3Dg" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="01b-w9-dez" secondAttribute="trailing" constant="10" id="vbE-rF-2mk"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
+                                            <outlet property="company" destination="01b-w9-dez" id="g5F-P6-Xbt"/>
                                             <outlet property="icon" destination="fVM-m7-JHO" id="mni-ur-zRt"/>
                                             <outlet property="name" destination="Qdz-Qv-zue" id="yIi-id-e7Y"/>
                                             <outlet property="time" destination="izK-sd-3Dg" id="D9l-UE-vc1"/>
@@ -242,8 +252,8 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ipz-sf-Wvh">
-                                                    <rect key="frame" x="70" y="7.5" width="334" height="23"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                                                    <rect key="frame" x="70" y="7.5" width="50.5" height="23"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="19"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -260,24 +270,34 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s3Q-Mk-4rg">
-                                                    <rect key="frame" x="70" y="39.5" width="30.5" height="18"/>
+                                                    <rect key="frame" x="373.5" y="7.5" width="30.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="company " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e1T-sO-N8H">
+                                                    <rect key="frame" x="70" y="39.5" width="67" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="lhh-eq-MMr" firstAttribute="trailing" secondItem="Ipz-sf-Wvh" secondAttribute="trailing" id="6qd-zt-ONw"/>
-                                                <constraint firstAttribute="trailing" secondItem="Ipz-sf-Wvh" secondAttribute="trailing" constant="10" id="AUA-yM-rsb"/>
+                                                <constraint firstAttribute="trailing" secondItem="lhh-eq-MMr" secondAttribute="trailing" constant="10" id="3gt-0b-buh"/>
+                                                <constraint firstItem="s3Q-Mk-4rg" firstAttribute="top" secondItem="Ipz-sf-Wvh" secondAttribute="top" id="4OJ-wl-zs7"/>
+                                                <constraint firstItem="e1T-sO-N8H" firstAttribute="leading" secondItem="Ipz-sf-Wvh" secondAttribute="leading" id="9P1-yw-Fgq"/>
+                                                <constraint firstItem="e1T-sO-N8H" firstAttribute="bottom" secondItem="QU4-Bp-liV" secondAttribute="bottom" id="9sX-7G-rxp"/>
                                                 <constraint firstItem="QU4-Bp-liV" firstAttribute="bottom" secondItem="lhh-eq-MMr" secondAttribute="bottom" id="CRl-0o-tTk"/>
                                                 <constraint firstItem="QU4-Bp-liV" firstAttribute="centerY" secondItem="BFt-8z-vge" secondAttribute="centerY" id="ICJ-rL-vG1"/>
+                                                <constraint firstItem="lhh-eq-MMr" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="e1T-sO-N8H" secondAttribute="trailing" constant="10" id="K4s-vm-3sM"/>
+                                                <constraint firstItem="lhh-eq-MMr" firstAttribute="trailing" secondItem="s3Q-Mk-4rg" secondAttribute="trailing" id="QaP-a1-HeC"/>
+                                                <constraint firstItem="s3Q-Mk-4rg" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ipz-sf-Wvh" secondAttribute="trailing" constant="10" id="aIr-qZ-UDR"/>
                                                 <constraint firstItem="Ipz-sf-Wvh" firstAttribute="leading" secondItem="QU4-Bp-liV" secondAttribute="trailing" constant="10" id="cbS-NJ-FKY"/>
-                                                <constraint firstItem="QU4-Bp-liV" firstAttribute="bottom" secondItem="s3Q-Mk-4rg" secondAttribute="bottom" id="jfY-SK-VjD"/>
                                                 <constraint firstItem="QU4-Bp-liV" firstAttribute="leading" secondItem="BFt-8z-vge" secondAttribute="leading" constant="10" id="p4s-Ig-1B7"/>
-                                                <constraint firstItem="s3Q-Mk-4rg" firstAttribute="leading" secondItem="Ipz-sf-Wvh" secondAttribute="leading" id="pAu-vh-Sce"/>
                                                 <constraint firstItem="Ipz-sf-Wvh" firstAttribute="top" secondItem="QU4-Bp-liV" secondAttribute="top" id="smG-gu-rgN"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
+                                            <outlet property="company" destination="e1T-sO-N8H" id="bKv-ZE-r7s"/>
                                             <outlet property="icon" destination="QU4-Bp-liV" id="qy9-n9-9kN"/>
                                             <outlet property="name" destination="Ipz-sf-Wvh" id="RF1-na-lcy"/>
                                             <outlet property="time" destination="lhh-eq-MMr" id="5CD-43-Uau"/>

RA TradeFiling/RA TradeFiling/My/SavedDetailViewController.m

@@ -64,7 +64,9 @@
 
     self.tableview.tableFooterView = [UIView new];
     
-    UIBarButtonItem *clearItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"bat_clear"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStylePlain target:self action:@selector(clearClick:)];
+    UIBarButtonItem *clearItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"bar_clear"] imageWithRenderingMode:UIImageRenderingModeAutomatic] style:UIBarButtonItemStylePlain target:self action:@selector(clearClick:)];
+    
+    clearItem.tintColor = UIColor.whiteColor;
     self.navigationItem.rightBarButtonItem = clearItem;
 }
 -(void)viewWillAppear:(BOOL)animated
@@ -80,43 +82,47 @@
 
 - (void)clearClick:(id)sender {
     
-//
-//
-//    NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
-//
-//
-//
-//            NSFileManager* fm = [NSFileManager defaultManager];
-//    [fm removeItemAtPath:[docDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@.json",@"saved_detail",RASingleton.sharedInstance.user]] error:nil];
-//
-    [self.data removeAllObjects];
-    
+
     
     
     
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle: @"Warning"
+                                                                                  message: @"Are you sure to clear the list?"
+                                                                           preferredStyle: UIAlertControllerStyleAlert];
+    UIAlertAction *action_ok = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+        [self.data removeAllObjects];
+        
+        
+        
+        
 
-    
+        
+         
+           
+           
      
-       
-       
- 
-    NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
-       
-       NSData* json_user =[RAConvertor arr2data:self.data];
-       bool result =[json_user writeToFile:[docDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@.json",@"saved_detail",RASingleton.sharedInstance.user]]  atomically:true];
-       
+        NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+           
+           NSData* json_user =[RAConvertor arr2data:self.data];
+           bool result =[json_user writeToFile:[docDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@.json",@"saved_detail",RASingleton.sharedInstance.user]]  atomically:true];
+           
+        
+        
+        
+        [self.tableview reloadData];
+
+        
+    }];
+    UIAlertAction *action_cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+        
+    }];
+    [alertVC addAction:action_ok];
+    [alertVC addAction:action_cancel];
+    [self presentViewController:alertVC animated:YES completion:nil];
     
     
     
-    [self.tableview reloadData];
-//    __weak typeof(self) weakSelf = self;
-//    [self.data deleteAll:^(BOOL success){
-//        if (success) {
-//            dispatch_async(dispatch_get_main_queue(), ^{
-//                [weakSelf.tableview reloadData];
-//            });
-//        }
-//    }];
 }
 
 /*
@@ -150,7 +156,7 @@
     CellItemHistory *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSString* name = [self.data[indexPath.row] valueForKey:@"name"];
     NSString* create_time = [self.data[indexPath.row] valueForKey:@"current_date"];
-    
+    NSString* company_name = [self.data[indexPath.row] valueForKey:@"company_name"];
     NSString *module_name = [self.data[indexPath.row] valueForKey:@"module"];
     // Cargo Tracking
     NSString* type =@"";
@@ -178,10 +184,12 @@
     }
     
     cell.name.text = name;
-    [cell.name sizeToFit];
+//    [cell.name sizeToFit];
     
     cell.time.text =create_time;
-    [cell.time sizeToFit];
+//    [cell.time sizeToFit];
+    cell.type.text =type;
+    cell.company.text = company_name;
     
     //    cell.imageView.image = [UIImage imageNamed:[self.toolsinfo[indexPath.row] valueForKey:@"img"]];
     

RA TradeFiling/RA TradeFiling/My/SavedSearchViewController.m

@@ -48,7 +48,9 @@
     // Do any additional setup after loading the view.
     self.tableview.tableFooterView = [UIView new];
     
-    UIBarButtonItem *clearItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"bat_clear"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStylePlain target:self action:@selector(clearClick:)];
+    
+    UIBarButtonItem *clearItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"bar_clear"] imageWithRenderingMode:UIImageRenderingModeAutomatic] style:UIBarButtonItemStylePlain target:self action:@selector(clearClick:)];
+    clearItem.tintColor = UIColor.whiteColor;
     self.navigationItem.rightBarButtonItem = clearItem;
 }
 -(void)viewWillAppear:(BOOL)animated
@@ -86,26 +88,43 @@
 
 - (void)clearClick:(id)sender {
     
-    [self.data removeAllObjects];
-    
-    
     
     
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle: @"Warning"
+                                                                                  message: @"Are you sure to clear the list?"
+                                                                           preferredStyle: UIAlertControllerStyleAlert];
+    UIAlertAction *action_ok = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+        [self.data removeAllObjects];
+        
+        
+        
+        
 
-    
+        
+         
+           
+           
      
-       
-       
- 
-    NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
-       
-       NSData* json_user =[RAConvertor arr2data:self.data];
-       bool result =[json_user writeToFile:[docDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@.json",@"saved_search",RASingleton.sharedInstance.user]]  atomically:true];
-       
-    
+        NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+           
+           NSData* json_user =[RAConvertor arr2data:self.data];
+           bool result =[json_user writeToFile:[docDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@.json",@"saved_search",RASingleton.sharedInstance.user]]  atomically:true];
+           
+        
+        
+        
+        [self.tableview reloadData];
+        
+    }];
+    UIAlertAction *action_cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+        
+    }];
+    [alertVC addAction:action_ok];
+    [alertVC addAction:action_cancel];
+    [self presentViewController:alertVC animated:YES completion:nil];
     
     
-    [self.tableview reloadData];
     
     
 //
@@ -149,6 +168,8 @@
     NSString *CellIdentifier = @"cell_item_history";
     CellItemHistory *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSString* name = [self.data[indexPath.row] valueForKey:@"name"];
+    
+    NSString* company_name = [self.data[indexPath.row] valueForKey:@"company_name"];
     NSString* create_time = [self.data[indexPath.row] valueForKey:@"current_date"];
     NSString* type =@"";
     NSString *module_name = [self.data[indexPath.row] valueForKey:@"module"];
@@ -185,7 +206,7 @@
     
     cell.type.text =type;
 //    [cell.time sizeToFit];
-    
+    cell.company.text = company_name;
     //    cell.imageView.image = [UIImage imageNamed:[self.toolsinfo[indexPath.row] valueForKey:@"img"]];
     
     return cell;
@@ -200,7 +221,7 @@
 
     NSMutableDictionary* params = [self.data[indexPath.row] valueForKey:@"param"];
 
-    [params setValue:[self.data[indexPath.row] valueForKey:@"sub_type"] forKey:@"sub_type"];
+//    [params setValue:[self.data[indexPath.row] valueForKey:@"sub_type"] forKey:@"sub_type"];
     
 //    resultViewController.params =params;
 //    [self.navigationController pushViewController:resultViewController animated:YES];

RA TradeFiling/RA TradeFiling/Result/ResultISFCell.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)setIcon:(NSString *)icon;
 - (instancetype)setIconSelect:(BOOL)select;
 - (instancetype)setConsignee:(NSString *)consignee;
-
+- (instancetype)setImportNo:(NSString *)import_no;
 - (instancetype)addAdditionName:(NSString *)name value:(NSString *)value;
 @end
 

RA TradeFiling/RA TradeFiling/Result/ResultISFCell.m

@@ -18,6 +18,7 @@
 @property (strong, nonatomic) IBOutlet UILabel *transactionnoLabel;
 @property (strong, nonatomic) IBOutlet UILabel *isftypeLabel;
 @property (strong, nonatomic) IBOutlet UIImageView *iconView;
+@property (weak, nonatomic) IBOutlet UILabel *importnoLabel;
 
 @property (strong, nonatomic) IBOutlet UILabel *logLabel;
 @property (strong, nonatomic) IBOutlet UILabel *consigneeLabel;
@@ -45,6 +46,7 @@
     
     self.bolLabel.textColor = [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0];
     self.isftypeLabel.textColor = SecondaryTextColor;
+    self.importnoLabel.textColor = SecondaryTextColor;
 //    self.consigneeLabel.textColor = SecondaryTextColor;
     self.transactionnoLabel.textColor = [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0];
     
@@ -67,7 +69,7 @@
 - (void)prepareForReuse {
     [super prepareForReuse];
     
-    [[[[[[[self setBOL:nil] setISFType:nil]  setTransactionNo:nil] setLog:nil] setIcon:nil] setIconSelect:NO] setConsignee:nil];
+    [[[[[[[[self setBOL:nil] setISFType:nil]  setTransactionNo:nil] setLog:nil] setIcon:nil] setIconSelect:NO] setConsignee:nil] setImportNo:nil];
     [self clearAdditionView];
 }
 
@@ -89,7 +91,11 @@
     return self;
 }
 
-
+- (instancetype)setImportNo:(NSString *)import_no
+{
+    self.importnoLabel.text = import_no;
+    return self;
+}
 
 - (instancetype)setTransactionNo:(NSString *)transactionno{
     self.transactionnoLabel.text = transactionno;

RA TradeFiling/RA TradeFiling/Result/ResultISFCell.xib

@@ -74,8 +74,8 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="no use" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ukD-Zu-xOS">
-                        <rect key="frame" x="15" y="44" width="38" height="14.5"/>
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="import no" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ukD-Zu-xOS">
+                        <rect key="frame" x="15" y="44" width="55" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
@@ -119,6 +119,7 @@
                 <outlet property="bolLabel" destination="mE3-Kv-2Y8" id="k8R-CZ-OkL"/>
                 <outlet property="consigneeLabel" destination="cZl-kt-Bxj" id="ABE-gX-GfT"/>
                 <outlet property="iconView" destination="0sd-WK-sQP" id="lA3-cP-TTU"/>
+                <outlet property="importnoLabel" destination="ukD-Zu-xOS" id="Htg-mM-Tc5"/>
                 <outlet property="isftypeLabel" destination="vSV-44-xfj" id="G52-Tk-RLt"/>
                 <outlet property="logLabel" destination="c1J-pL-pbT" id="23M-SP-IuT"/>
                 <outlet property="transactionnoLabel" destination="Ebp-dM-thP" id="Ocb-Ki-pVM"/>

RA TradeFiling/RA TradeFiling/Result/ResultISFModel.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString *icon;
 @property (nonatomic,copy) NSString *transactionno;
 @property (nonatomic,copy) NSString *log;
-
+@property (nonatomic,copy) NSString *import_no;
 @property (nonatomic,copy) NSString *isftype;
 @property (nonatomic,copy) NSString *consignee;
 @end

RA TradeFiling/RA TradeFiling/Result/ResultPresenter.m

@@ -122,6 +122,8 @@ static const NSInteger detal = 20;
     NSMutableDictionary *params = [self.params mutableCopy];
     [params setObject:[NSNumber numberWithInteger:offset] forKey:@"offset"];
     [params setObject:[NSNumber numberWithInteger:detal] forKey:@"limit"];
+    
+    
     [params setObject:displayFields forKey:@"columns"];
     
 
@@ -365,7 +367,7 @@ static const NSInteger detal = 20;
         NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error] ;
         
     //    NSMutableArray* names=[dict[@"show"][@"names"] mutableCopy];
-        self.displayFields=[dict[@"show"] mutableCopy];
+        self.displayFields= [RAConvertor dict2string:dict[@"show"]];
         
         
         
@@ -419,6 +421,8 @@ static const NSInteger detal = 20;
     if (self.displayFields) {
         [params setValue:self.displayFields forKey:@"columns"];
     }
+    
+
 //    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:NSJSONWritingPrettyPrinted error:nil];
 //    NSString *paramStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     

RA TradeFiling/RA TradeFiling/Result/ResultViewController+TableDataSource.m

@@ -89,6 +89,7 @@
             
             [[[[[cell setBOL:isfModel.bol] setTransactionNo:isfModel.transactionno] setIcon:isfModel.icon] setISFType:isfModel.isftype]  setLog:isfModel.log];
             [cell setConsignee:isfModel.consignee];
+            [cell setImportNo:isfModel.import_no];
 
             for (ResultAddition *addition in isfModel.addition) {
                 [cell addAdditionName:addition.name value:addition.value];