- update halaman sertifikat dan aplikasi

-  fix bug slider

Sirani.xcodeproj/project.pbxproj

@@ -3,10 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		04779EE52B3DAA3600224D1B /* ColorExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04779EE42B3DAA3600224D1B /* ColorExtensions.swift */; };
 		0485C69C2A4193A90072B449 /* LabelVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485C69B2A4193A90072B449 /* LabelVC.swift */; };
 		0485C69E2A4193D20072B449 /* LabelPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485C69D2A4193D20072B449 /* LabelPresenter.swift */; };
 		0485C6A02A4193E80072B449 /* SearchLabelVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485C69F2A4193E80072B449 /* SearchLabelVC.swift */; };
@@ -235,6 +236,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		04779EE42B3DAA3600224D1B /* ColorExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtensions.swift; sourceTree = "<group>"; };
 		0485C69B2A4193A90072B449 /* LabelVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelVC.swift; sourceTree = "<group>"; };
 		0485C69D2A4193D20072B449 /* LabelPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelPresenter.swift; sourceTree = "<group>"; };
 		0485C69F2A4193E80072B449 /* SearchLabelVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchLabelVC.swift; sourceTree = "<group>"; };
@@ -729,6 +731,7 @@
 				FC3DADB9225046D400CF4C81 /* ConnectionHelper.swift */,
 				FCF468F1225A2E1D00B9227A /* UserState.swift */,
 				FC67D367224F94E000E456FB /* ViewExtensions.swift */,
+				04779EE42B3DAA3600224D1B /* ColorExtensions.swift */,
 				FC6B67A02269AC430042656E /* AppUtility.swift */,
 			);
 			path = Helper;
@@ -1465,6 +1468,7 @@
 				FCF399E5224D0D2200A73D5B /* MenuCell.swift in Sources */,
 				FCD5F1E2255D0310008B42F7 /* NotificationDetailPresenter.swift in Sources */,
 				FC74C508226B1E5800E55F29 /* OdsSp2AfterVC.swift in Sources */,
+				04779EE52B3DAA3600224D1B /* ColorExtensions.swift in Sources */,
 				FCCBBDAB255BDDD000EF2477 /* NotificationListViewDelegate.swift in Sources */,
 				FCEE51F0225FF645000AE43B /* HasilSurveyVC.swift in Sources */,
 				FC6B67952268972A0042656E /* OdsSp2BaruVC.swift in Sources */,

Sirani/ApiServices/SiraniApiServices.swift

@@ -180,6 +180,9 @@ class SiraniApiServices {
             "search" : search
         ]
         
+        print(METHOD_GET_TARIF_SERTIFIKAT_NEW)
+        print(body)
+        
         return AF.request(METHOD_GET_TARIF_SERTIFIKAT_NEW, method: .post, parameters: body, encoding: URLEncoding.default, headers: headers)
     }
     

Sirani/Base.lproj/Main.storyboard

@@ -4103,7 +4103,7 @@
                                                     <rect key="frame" x="16" y="11" width="343" height="238"/>
                                                     <subviews>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID Izin :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y8n-Bo-1tB" userLabel="IdIzinTitle">
-                                                            <rect key="frame" x="8" y="8" width="52" height="16"/>
+                                                            <rect key="frame" x="8" y="8" width="52" height="14"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="1nA-cp-2Vp"/>
                                                             </constraints>
@@ -4121,7 +4121,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID Aplikasi :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k5m-OB-6Jn" userLabel="IDAplikasiTitle">
-                                                            <rect key="frame" x="8" y="28" width="80" height="16"/>
+                                                            <rect key="frame" x="8" y="26" width="80" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="nw1-Sr-kCV"/>
                                                             </constraints>
@@ -4130,7 +4130,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="139735" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nrb-o9-PUM" userLabel="IDAplikasi">
-                                                            <rect key="frame" x="92" y="28" width="243" height="16"/>
+                                                            <rect key="frame" x="92" y="26" width="243" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="16" id="TyQ-3N-MFO"/>
                                                             </constraints>
@@ -4139,7 +4139,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Resi :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wpa-cC-Has" userLabel="NoResiTitle">
-                                                            <rect key="frame" x="8" y="48" width="60" height="16"/>
+                                                            <rect key="frame" x="8" y="46" width="60" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="XPi-7q-8g6"/>
                                                             </constraints>
@@ -4148,7 +4148,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="3596/VI/2023" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1dN-Lt-Yc8" userLabel="NoResi">
-                                                            <rect key="frame" x="72" y="48" width="263" height="16"/>
+                                                            <rect key="frame" x="72" y="46" width="263" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="x2V-QQ-cry"/>
                                                             </constraints>
@@ -4157,7 +4157,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tanggal Submit  :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mHc-gP-acQ" userLabel="TglSubmitTitle">
-                                                            <rect key="frame" x="8" y="68" width="111.5" height="16"/>
+                                                            <rect key="frame" x="8" y="66" width="111.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="48" id="3nS-Yp-Phg"/>
                                                             </constraints>
@@ -4166,7 +4166,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="awR-X2-QWw" userLabel="TglSubmit">
-                                                            <rect key="frame" x="123.5" y="68" width="211.5" height="16"/>
+                                                            <rect key="frame" x="123.5" y="66" width="211.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="FXF-O2-jKi"/>
                                                             </constraints>
@@ -4175,13 +4175,13 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nama Pemohon :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dgK-UU-KuR" userLabel="CustNameTitle">
-                                                            <rect key="frame" x="8" y="88" width="109" height="16"/>
+                                                            <rect key="frame" x="8" y="86" width="109" height="16"/>
                                                             <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="251" text="-" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gql-id-FWC" userLabel="CustName">
-                                                            <rect key="frame" x="121" y="88" width="214" height="16"/>
+                                                            <rect key="frame" x="121" y="86" width="214" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Vyu-1e-uYO"/>
                                                             </constraints>
@@ -4190,7 +4190,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nama Perangkat :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IwW-DG-xNW" userLabel="PerangkatTitle">
-                                                            <rect key="frame" x="8" y="108" width="114.5" height="16"/>
+                                                            <rect key="frame" x="8" y="106" width="114.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="51" id="Mm8-X0-U8A"/>
                                                             </constraints>
@@ -4199,7 +4199,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WnK-ZO-jOl" userLabel="Perangkat">
-                                                            <rect key="frame" x="126.5" y="108" width="208.5" height="16"/>
+                                                            <rect key="frame" x="126.5" y="106" width="208.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Hv1-jW-bcz"/>
                                                             </constraints>
@@ -4208,7 +4208,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Merk :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bE2-NG-JRO" userLabel="MerkTitle">
-                                                            <rect key="frame" x="8" y="128" width="45" height="16"/>
+                                                            <rect key="frame" x="8" y="126" width="45" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="IUB-HA-76c"/>
                                                             </constraints>
@@ -4217,7 +4217,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tXG-oR-Ce1" userLabel="Merk">
-                                                            <rect key="frame" x="57" y="128" width="278" height="16"/>
+                                                            <rect key="frame" x="57" y="126" width="278" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Pcg-U7-r9S"/>
                                                             </constraints>
@@ -4226,7 +4226,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Model :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2p7-XE-sid" userLabel="ModelTitle">
-                                                            <rect key="frame" x="8" y="148" width="47.5" height="16"/>
+                                                            <rect key="frame" x="8" y="146" width="47.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="WRr-TK-e2E"/>
                                                             </constraints>
@@ -4235,7 +4235,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MCF-Ec-5Iy" userLabel="Model">
-                                                            <rect key="frame" x="59.5" y="148" width="275.5" height="16"/>
+                                                            <rect key="frame" x="59.5" y="146" width="275.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="sis-99-zqc"/>
                                                             </constraints>
@@ -4244,7 +4244,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Brand :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ij1-3v-BgO" userLabel="BrandTitle">
-                                                            <rect key="frame" x="8" y="168" width="46.5" height="16"/>
+                                                            <rect key="frame" x="8" y="166" width="46.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="KST-WA-quf"/>
                                                             </constraints>
@@ -4253,7 +4253,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b5P-ju-lpo" userLabel="Brand">
-                                                            <rect key="frame" x="58.5" y="168" width="276.5" height="16"/>
+                                                            <rect key="frame" x="58.5" y="166" width="276.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Maa-go-bt7"/>
                                                             </constraints>
@@ -4262,7 +4262,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User Disposisi :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m4c-AW-27R" userLabel="DisposisiTitle">
-                                                            <rect key="frame" x="8" y="188" width="100.5" height="16"/>
+                                                            <rect key="frame" x="8" y="186" width="100.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="wEb-Ia-8br"/>
                                                             </constraints>
@@ -4271,7 +4271,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VoF-r8-osW" userLabel="Disposisi">
-                                                            <rect key="frame" x="112.5" y="188" width="222.5" height="16"/>
+                                                            <rect key="frame" x="112.5" y="186" width="222.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="O89-v8-F9Y"/>
                                                             </constraints>
@@ -4280,7 +4280,7 @@
                                                             <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="qEh-sA-4sn" userLabel="StatusTitle">
-                                                            <rect key="frame" x="8" y="208" width="50" height="16"/>
+                                                            <rect key="frame" x="8" y="206" width="50" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="OBd-GD-RSn"/>
                                                             </constraints>
@@ -4288,13 +4288,15 @@
                                                             <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="-" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hbz-Ot-PSK" userLabel="Status">
-                                                            <rect key="frame" x="62" y="208" width="273" height="16"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hbz-Ot-PSK" userLabel="Status">
+                                                            <rect key="frame" x="62" y="206" width="140" height="18"/>
+                                                            <color key="backgroundColor" red="0.30948448179999999" green="0.66594260930000004" blue="0.23518025880000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="iK9-iq-9vg"/>
+                                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="dye-Gf-tEJ"/>
+                                                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="iK9-iq-9vg"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
@@ -4322,7 +4324,7 @@
                                                         <constraint firstItem="2p7-XE-sid" firstAttribute="leading" secondItem="IKM-BE-Bei" secondAttribute="leading" constant="8" id="QIR-5A-LFb"/>
                                                         <constraint firstItem="dgK-UU-KuR" firstAttribute="leading" secondItem="IKM-BE-Bei" secondAttribute="leading" constant="8" id="QdE-9r-dcN"/>
                                                         <constraint firstItem="wpa-cC-Has" firstAttribute="top" secondItem="1dN-Lt-Yc8" secondAttribute="top" id="Sqr-nx-h6t"/>
-                                                        <constraint firstAttribute="trailing" secondItem="hbz-Ot-PSK" secondAttribute="trailing" constant="8" id="VfN-vu-fo0"/>
+                                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hbz-Ot-PSK" secondAttribute="trailing" id="VfN-vu-fo0"/>
                                                         <constraint firstItem="MCF-Ec-5Iy" firstAttribute="top" secondItem="tXG-oR-Ce1" secondAttribute="bottom" constant="4" id="VtJ-MJ-uN7"/>
                                                         <constraint firstItem="mHc-gP-acQ" firstAttribute="leading" secondItem="IKM-BE-Bei" secondAttribute="leading" constant="8" id="Xbr-mW-vuw"/>
                                                         <constraint firstItem="Gql-id-FWC" firstAttribute="top" secondItem="awR-X2-QWw" secondAttribute="bottom" constant="4" id="ZGw-PF-fTe"/>
@@ -25606,8 +25608,8 @@
     </designables>
     <inferredMetricsTieBreakers>
         <segue reference="pgo-8x-SnY"/>
-        <segue reference="6xD-yH-Auw"/>
-        <segue reference="9FY-cj-Pe8"/>
+        <segue reference="Ygg-sY-0vd"/>
+        <segue reference="xge-6s-p6K"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="calendar.badge.clock" catalog="system" width="128" height="109"/>

Sirani/Helper/ColorExtensions.swift

@@ -0,0 +1,30 @@
+//
+//  ColorExtensions.swift
+//  Sirani
+//
+//  Created by Hendi on 28/12/23.
+//  Copyright © 2023 PT. Mitra Sinerji Teknoindo. All rights reserved.
+//
+
+import UIKit
+
+extension UIColor {
+    convenience init?(hexString: String) {
+        var hexSanitized = hexString.trimmingCharacters(in: .whitespacesAndNewlines)
+        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
+
+        var rgb: UInt64 = 0
+
+        guard Scanner(string: hexSanitized).scanHexInt64(&rgb) else {
+            return nil
+        }
+
+        self.init(
+            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
+            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
+            blue: CGFloat(rgb & 0x0000FF) / 255.0,
+            alpha: 1.0
+        )
+    }
+}
+

Sirani/Model/Aplikasi.swift

@@ -25,8 +25,9 @@ struct Aplikasi {
     private(set) public var disposisi: String
     private(set) public var status: String
     private(set) public var StatusStr: String
+    private(set) public var StatusBgColor: String
     
-    init (id: String, apl_id: Int, cust_id: Int, cust_name: String, id_izin: String, id_proyek: String, nib: String, resi_no: String, resi_date: String, eqp_name: String, merk: String, model: String, brand: String, disposisi: String, status: String, StatusStr: String) {
+    init (id: String, apl_id: Int, cust_id: Int, cust_name: String, id_izin: String, id_proyek: String, nib: String, resi_no: String, resi_date: String, eqp_name: String, merk: String, model: String, brand: String, disposisi: String, status: String, StatusStr: String, statusBgColor: String) {
         self.id = id
         self.apl_id = apl_id
         self.cust_id = cust_id
@@ -43,6 +44,7 @@ struct Aplikasi {
         self.disposisi = disposisi
         self.status = status
         self.StatusStr = StatusStr
+        self.StatusBgColor = statusBgColor
     }
 }
 

Sirani/Model/CertificateData.swift

@@ -24,8 +24,10 @@ struct CertificateData {
     private(set) public var model: String
     private(set) public var merk: String
     private(set) public var berlaku: String
+    private(set) public var statusBerlaku: String
+    private(set) public var statusBgColor: String
     
-    init (nomor: String, cust_name: String, eqp_name: String, lic_id: Int, brand: String, lic_date: String, lic_no: String, exp_date: String, models: String, plg_id: Int, apl_id: Int, negara: String, model: String, merk: String, berlaku: String) {
+    init (nomor: String, cust_name: String, eqp_name: String, lic_id: Int, brand: String, lic_date: String, lic_no: String, exp_date: String, models: String, plg_id: Int, apl_id: Int, negara: String, model: String, merk: String, berlaku: String, statusBerlaku: String, statusBgColor: String) {
         self.nomor = nomor
         self.cust_name = cust_name
         self.eqp_name = eqp_name
@@ -41,5 +43,7 @@ struct CertificateData {
         self.model = model
         self.negara = negara
         self.berlaku = berlaku
+        self.statusBerlaku = statusBerlaku
+        self.statusBgColor = statusBgColor
     }
 }

Sirani/View/Aplikasi/AplikasiCell.swift

@@ -63,6 +63,13 @@ class AplikasiCell: UITableViewCell {
         lblBrand.text = aplData.brand
         lblStatusStr.text = aplData.StatusStr
         
+        lblStatusStr?.layer.cornerRadius = 6
+        lblStatusStr?.layer.masksToBounds = true
+    
+        if let statusColor = UIColor(hexString: aplData.StatusBgColor) {
+            lblStatusStr.backgroundColor = statusColor
+        }
+        
         var resiDate = ""
         if (aplData.resi_date == "null" || aplData.resi_date.isEmpty) {
             resiDate = ""

Sirani/View/Aplikasi/AplikasiPresenter.swift

@@ -55,7 +55,8 @@ class AplikasiPresenter {
                                     brand: item["brand"].stringValue,
                                     disposisi: item["disposisi"].stringValue,
                                     status: item["status"].stringValue,
-                                    StatusStr: item["StatusStr"].stringValue)
+                                    StatusStr: item["StatusStr"].stringValue,
+                                    statusBgColor: item["StatusBgColor"].stringValue)
                 
                                 label.append(aplikasiData)
                             }

Sirani/View/Aplikasi/SearchAplikasiVC.swift

@@ -29,13 +29,13 @@ class SearchAplikasiVC: UIViewController {
         OptionItem(label: "Semua", value: "apl_all"),
         OptionItem(label: "Draft Customer", value: "apl_draft_cust"),
         OptionItem(label: "Pemeriksaan Dokumen", value: "apl_pemeriksaan_dok"),
-        OptionItem(label: "Tunggu Disposisi", value: ""),
+        OptionItem(label: "Tunggu Disposisi", value: "apl_tunggu_disposisi"),
         OptionItem(label: "Evaluasi Dokumen", value: "apl_eval_dok"),
-        OptionItem(label: "Rekomendasi Aplikasi", value: ""),
-        OptionItem(label: "Persetujuan Aplikasi", value: ""),
-        OptionItem(label: "Persetujuan Penerbitan", value: ""),
+        OptionItem(label: "Rekomendasi Aplikasi", value: "apl_rekomendasi_apl"),
+        OptionItem(label: "Persetujuan Aplikasi", value: "apl_persetujuan_apl"),
+//        OptionItem(label: "Persetujuan Penerbitan", value: ""),
         OptionItem(label: "Proses Sertifikasi", value: "apl_proses_sertifikasi"),
-        OptionItem(label: "Pembayaran SP2", value: ""),
+        OptionItem(label: "Pembayaran SP2", value: "apl_pembayaran_sp2"),
         OptionItem(label: "Sertifikat Dicetak", value: "apl_sertifikat_dicetak"),
         OptionItem(label: "Permohonan Tidak Lengkap", value: "apl_permohonan_tidak_lengkap"),
         OptionItem(label: "Draft Ditolak", value: "apl_draft_ditolak"),

Sirani/View/DaftarSertifikat/Index/DaftarSertifikatPresenter.swift

@@ -52,7 +52,9 @@ class DaftarSertifikatPresenter {
                                     negara: item["negara"].stringValue,
                                     model: item["model"].stringValue,
                                     merk: item["merk"].stringValue,
-                                    berlaku: item["berlaku"].stringValue
+                                    berlaku: item["berlaku"].stringValue,
+                                    statusBerlaku: item["StatusBerlaku"].stringValue,
+                                    statusBgColor: item["StatusBgColor"].stringValue
                                 )
                                 certificates.append(certificateData)
                             }

Sirani/View/Home/HomeVC.swift

@@ -677,7 +677,8 @@ extension HomeVC: HomeViewDelegate {
         if !images.isEmpty {
             var sources = [SDWebImageSource]()
             for url in images {
-                if let webpSource = SDWebImageSource(urlString: url) {
+                if let encodedURLString = url.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
+                   let webpSource = SDWebImageSource(urlString: encodedURLString) {
                     sources.append(webpSource)
                 }
             }

Sirani/View/Label/LabelCell.swift

@@ -82,8 +82,6 @@ class LabelCell: UITableViewCell {
             }
         }
         lblBerlakuDate.text = licDate
-        
-        var status = ""
 
         lblStatus?.layer.cornerRadius = 6
         lblStatus?.layer.masksToBounds = true
@@ -101,23 +99,3 @@ class LabelCell: UITableViewCell {
     }
 
 }
-
-extension UIColor {
-    convenience init?(hexString: String) {
-        var hexSanitized = hexString.trimmingCharacters(in: .whitespacesAndNewlines)
-        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
-
-        var rgb: UInt64 = 0
-
-        guard Scanner(string: hexSanitized).scanHexInt64(&rgb) else {
-            return nil
-        }
-
-        self.init(
-            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
-            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
-            blue: CGFloat(rgb & 0x0000FF) / 255.0,
-            alpha: 1.0
-        )
-    }
-}

Sirani/View/News/Detail/NewsDetailVC.swift

@@ -128,6 +128,7 @@ extension NewsDetailVC: NewsDetailViewDelegate {
         
         DispatchQueue.main.async {
             self.NewsText.setHTMLFromString(news)
+            self.NewsText.isEditable = false
         }
     }
     

Sirani/View/Sertifikat/SertifikatNewCell.swift

@@ -83,27 +83,14 @@ class SertifikatNewCell: UITableViewCell {
         }
         lblBerlakuDate.text = licDate
         
-        var status = ""
-
         lblStatus?.layer.cornerRadius = 6
         lblStatus?.layer.masksToBounds = true
-        
-        switch certificateData.berlaku {
-            case "0":
-                status = "Tidak Berlaku"
-                lblStatus.backgroundColor = UIColor.red
-            case "1":
-                status = "Berlaku"
-                lblStatus.backgroundColor = UIColor.green
-            case "3":
-                status = "Revisi"
-                lblStatus.backgroundColor = UIColor.orange
-            default:
-                lblStatus.backgroundColor = UIColor.white
+                
+        lblStatus.text = certificateData.statusBerlaku
+        if let statusColor = UIColor(hexString: certificateData.statusBgColor) {
+            lblStatus.backgroundColor = statusColor
         }
         
-        lblStatus.text = status
-        
         self.dataSertifikat = certificateData
     }
     

Sirani/View/Sertifikat/SertifikatPresenter.swift

@@ -52,7 +52,9 @@ class SertifikatPresenter {
                                     negara: item["negara"].stringValue,
                                     model: item["model"].stringValue,
                                     merk: item["merk"].stringValue,
-                                    berlaku: item["berlaku"].stringValue
+                                    berlaku: item["berlaku"].stringValue,
+                                    statusBerlaku: item["StatusBerlaku"].stringValue,
+                                    statusBgColor: item["StatusBgColor"].stringValue
                                 )
                                 certificates.append(certificateData)
                             }
@@ -104,7 +106,9 @@ class SertifikatPresenter {
                                     negara: item["negara"].stringValue,
                                     model: item["model"].stringValue,
                                     merk: item["merk"].stringValue,
-                                    berlaku: item["berlaku"].stringValue
+                                    berlaku: item["berlaku"].stringValue,
+                                    statusBerlaku: item["StatusBerlaku"].stringValue,
+                                    statusBgColor: item["StatusBgColor"].stringValue
                                 )
                                 certificates.append(certificateData)
                             }

Sirani/View/TarifSertifikat/Index/TarifSertifikatVC.swift

@@ -145,9 +145,9 @@ extension TarifSertifikatVC: TarifSertifikatViewDelegate {
                 tarifSertifikatTV.endUpdates()
             }
             
-            let totalData = dataList.count
-            cursor += totalData
-            loadMore = true
+//            let totalData = dataList.count
+//            cursor += totalData
+            loadMore = false
         } else {
             lastDataLoadedEmpty = true
             loadMore = false