+ {pedigreeView && (
+
+ popup(
diff --git a/frontend/src/individual_add.tsx b/frontend/src/individual_add.tsx
index 784d2580..64c17bb7 100644
--- a/frontend/src/individual_add.tsx
+++ b/frontend/src/individual_add.tsx
@@ -122,9 +122,6 @@ export function IndividualAdd({
genebank?: Genebank;
}) {
const [individual, setIndividual] = React.useState({} as Individual);
- const [currentGenebank, setCurrentGenebank] = React.useState(
- undefined as Genebank | undefined
- );
const [showFromDateFilter, setShowFromDateFilter] = React.useState(false);
const [success, setSuccess] = React.useState(false as boolean);
const [newSibling, setSibling] = React.useState(false as boolean);
@@ -138,18 +135,24 @@ export function IndividualAdd({
const [birthDateError, setBirthDateError] = React.useState(false as boolean);
const [litterError, setLitterError] = React.useState(false as boolean);
const [litterError6w, setLitterError6w] = React.useState(false as boolean);
+ const [intygError, setIntygError] = React.useState(false as boolean);
let defaultDate = new Date();
defaultDate.setFullYear(defaultDate.getFullYear() - 10);
const [fromDate, setFromDate] = React.useState(defaultDate as Date);
const [showDead, setshowDead] = React.useState(false as boolean);
- const [activeMalesLimited, setActiveMalesLimited] = React.useState([]);
- const [activeFemalesLimited, setActiveFemalesLimited] = React.useState([]);
+ const [activeMalesLimited, setActiveMalesLimited] = React.useState(
+ [] as LimitedIndividual[]
+ );
+ const [activeFemalesLimited, setActiveFemalesLimited] = React.useState(
+ [] as LimitedIndividual[]
+ );
const [breedingMatch, setBreedingMatch] = React.useState(
undefined as Breeding | undefined
);
const { userMessage, popup } = useMessageContext();
const { user } = useUserContext();
const is_admin = !!(user?.is_manager || user?.is_admin);
+ const [herdOptions, setHerdOptions] = React.useState([] as OptionType[]);
const {
genebanks,
herdListener,
@@ -165,6 +168,29 @@ export function IndividualAdd({
modifyBreedingUpdates,
} = useBreedingContext();
const style = useStyles();
+ //Calculated value instead of effect
+ const isGenbankorHerd = (
+ genebank: Genebank | undefined,
+ herdId: string | undefined
+ ) => {
+ if (!!genebank) {
+ return genebank;
+ } else {
+ if (!!herdId) {
+ const originGenebank = genebanks.find((g) =>
+ g.herds.some((herd) => herd.herd == herdId)
+ );
+ return originGenebank;
+ } else {
+ const originGenebank = genebanks.find((g) =>
+ g.herds.some((herd) => herd.herd == individual?.origin_herd?.herd)
+ );
+ return originGenebank;
+ }
+ }
+ };
+
+ const currentGenebank = isGenbankorHerd(genebank, herdId);
/**
* Updates a single field in `individual`.
@@ -179,6 +205,40 @@ export function IndividualAdd({
individual && setIndividual({ ...individual, [field]: value });
};
+ const handleUpdateMother = async (value: LimitedIndividual) => {
+ let mother;
+ if (value) {
+ mother = await get(`/api/individual/${value.number}`);
+ if (!mother) {
+ return;
+ }
+ let herds = mother.herd_tracking;
+
+ if (herds.length > 0) {
+ const herdOptions: OptionType[] = herds.map((h: LimitedHerd) => {
+ return { value: h, label: herdLabel(h) };
+ });
+ herdOptions.filter(
+ (item, index) => herdOptions.indexOf(item) === index
+ );
+ //Filter unique herds from herd_tracking
+ let unique = [
+ ...new Map(herdOptions.map((item) => [item["label"], item])).values(),
+ ];
+
+ setHerdOptions(unique);
+ setIndividual({
+ ...individual,
+ origin_herd: mother.herd,
+ mother: value,
+ });
+ return;
+ } else {
+ return [];
+ }
+ }
+ };
+
React.useEffect(() => {
setActiveFemalesLimited(
toLimitedIndividuals(
@@ -204,42 +264,6 @@ export function IndividualAdd({
);
}, [fromDate, currentGenebank, herdId, showDead]);
- React.useEffect(() => {
- if (!!genebank && !success && !newSibling) {
- setCurrentGenebank(genebank);
- setIndividual({
- ...individual,
- mother: null,
- father: null,
- origin_herd: null,
- number: null,
- });
- } else {
- if (!!herdId) {
- const originGenebank = genebanks.find((g) =>
- g.herds.some((herd) => herd.herd == herdId)
- );
- setCurrentGenebank(originGenebank);
- } else {
- const originGenebank = genebanks.find((g) =>
- g.herds.some((herd) => herd.herd == individual?.origin_herd?.herd)
- );
- setCurrentGenebank(originGenebank);
- }
- }
- if (herdId) {
- handleUpdateIndividual("herd", herdId); // backend right now requires a string for field herd. Inconsistent with other database entries.
- }
- }, [herdId, genebank]);
-
- // add the field genebank to the individual to get the color options in the form
- // make sure it also is triggered after resetBlank has been called
- React.useEffect(() => {
- if (currentGenebank) {
- handleUpdateIndividual("genebank", currentGenebank.name);
- }
- }, [currentGenebank]);
-
// remove error layout from input fields when user has added an input
React.useEffect(() => {
if (individual?.color) {
@@ -260,6 +284,9 @@ export function IndividualAdd({
if (individual?.litter_size6w) {
setLitterError6w(false);
}
+ if (individual?.certificate) {
+ setIntygError(false);
+ }
}, [
individual?.color,
individual?.number,
@@ -267,6 +294,7 @@ export function IndividualAdd({
individual?.birth_date,
individual?.litter_size,
individual?.litter_size6w,
+ individual?.certificate,
]);
//Searches for existing breedings and update form with data from that found breeding
//Suggest the next individual number
@@ -276,7 +304,11 @@ export function IndividualAdd({
individual?.birth_date &&
individual?.father &&
individual?.mother &&
- individual?.origin_herd
+ individual?.origin_herd &&
+ individual?.origin_herd.herd !== "GX1" &&
+ individual?.origin_herd.herd !== "MX1" &&
+ !success &&
+ !(success && newSibling)
) {
let limitedBreedingInput: LimitedBreeding = {
birth_date: individual.birth_date,
@@ -290,9 +322,12 @@ export function IndividualAdd({
limitedBreedingInput
);
setBreedingMatch(Breedingmatch.breedings);
- if (Breedingmatch.breedings != null) {
+ if (
+ Breedingmatch.breedings !== null &&
+ Breedingmatch.breedings.birth_date !== null
+ ) {
userMessage(
- `Hittade ett befintligt parningstillfälle med parningsdatum : ${Breedingmatch.breedings.breed_date}. Kontrollera att uppgifterna stämmer`,
+ `Kull hittad i ${individual?.origin_herd.herd} mellan Mor: ${Breedingmatch.breedings.mother} Far: ${Breedingmatch.breedings.father} och födelsedatum ${Breedingmatch.breedings.birth_date}. Kontrollera att uppgifterna stämmer!`,
"success"
);
if (individual.birth_date != Breedingmatch.breedings.birth_date) {
@@ -301,31 +336,30 @@ export function IndividualAdd({
"warning"
);
}
- let BreedHerd: LimitedHerd = await get(
- `/api/herd/${Breedingmatch.breedings.breeding_herd}`
- );
- const IndNumber = await post(
- `/api/breeding/nextind/`,
- Breedingmatch.breedings
+ getIndnumbSuggestion(Breedingmatch.breedings);
+ } else if (
+ Breedingmatch.breedings != null &&
+ Breedingmatch.breedings.birth_date === null
+ ) {
+ Breedingmatch.breedings.birth_date = individual.birth_date;
+ getIndnumbSuggestion(Breedingmatch.breedings);
+ userMessage(
+ `En parning är funnen i ${individual?.origin_herd.herd} mellan Mor: ${Breedingmatch.breedings.mother} Far: ${Breedingmatch.breedings.father} och parningsdatum ${Breedingmatch.breedings.breed_date}.
+ Parningen kommer uppdateras med födelsedatum och kullstorlek från detta formulär. Kontrollera att uppgifterna stämmer!`,
+ "success"
);
- setIndividual({
- ...individual,
- origin_herd: BreedHerd,
- number: IndNumber,
- litter_size: Breedingmatch.breedings.litter_size,
- litter_size6w: Breedingmatch.breedings.litter_size6w,
- });
} else {
userMessage(
- `Hittade inget befintligt parningstillfälle kommer skapa ett nytt!`,
+ `Kommer skapa en ny kull i ${individual?.origin_herd.herd} med Mor: ${individual?.mother.number} Far: ${individual?.father.number} Kontrollera att uppgifterna stämmer!`,
"info"
);
- const IndNumber1 = await post(
- `/api/breeding/nextind/`,
- limitedBreedingInput
- );
- setIndividual({ ...individual, number: IndNumber1 });
+ getIndnumbSuggestion(limitedBreedingInput);
}
+ } else if (
+ individual?.origin_herd?.herd === "GX1" ||
+ individual?.origin_herd?.herd === "MX1"
+ ) {
+ handleUpdateIndividual("number", null);
}
};
getBreeding();
@@ -333,6 +367,7 @@ export function IndividualAdd({
individual?.birth_date,
individual?.father,
individual?.mother,
+ individual?.origin_herd?.herd,
newSibling,
]);
@@ -363,6 +398,7 @@ export function IndividualAdd({
setLitterError6w(true);
error = true;
}
+
if (error) {
userMessage("Fyll i alla obligatoriska fält.", "warning");
return false;
@@ -420,7 +456,11 @@ export function IndividualAdd({
}
const motherHerd = await getParentHerd(individual.mother.number);
const fatherHerd = await getParentHerd(individual.father.number);
- if (originHerdNumber !== motherHerd && originHerdNumber !== fatherHerd) {
+ if (
+ originHerdNumber !== motherHerd &&
+ originHerdNumber !== fatherHerd &&
+ !is_admin
+ ) {
userMessage(
`Individens nummer ska börja med antingen moderns eller faderns nuvarande besättning.
I det här fallet ${motherHerd} eller ${fatherHerd}.`,
@@ -475,13 +515,6 @@ export function IndividualAdd({
father: individual.father.number,
};
- // Check if there already is a breeding
- //const herdBreedings = await get(`/api/breeding/${herdId}`);
- //'const breedingMatch = await findBreedingMatch(
- // breedingInput,
- // herdBreedings
- //);
-
// If there is a breeding, update it
if (breedingMatch) {
const modifiedBreedingUpdates = modifyBreedingUpdates(
@@ -512,6 +545,82 @@ export function IndividualAdd({
}
}
};
+ const getIndnumbSuggestion = async (
+ BreedingMatch: Breeding | LimitedBreeding
+ ) => {
+ post(`/api/breeding/nextind/`, BreedingMatch).then(
+ (json) => {
+ switch (json.status) {
+ case "success": {
+ setIndividual({
+ ...individual,
+ number: json.number,
+ litter_size: BreedingMatch?.litter_size ?? null,
+ litter_size6w: BreedingMatch?.litter_size6w ?? null,
+ });
+ break;
+ }
+ case "error": {
+ switch (json.message) {
+ case "litter_size": {
+ setIndividual({
+ ...individual,
+ number: null,
+ litter_size: BreedingMatch?.litter_size ?? null,
+ litter_size6w: BreedingMatch?.litter_size6w ?? null,
+ });
+ userMessage(
+ "Alla kaniner i denna kull är redan registrerade",
+ "error"
+ );
+ break;
+ }
+ case "NINE": {
+ setIndividual({
+ ...individual,
+ number: null,
+ litter_size: BreedingMatch?.litter_size ?? null,
+ litter_size6w: BreedingMatch?.litter_size6w ?? null,
+ });
+ userMessage(
+ "Du får max registrera 9 kaniner från en och samma kull.",
+ "error",
+ true
+ );
+ break;
+ }
+ case "kull": {
+ setIndividual({
+ ...individual,
+ number: json.number,
+ litter_size: BreedingMatch?.litter_size ?? null,
+ litter_size6w: BreedingMatch?.litter_size6w ?? null,
+ });
+ userMessage(
+ `En eller flera kaniner i kullen är registrerade med fel kull nummer: ${json.wrong}
+ om du har registrerat alla kullar för detta år i rätt ordning ska denna kull ha nummer ${json.kull}
+ Vänligen kontrollera individerna i denna kull. Kontakta Genbanksansvarig för hjälp! `,
+ "error",
+ true
+ );
+ break;
+ }
+ default: {
+ userMessage(
+ `Något gick fel. Det här borde inte hända. Vänligen rapportera detta fel till admin: ${json.message}`,
+ "error"
+ );
+ console.log("Fel från API: ", json.message);
+ }
+ }
+ }
+ }
+ },
+ (error) => {
+ userMessage("Något gick fel.", "error");
+ }
+ );
+ };
const createIndividual = (individual: Individual) => {
post("/api/individual", individual).then(
@@ -527,11 +636,17 @@ export function IndividualAdd({
setHerdChangeListener(herdChangeListener + 1);
loadData(["genebanks"]);
setSuccess(true);
+ if (newSibling) {
+ setSibling(false);
+ }
}
} else {
userMessage("Kaninen har lagts till!", "success");
loadData(["genebanks"]);
setSuccess(true);
+ if (newSibling) {
+ setSibling(false);
+ }
}
break;
}
@@ -557,13 +672,23 @@ export function IndividualAdd({
"Det finns redan en kanin med detta nummer i databasen.",
"error"
);
+ setNumberError(true);
+ break;
+ }
+ case "Individual certificate already exists": {
+ userMessage(
+ `Det finns redan ett intyg med nummer ${individual.certificate} i systemet!`,
+ "error"
+ );
+ setIntygError(true);
break;
}
default: {
userMessage(
- "Något gick fel. Det här borde inte hända.",
+ `Något gick fel. Det här borde inte hända. Vänligen rapportera detta fel till admin: ${json.message}`,
"error"
);
+ console.log("Fel från API: ", json.message);
}
}
}
@@ -613,22 +738,12 @@ export function IndividualAdd({
const resetBlank = () => {
// change the keys to something new to cause rerender of the Autocompletes
- setHerdKey(Date.now());
- setColorKey(Date.now());
setIndividual({} as Individual);
setSuccess(false);
};
const resetSibling = () => {
- const numberParts: string[] = individual?.number?.split("-");
const sibling: Individual = {
- number: numberParts
- ? numberParts[0] +
- "-" +
- numberParts[1][0] +
- numberParts[1][1] +
- numberParts[1][2]
- : null,
origin_herd: individual.origin_herd,
birth_date: individual.birth_date,
mother: individual.mother,
@@ -637,8 +752,8 @@ export function IndividualAdd({
litter_size6w: individual.litter_size6w,
genebank: individual.genebank,
};
- setIndividual(sibling);
setSibling(true);
+ setIndividual(sibling);
setSuccess(false);
};
@@ -692,8 +807,8 @@ export function IndividualAdd({
)}
}
>
-
);
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 37b963aa..42abd8f8 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -4,6 +4,7 @@ import styled, * as sc from "styled-components";
import CssBaseline from "@material-ui/core/CssBaseline";
import CookieConsent from "react-cookie-consent";
import { BrowserRouter } from "react-router-dom";
+import { SnackbarProvider } from "notistack";
import { WithUserContext } from "@app/user_context";
import { WithDataContext } from "@app/data_context";
@@ -11,6 +12,7 @@ import { WithMessageContext } from "@app/message_context";
import { WithBreedingContext } from "@app/breeding_context";
import { Navigation } from "@app/navigation";
import { StylesProvider } from "@material-ui/core";
+import hotjar from "react-hotjar";
const Main = (
<>
@@ -18,15 +20,17 @@ const Main = (
{
variant={inputVariant}
className={style.wideControl}
multiline
- rows={2}
+ minRows={2}
value={deadIndividual.death_note ?? ""}
InputProps={{
classes: {
diff --git a/frontend/src/individual_form.tsx b/frontend/src/individual_form.tsx
index 64bc1605..52aae001 100644
--- a/frontend/src/individual_form.tsx
+++ b/frontend/src/individual_form.tsx
@@ -14,13 +14,11 @@ import InfoOutlinedIcon from "@material-ui/icons/InfoOutlined";
import {
dateFormat,
Genebank,
- herdLabel,
inputVariant,
Individual,
- LimitedHerd,
OptionType,
} from "@app/data_context_global";
-import { get } from "./communication";
+
import { useUserContext } from "./user_context";
import { BreedingDialog } from "./breeding_dialog";
import { CertAutocomplete } from "./cert_autocomplete";
@@ -43,6 +41,8 @@ export function IndividualForm({
birthDateError,
litterError,
litterError6w,
+ intygError,
+ herdOptions,
}: {
genebank: Genebank;
individual: Individual;
@@ -55,23 +55,18 @@ export function IndividualForm({
birthDateError: boolean;
litterError: boolean;
litterError6w: boolean;
+ intygError: boolean;
+ herdOptions: OptionType[];
}) {
- const [herdOptions, setHerdOptions] = React.useState([] as OptionType[]);
const [openBreedDialog, setBreedDiOpen] = React.useState(false);
- const { colors, genebanks } = useDataContext();
+ const { colors } = useDataContext();
const { user } = useUserContext();
- const [isIndNull, setIndNull] = React.useState(true);
// returns true if you are an admin or the manager of the genebank the individual belongs to
const canManage: boolean = React.useMemo(() => {
if (user?.is_admin) {
return true;
} else {
- if (!individual?.is_registered) {
- return true;
- }
- console.log(genebank);
- console.log(user?.is_manager);
if (!!genebank?.id) {
return user?.is_manager?.includes(genebank?.id);
} else {
@@ -80,15 +75,20 @@ export function IndividualForm({
}
}, [user, individual, genebank]);
- const canEditBreeding: boolean = React.useMemo(() => {
- return user?.canEdit(individual?.origin_herd?.herd);
- }, [user, individual]);
-
const colorOptions: OptionType[] = React.useMemo(() => {
- if (
+ if (genebank && colors && Object.keys(colors).includes(genebank.name)) {
+ return colors[genebank.name].map((c) => {
+ return {
+ id: c.id,
+ comment: c.comment,
+ value: c.name,
+ label: `${c.id} - ${c.name}`,
+ };
+ });
+ } else if (
individual &&
colors &&
- Object.keys(colors).includes(individual.genebank)
+ Object.keys(colors).includes(individual?.genebank)
) {
return colors[individual.genebank].map((c) => {
return {
@@ -100,39 +100,7 @@ export function IndividualForm({
});
}
return [];
- }, [colors, individual]);
-
- React.useEffect(() => {
- const getParents = async () => {
- let herds = [];
- let father;
- let mother;
-
- if (individual.mother?.number && formAction == FormAction.AddIndividual) {
- mother = await get(`/api/individual/${individual.mother?.number}`);
- if (!mother) {
- return;
- }
- herds.push(mother.herd);
- individual.origin_herd = mother.herd;
- individual.number = mother.herd.herd + "-";
- setIndNull(false);
- }
- if (herds.length > 0) {
- const herdOptions: OptionType[] = herds.map((h: LimitedHerd) => {
- return { value: h, label: herdLabel(h) };
- });
- herdOptions.filter(
- (item, index) => herdOptions.indexOf(item) === index
- );
- setHerdOptions(herdOptions);
- return;
- } else {
- return [];
- }
- };
- getParents();
- }, [individual.mother?.number]);
+ }, [colors, genebank]);
const sexOptions = [
{ value: "female", label: "Hona" },
@@ -155,9 +123,15 @@ export function IndividualForm({
{formAction == FormAction.editIndividual ? ( // jscpd:ignore-start
<>
+ Redigera Individ
-
+
@@ -237,7 +211,7 @@ export function IndividualForm({
option.label}
className="wideControlInd"
@@ -292,55 +266,56 @@ export function IndividualForm({
onUpdateIndividual("birth_date", value);
}}
/>
-
- {individual?.number
- ? `${
- individual.number?.match(
- /([G-M]\d+|[G-M]X1)-\d{0,2}/
- )[0]
- }`
- : `${
- individual.genebank
- ? individual.genebank[0]
- : "X"
- }XXX-XX`}
-
- ),
- }}
- onChange={(event) => {
- onUpdateIndividual(
- "number",
- `${
- individual.number?.match(
- /([G-M]\d+|[G-M]X1)-\d{0,2}/
- )[0]
- }${event.currentTarget.value}`
- );
- }}
- />
+
+
+ {individual?.number
+ ? `${
+ individual.number?.match(
+ /([G-M]\d+|[G-M]X1)-\d{0,2}/
+ )[0]
+ }`
+ : `${
+ genebank ? genebank.name[0] : "X"
+ }XXX-XX`}
+
+ ),
+ }}
+ onChange={(event) => {
+ onUpdateIndividual(
+ "number",
+ `${
+ individual.number?.match(
+ /([G-M]\d+|[G-M]X1)-\d{0,2}/
+ )[0]
+ }${event.currentTarget.value}`
+ );
+ }}
+ />
+
{" "}
- {!canManage ? (
+ {!canManage && individual?.is_registered ? (
Kan endast ändras av genbanksansvarig
@@ -165,7 +139,7 @@ export function IndividualForm({
<>
)}
- Kan endast ändras av genbanksansvarig eller ägare av
- ursprungsbesättning
+ Kan endast ändras av genbanksansvarig!
) : (
@@ -382,7 +356,7 @@ export function IndividualForm({
+
) : (
"Loading"
)}
-
+
+ Släktträd
+
-
Släktträd
-Du har inte rättigheterna att registrera nya kaniner.
diff --git a/frontend/src/sorted_table.tsx b/frontend/src/sorted_table.tsx index c15d5a2f..b223dc4d 100644 --- a/frontend/src/sorted_table.tsx +++ b/frontend/src/sorted_table.tsx @@ -212,7 +212,7 @@ export function SortedTable({- Gotlandskaninen är en rest av den gamla svenska lantraskaninen. På - 1970-talet uppmärksammades att det fanns några gårdar på Gotland som - hade kvar kaniner av den gamla stammen. De gavs då namnet - Gotlandskanin. Efter en inventering 1993 slöts rasregistret och dagens - Gotlandskaniner är ättlingar till inventeringsdjuren. + Detta är Föreningen Gotlandskaninens system för stambokföring online. + Använd menyn för att logga in med hjälp av ditt Gottiskonto. Har du + inget sådant kan du som är medlem i föreningen ansöka om ett via detta + formulär.{" "} + + Kontoansökan +
- En annan rest av den gamla lantraskaninen är den så kallade - Mellerudskaninen. Den fanns i en besättning hos Edith Johansson, som - bodde nära Mellerud i Dalsland. Kaninerna liknar mycket - Gotlandskaninen i kroppsbyggnaden, men finns bara som brokigt - svartvita (holländarteckning) eller som helvita (albino). + Behöver du hjälp kontakt admin@gotlandskanin.se, du kommer också åt + hjälpsidorna under menyval "Hjälp" när du väl har loggat in.
+
+
+ Stamboken Online
+
+
);
@@ -80,7 +220,11 @@ export function Gotlandskaninen() {
- Föreningen Gotlandskaninens syfte är att bevara den svenska - lantraskaninen för framtiden samt att sprida kunskap om rasen och dess - roll i självhushållet. Bevarandearbetet organiseras i form av - genbanksbesättningar, där avel på Gotlands- respektive Mellerudskanin - bedrivs. + En användarmanual är påbörjad men den är + inte komplett: + + Användarmanual för Stamboken Online + + Bidra gärna med ändringar till dokumentet eller lägg + till kommentarer osv.{" "} +
+ ++ Som ett komplement till den oskrivna manualen finns följande + presentationsserie : +
+ +-
+
- + + Del 1 Överblick + + +
- + + Del 2 Registrera ny kanin + + +
- + + Del 3 Utfärda digitalt Genbanksintyg + + +
- + + Del 4 Kullar och parningar + + +
+ Om något fortfarande är oklart finns det flera sätt + att få hjälp :
+ +-
+
- + Posta en fråga i forumet. Tex i + + Tråden om Stamboken online + + . + +
- + Du kan också använda feedback funktionen direkt på + sidan, den är väldigt bra om du stöter på en + tex bugg. Då klickar du på den röda rutan till + höger där det står "Ge oss feedback". + +
- + Använd vårt{" "} + + chatrum + + . + +
- + Sänd E-post till{" "} + + admin@gotlandskaninen.se + + . + +
- + Behöver du hjälp med redigering av någon kanin + så kontaktar du Genbanksansvariga direkt.{" "} + + + + +
- Kontakta valfri person i styrelsen, +
Om du är intresserad av att veta mer, eller vill starta en genbanksbesättning för Gotlandskanin, kontakta genbanksansvarig, - + gotlandskanin@gotlandskaninen.se . @@ -134,7 +278,11 @@ export function Mellerudskaninen() {
Om du är intresserad av att veta mer, eller vill starta en
genbanksbesättning för Mellerudskanin, kontakta genbanksansvarig,
-
+
mellerudskanin@gotlandskaninen.se
.
@@ -174,27 +322,54 @@ export function Kontakt() {
- info@gotlandskaninen.se
+
+ info@gotlandskaninen.se
+
Kontakt med föreningen, annonser och material till hemsidan
-
+
gotlandskanin@gotlandskaninen.se
Genbanksansvarig för Gotlandskanin, kassör
-
+
mellerudskanin@gotlandskaninen.se
- Genbanksansvarig för Mellerudskanin, vice ordförande
+ Genbanksansvarig för Mellerudskanin
-
+
ordforande@gotlandskaninen.se
Ordförande
+
+ Föreningen Gotlandskaninen får stöd från EU för att bevara Gotlands-
+ och Mellerudskanin. Stödet går till genbanksbesättningarna,
+ medlemstidningen, trycksaker, genbanksintyg, marknadsföring, kurser
+ och utbildningar, transport av värdefulla djur samt obduktioner.
+
+
+
+
+
+ Stamboken Online version :{" "} + + {tags.gitBranch} + +
+
- option.toString()}
- value={generations_input}
- onChange={(event, newValue) => {
- setGenerations(newValue ? newValue : generations)
- }}
- renderInput={(params) => popup(
+
+ option.toString()}
+ value={generations_input}
+ onChange={(event, newValue) => {
+ setGenerations(newValue ? newValue : generations);
+ }}
+ renderInput={(params) => (
+ {
- setshowCommonAncestors(!showCommonAncestors)
- }} disabled={commonAncestors ? false : true} edge='start'/>}
- label= "Markera gemensamma släktingar"
- labelPlacement="end"
+ {
+ setshowCommonAncestors(!showCommonAncestors);
+ }}
+ disabled={commonAncestors ? false : true}
+ edge="start"
+ />
+ }
+ label="Markera gemensamma släktingar"
+ labelPlacement="end"
/>
-
- {pedigree &&
-
+ {pedigree && (
+
+ popup(
+
+ );
+}
diff --git a/frontend/src/testbreed_recommendation.tsx b/frontend/src/testbreed_recommendation.tsx
index ae7ec5ef..60e2fdc4 100644
--- a/frontend/src/testbreed_recommendation.tsx
+++ b/frontend/src/testbreed_recommendation.tsx
@@ -1,29 +1,42 @@
/**
- * @file This file displays the calculated coefficient of inbreeding (COI)
+ * @file This file displays the calculated coefficient of inbreeding (COI)
* of the offspring of chosen ancestors and the resulting recommendations
* based on that COI.
*/
-import React from 'react'
-import { AppBar, Box, Tabs, Tab, Tooltip, CircularProgress, Table, TableBody, TableHead, TableRow, TableCell } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import CheckCircleSharpIcon from '@material-ui/icons/CheckCircleSharp'
-import CancelSharpIcon from '@material-ui/icons/CancelSharp'
-import HelpOutlineIcon from '@material-ui/icons/HelpOutline';
-import { individualLabel } from './data_context_global'
-import { useDataContext } from '@app/data_context'
-import { get, post } from '@app/communication'
-import { testBreedPedigree } from '@app/pedigree'
-import { useMessageContext } from '@app/message_context'
-import { testBreedIndividuals } from '@app/testbreed_form'
-import { TestbreedPedigreView } from '@app/testbreed_pedigree_view'
+import React from "react";
+import {
+ AppBar,
+ Box,
+ Tabs,
+ Tab,
+ Tooltip,
+ CircularProgress,
+ Table,
+ TableBody,
+ TableHead,
+ TableRow,
+ TableCell,
+ Typography,
+} from "@material-ui/core";
+import { makeStyles } from "@material-ui/core/styles";
+import CheckCircleSharpIcon from "@material-ui/icons/CheckCircleSharp";
+import CancelSharpIcon from "@material-ui/icons/CancelSharp";
+import HelpOutlineIcon from "@material-ui/icons/HelpOutline";
+import { Genebank, individualLabel } from "./data_context_global";
+import { useDataContext } from "@app/data_context";
+import { get, post } from "@app/communication";
+import { testBreedPedigree } from "@app/pedigree";
+import { useMessageContext } from "@app/message_context";
+import { testBreedIndividuals } from "@app/testbreed_form";
+import { TestbreedPedigreView } from "@app/testbreed_pedigree_view";
const useStyles = makeStyles({
container: {
- display: 'block',
- width: '80vw',
- height: '70vh',
- minWidth: '400px',
- minHeight: '500px'
+ display: "block",
+ width: "80vw",
+ height: "70vh",
+ minWidth: "400px",
+ minHeight: "500px",
},
loading: {
display: "flex",
@@ -32,38 +45,36 @@ const useStyles = makeStyles({
alignItems: "center",
},
inbreedCoefficient: {
- width: '45%',
- marginTop: '30px',
- borderStyle: 'solid',
- borderColor: '#d3d3d3',
- borderWidth: '1px'
+ width: "45%",
+ marginTop: "30px",
+ borderStyle: "solid",
+ borderColor: "#d3d3d3",
+ borderWidth: "1px",
},
tableCell: {
- padding: '5px',
- fontSize: '1.25em'
-
+ padding: "5px",
+ fontSize: "1.25em",
},
recommendation: {
- display: 'flex',
- alignItems: 'center',
- fontSize: '1.30em'
+ alignItems: "center",
+ fontSize: "1.30em",
},
fillWidth: {
- width: '100%',
+ width: "100%",
},
netWorkConfiguration: {
- width: '30%',
- height: '30%',
- marginTop: '30px'
+ width: "30%",
+ height: "30%",
+ marginTop: "30px",
},
generationsInput: {
- width: '140px',
- margin: '5px 0px 5px 0px'
+ width: "140px",
+ margin: "5px 0px 5px 0px",
},
toggle: {
- margin: '5px 0px 5px 0px',
- }
-})
+ margin: "5px 0px 5px 0px",
+ },
+});
/**
* Requests backend to get calculated coefficient of inbreeding (COI)
@@ -72,66 +83,85 @@ const useStyles = makeStyles({
* threshold. In addition, a pedigree is available where users can see the
* pedigree of the chosen ancestors and highlight their common ancestors
*/
-export function InbreedingRecommendation({chosenAncestors, genebankId}
- : {chosenAncestors: testBreedIndividuals, genebankId: number | undefined}) {
- const style = useStyles()
- const {userMessage} = useMessageContext()
- const [offspringCOI, setOffspringCOI] = React.useState(undefined as number | undefined)
- const [activeTab, setActiveTab] = React.useState('COI' as TabValue)
- let generationsOptions: number[] = []
- for (let i=3; i < 8; i++) {
- generationsOptions.push(i)
+export function InbreedingRecommendation({
+ chosenAncestors,
+ genebank,
+}: {
+ chosenAncestors: testBreedIndividuals;
+ genebank: Genebank | undefined;
+}) {
+ const style = useStyles();
+ const { userMessage } = useMessageContext();
+ const [offspringCOI, setOffspringCOI] = React.useState(
+ undefined as number | undefined
+ );
+ const [activeTab, setActiveTab] = React.useState("COI" as TabValue);
+ let generationsOptions: number[] = [];
+ for (let i = 3; i < 8; i++) {
+ generationsOptions.push(i);
}
-
+
// Send request with chosen ancestors to /api/testbreed to
// get COI of their potential offspring
React.useEffect(() => {
- setOffspringCOI(undefined)
- let payload = {genebankId: genebankId}
+ setOffspringCOI(undefined);
+ let payload = { genebankId: genebank?.id };
Object.entries(chosenAncestors).forEach(([key, value]) => {
if (value) {
- payload[key] = value.number
+ payload[key] = value.number;
}
- })
- post('/api/testbreed', payload).then(
- (data: any) => {
- setOffspringCOI(data.offspringCOI)
- console.log('R-api data', data)
+ });
+ post("/api/testbreed", payload).then(
+ (data: any) => {
+ setOffspringCOI(data.offspringCOI);
+ console.log("R-api data", data);
},
- error => {
- console.error(error)
- userMessage('Something went wrong', 'error')
- } )
- }, [chosenAncestors])
+ (error) => {
+ console.error(error);
+ userMessage("Something went wrong", "error");
+ }
+ );
+ }, [chosenAncestors]);
//TODO, error handling
- let calculationError = false
- let thresholdCOI = genebankId === 1 ? 4 : 15
- let beneficialCOI = offspringCOI? offspringCOI <= thresholdCOI : false
+ let calculationError = false;
+ let thresholdCOI = genebank?.id === 1 ? 4 : 15;
+ let beneficialCOI = offspringCOI ? offspringCOI <= thresholdCOI : false;
- let mother = chosenAncestors['female'] ? individualLabel(chosenAncestors['female']) :
- `♀(${chosenAncestors['femaleGM'].name}+${chosenAncestors['femaleGF'].name})`
-
- let father = chosenAncestors['male'] ? individualLabel(chosenAncestors['male']) :
- `♂(${chosenAncestors['maleGM'].name}+${chosenAncestors['maleGF'].name})`
+ let mother = chosenAncestors["female"]
+ ? individualLabel(chosenAncestors["female"])
+ : `♀(${chosenAncestors["femaleGM"].name}+${chosenAncestors["femaleGF"].name})`;
- let recommendationText
- let recommendationSymbol
+ let father = chosenAncestors["male"]
+ ? individualLabel(chosenAncestors["male"])
+ : `♂(${chosenAncestors["maleGM"].name}+${chosenAncestors["maleGF"].name})`;
+
+ let recommendationText;
+ let recommendationSymbol;
if (calculationError) {
- recommendationText = 'Något gick fel i beräkningen'
- recommendationSymbol =
- {value === index && (
-
- {children}
-
- )}
+ {value === index && {children} }
);
}
- return <>
- {offspringCOI ?
-
-
+
+ Inaveln för {genebank?.name} ligger i genomsnitt på {thresholdCOI}
+ %. Du bör sikta på att hamna under eller lika med dessa värden,
+ men det behöver inte vara fel att få ett högre värde för den
+ tänkta parningen, om andra faktorer talar för att kombinationen
+ hona / hane är bra. Vänligen läs de fullständiga{" "}
+
+ avelsråden
+ {" "}
+ innan du parar dessa kaniner!
+
+ {/*
+
+
+ ) : (
+ Provparning {mother} och {father}
+ return ( + <> + {offspringCOI ? ( +
+
, newValue: TabValue) => {
- setActiveTab(newValue)
+ setActiveTab(newValue);
}}
indicatorColor="primary"
textColor="primary"
variant="fullWidth"
- >
-
-
- {!calculationError &&
+
+ {!calculationError && (
- }
-
-
-
-
- :
- + {" "} + Provparning {mother} och {father} +
{recommendationSymbol} {recommendationText}
-
-
-
-
}
-
+
+ )}
+ Beräknar provparning
-{recommendationSymbol} {recommendationText}
*/} + +
+
+
+
+ )}
+
+ );
}
diff --git a/frontend/src/user_context.tsx b/frontend/src/user_context.tsx
index a4651b9c..349212f7 100644
--- a/frontend/src/user_context.tsx
+++ b/frontend/src/user_context.tsx
@@ -2,6 +2,7 @@ import * as React from "react";
import { post, get } from "@app/communication";
import { useDataContext } from "@app/data_context";
+import hotjar from "react-hotjar";
/** The currently logged in user, if any */
export interface User {
@@ -71,6 +72,10 @@ export function WithUserContext(props: { children: React.ReactNode }) {
(data) => {
console.log(data);
setUser(data ?? null);
+ hotjar.hotjar.identify(data?.username, {
+ is_manager: data?.is_manager,
+ is_owner: data?.is_owner?.toString(),
+ });
return data ? "logged_in" : "logged_out";
},
(error) => {
diff --git a/system/entrypoint.sh b/system/entrypoint.sh
index 3862bed9..1e32d7fa 100755
--- a/system/entrypoint.sh
+++ b/system/entrypoint.sh
@@ -2,7 +2,7 @@
# Set up self signed certificate in case none is supplied.
-yes '' | openssl req -x509 -nodes -days 365 -newkey rsa:4096 -keyout /code/key.pem -out /code/cert.pem > /dev/null 2>/dev/null
+yes '' | openssl req -x509 -nodes -days 7304 -newkey rsa:4096 -keyout /code/key.pem -out /code/cert.pem > /dev/null 2>/dev/null
cp /code/cert.pem /code/ca.pem
for p in {cert,key,ca}; do