Changed categories
This commit is contained in:
Dennis Thiessen
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -259,70 +259,50 @@
|
||||
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
|
||||
|
||||
<string-array name="cat_situation_main">
|
||||
<item>A Threatening Incident or Situation</item>
|
||||
<item>Verbal Violence</item>
|
||||
<item>Light to Heavy Physical Violence</item>
|
||||
<item>Life-Threatening Violence</item>
|
||||
<item>Natural Disaster</item>
|
||||
<item>Human Disasters & Infrastructure</item>
|
||||
<item>Threat</item>
|
||||
<item>Physical</item>
|
||||
<item>Life-Threatening</item>
|
||||
<item>Disaster</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_general">
|
||||
<item>Fraud, Theft, Mugging or Burglary</item>
|
||||
<item>Drug Abuse eg Drink spiked</item>
|
||||
<item>Demonstration, Riot or Road Blockade</item>
|
||||
<item>Checkpoints, Controls</item>
|
||||
<item>Corruption, Extortion</item>
|
||||
<item>Crime, Militia or Terrorist Activities</item>
|
||||
<item>Other …</item>
|
||||
<string-array name="cat_situation_sub_threat">
|
||||
<item>Robbery</item>
|
||||
<item>Drug related</item>
|
||||
<item>Strike/Riot</item>
|
||||
<item>Checkpoint/Blockade</item>
|
||||
<item>Corruption/Extorsion</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_verbal">
|
||||
<item>Sexual Harassment</item>
|
||||
<item>Insulting or Threatening Language</item>
|
||||
<item>Interrogation, Pressuring or Coercing</item>
|
||||
<item>Incitement</item>
|
||||
<item>Other …</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_force">
|
||||
<string-array name="cat_situation_sub_physical">
|
||||
<item>Mugging</item>
|
||||
<item>Sexual Assault</item>
|
||||
<item>Physical Attack in general</item>
|
||||
<item>A Fight or Brawl</item>
|
||||
<item>Arrest or Capture </item>
|
||||
<item>Physical Attack</item>
|
||||
<item>Fight</item>
|
||||
<item>Arrest/Capture</item>
|
||||
<item>Forced Labour</item>
|
||||
<item>Other …</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_force_serious">
|
||||
<string-array name="cat_situation_sub_lifethreat">
|
||||
<item>Rape</item>
|
||||
<item>Torture, Kidnapping, Hostage-Taking</item>
|
||||
<item>Kidnapping/Hostage</item>
|
||||
<item>Shooting</item>
|
||||
<item>Bomb or Suicide Attack</item>
|
||||
<item>Murder, Public Execution</item>
|
||||
<item>Display of Corpse or Corpse Parts </item>
|
||||
<item>Other …</item>
|
||||
<item>Bombing</item>
|
||||
<item>Murder</item>
|
||||
<item>Dead body</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_nature">
|
||||
<item>Extreme Temperaturs</item>
|
||||
<item>Storm, Hurricane, Tornado</item>
|
||||
<item>Flooding, Tsunami</item>
|
||||
<item>Earthquake, Landslide</item>
|
||||
<item>Fire, Smoke, Volcanic Eruption</item>
|
||||
<item>Famine, Drought, Animal Plague </item>
|
||||
<item>Other …</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_situation_sub_infrastructure">
|
||||
<item>Air Pollution</item>
|
||||
<item>Power Failure or General Accident</item>
|
||||
<item>Collapsing Buildings or Destruction</item>
|
||||
<item>Widespread Fire</item>
|
||||
<item>Chemical Disaster or Oil Spill</item>
|
||||
<item>Disease Outbreak or Epidemic</item>
|
||||
<item>Chaos, Anarchy</item>
|
||||
<item>Other …</item>
|
||||
<string-array name="cat_situation_sub_disaster">
|
||||
<item>Heat Wave</item>
|
||||
<item>Cyclone/Tornado</item>
|
||||
<item>Flood</item>
|
||||
<item>Earthquake</item>
|
||||
<item>Wild Fire</item>
|
||||
<item>Volcano</item>
|
||||
<item>Tsunami</item>
|
||||
<item>Fire</item>
|
||||
<item>Chemical/Oil Spill</item>
|
||||
<item>Epidemic</item>
|
||||
<item>Chaos/Anarchy</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cat_time_main">
|
||||
@@ -366,7 +346,7 @@
|
||||
|
||||
<string-array name="cat_suspect_count">
|
||||
<item>Individual</item>
|
||||
<item>Small group(2-5)</item>
|
||||
<item>Small group(2–5)</item>
|
||||
<item>Large group (more than 5)</item>
|
||||
<item>I do not know</item>
|
||||
<item>Other …</item>
|
||||
|
||||
Reference in New Issue
Block a user