DT @05.01.2016: Bugfixes and Icons added

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "org.deke.risk.riskahead"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 2
+        versionCode 3
-        versionName "1.1"
+        versionName "1.2"
     }
     buildTypes {
         release {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_3_Fragment.java

@@ -103,6 +103,8 @@ public class ReportWF_3_Fragment extends Fragment {
                     if (stringId != 0) {
                         suspectSubCategory.setVisibility(View.VISIBLE);
                         setSubSpinnerValues(stringId);
+                    }else{
+                        suspectSubCategory.setVisibility(View.INVISIBLE);
                     }
 
                     if (position != ETC){

app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java

@@ -12,6 +12,10 @@ import org.deke.risk.riskahead.R;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * Created by Dennis on 12.11.2015.
  */
@@ -131,61 +135,118 @@ public class IncidentReport implements ClusterItem {
     }
 
     public BitmapDescriptor getIcon() {
-        BitmapDescriptor mIcon;
+        return BitmapDescriptorFactory.fromResource(getIconDrawable());
-
-            switch (Integer.valueOf(this.fidIncidentCategory)) {
-                case 1:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_general);
-                    break;
-                case 2:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_verbal);
-                    break;
-                case 3:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_middle_violance);
-                    break;
-                case 4:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_high_violance);
-                    break;
-                case 5:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_nature);
-                    break;
-                case 6:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_infra_v2);
-                    break;
-                default:
-                    mIcon = BitmapDescriptorFactory.fromResource(R.drawable.icon_general);
-                    break;
-            }
-
-        return mIcon;
     }
 
     public int getIconDrawable() {
         int mIcon;
 
-        switch (Integer.valueOf(this.fidIncidentCategory)) {
+        Date tmpFromDate = null;
+        Date today = new Date();
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            tmpFromDate = simpleDateFormat.parse(this.fromDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        switch (this.fidIncidentCategory) {
             case 1:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_general_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_general_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_general_w;
+                    }else{
                         mIcon = R.drawable.icon_general;
+                    }
+                }
                 break;
             case 2:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_verbal_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_verbal_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_verbal_w;
+                    }else{
                         mIcon = R.drawable.icon_verbal;
+                    }
+                }
                 break;
             case 3:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_middle_violance_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_middle_violance_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_middle_violance_w;
+                    }else{
                         mIcon = R.drawable.icon_middle_violance;
+                    }
+                }
                 break;
             case 4:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_high_violance_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_high_violance_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_high_violance_w;
+                    }else{
                         mIcon = R.drawable.icon_high_violance;
+                    }
+                }
                 break;
             case 5:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_nature_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_nature_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_nature_w;
+                    }else{
                         mIcon = R.drawable.icon_nature;
+                    }
+                }
                 break;
             case 6:
+                if(tmpFromDate != null && tmpFromDate.after(today)){
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_infra_v2_w_f;
+                    }else{
+                        mIcon = R.drawable.icon_infra_v2_f;
+                    }
+                }else{
+                    if(fidVictimCategory == 1){
+                        mIcon = R.drawable.icon_infra_v2_w;
+                    }else{
                         mIcon = R.drawable.icon_infra_v2;
+                    }
+                }
                 break;
             default:
                 mIcon = R.drawable.icon_general;
                 break;
         }
+
         return mIcon;
     }