admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
Dave Richer
2023-12-11 17:34:05 -05:00
parent 5c164f807d
commit ad79344709
87 changed files with 1100 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/shop-employees/shop-employees-form.component.jsx
View File

@@ -13,11 +13,10 @@ import {
} from "antd";
import { useForm } from "antd/es/form/Form";
import moment from "moment";
import querystring from "query-string";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useNavigate, useLocation } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
import {
@@ -36,6 +35,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
import queryString from "query-string";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -48,7 +48,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
const { t } = useTranslation();
const [form] = useForm();
const history = useNavigate();
const search = querystring.parse(useLocation().search);
const search = queryString.parse(useSearchParams().toString());
const [deleteVacation] = useMutation(DELETE_VACATION);
const { error, data } = useQuery(QUERY_EMPLOYEE_BY_ID, {
variables: { id: search.employeeId },
@@ -103,7 +103,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
refetchQueries: ["QUERY_EMPLOYEES"],
}).then((r) => {
search.employeeId = r.data.insert_employees.returning[0].id;
history.push({ search: querystring.stringify(search) });
history({ search: queryString.stringify(search) });
notification["success"]({
message: t("employees.successes.save"),
});

12
client/src/components/shop-employees/shop-employees-list.component.jsx
View File

@@ -2,20 +2,20 @@ import { Button, Table } from "antd";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { useNavigate, useLocation } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
export default function ShopEmployeesListComponent({ loading, employees }) {
const { t } = useTranslation();
const history = useNavigate();
const search = queryString.parse(useLocation().search);
const search = queryString.parse(useSearchParams().toString());
const handleOnRowClick = (record) => {
if (record) {
search.employeeId = record.id;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
} else {
delete search.employeeId;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
}
};
const columns = [
@@ -54,7 +54,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
type="primary"
onClick={() => {
search.employeeId = "new";
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
}}
>
{t("employees.actions.new")}
@@ -69,7 +69,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
rowSelection={{
onSelect: (props) => {
search.employeeId = props.id;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
},
type: "radio",
selectedRowKeys: [search.employeeId],