diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_1_Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_1_Fragment.java
index 5e24018..277c30c 100644
--- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_1_Fragment.java
+++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_1_Fragment.java
@@ -25,12 +25,10 @@ import org.deke.risk.riskahead.adapter.SpinnerHintAdapter;
*
*/
public class ReportWF_1_Fragment extends BaseReportWFFragment{
- private final static int VIOLANCE_GENERAL = 1;
- private final static int VIOLANCE_VERBAL = 2;
- private final static int VIOLANCE_LIGHT = 3;
- private final static int VIOLANCE_HARD = 4;
- private final static int VIOLANCE_NATURE = 5;
- private final static int VIOLANCE_INFRASTRUCTURE = 6;
+ private final static int VIOLANCE_THREAT = 1;
+ private final static int VIOLANCE_PHYSICAL = 2;
+ private final static int VIOLANCE_LIFETHREAT = 3;
+ private final static int VIOLANCE_DISASTER = 4;
private View viewFragment;
@@ -89,25 +87,19 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
switch (position) {
case 1:
- stringId = R.array.cat_situation_sub_general;
+ stringId = R.array.cat_situation_sub_threat;
break;
case 2:
- stringId = R.array.cat_situation_sub_verbal;
+ stringId = R.array.cat_situation_sub_physical;
break;
case 3:
- stringId = R.array.cat_situation_sub_force;
+ stringId = R.array.cat_situation_sub_lifethreat;
break;
case 4:
- stringId = R.array.cat_situation_sub_force_serious;
- break;
- case 5:
- stringId = R.array.cat_situation_sub_nature;
- break;
- case 6:
- stringId = R.array.cat_situation_sub_infrastructure;
+ stringId = R.array.cat_situation_sub_disaster;
break;
default:
- stringId = R.array.cat_situation_sub_general;
+ stringId = R.array.cat_situation_sub_threat;
break;
}
@@ -120,9 +112,6 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
checkIfFinished();
}
-
-
-
}
@Override
diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java b/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java
index ad8b9f1..c4afd01 100644
--- a/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java
+++ b/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java
@@ -315,32 +315,22 @@ public class IncidentReport implements ClusterItem {
switch(this.fidIncidentCategory){
case 1:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_general);
+ stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_threat);
returnValue = stringArray[this.fidIncidentSubCategory-1];
break;
case 2:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_verbal);
+ stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_physical);
returnValue = stringArray[this.fidIncidentSubCategory-1];
break;
case 3:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_force);
+ stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_lifethreat);
returnValue = stringArray[this.fidIncidentSubCategory-1];
break;
case 4:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_force_serious);
- returnValue = stringArray[this.fidIncidentSubCategory-1];
-
- break;
- case 5:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_nature);
- returnValue = stringArray[this.fidIncidentSubCategory-1];
-
- break;
- case 6:
- stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_infrastructure);
+ stringArray = context.getResources().getStringArray(R.array.cat_situation_sub_disaster);
returnValue = stringArray[this.fidIncidentSubCategory-1];
break;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ceee2fa..e3ff6c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,70 +259,50 @@
Already have an account? Login here!
- - A Threatening Incident or Situation
- - Verbal Violence
- - Light to Heavy Physical Violence
- - Life-Threatening Violence
- - Natural Disaster
- - Human Disasters & Infrastructure
+ - Threat
+ - Physical
+ - Life-Threatening
+ - Disaster
-
- - Fraud, Theft, Mugging or Burglary
- - Drug Abuse eg Drink spiked
- - Demonstration, Riot or Road Blockade
- - Checkpoints, Controls
- - Corruption, Extortion
- - Crime, Militia or Terrorist Activities
- - Other …
+
+ - Robbery
+ - Drug related
+ - Strike/Riot
+ - Checkpoint/Blockade
+ - Corruption/Extorsion
-
- - Sexual Harassment
- - Insulting or Threatening Language
- - Interrogation, Pressuring or Coercing
- - Incitement
- - Other …
-
-
-
+
+ - Mugging
- Sexual Assault
- - Physical Attack in general
- - A Fight or Brawl
- - Arrest or Capture
+ - Physical Attack
+ - Fight
+ - Arrest/Capture
- Forced Labour
- - Other …
-
+
- Rape
- - Torture, Kidnapping, Hostage-Taking
+ - Kidnapping/Hostage
- Shooting
- - Bomb or Suicide Attack
- - Murder, Public Execution
- - Display of Corpse or Corpse Parts
- - Other …
+ - Bombing
+ - Murder
+ - Dead body
-
- - Extreme Temperaturs
- - Storm, Hurricane, Tornado
- - Flooding, Tsunami
- - Earthquake, Landslide
- - Fire, Smoke, Volcanic Eruption
- - Famine, Drought, Animal Plague
- - Other …
-
-
-
- - Air Pollution
- - Power Failure or General Accident
- - Collapsing Buildings or Destruction
- - Widespread Fire
- - Chemical Disaster or Oil Spill
- - Disease Outbreak or Epidemic
- - Chaos, Anarchy
- - Other …
+
+ - Heat Wave
+ - Cyclone/Tornado
+ - Flood
+ - Earthquake
+ - Wild Fire
+ - Volcano
+ - Tsunami
+ - Fire
+ - Chemical/Oil Spill
+ - Epidemic
+ - Chaos/Anarchy
@@ -366,7 +346,7 @@
- Individual
- - Small group(2-5)
+ - Small group(2–5)
- Large group (more than 5)
- I do not know
- Other …