apex mobile 2.70 release

Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -410,7 +410,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/HomeViewController.m"
-            timestampString = "576740072.463834"
+            timestampString = "577090186.076423"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "426"
@@ -458,11 +458,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/HomeViewController.m"
-            timestampString = "576740072.463881"
+            timestampString = "577090186.076489"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "967"
-            endingLineNumber = "967"
+            startingLineNumber = "971"
+            endingLineNumber = "971"
             landmarkName = "-showMapAnnotaionWithIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -547,5 +547,21 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/ShipSearchController.m"
+            timestampString = "577089974.339744"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "129"
+            endingLineNumber = "129"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Apex Mobile/Apex Mobile/Apex Mobile-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>190403</string>
+	<string>190419</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Apex Mobile/Apex Mobile/HomeViewController.m

@@ -645,7 +645,11 @@ typedef enum {
         NSString *date = [item objectForKey:@"date"];
         NSString *port = [item objectForKey:@"port"];
         NSInteger stage = [[item objectForKey:@"transport_stage"] integerValue];
-        
+        NSString *po_no = [item objectForKey:@"po_no"];
+        NSString * po_text = @"PO#: ";
+        if(po_no.length>0)
+            po_text=[po_text stringByAppendingString:po_no];
+        [cell setPoNO:po_text];
         [[[[[[[[cell setTitle:title] setDescription:desc] setDetail:detail] setPort:port] setTime:date] setIcon:icon] setTransportStage:stage] setDelegate:self];
         
         if (self.iconSelectedIndexPath && self.iconSelectedIndexPath.section == indexPath.section) {
@@ -696,7 +700,7 @@ typedef enum {
     if (self.shipTableView != tableView) {
         return tableView.bounds.size.height;
     }
-    return 110;
+    return 128;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

Apex Mobile/Apex Mobile/OrderHistoryViewController.m

@@ -353,7 +353,11 @@ static const int history_delta = 7;
     NSString *date = [item objectForKey:@"date"];
     NSString *port = [item objectForKey:@"port"];
     NSInteger stage = [[item objectForKey:@"transport_stage"] integerValue];
-    
+    NSString *po_no = [item objectForKey:@"po_no"];
+    NSString * po_text = @"PO#: ";
+    if(po_no.length>0)
+        po_text=[po_text stringByAppendingString:po_no];
+    [cell setPoNO:po_text];
     [[[[[[[cell setTitle:title] setDescription:desc] setDetail:detail] setPort:port] setTime:date] setIcon:icon] setTransportStage:stage];
     
     return cell;
@@ -368,7 +372,7 @@ static const int history_delta = 7;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
-    return 110;
+    return 128;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

Apex Mobile/Apex Mobile/ShipingStatusCell.h

@@ -25,6 +25,7 @@
 - (instancetype)setPort:(NSString *)port;
 - (instancetype)setTime:(NSString *)time;
 - (instancetype)setDescription:(NSString *)desc;
+- (instancetype)setPoNO:(NSString *)po;
 - (instancetype)setDetail:(NSString *)detail;
 - (instancetype)setIcon:(NSString *)icon;
 - (instancetype)setTransportStage:(NSInteger)stage;

Apex Mobile/Apex Mobile/ShipingStatusCell.m

@@ -18,6 +18,7 @@
 @property (strong, nonatomic) IBOutlet UILabel *descLabel;
 @property (strong, nonatomic) IBOutlet UILabel *detailLabel;
 @property (strong, nonatomic) IBOutlet UIView *transportStageView;
+@property (strong, nonatomic) IBOutlet UILabel *poLabel;
 
 @property (nonatomic,strong) NSOperation *operation;
 @property (nonatomic,strong) NSOperationQueue *queue;
@@ -41,6 +42,7 @@
     self.timeLabel.textColor = [UIColor colorWithRed:168 / 255.0 green:9 / 255.0 blue:26 / 255.0 alpha:1.0];
     self.descLabel.textColor = [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0];
     
+    self.poLabel.textColor = [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0];
     // Initialization code
     
     self.iconView.userInteractionEnabled = YES;
@@ -94,6 +96,11 @@
     return self;
 }
 
+- (instancetype)setPoNO:(NSString *)po {
+    self.poLabel.text = po;
+    return self;
+}
+
 - (instancetype)setDetail:(NSString *)detail {
     self.detailLabel.text = detail;
     return self;

Apex Mobile/Apex Mobile/ShippingStatusCell.xib

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="110" id="tck-7a-pd9" customClass="ShipingStatusCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="128" id="tck-7a-pd9" customClass="ShipingStatusCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="128"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tck-7a-pd9" id="9kY-ry-WFt">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="109.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="127.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="315 Status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NSI-Dy-9wQ">
@@ -28,20 +28,20 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zzT-Tl-h4X">
-                        <rect key="frame" x="15" y="54" width="48" height="48"/>
+                        <rect key="frame" x="15" y="62.5" width="48" height="48"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48" id="QkP-uV-fWa"/>
                             <constraint firstAttribute="width" constant="48" id="nFE-z2-5cD"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="latest update information shows here include location, status, time, etc" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GXE-Kf-rIH">
-                        <rect key="frame" x="71" y="77" width="289" height="14.5"/>
+                        <rect key="frame" x="71" y="94.5" width="289" height="29"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1801380001 (5 containers)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y76-2K-QNR">
-                        <rect key="frame" x="71" y="54" width="289" height="18"/>
+                        <rect key="frame" x="71" y="53.5" width="289" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="AVN-RC-itM"/>
                         </constraints>
@@ -49,21 +49,30 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PO#:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BtV-2P-XzX" userLabel="PO#:">
+                        <rect key="frame" x="71" y="71.5" width="289" height="18"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="18" id="MCh-Tw-JW9"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n0i-nd-KME">
-                        <rect key="frame" x="370" y="0.0" width="5" height="110"/>
+                        <rect key="frame" x="370" y="0.0" width="5" height="128"/>
                         <color key="backgroundColor" red="0.0" green="0.56031829119999998" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="5" id="DWZ-1n-IWP"/>
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12/09/2017 - 01/20/2018" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A9v-MV-LqP">
-                        <rect key="frame" x="15" y="34" width="140" height="15"/>
+                        <rect key="frame" x="15" y="34" width="140" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CNTAO - USLAX" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X99-0j-XQm">
-                        <rect key="frame" x="266.5" y="34" width="93.5" height="14.5"/>
+                        <rect key="frame" x="266" y="34" width="94" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
@@ -72,24 +81,27 @@
                 <constraints>
                     <constraint firstItem="NSI-Dy-9wQ" firstAttribute="top" secondItem="9kY-ry-WFt" secondAttribute="top" constant="10" id="0x2-9N-9Gx"/>
                     <constraint firstItem="X99-0j-XQm" firstAttribute="height" secondItem="A9v-MV-LqP" secondAttribute="height" id="4k2-nw-bsm"/>
+                    <constraint firstItem="BtV-2P-XzX" firstAttribute="top" secondItem="Y76-2K-QNR" secondAttribute="bottom" id="6l8-2F-yQn"/>
                     <constraint firstItem="zzT-Tl-h4X" firstAttribute="leading" secondItem="9kY-ry-WFt" secondAttribute="leading" constant="15" id="8YL-SL-YfK"/>
-                    <constraint firstItem="Y76-2K-QNR" firstAttribute="top" secondItem="zzT-Tl-h4X" secondAttribute="top" id="A8J-Gx-psD"/>
+                    <constraint firstItem="Y76-2K-QNR" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="bottom" constant="5" id="A8J-Gx-psD"/>
                     <constraint firstItem="A9v-MV-LqP" firstAttribute="top" secondItem="NSI-Dy-9wQ" secondAttribute="bottom" constant="3" id="Aha-Te-rAw"/>
                     <constraint firstAttribute="trailing" secondItem="n0i-nd-KME" secondAttribute="trailing" id="DxD-fy-Wmq"/>
                     <constraint firstItem="X99-0j-XQm" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="A9v-MV-LqP" secondAttribute="trailing" priority="999" constant="5" id="LPn-jJ-Mp5"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="GXE-Kf-rIH" secondAttribute="trailing" constant="10" id="OjN-xO-iJz"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="NSI-Dy-9wQ" secondAttribute="trailing" constant="10" id="Oxd-LI-Gwp"/>
                     <constraint firstItem="Y76-2K-QNR" firstAttribute="leading" secondItem="zzT-Tl-h4X" secondAttribute="trailing" constant="8" id="PYE-p2-t6z"/>
-                    <constraint firstItem="GXE-Kf-rIH" firstAttribute="top" secondItem="Y76-2K-QNR" secondAttribute="bottom" constant="5" id="PyT-en-aqn"/>
+                    <constraint firstItem="GXE-Kf-rIH" firstAttribute="top" secondItem="BtV-2P-XzX" secondAttribute="bottom" constant="5" id="PyT-en-aqn"/>
                     <constraint firstItem="NSI-Dy-9wQ" firstAttribute="leading" secondItem="9kY-ry-WFt" secondAttribute="leading" constant="15" id="QNP-sF-OD5"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="top" secondItem="9kY-ry-WFt" secondAttribute="top" id="RtR-AN-v5X"/>
+                    <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="BtV-2P-XzX" secondAttribute="trailing" constant="10" id="YNG-GZ-aUZ"/>
                     <constraint firstItem="GXE-Kf-rIH" firstAttribute="leading" secondItem="zzT-Tl-h4X" secondAttribute="trailing" constant="8" id="bLG-O5-Z3P"/>
+                    <constraint firstItem="BtV-2P-XzX" firstAttribute="leading" secondItem="zzT-Tl-h4X" secondAttribute="trailing" constant="8" id="e0o-9M-g2e"/>
                     <constraint firstItem="A9v-MV-LqP" firstAttribute="leading" secondItem="NSI-Dy-9wQ" secondAttribute="leading" id="iIe-PU-kax"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="Y76-2K-QNR" secondAttribute="trailing" constant="10" id="iV1-5N-bTi"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="X99-0j-XQm" secondAttribute="trailing" constant="10" id="ixT-Jv-xxY"/>
                     <constraint firstItem="X99-0j-XQm" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="top" id="sDc-qv-eaU"/>
                     <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="GXE-Kf-rIH" secondAttribute="bottom" id="tYK-6n-E8u"/>
-                    <constraint firstItem="zzT-Tl-h4X" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="bottom" constant="5" id="tws-Vn-hdS"/>
+                    <constraint firstItem="zzT-Tl-h4X" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="bottom" constant="14" id="tws-Vn-hdS"/>
                 </constraints>
             </tableViewCellContentView>
             <constraints>
@@ -99,6 +111,7 @@
                 <outlet property="descLabel" destination="Y76-2K-QNR" id="nvv-dh-hdz"/>
                 <outlet property="detailLabel" destination="GXE-Kf-rIH" id="ils-ci-0eO"/>
                 <outlet property="iconView" destination="zzT-Tl-h4X" id="CiS-Ec-KJw"/>
+                <outlet property="poLabel" destination="BtV-2P-XzX" id="gb5-4t-PMz"/>
                 <outlet property="portLabel" destination="X99-0j-XQm" id="vMo-sm-Ghw"/>
                 <outlet property="timeLabel" destination="A9v-MV-LqP" id="7Br-4s-QfR"/>
                 <outlet property="titleLabel" destination="NSI-Dy-9wQ" id="t3H-5x-9f7"/>