add dataSource of accident - tik clalcy/ moorhav

Author: citizen-dror

src/components/filter/CardFilterSeverty.tsx

@@ -6,6 +6,7 @@ import GroupCheckbox from './GroupCheckBox';
 import { useStore } from '../../stores/storeConfig';
 import CustomToggle from './CustomToggle';
 import '../../styles/accordion.css'
+import UseTd3Checkbox from './UseTd3Checkbox';
 
 const CardFilterSeverty = observer(() => {
     const { t } = useTranslation();
@@ -25,13 +26,18 @@ const CardFilterSeverty = observer(() => {
              eventKey="6"
              className="filterControls">
              <div>
-                <GroupCheckbox
+               <div>
+               <GroupCheckbox
                 formName="filterForm"
                 colFilter={injurySeverity}
                 onChange={updateInjurySeverity}
                 />
-            <span style={{ color: 'grey', fontSize: '10px', marginTop: '10px' }}>{t('ToChooseSeverityModerate')}</span>
-             </div>
+                <span style={{ color: 'grey', fontSize: '10px', marginTop: '10px' }}>{t('ToChooseSeverityModerate')}</span>
+               </div>
+                <div>
+                   <UseTd3Checkbox />
+                </div>               
+             </div>            
           </Accordion.Collapse>
        </Card>
     );

src/components/filter/UseTd3Checkbox.tsx

@@ -0,0 +1,23 @@
+import React, { ChangeEvent } from "react";
+import { observer } from "mobx-react";
+import { useStore } from '../../stores/storeConfig';
+import { Checkbox } from "../common";
+
+const UseTd3Checkbox: React.FC = observer(() => {
+    const { filterStore } = useStore();
+    const { dataSource, updateDataSource } = filterStore;
+    const onChange = (e: ChangeEvent<HTMLInputElement>) => {
+        updateDataSource(e.target.checked ? 3 : 1);
+    };
+  return (
+    <Checkbox
+      label="IncludeCommonFile"
+      group="datasource"
+      id={3}
+      checked={dataSource === 3}
+      onChange={onChange}
+    />
+  );
+});
+
+export default UseTd3Checkbox;

src/lng/en/translation.json

@@ -81,6 +81,7 @@
 	"dead": "Dead",
 	"severly-injured": "Severly",
 	"modarte-injured": "Modarte",
+	"IncludeCommonFile": "Common File",
 	"Vehicle": "Vehicle",
 	"TypeInjured": "Type Injured",
 	"all": "All",

src/lng/he/translation.json

@@ -81,6 +81,7 @@
 	"dead": "הרוג",
 	"severly-injured": "קשה",
 	"modarte-injured": "קל",
+	"IncludeCommonFile": "תיק דרכים כללי" ,
 	"Vehicle": "כלי רכב",
 	"TypeInjured": "סוג נפגע",
 	"all": "כל הסוגים",

src/stores/filter/FilterStore.ts

@@ -11,7 +11,8 @@ import { IFilterChecker } from './FilterChecker';
 import GroupBy, { initGroupMap } from './GroupBy';
 import GroupBy2 from './GroupBy2';
 import GroupMap, { initGroup2Map } from './GroupMap';
-import { getCitiesNames, padDataYearsWith0, createFilterQureyByGroup, getfilterBounds, createFilterQureyByCityPop, getRoadSegments } from '../../utils/FilterUtils';
+import { getCitiesNames, padDataYearsWith0, createFilterQureyByGroup, getfilterBounds,
+    createFilterQureyByCityPop, getRoadSegments, getfilterDatasource } from '../../utils/FilterUtils';
 import { getQueryParamValues } from '../../utils/queryStringUtils';
 import AccidentService from '../../services/AccidentService';
 import CityService from '../../services/CityService';
@@ -49,7 +50,8 @@ class FilterStore implements IFilterStore  {
          streets: observable,
          groupByDict: observable,
          dataByYears: observable,
-         chartDataRanges: observable
+         chartDataRanges: observable,
+         dataSource: observable
       });
       this.injurySeverity = FC.initInjurySeverity();
       this.setCasualtiesNames(this.injurySeverity);
@@ -156,6 +158,16 @@ class FilterStore implements IFilterStore  {
       this.casualtiesNames = res;
    }
 
+   //datasource of acciednt - 1 police, 3 common file (tik claly), 4 - Offense repot (shomay haderch)
+   @observable
+   dataSource: number = 1;
+
+   @action
+   updateDataSource = (sourceVal: number) => {
+     this.dataSource = sourceVal;
+   }
+
+
    // ///////////////////////////////////////////////////////////////////////////////////////////////
    // where
    // ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -786,6 +798,7 @@ class FilterStore implements IFilterStore  {
       query += this.startYear.getFilter();
       query += this.endYear.getFilter();
       query += this.injurySeverity.getFilter();
+      query += getfilterDatasource(this.dataSource);
       query += this.cities.getFilter();
       if (useBounds && bounds != null) query += getfilterBounds(bounds);
       query += this.dayNight.getFilter();

src/utils/FilterUtils.ts

@@ -33,7 +33,10 @@ export const createFilterQureyByCityPop = (popMin: number, popMax: number) => {
   return filter;
 };
 
-
+export const getfilterDatasource = (datasource: number) => {
+  let filter = (datasource !== 1)? "": `&pc=1`;
+  return filter;
+};
 
 export const getfilterBounds = (mapBounds: L.LatLngBounds) => {
   let filter = `&lat=${mapBounds.getSouth()},${mapBounds.getNorth()}`;