info balai uji

Sirani/ApiServices/SiraniApiServices.swift

@@ -720,4 +720,25 @@ class SiraniApiServices {
         
         return AF.request(METHOD_GET_APLIKASI, method: .post, parameters: body, encoding: URLEncoding.default, headers: headers)
     }
+    
+    func postToGetBalaiUjiNew(user_id: Int, cust_id: Int, role_id: String, status: String, limit: Int, page: Int, search: String, jenis: String) -> DataRequest {
+        
+        let headers: HTTPHeaders = ["Accept" : "Application/json; charset=utf-8"]
+        let body: Parameters = [
+            "user_id" : String(user_id),
+            "cust_id" : String(cust_id),
+            "role_id" : role_id,
+            "status" : status,
+            "limit" : String(limit),
+            "page" : String(page),
+            "search" : search,
+            "jenis" : jenis
+        ]
+        
+        print("url : \(METHOD_GET_BALAI_UJI_NEW)")
+        print("params : \(body)")
+        
+        return AF.request(METHOD_GET_BALAI_UJI_NEW, method: .post, parameters: body, encoding: URLEncoding.default, headers: headers)
+    }
+
 }

Sirani/ApiServices/UriConstants.swift

@@ -112,3 +112,5 @@ let METHOD_GET_APLIKASI = "\(HOST_API_NEW)\(API)\(VERSION)Aplikasi"
 // TARIF SERTIFIKAT
 let METHOD_GET_TARIF_SERTIFIKAT_NEW = "\(HOST_API_NEW)\(API)\(VERSION)Tarifsertifikasi"
 
+// BALAI UJI
+let METHOD_GET_BALAI_UJI_NEW = "\(HOST_API_NEW)\(API)\(VERSION)balaiuji"

Sirani/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="KcC-mT-Qvi">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="KcC-mT-Qvi">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -145,11 +145,11 @@
             <objects>
                 <viewController id="wLH-bE-PwM" customClass="QRScannerVC" customModule="Sirani" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="uam-Zl-gDj">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDW-iG-Sob" userLabel="ScannerView">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="diW-Vz-xdt" userLabel="overlayTop">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
@@ -159,21 +159,21 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUU-E4-f66" userLabel="overlayLeft">
-                                        <rect key="frame" x="0.0" y="60" width="30" height="427"/>
+                                        <rect key="frame" x="0.0" y="60" width="30" height="447"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="s6S-lY-hA9"/>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XCg-Ma-IVZ" userLabel="overlayBtm">
-                                        <rect key="frame" x="0.0" y="487" width="375" height="160"/>
+                                        <rect key="frame" x="0.0" y="507" width="375" height="160"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="160" id="vmI-VX-8FM"/>
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nb4-Tc-Xkd">
-                                        <rect key="frame" x="30" y="547" width="315" height="40"/>
+                                        <rect key="frame" x="30" y="567" width="315" height="40"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="40" id="VeV-fd-5sK"/>
@@ -188,7 +188,7 @@
                                         </connections>
                                     </button>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="25n-Wm-R8z" userLabel="overlayRight">
-                                        <rect key="frame" x="345" y="60" width="30" height="427"/>
+                                        <rect key="frame" x="345" y="60" width="30" height="447"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="fR1-Kc-rET"/>
@@ -215,7 +215,7 @@
                                 </constraints>
                             </view>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0N2-eN-vbJ" userLabel="ResultLayout">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ghd-Kv-OTW" userLabel="ResultHeader">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
@@ -295,7 +295,7 @@
                                         </constraints>
                                     </view>
                                     <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ewk-92-S4r" userLabel="ResultScrollView">
-                                        <rect key="frame" x="0.0" y="156" width="375" height="461"/>
+                                        <rect key="frame" x="0.0" y="156" width="375" height="481"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PMN-7G-GEI" userLabel="ResultContainerView">
                                                 <rect key="frame" x="0.0" y="0.0" width="375" height="2114"/>
@@ -874,7 +874,7 @@
                                         </constraints>
                                     </scrollView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ditjen SDPPI Kominfo @ 2019" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SS9-Ch-aZY" userLabel="ResultFooter">
-                                        <rect key="frame" x="0.0" y="617" width="375" height="30"/>
+                                        <rect key="frame" x="0.0" y="637" width="375" height="30"/>
                                         <color key="backgroundColor" red="0.1056468859" green="0.26498940589999997" blue="0.5374458432" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="266-Ir-7nP"/>
@@ -884,10 +884,10 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rbc-oF-1g6" userLabel="ResultLoading">
-                                        <rect key="frame" x="0.0" y="156" width="375" height="461"/>
+                                        <rect key="frame" x="0.0" y="156" width="375" height="481"/>
                                         <subviews>
                                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="WCF-0e-Nwn">
-                                                <rect key="frame" x="169" y="212" width="37" height="37"/>
+                                                <rect key="frame" x="169" y="222" width="37" height="37"/>
                                                 <color key="color" red="0.1396022327" green="0.32877562980000002" blue="0.67986595809999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                             </activityIndicatorView>
                                         </subviews>
@@ -1156,7 +1156,7 @@
                                                                             </constraints>
                                                                         </imageView>
                                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="calendar.badge.clock" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="Yia-FS-dUF">
-                                                                            <rect key="frame" x="155" y="6.5" width="21.5" height="19"/>
+                                                                            <rect key="frame" x="155" y="6.5" width="22.5" height="20"/>
                                                                             <color key="tintColor" systemColor="systemOrangeColor"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="height" constant="20" id="7fp-7S-Jyo"/>
@@ -1339,8 +1339,8 @@
                                                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pqQ-Vy-6Fi" userLabel="moreMenuUtamaNewTitle">
                                                                 <rect key="frame" x="0.0" y="-20" width="359" height="20"/>
                                                                 <subviews>
-                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Menu Utama New" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kPd-Z2-9AQ">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="133.5" height="19.5"/>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Permohonan" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kPd-Z2-9AQ">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="96.5" height="19.5"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Q0N-WC-KLU"/>
                                                                         </constraints>
@@ -1349,7 +1349,7 @@
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ud6-Zr-x1X" userLabel="moreMenuNotifUtamaNew">
-                                                                        <rect key="frame" x="141.5" y="2" width="8" height="16"/>
+                                                                        <rect key="frame" x="104.5" y="2" width="8" height="16"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gym-tb-Xqi">
                                                                                 <rect key="frame" x="4" y="0.0" width="0.0" height="16"/>
@@ -2974,7 +2974,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="calendar.badge.clock" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="qU9-Jq-kgT">
-                                                    <rect key="frame" x="167" y="6.5" width="21.5" height="19"/>
+                                                    <rect key="frame" x="167" y="6.5" width="22.5" height="20"/>
                                                     <color key="tintColor" systemColor="systemOrangeColor"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="PE2-Ot-vBO"/>
@@ -4371,6 +4371,7 @@
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="card" destination="IKM-BE-Bei" id="2sf-4m-ifM"/>
+                                            <outlet property="disposisiTitle" destination="m4c-AW-27R" id="w7B-hx-muT"/>
                                             <outlet property="lblAplId" destination="nrb-o9-PUM" id="efy-R3-l2U"/>
                                             <outlet property="lblBrand" destination="b5P-ju-lpo" id="G9w-QG-awn"/>
                                             <outlet property="lblCustName" destination="Gql-id-FWC" id="jUL-FA-PPX"/>
@@ -4382,6 +4383,7 @@
                                             <outlet property="lblResiDate" destination="awR-X2-QWw" id="aIV-Jm-ABe"/>
                                             <outlet property="lblResiNo" destination="1dN-Lt-Yc8" id="LSX-kx-BrY"/>
                                             <outlet property="lblStatusStr" destination="hbz-Ot-PSK" id="HqJ-YE-t5m"/>
+                                            <outlet property="statusTop" destination="ibw-T6-7Jx" id="tFa-AF-fmO"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -5635,7 +5637,7 @@
                                                             <color key="textColor" red="0.37055522200000002" green="0.37056469920000001" blue="0.37055957319999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Status :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSs-O3-ZXh" userLabel="StatusTitle">
+                                                        <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Status :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSs-O3-ZXh" userLabel="StatusTitle">
                                                             <rect key="frame" x="8" y="234.5" width="55" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="55" id="exc-gc-7cO"/>
@@ -5644,7 +5646,7 @@
                                                             <color key="textColor" red="0.37055522200000002" green="0.37056469920000001" blue="0.37055957319999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Tidak Berlaku" textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4ni-jP-nXD" userLabel="Status">
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" verticalHuggingPriority="251" text="Tidak Berlaku" textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4ni-jP-nXD" userLabel="Status">
                                                             <rect key="frame" x="67" y="234.5" width="120" height="16"/>
                                                             <color key="backgroundColor" systemColor="systemGreenColor"/>
                                                             <constraints>
@@ -6810,7 +6812,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="calendar.badge.clock" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="RkE-2f-vRY">
-                                                <rect key="frame" x="16" y="364.5" width="21.5" height="19"/>
+                                                <rect key="frame" x="16" y="364.5" width="22.5" height="20"/>
                                                 <color key="tintColor" systemColor="systemOrangeColor"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="40S-V2-qp1"/>
@@ -8031,17 +8033,17 @@
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZQG-CJ-lJt" customClass="MDCCard">
                                                             <rect key="frame" x="16" y="11" width="343" height="220"/>
                                                             <subviews>
-                                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Penetapan :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fSi-Px-Ky9" userLabel="NoPenetapanTitle">
-                                                                    <rect key="frame" x="8" y="4" width="104" height="16"/>
+                                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID Balai :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fSi-Px-Ky9" userLabel="NoPenetapanTitle">
+                                                                    <rect key="frame" x="8" y="4" width="56.5" height="16"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="104" id="OgM-Dq-m4E"/>
+                                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="OgM-Dq-m4E"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
                                                                     <color key="textColor" red="0.37055522200000002" green="0.37056469920000001" blue="0.37055957319999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" text="Info" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CIs-Xh-A1e" userLabel="NoPenetapan">
-                                                                    <rect key="frame" x="112" y="4" width="223" height="16"/>
+                                                                    <rect key="frame" x="69.5" y="4" width="265.5" height="16"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                     <color key="textColor" red="0.37055522200000002" green="0.37056469920000001" blue="0.37055957319999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -8167,7 +8169,7 @@
                                                                 <constraint firstItem="goq-t0-KBa" firstAttribute="leading" secondItem="Ftd-7C-KLg" secondAttribute="trailing" id="902-6D-cos"/>
                                                                 <constraint firstItem="VY8-E0-dvl" firstAttribute="leading" secondItem="oVp-UQ-5Af" secondAttribute="trailing" id="9q0-rP-5oL"/>
                                                                 <constraint firstItem="cG9-9X-O4U" firstAttribute="leading" secondItem="AyS-F6-SMb" secondAttribute="trailing" constant="8" id="ARy-0V-5JX"/>
-                                                                <constraint firstItem="CIs-Xh-A1e" firstAttribute="leading" secondItem="fSi-Px-Ky9" secondAttribute="trailing" id="B14-i9-aWQ"/>
+                                                                <constraint firstItem="CIs-Xh-A1e" firstAttribute="leading" secondItem="fSi-Px-Ky9" secondAttribute="trailing" constant="5" id="B14-i9-aWQ"/>
                                                                 <constraint firstAttribute="trailing" secondItem="J0B-3R-udA" secondAttribute="trailing" constant="8" id="FcG-Pa-2wp"/>
                                                                 <constraint firstAttribute="trailing" secondItem="CIs-Xh-A1e" secondAttribute="trailing" constant="8" id="GUl-h5-JC8"/>
                                                                 <constraint firstItem="Ftd-7C-KLg" firstAttribute="leading" secondItem="ZQG-CJ-lJt" secondAttribute="leading" constant="8" id="H9V-W6-yb5"/>
@@ -8315,7 +8317,7 @@
                         <outlet property="noDataLayout" destination="cSb-rQ-kI0" id="RZa-Q1-ury"/>
                         <outlet property="progressLoading" destination="qYL-zU-ZgD" id="IcO-wK-ouJ"/>
                         <segue destination="mb9-eH-ozu" kind="unwind" identifier="unwindBalaiUjiToHome" unwindAction="unwindToHomeWithSegue:" id="IKZ-bI-K9M"/>
-                        <segue destination="fg9-s0-Das" kind="show" identifier="balaiUjiSearchSegueId" id="G5F-10-bdh"/>
+                        <segue destination="fg9-s0-Das" kind="presentation" identifier="balaiUjiSearchSegueId" modalPresentationStyle="fullScreen" id="G5F-10-bdh"/>
                         <segue destination="lg6-hT-6Nf" kind="show" identifier="lokasiBalaiUjiSegueId" id="zxo-IW-2A6"/>
                     </connections>
                 </viewController>
@@ -9300,7 +9302,7 @@
             <objects>
                 <viewController id="fg9-s0-Das" customClass="SearchBalaiUjiVC" customModule="Sirani" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="J98-3s-kzI">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AzD-qH-vp3" userLabel="SearchBalauUjiToolbar">
@@ -9346,10 +9348,10 @@
                                 </constraints>
                             </view>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mmM-VN-glP" userLabel="SearchBalaiUjiScrollView">
-                                <rect key="frame" x="0.0" y="80" width="375" height="537"/>
+                                <rect key="frame" x="0.0" y="80" width="375" height="557"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fnK-bS-Tds" userLabel="ContainerView">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="557"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="471"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Masukan Kata Pencarian" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J25-bI-WT5" userLabel="SearchBalaiUjiTitle">
                                                 <rect key="frame" x="16" y="16" width="343" height="20"/>
@@ -9368,13 +9370,13 @@
                                                     <action selector="onInputSearchKeyTap:" destination="fg9-s0-Das" eventType="primaryActionTriggered" id="vYV-oZ-PAB"/>
                                                 </connections>
                                             </textField>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Parameter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MH3-lU-sp7" userLabel="SearchBalaiUjiParameterTitle">
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Parameter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MH3-lU-sp7" userLabel="SearchBalaiUjiParameterTitle">
                                                 <rect key="frame" x="16" y="110" width="343" height="20"/>
                                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9XL-zi-aTd" userLabel="SearchBalaiUjiOptionParameter">
+                                            <button hidden="YES" opaque="NO" alpha="0.0" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9XL-zi-aTd" userLabel="SearchBalaiUjiOptionParameter">
                                                 <rect key="frame" x="16" y="138" width="343" height="40"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
@@ -9396,14 +9398,14 @@
                                                     <constraint firstAttribute="width" constant="24" id="i9j-1s-fG4"/>
                                                 </constraints>
                                             </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Jenis Sertifikat" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gyc-q3-rwe" userLabel="SearchBalaiUjiJenisSertifikatTitle">
-                                                <rect key="frame" x="16" y="194" width="343" height="19.5"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Jenis Balai" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gyc-q3-rwe" userLabel="SearchBalaiUjiJenisSertifikatTitle">
+                                                <rect key="frame" x="16" y="108" width="343" height="19.5"/>
                                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lqG-rL-6VR" userLabel="SearchBalaiUjiOptionJenisSertifikat">
-                                                <rect key="frame" x="16" y="221.5" width="343" height="40"/>
+                                                <rect key="frame" x="16" y="135.5" width="343" height="40"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="40" id="1WM-HB-Cg5"/>
@@ -9418,14 +9420,14 @@
                                                 </connections>
                                             </button>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dropdown" translatesAutoresizingMaskIntoConstraints="NO" id="yXu-To-Mxg" userLabel="SearchBalaiUjiDropdownJenis">
-                                                <rect key="frame" x="335" y="221.5" width="24" height="40"/>
+                                                <rect key="frame" x="335" y="135.5" width="24" height="40"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="24" id="12p-lF-fcM"/>
                                                     <constraint firstAttribute="height" constant="40" id="FlR-eF-oQv"/>
                                                 </constraints>
                                             </imageView>
                                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4zw-Tk-oFr" userLabel="SearchBalaiUjiBtnSearch">
-                                                <rect key="frame" x="259" y="294" width="100" height="40"/>
+                                                <rect key="frame" x="259" y="208" width="100" height="40"/>
                                                 <color key="backgroundColor" red="0.1056468859" green="0.26498940589999997" blue="0.5374458432" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="40" id="3HI-UJ-R4H"/>
@@ -9440,7 +9442,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dt5-wr-GgR" userLabel="SearchBalaiUjiBtnReset">
-                                                <rect key="frame" x="143" y="294" width="100" height="40"/>
+                                                <rect key="frame" x="143" y="208" width="100" height="40"/>
                                                 <color key="backgroundColor" red="0.1056468859" green="0.26498940589999997" blue="0.5374458432" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="40" id="Qg0-XJ-ijZ"/>
@@ -9484,7 +9486,7 @@
                                             <constraint firstItem="J25-bI-WT5" firstAttribute="top" secondItem="fnK-bS-Tds" secondAttribute="top" constant="16" id="ciS-fc-LBf"/>
                                             <constraint firstAttribute="trailing" secondItem="o4s-HW-8gy" secondAttribute="trailing" constant="16" id="diy-Up-RPH"/>
                                             <constraint firstItem="MH3-lU-sp7" firstAttribute="top" secondItem="o4s-HW-8gy" secondAttribute="bottom" constant="16" id="eCF-fb-tsz"/>
-                                            <constraint firstItem="Gyc-q3-rwe" firstAttribute="top" secondItem="9XL-zi-aTd" secondAttribute="bottom" constant="16" id="iNV-ly-Qth"/>
+                                            <constraint firstItem="Gyc-q3-rwe" firstAttribute="top" secondItem="9XL-zi-aTd" secondAttribute="bottom" constant="-70" id="iNV-ly-Qth"/>
                                             <constraint firstItem="9XL-zi-aTd" firstAttribute="top" secondItem="MH3-lU-sp7" secondAttribute="bottom" constant="8" id="jBf-9b-e2X"/>
                                             <constraint firstAttribute="trailing" secondItem="MH3-lU-sp7" secondAttribute="trailing" constant="16" id="lfc-WQ-1Zk"/>
                                             <constraint firstItem="lqG-rL-6VR" firstAttribute="bottom" secondItem="yXu-To-Mxg" secondAttribute="bottom" id="n97-ZH-TIn"/>
@@ -9503,14 +9505,14 @@
                                 </constraints>
                             </scrollView>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rqf-Yi-kjX" userLabel="BalaiUjiOptionsLayout">
-                                <rect key="frame" x="0.0" y="80" width="375" height="537"/>
+                                <rect key="frame" x="0.0" y="80" width="375" height="557"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pKh-qE-mZL" userLabel="BalaiUjiOptionBg">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="537"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="557"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.24269584759999999" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cnu-wR-42j" userLabel="BalaiUjiOptions">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="537"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="557"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
@@ -9558,7 +9560,7 @@
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ditjen SDPPI Kominfo @ 2019" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lmR-Dc-fR5" userLabel="SearchBalauUjiFooter">
-                                <rect key="frame" x="0.0" y="617" width="375" height="30"/>
+                                <rect key="frame" x="0.0" y="637" width="375" height="30"/>
                                 <color key="backgroundColor" red="0.1056468859" green="0.26498940589999997" blue="0.5374458432" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="8VF-zj-5fZ"/>
@@ -25608,11 +25610,11 @@
     </designables>
     <inferredMetricsTieBreakers>
         <segue reference="pgo-8x-SnY"/>
-        <segue reference="Ygg-sY-0vd"/>
-        <segue reference="xge-6s-p6K"/>
+        <segue reference="6xD-yH-Auw"/>
+        <segue reference="VWb-QP-6FN"/>
     </inferredMetricsTieBreakers>
     <resources>
-        <image name="calendar.badge.clock" catalog="system" width="128" height="108"/>
+        <image name="calendar.badge.clock" catalog="system" width="128" height="109"/>
         <image name="data-not-avail.9" width="514" height="514"/>
         <image name="direction" width="50" height="50"/>
         <image name="download-sertifikat" width="24.5" height="24"/>
@@ -25645,10 +25647,10 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGreenColor">
-            <color red="0.20392156862745098" green="0.7803921568627451" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.20392156859999999" green="0.78039215689999997" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemOrangeColor">
-            <color red="1" green="0.58431372549019611" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.58431372550000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

Sirani/View/Aplikasi/AplikasiCell.swift

@@ -28,6 +28,8 @@ class AplikasiCell: UITableViewCell {
     @IBOutlet weak var lblDisposisi : UILabel!
     @IBOutlet weak var lblStatusStr : UILabel!
 
+    @IBOutlet weak var statusTop: NSLayoutConstraint!
+    @IBOutlet weak var disposisiTitle: UILabel!
     var cellDelegate: AplikasiCellDelegate?
     var dataAplikasi: Aplikasi?
     
@@ -37,6 +39,20 @@ class AplikasiCell: UITableViewCell {
         let gesture = UITapGestureRecognizer(target: self, action:  #selector(self.onItemTap))
         card.addGestureRecognizer(gesture)
         
+        let roleId = UserState.instance.getRoleId()
+        
+        if roleId == "17" {
+            statusTop.constant = -16
+            lblDisposisi.hide()
+            disposisiTitle.hide()
+            lblDisposisi.text = ""
+        }else {
+            statusTop.constant = 4
+            lblDisposisi.show()
+            disposisiTitle.show()
+            lblDisposisi.text = aplData.disposisi
+        }
+        
         lblIdIzin.text = aplData.id_izin
         lblAplId.text = String(aplData.apl_id)
         lblResiNo.text = aplData.resi_no
@@ -45,7 +61,6 @@ class AplikasiCell: UITableViewCell {
         lblMerk.text = aplData.merk
         lblModel.text = aplData.model
         lblBrand.text = aplData.brand
-        lblDisposisi.text = aplData.disposisi
         lblStatusStr.text = aplData.StatusStr
         
         var resiDate = ""

Sirani/View/BalaiUji/Index/BalaiUjiCell.swift

@@ -16,6 +16,7 @@ protocol BalaiUjiCellDelegate: NSObjectProtocol  {
 class BalaiUjiCell: UITableViewCell {
 
     @IBOutlet weak var card: MDCCard!
+    @IBOutlet weak var lblIdBalai: UILabel!
     @IBOutlet weak var lblNoPenetapanTitle: UILabel!
     @IBOutlet weak var lblNoPenetapan: UILabel!
     @IBOutlet weak var lblTglPenetapanTitle: UILabel!
@@ -33,9 +34,9 @@ class BalaiUjiCell: UITableViewCell {
         card.isInteractable = false
         btnWebsite.layer.cornerRadius = 5
         
-        if !balaiUji.no_lab.isEmpty {
+        if balaiUji.balai_id != 0 {
             lblNoPenetapanTitle.show()
-            lblNoPenetapan.text = balaiUji.no_lab
+            lblNoPenetapan.text = String(balaiUji.balai_id)
         } else {
             lblNoPenetapanTitle.hide()
             lblNoPenetapan.text = ""
@@ -43,7 +44,19 @@ class BalaiUjiCell: UITableViewCell {
         
         if !balaiUji.tanggal_terbit.isEmpty {
             lblTglPenetapanTitle.show()
-            lblTglPenetapan.text = balaiUji.tanggal_terbit
+            
+            var tglTerbit = ""
+            let inputFormatter = DateFormatter()
+            inputFormatter.dateFormat = "yyyy-MM-dd"
+            let dateString = String(balaiUji.tanggal_terbit.prefix(10))
+            
+            if let output = inputFormatter.date(from: dateString) {
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "dd MMM yyyy"
+                tglTerbit = outputFormatter.string(from: output)
+            }
+            
+            lblTglPenetapan.text = tglTerbit
         } else {
             lblTglPenetapanTitle.hide()
             lblTglPenetapan.text = ""

Sirani/View/BalaiUji/Index/BalaiUjiPresenter.swift

@@ -26,7 +26,7 @@ class BalaiUjiPresenter {
         self.view = nil
     }
     
-    func loadData(cursor: Int, prev: Int, jenis: String, columns: String, search: String) {
+    func loadData(status: String, limit: Int, page: Int, jenis: String, search: String) {
         self.view?.hideNoDataLayout()
         self.view?.showLoading()
         
@@ -51,7 +51,7 @@ class BalaiUjiPresenter {
         }
         
         var dataList = [BalaiUji]()
-        siraniApiServices.postToGetBalaiUji(cursor: cursor, prev: prev, jenis: jenis, columns: columns, search: search, cust_id: custId, role_id: roleId, user_id: userId).responseJSON { response in
+        siraniApiServices.postToGetBalaiUjiNew(user_id: userId, cust_id: custId, role_id: roleId, status: status, limit: limit, page: page, search: search, jenis: jenis).responseJSON { response in
             if response.error == nil {
                 guard let data = response.data else { return }
                 if let json = try? JSON(data: data) {
@@ -78,7 +78,7 @@ class BalaiUjiPresenter {
                             }
                             self.setDataList(dataList: dataList)
                         } else {
-                            if cursor > 0 {
+                            if page > 0 {
                                 self.setDataList(dataList: dataList)
                             } else {
                                 self.showNoData()

Sirani/View/BalaiUji/Index/BalaiUjiVC.swift

@@ -37,11 +37,11 @@ class BalaiUjiVC: UIViewController {
     private var documentInteractorController: UIDocumentInteractionController!
     
     // Request Params
-    private var cursor: Int = 0
-    private var prev: Int = 1
+    private var limit: Int = 5
+    private var page: Int = 1
     private var jenis: String = "ID"
-    private var columns: String = ""
     private var search: String = ""
+    private var status: String = ""
     
     // Others
     private var loading = false
@@ -76,7 +76,7 @@ class BalaiUjiVC: UIViewController {
     private func loadData() {
         if !loading && !lastDataLoadedEmpty {
             if ConnectionHelper.isConnectedToNetwork() {
-                presenter.loadData(cursor: cursor, prev: prev, jenis: jenis, columns: columns, search: search)
+                presenter.loadData(status: status, limit: limit, page: page, jenis: jenis, search: search)
             } else {
                 showNoConnection()
             }
@@ -157,7 +157,7 @@ extension BalaiUjiVC: BalaiUjiViewDelegate {
     }
     
     func showNoDataLayout() {
-        if cursor == 0 {
+        if page == 1 {
             noDataLayout.show()
         }
     }
@@ -168,7 +168,7 @@ extension BalaiUjiVC: BalaiUjiViewDelegate {
     
     func setDataList(dataList: [BalaiUji]) {
         
-        if cursor == 0 {
+        if page == 1 {
             noDataLayout.hide()
         }
         
@@ -183,9 +183,7 @@ extension BalaiUjiVC: BalaiUjiViewDelegate {
                 )
                 balaiUjiTV.endUpdates()
             }
-            
-            let totalData = dataList.count
-            cursor += totalData
+            page += 1
             loadMore = true
         } else {
             lastDataLoadedEmpty = true
@@ -255,11 +253,11 @@ extension BalaiUjiVC: SearchBalaiUjiDelegate {
         loading = false
         lastDataLoadedEmpty = false
         
-        self.cursor = 0
-        self.prev = 0
+        self.limit = 5
+        self.page = 1
         self.search = search
         self.jenis = jenis
-        self.columns = parameter
+//        self.status = status
         
         dataList.removeAll()
         balaiUjiTV.reloadData()