Skip to content

Commit

Permalink
Fix bakrunnkart bort med opencache
Browse files Browse the repository at this point in the history
  • Loading branch information
steinho committed Aug 9, 2024
1 parent 3d51b0d commit 720e2ef
Show file tree
Hide file tree
Showing 6 changed files with 3,100 additions and 2,565 deletions.
16 changes: 9 additions & 7 deletions Prod.Web/src/components/artskart/Artskart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import * as Xcomp from "../observableComponents";
const mapBounds = {
S: [
[73, 13],
[83, 23]
[83, 23],
],
N: [
[57, 4.3],
[71.5, 32.5]
]
[71.5, 32.5],
],
};

const Artskart = ({
Expand All @@ -29,7 +29,8 @@ const Artskart = ({
artskartAdded,
artskartRemoved,
onCancel,
showTransferRegionlist
showTransferRegionlist,
token,
}) => {
// console.log('Artskart', taxonId, scientificNameId, evaluationContext);
return (
Expand All @@ -40,13 +41,13 @@ const Artskart = ({
top: 16,
right: 56,
float: "right",
zIndex: 1000
zIndex: 1000,
}}
>
<Utvalg utvalg={utvalg} artskartModel={artskartModel} />
<Xcomp.Button
alwaysEnabled = {true}
onClick={e => {
alwaysEnabled={true}
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
onCancel();
Expand All @@ -72,6 +73,7 @@ const Artskart = ({
artskartSelectionGeometry={artskartSelectionGeometry}
onCancel={onCancel}
showTransferRegionlist={showTransferRegionlist}
token={token}
></RedigerbartKart>
</div>
);
Expand Down
16 changes: 12 additions & 4 deletions Prod.Web/src/components/artskart/ModalArtskart.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const ModalArtskart = ({
artskartRemoved,
artskartSelectionGeometry,
onOverførFraArtskart,
showTransferRegionlist

showTransferRegionlist,
token,
}) => {
const ref = useRef();
const [visArtskart, setVisArtskart] = useState(false);
Expand All @@ -28,7 +28,7 @@ const ModalArtskart = ({
<div ref={ref}>
<Artskart
evaluationContext={evaluationContext}
onSave={resultat => this.handleSave(resultat)}
onSave={(resultat) => this.handleSave(resultat)}
onCancel={() => setVisArtskart(false)}
showWaterAreas={showWaterAreas}
artskartWaterModel={artskartWaterModel}
Expand All @@ -42,12 +42,20 @@ const ModalArtskart = ({
artskartRemoved={artskartRemoved}
artskartSelectionGeometry={artskartSelectionGeometry}
showTransferRegionlist={showTransferRegionlist}
token={token}
/>
)
</div>
) : (
<div>
<span>{labels.goTo}</span> <Xcomp.Button primary onClick={() => setVisArtskart(true)} alwaysEnabled={true}>{labels.speciesMap}</Xcomp.Button>
<span>{labels.goTo}</span>{" "}
<Xcomp.Button
primary
onClick={() => setVisArtskart(true)}
alwaysEnabled={true}
>
{labels.speciesMap}
</Xcomp.Button>
</div>
);
// return (
Expand Down
Loading

0 comments on commit 720e2ef

Please sign in to comment.