Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

41 izuvinimu zuvu pasirinkimo apribojimai #43

Merged
merged 4 commits into from
Jan 23, 2024
Merged

41 izuvinimu zuvu pasirinkimo apribojimai #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0656e92
filter fishType list
DovMa Jan 18, 2024
fabb60b
variuos fixes
DovMa Jan 19, 2024
84b8fc2
unnecessary string cast removed
DovMa Jan 19, 2024
a5eb737
merge conflicts
DovMa Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"prettier --write",
"eslint"
"prettier --write"
],
"*.{md,html,css}": "prettier --write"
}
Expand Down
159 changes: 71 additions & 88 deletions src/components/forms/Done.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,105 @@
import { useMediaQuery } from "@material-ui/core";
import { format } from "date-fns";
import { isEmpty } from "lodash";
import { useNavigate } from "react-router";
import { createSearchParams } from "react-router-dom";
import styled from "styled-components";
import { device } from "../../styles";
import { FishStockingStatus } from "../../utils/constants";
import { slugs } from "../../utils/routes";
import { buttonsTitles } from "../../utils/texts";
import { FishStocking } from "../../utils/types";
import Button from "../buttons/Button";
import PhotoUploadField from "../fields/PhotoUploadField";
import FishStockingInfo from "../other/Info";
import InfoColumn from "../other/InfoColumn";
import FishStockingPageTitle from "../other/PageTitle";
import PreviewMap from "../other/PreviewMap";
import SignatureList from "../other/SignatureList";
import FishStockingTable from "../other/Table";
import { fishOrigins } from "./Registration";
import { useMediaQuery } from '@material-ui/core';
import { format } from 'date-fns';
import { isEmpty } from 'lodash';
import { useNavigate } from 'react-router';
import { createSearchParams } from 'react-router-dom';
import styled from 'styled-components';
import { device } from '../../styles';
import { FishStockingStatus } from '../../utils/constants';
import { slugs } from '../../utils/routes';
import { buttonsTitles } from '../../utils/texts';
import { FishStocking } from '../../utils/types';
import Button from '../buttons/Button';
import PhotoUploadField from '../fields/PhotoUploadField';
import FishStockingInfo from '../other/Info';
import InfoColumn from '../other/InfoColumn';
import FishStockingPageTitle from '../other/PageTitle';
import PreviewMap from '../other/PreviewMap';
import SignatureList from '../other/SignatureList';
import FishStockingTable from '../other/Table';
import { fishOriginOptions } from '../../utils/options';

export interface FishStockingCompletedProps {
fishStocking: FishStocking;
disabled?: boolean;
}
const locale = {
vet_no_0: "Vet. patvirtinimo nr.",
vet_no_1: "Vet. patvirtinimo įsakymo nr.",
waybill_no: "Važtaraščio nr.",
fish_origin_company: "Žuvivaisos įmonės pavadinimas",
fish_origin_reservoir: "Vandens telkinio pavadinimas"
vet_no_0: 'Vet. patvirtinimo nr.',
vet_no_1: 'Vet. patvirtinimo įsakymo nr.',
waybill_no: 'Važtaraščio nr.',
fish_origin_company: 'Žuvivaisos įmonės pavadinimas',
fish_origin_reservoir: 'Vandens telkinio pavadinimas',
};

const FishStockingCompleted = ({
fishStocking
}: FishStockingCompletedProps) => {
const status = fishStocking?.status;
const FishStockingCompleted = ({ fishStocking }: FishStockingCompletedProps) => {
const status = fishStocking.status;
const navigate = useNavigate();
const isMobile = useMediaQuery(device.mobileL);

if (!fishStocking) {
return null;
}
const showAdditionalInfo = ![
FishStockingStatus.NOT_FINISHED,
FishStockingStatus.CANCELED
FishStockingStatus.CANCELED,
].includes(status!);

const fishStocker =
fishStocking.reviewedBy ||
fishStocking.assignedTo ||
fishStocking.createdBy;
const fishStocker = fishStocking.reviewedBy || fishStocking.assignedTo || fishStocking.createdBy;

const info = [
[
{
type: "location",
type: 'location',
value: fishStocking?.location?.municipality?.name,
label: "Įžuvinimo vieta"
label: 'Įžuvinimo vieta',
},
{
type: "date",
type: 'date',
value: format(
new Date(fishStocking?.reviewTime || fishStocking.eventTime!),
"yyyy-MM-dd HH:mm"
'yyyy-MM-dd HH:mm',
),
label: "Data"
label: 'Data',
},
{
type: "phone",
type: 'phone',
value: fishStocking.phone,
label: "Telefonas"
}
label: 'Telefonas',
},
],
[
{
type: "info",
type: 'info',
value: `${fishStocking.location?.name}, ${fishStocking.location?.cadastral_id}`,
label: "Telkinys"
label: 'Telkinys',
},
{
type: "user",
type: 'user',
value: `${fishStocker?.firstName} ${fishStocker?.lastName}`,
label: "Atsakingas asmuo"
}
]
label: 'Atsakingas asmuo',
},
],
];
if (showAdditionalInfo) {
info.push([
{
type: "temp",
type: 'temp',
value: fishStocking.containerWaterTemp
? fishStocking.containerWaterTemp + "\u00b0C"
: "Nežinoma temperatūra",
label: "Vandens temperatūra taroje"
? fishStocking.containerWaterTemp + '\u00b0C'
: 'Nežinoma temperatūra',
label: 'Vandens temperatūra taroje',
},
{
type: "water",
value: fishStocking.waterTemp
? fishStocking.waterTemp + "\u00b0C"
: "Nežinoma temperatūra",
label: "Vandens temperatūra telkinyje"
}
type: 'water',
value: fishStocking.waterTemp ? fishStocking.waterTemp + '\u00b0C' : 'Nežinoma temperatūra',
label: 'Vandens temperatūra telkinyje',
},
]);
}

return (
<InnerContainer>
<Container>
<FishStockingPageTitle status={fishStocking?.status!} />
<FishStockingPageTitle status={fishStocking.status!} />
<FishStockingInfo
fishStocking={fishStocking}
additionalInfo={showAdditionalInfo}
Expand All @@ -116,60 +111,48 @@ const FishStockingCompleted = ({
{showAdditionalInfo && (
<>
<Row>
{fishStocking?.fishOrigin === fishOrigins[0].value ? (
{fishStocking.fishOrigin === fishOriginOptions[0].value ? (
<InfoColumn
label={locale.fish_origin_company}
value={fishStocking?.fishOriginCompanyName}
value={fishStocking.fishOriginCompanyName}
/>
) : (
<InfoColumn
label={locale.fish_origin_reservoir}
value={fishStocking?.fishOriginReservoir?.name}
value={fishStocking.fishOriginReservoir?.name}
/>
)}
</Row>
<Row>
<InfoColumn
label={locale.vet_no_0}
value={fishStocking?.veterinaryApprovalNo}
/>
<InfoColumn label={locale.vet_no_0} value={fishStocking.veterinaryApprovalNo} />
<InfoColumn
label={locale.vet_no_1}
value={fishStocking?.veterinaryApprovalOrderNo}
/>
<InfoColumn
label={locale.waybill_no}
value={fishStocking?.waybillNo}
value={fishStocking.veterinaryApprovalOrderNo}
/>
<InfoColumn label={locale.waybill_no} value={fishStocking.waybillNo} />
</Row>
</>
)}

{fishStocking?.batches && (
<FishStockingTable fishStocking={fishStocking} />
)}
{fishStocking?.batches && <FishStockingTable fishStocking={fishStocking} />}
{fishStocking?.comment && (
<InfoColumn
label="Pastaba"
value={fishStocking?.comment}
reverse={true}
/>
<InfoColumn label="Pastaba" value={fishStocking?.comment} reverse={true} />
)}

{!isEmpty(fishStocking.images) && (
<PhotoUploadField
name={"images"}
photos={fishStocking?.images!}
name={'images'}
photos={fishStocking.images!}
getSrc={(photo) => `${photo?.url}`}
disabled={true}
/>
)}
{!isEmpty(fishStocking?.signatures) && (
{!isEmpty(fishStocking.signatures) && (
<SignedContainer>
<Label>{"Įžuvinime dalyvavo"}</Label>
<Label>{'Įžuvinime dalyvavo'}</Label>
<SignatureList
data={fishStocking?.signatures}
municipalityId={fishStocking?.location?.municipality?.id}
data={fishStocking.signatures}
municipalityId={fishStocking.location?.municipality?.id}
/>
</SignedContainer>
)}
Expand All @@ -180,8 +163,8 @@ const FishStockingCompleted = ({
navigate({
pathname: slugs.newFishStockings,
search: createSearchParams({
repeat: fishStocking?.id!.toString()
}).toString()
repeat: fishStocking?.id!.toString(),
}).toString(),
});
}}
>
Expand Down
Loading
Loading