Skip to content

Commit

Permalink
Merge Show text not kurztext #271
Browse files Browse the repository at this point in the history
Closes #264
  • Loading branch information
MiraGeowerkstatt authored Aug 8, 2022
2 parents 9f2f992 + f9d12a8 commit b061781
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/ClientApp/cypress/fixtures/standorteGemeinde.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
"codeSchichtId": 20024,
"codeSchicht": {
"id": 20024,
"kurztext": "Avon Intelligent Cotton Keyboard",
"text": "http://earl.com/front-line/pennsylvania/buckinghamshire"
"kurztext": "http://earl.com/front-line/pennsylvania/buckinghamshire",
"text": "Avon Intelligent Cotton Keyboard"
},
"tiefe": 0.19328074,
"qualitaetId": 103,
Expand Down
2 changes: 1 addition & 1 deletion src/ClientApp/src/components/BohrprofilForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ export default function BohrprofilForm(props) {
{currentBohrprofil.schichten.map((schicht) => (
<TableRow key={schicht.id}>
<TableCell>{schicht.tiefe}</TableCell>
<TableCell>{schicht.codeSchicht?.kurztext}</TableCell>
<TableCell>{schicht.codeSchicht?.text}</TableCell>
<TableCell align="right">
<Tooltip title="Schicht editieren">
<IconButton onClick={() => onEditSchicht(schicht)} name="edit-button" color="primary">
Expand Down
2 changes: 1 addition & 1 deletion src/ClientApp/src/components/SchichtForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export default function SchichtForm(props) {
sx={{ width: "47%" }}
options={codeSchichten.map((c) => c.id).sort((a, b) => a - b)}
value={field.value}
getOptionLabel={(option) => codeSchichten.find((c) => c.id === option)?.kurztext}
getOptionLabel={(option) => codeSchichten.find((c) => c.id === option)?.text}
onChange={(_, data) => field.onChange(data)}
autoHighlight
renderInput={(params) => (
Expand Down

0 comments on commit b061781

Please sign in to comment.