- clear stage

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -9,12 +9,13 @@ import {createStructuredSelector} from "reselect";
 import {QUERY_ACTIVE_EMPLOYEES} from "../../graphql/employees.queries";
 import {QUERY_ALL_VENDORS} from "../../graphql/vendors.queries";
 import {selectReportCenter} from "../../redux/modals/modals.selectors";
-import DatePIckerRanges from "../../utils/DatePickerRanges";
+import DatePickerRanges from "../../utils/DatePickerRanges";
 import {GenerateDocument} from "../../utils/RenderTemplate";
 import {TemplateList} from "../../utils/TemplateConstants";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
+import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
 
 const mapStateToProps = createStructuredSelector({
     reportCenterModal: selectReportCenter,
@@ -78,6 +79,8 @@ export function ReportCenterModalComponent({reportCenterModal}) {
 
                     ...(id ? {id: id} : {}),
                 },
+                filters: values.filters,
+                sorters: values.sorters,
             },
             {
                 to: values.to,
@@ -148,7 +151,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                                         <Typography.Title level={4}>
                                             {t(`reportcenter.labels.groups.${key}`)}
                                         </Typography.Title>
-                                        <ul style={{columns: "2 auto"}}>
+                                        <ul style={{listStyleType: 'none', columns: "2 auto"}}>
                                             {grouped[key].map((item) => (
                                                 <li key={item.key}>
                                                     <Radio key={item.key} value={item.key}>
@@ -180,6 +183,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                         );
                     }}
                 </Form.Item>
+                <ReportCenterModalFiltersSortersComponent form={form}/>
                 <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
                     {() => {
                         const key = form.getFieldValue("key");
@@ -248,7 +252,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                                 >
                                     <DatePicker.RangePicker
                                         format="MM/DD/YYYY"
-                                        presets={DatePIckerRanges}
+                                        presets={DatePickerRanges}
                                     />
                                 </Form.Item>
                             );
@@ -304,3 +308,4 @@ export function ReportCenterModalComponent({reportCenterModal}) {
         </div>
     );
 }
+