Rename Accident to Incident thru app

Author: fungjj92

README.md

@@ -59,7 +59,7 @@ telling it to communicate with the Docker daemon on the `app` virtual machine.
 
 ## Testing Data
 
-A CSV of historical data can be downloaded from the project /data folder (accidents_and_sites.csv).
+A CSV of historical data can be downloaded from the project /data folder (incidents_and_sites.csv).
 
 Once the app has been built, this data can be loaded.
 
@@ -68,7 +68,7 @@ Then open the network tab in web developer tools and reload the page. Inspect th
 from an API request and pull out the value of the `Authorization` header, for example
 `Token f1acac96cc79c4822e9010d23ab425231d580875`.
 
-Run `python scripts/load_accidents_v3.py --authz 'Token YOUR_AUTH_TOKEN' /path/to/accident_csvs`.
+Run `python scripts/load_incidents_v3.py --authz 'Token YOUR_AUTH_TOKEN' /path/to/incident_csvs`.
 Note that the import process will take roughly two hours for the full data set; you can cut down the
 number of records with `head` on the individual CSVs.
 

app/data/tests/test_serializers.py

@@ -26,10 +26,10 @@ def setUp(self):
 
     def test_transform_details_only(self):
         """Test that non-read-only keys are removed from 'properties' and 'definitions'"""
-        test_value = {'Accident Details': {}, 'Related Info 1': {}, 'Related Info 2': {}}
-        self.assertEqual(('definitions', {'Accident Details': {}}),
+        test_value = {'Incident Details': {}, 'Related Info 1': {}, 'Related Info 2': {}}
+        self.assertEqual(('definitions', {'Incident Details': {}}),
                          self.serializer.make_read_only_schema('definitions', test_value))
-        self.assertEqual(('properties', {'Accident Details': {}}),
+        self.assertEqual(('properties', {'Incident Details': {}}),
                          self.serializer.make_read_only_schema('properties', test_value))
         self.assertEqual(('no_transform', test_value),
                          self.serializer.make_read_only_schema('no_transform', test_value))

app/data/tests/test_views.py

@@ -176,7 +176,7 @@ def test_audit_log_creation(self):
         post_data = {
             'data': {
                 'Person': [],
-                'Accident Details': {
+                'Incident Details': {
                     'Num passenger casualties': '',
                     'Num driver casualties': '',
                     'Num pedestrian casualties': '',

app/data/views.py

@@ -229,7 +229,7 @@ def crosstabs(self, request):
             - row_boundary_id: Id of a Boundary whose BoundaryPolygons should be used as rows
             - row_choices_path: Path components to a schema property whose choices should be used
                                 as rows, separated by commas
-                                e.g. &row_choices_path=accidentDetails,properties,Collision%20type
+                                e.g. &row_choices_path=incidentDetails,properties,Collision%20type
                                 Note that ONLY properties which have an 'enum' key are valid here.
         - Exactly one column specification parameter chosen from:
             - col_period_type
@@ -532,7 +532,7 @@ def _make_choices_case(self, schema, path):
             filter_rule = dict(_rule_type='containment', contains=[choice])
             for component in filter_path:
                 # Nest filter inside itself so we eventually get something like:
-                # {"accidentDetails": {"severity": {"_rule_type": "containment"}}}
+                # {"incidentDetails": {"severity": {"_rule_type": "containment"}}}
                 tmp = dict()
                 tmp[component] = filter_rule
                 filter_rule = tmp

deployment/ansible/group_vars/all.example

@@ -40,7 +40,7 @@ web_js_nominatim_key: ""
 web_js_html5mode: "true"
 web_js_html5mode_prefix: "!"
 web_js_record_type_visible: "false"
-web_js_record_type_primary_label: "Accident"
+web_js_record_type_primary_label: "Incident"
 web_js_record_type_secondary_label: "Intervention"
 editor_js_html5mode: "true"
 editor_js_html5mode_prefix: "!"

schema_editor/app/scripts/views/recordtype/add-edit-partial.html

@@ -10,7 +10,7 @@ <h2 ng-show="rt.recordType.uuid">Edit Record Type</h2>
             <div class="form-group col-sm-6">
                 <label for="single-title">Single Title</label>
                 <input required type="text" name="label" ng-model="rt.recordType.label"
-                       class="form-control" id="single-title" placeholder="Accident"
+                       class="form-control" id="single-title" placeholder="Incident"
                        ng-minlength="3" ng-maxlength="64" />
                 <p ng-show="rtForm.label.$invalid && !rtForm.label.$pristine" class="help-block">
                     Single Title is required
@@ -21,7 +21,7 @@ <h2 ng-show="rt.recordType.uuid">Edit Record Type</h2>
             <div class="form-group col-sm-6">
                 <label for="plural-title">Plural Title</label>
                 <input required type="text" name="plural_label" ng-model="rt.recordType.plural_label"
-                       class="form-control" id="plural-title" placeholder="Accidents"
+                       class="form-control" id="plural-title" placeholder="Incidents"
                        ng-minlength="3" ng-maxlength="64" />
                 <p ng-show="rtForm.plural_label.$invalid && !rtForm.plural_label.$pristine" class="help-block">
                     Plural Title is required

schema_editor/app/scripts/views/recordtype/related-add-edit-partial.html

@@ -12,7 +12,7 @@ <h2 ng-show="rtRelated.schemaKey">Edit Related Content</h2>
                 <label for="single-title">Single Title</label>
                 <input required type="text" name="label" ng-model="rtRelated.definition.title"
                        ng-readonly="!!rtRelated.schemaKey"
-                       class="form-control" id="single-title" placeholder="Accident"
+                       class="form-control" id="single-title" placeholder="Incident"
                        ng-minlength="3" ng-maxlength="64" />
                 <p ng-show="rtForm.title.$invalid && !rtForm.title.$pristine" class="help-block">
                     Single Title is required
@@ -23,7 +23,7 @@ <h2 ng-show="rtRelated.schemaKey">Edit Related Content</h2>
             <div class="form-group col-sm-6">
                 <label for="plural-title">Plural Title</label>
                 <input required type="text" name="plural_label" ng-model="rtRelated.definition.plural_title"
-                       class="form-control" id="plural-title" placeholder="Accidents"
+                       class="form-control" id="plural-title" placeholder="Incidents"
                        ng-minlength="3" ng-maxlength="64" />
                 <p ng-show="rtForm.plural_title.$invalid && !rtForm.plural_title.$pristine" class="help-block">
                     Plural Title is required

schema_editor/test/mock/resources/resources-mocks.js

@@ -61,10 +61,10 @@
                         'title': '',
                         'plural_title': '',
                         'definitions': {
-                            'Accident Details': {
-                                'description': 'Details of accident',
-                                'title': 'Accident Details',
-                                'plural_title': 'Accident Details',
+                            'Incident Details': {
+                                'description': 'Details of incident',
+                                'title': 'Incident Details',
+                                'plural_title': 'Incident Details',
                                 'definitions': {},
                                 'type': 'object',
                                 'properties': {
@@ -89,8 +89,8 @@
                         },
                         'type': 'object',
                         'properties': {
-                            'Accident Details': {
-                                '$ref': '#/definitions/Accident Details'
+                            'Incident Details': {
+                                '$ref': '#/definitions/Incident Details'
                             },
                             'Firearm': {
                                 '$ref': '#/definitions/Firearm'
@@ -116,9 +116,9 @@
                     'current_schema':'80c10057-2cfc-4a32-8e3c-0573e8bf8f3f',
                     'created':'2015-05-13T21:43:29.227598Z',
                     'modified':'2015-05-13T21:43:29.227639Z',
-                    'label':'Accident',
-                    'plural_label':'Accidents',
-                    'description':'An accident.',
+                    'label':'Incident',
+                    'plural_label':'Incidents',
+                    'description':'An incident.',
                     'active':true
                 },
                 {
@@ -150,11 +150,11 @@
 
         var RecordSchemaRequest = angular.extend({}, RecordType, {
             definitions: {
-                'Accident Details': {
+                'Incident Details': {
                     type: 'object',
-                    title: 'Accident Details',
-                    plural_title: 'Accident Details',
-                    description: 'Details for Accident',
+                    title: 'Incident Details',
+                    plural_title: 'Incident Details',
+                    description: 'Details for Incident',
                     multiple: false,
                     propertyOrder: 0,
                     details: true

schema_editor/test/spec/views/recordtype/add-controller.spec.js

@@ -35,9 +35,9 @@ describe('ase.views.recordtype: AddController', function () {
 
         /* jshint camelcase: false */
         var recordType = {
-            label: 'Accident',
-            plural_label: 'Accidents',
-            description: 'An Accident'
+            label: 'Incident',
+            plural_label: 'Incidents',
+            description: 'An Incident'
         };
 
         var recordSchema = {
@@ -48,19 +48,19 @@ describe('ase.views.recordtype: AddController', function () {
                 plural_title: '',
                 description: '',
                 properties: {
-                    'accidentDetails': {
-                        $ref: '#/definitions/accidentDetails',
+                    'incidentDetails': {
+                        $ref: '#/definitions/incidentDetails',
                         options: {
                             collapsed: true
                         }
                     }
                 },
                 definitions: {
-                    'accidentDetails': {
+                    'incidentDetails': {
                         type: 'object',
-                        title: 'Accident Details',
-                        plural_title: 'Accident Details',
-                        description: 'Details for Accident',
+                        title: 'Incident Details',
+                        plural_title: 'Incident Details',
+                        description: 'Details for Incident',
                         multiple: false,
                         propertyOrder: 0,
                         properties: {},

schema_editor/test/spec/views/recordtype/add-directive.spec.js

@@ -38,11 +38,11 @@ describe('ase.views.recordtype: RTAdd', function () {
 
         // Save button should be disabled until all the required fields are entered
         checkSaveButtonDisabled(true);
-        element.find('#single-title').val('Accident').change();
+        element.find('#single-title').val('Incident').change();
         checkSaveButtonDisabled(true);
-        element.find('#plural-title').val('Accidents').change();
+        element.find('#plural-title').val('Incidents').change();
         checkSaveButtonDisabled(true);
-        element.find('#description').val('An accident').change();
+        element.find('#description').val('An incident').change();
         checkSaveButtonDisabled(false);
 
         // All required fields are entered, press Save and verify it's submitted