Improvement VCare 1.0.9 on PM

-change DetailPM.java (switch index of array at validation method)

app/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -71,7 +71,6 @@
         android:largeHeap="true"
         android:screenOrientation="portrait"
         android:supportsRtl="true"
-        android:testOnly="true"
         android:theme="@style/MyMaterialTheme" >
 
         <!-- android:theme="@style/MyMaterialTheme"> -->

app/build/intermediates/res/merged/debug/layout/activity_detail_incident.xml

@@ -451,6 +451,28 @@
                     android:textColor="@android:color/black"
                     android:textSize="16dp" />
             </LinearLayout>
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="10dp"
+                android:text="Thermal Stock"
+                android:textColor="@android:color/black"
+                android:textSize="16dp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="25dp"
+                android:id="@+id/tvTS"
+                android:text=" "
+                android:textColor="@android:color/black"
+                android:textSize="16dp" />
+
         </LinearLayout>
 
         <LinearLayout

app/build/intermediates/res/merged/debug/layout/activity_detail_pm.xml

@@ -682,6 +682,27 @@
             android:paddingTop="5dp"
             android:scrollbars="vertical" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="5dp"
+            android:text="Thermal Stock"
+            android:textColor="@android:color/black"
+            android:textSize="16dp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="10dp"
+            android:text=" "
+            android:id="@+id/TSpm"
+            android:textColor="@android:color/black"
+            android:textSize="16dp" />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/java/id/co/visionet/crm_multibank/activity/DetailPM.java

@@ -1170,7 +1170,7 @@ public class DetailPM extends AppCompatActivity {
                                     final MerchantDataCopyPM merchantDataCopyPM = new MerchantDataCopyPM();
                                     merchantDataCopyPM.setMerchantId(MID);
                                     merchantDataCopyPM.setSpinnerMerchantComment(SpinnerMerchantComment);
-                                     merchantDataCopyPM.setSpinnerCommentReason(SpinnerCommentReason);
+                                    merchantDataCopyPM.setSpinnerCommentReason(SpinnerCommentReason);
                                     merchantDataCopyPM.setSpinnerOtherEDCAvailability(SpinnerOtherEDCAvailability);
                                     merchantDataCopyPM.setOtherEDC(OtherEDC);
                                     merchantDataCopyPM.setPriorityEDC(PriorityEDC);
@@ -1804,7 +1804,7 @@ public class DetailPM extends AppCompatActivity {
     private boolean isValid() {
         boolean valid = true;
         String kosong = "field can't be empty";
-        if (MerchantConditionPm.getSelectedItemPosition() == 1 || MerchantConditionPm.getSelectedItemPosition() == 4 || MerchantConditionPm.getSelectedItemPosition() == 6) {
+        if (MerchantConditionPm.getSelectedItemPosition() == 1 || MerchantConditionPm.getSelectedItemPosition() == 3 || MerchantConditionPm.getSelectedItemPosition() == 5) {
             final RealmResults<PmFoto> pmFotos = woFotoHelper.getFotoStrukPm(pmModel.getPreventiveMaintenanceId());
             for (int j = pmFotos.size(); j < ivStrukList.size(); j++) {
                 ivStrukList.get(j).setImageResource(R.drawable.ic_foto_empty);
@@ -2024,7 +2024,7 @@ public class DetailPM extends AppCompatActivity {
         } else if (MerchantConditionPm.getSelectedItemPosition() == 0) {
             valid = false;
             setSpinnerError(MerchantConditionPm, kosong);
-        } else if (MerchantConditionPm.getSelectedItemPosition() == 2 || MerchantConditionPm.getSelectedItemPosition() == 3 || MerchantConditionPm.getSelectedItemPosition() == 5 || MerchantConditionPm.getSelectedItemPosition() == 7) {
+        } else if (MerchantConditionPm.getSelectedItemPosition() == 2 || MerchantConditionPm.getSelectedItemPosition() == 4 || MerchantConditionPm.getSelectedItemPosition() == 5 || MerchantConditionPm.getSelectedItemPosition() == 6 || MerchantConditionPm.getSelectedItemPosition() == 7) {
             if (woFotoHelper.getFotoMerchantPm(pmModel.getMerchantId(),pmModel.getTargetDate()) == null) {
                 //Toast.makeText(DetailPM.this,"Foto Merchant belum terisi",Toast.LENGTH_SHORT).show();
                 valid = false;

app/src/main/java/id/co/visionet/crm_multibank/rest/ApiClient.java

@@ -10,7 +10,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
  */
 
 public class ApiClient {
-//    public static String url = "https://demo.visionet.co.id/DemoProdVcare/api/";
+    //   public static String url = "https://demo.visionet.co.id/DemoProdVcare/api/";
     public static String url = "https://demo.visionet.co.id/crmmultibankapi/api/";
 //    public static String url = "https://vcare.visionet.co.id/api/api/";
     private static Retrofit retrofit = null;

app/src/main/java/id/co/visionet/crm_multibank/rest/ApiClientApp.java

@@ -7,7 +7,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class ApiClientApp {
     public static String url = "https://demo.visionet.co.id/devapi/api/";
-//    public static String url = "https://fso.visionet.co.id/api/api/";
+ //   public static String url = "https://fso.visionet.co.id/api/api/";
     private static Retrofit retrofit = null;
 
     public static Retrofit getClient(){

vcare_master.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />