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.

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

LF-4158: Create animal creation details cards for animal #3192

Merged
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
fdacd30
LF-4158 add translations for general detail
SayakaOno Apr 8, 2024
4a115f7
LF-4158 add new colors
SayakaOno Apr 8, 2024
d1d9210
LF-4158 add AnimalSexes enum
SayakaOno Apr 9, 2024
cb5672d
LF-4158 create GneralDetail component
SayakaOno Apr 9, 2024
7e3c6cc
LF-4158 create AnimalDetails component and stories
SayakaOno Apr 9, 2024
36b788d
LF-4158 add translations for Animal UniqueDetail
SayakaOno Apr 9, 2024
b980bbe
LF-4158 create UniqueDetail component, modify className in GeneralDetail
SayakaOno Apr 9, 2024
302a775
LF-4158 add UniqueDetail to AnimalDetails
SayakaOno Apr 9, 2024
0cc7e78
LF-4158 add translations for Other details
SayakaOno Apr 9, 2024
a6bcb27
LF-4158 add OrganicStatuses enum
SayakaOno Apr 9, 2024
27688d6
LF-4158 create OtherDetail
SayakaOno Apr 9, 2024
3e01c9a
LF-4158 add OtherDetail to AnimalDetails
SayakaOno Apr 9, 2024
c96830a
LF-4158 add translations for Other details
SayakaOno Apr 9, 2024
83ebaa6
LF-4158 create Origin component
SayakaOno Apr 9, 2024
cd768f7
LF-4158 add Origin to AnimalDetails
SayakaOno Apr 9, 2024
618be19
LF-4158 change 'detail' to plural
SayakaOno Apr 10, 2024
bba2525
LF-4158 update Origin component
SayakaOno Apr 10, 2024
8a1b3e9
LF-4158 add API config for animal attributes options
SayakaOno Apr 10, 2024
ee71a37
LF-4158 add keys to inputs to show correct ones when changing origin
SayakaOno Apr 10, 2024
e316bac
LF-4158 add/update translations
SayakaOno Apr 10, 2024
31e06a3
LF-4158 add more stories
SayakaOno Apr 10, 2024
f13d53b
LF-4158 make components reusable for batch
SayakaOno Apr 12, 2024
57ccfbb
LF-4158 add validations and error messages
SayakaOno Apr 12, 2024
ce3be2b
LF-4158 create ImagePicker component(container)
SayakaOno Apr 15, 2024
c444317
LF-4158 add ImagePicker to Other component
SayakaOno Apr 15, 2024
82b70b1
LF-4158 add translations for tag color
SayakaOno Apr 16, 2024
a2aacf9
LF-4158 update details components to take t function
SayakaOno Apr 16, 2024
4a78dff
LF-4158 set types properly
SayakaOno Apr 17, 2024
26bc74d
LF-4158 add more translations
SayakaOno Apr 17, 2024
fbc9ea4
LF-4158 update Unique component to add logic and change fields order
SayakaOno Apr 17, 2024
8c67e87
LF-4159 add missing useMemo dependency in General component
SayakaOno Apr 17, 2024
264df1d
LF-4158 make details components pure, delete organic status enum
SayakaOno Apr 19, 2024
0f89f5d
LF-4158 make GeneralDetails pure, reorganize stories
SayakaOno Apr 19, 2024
00c374b
LF-4158 add translations
SayakaOno Apr 19, 2024
13b523b
LF-4158 rename props
SayakaOno Apr 20, 2024
bf2e244
LF-4158 fix types
SayakaOno Apr 20, 2024
abb52da
LF-4158 remove ts-ignore for ReactSelect
SayakaOno Apr 20, 2024
5217952
LF-4158 move and rename folders
SayakaOno Apr 20, 2024
d6793fd
LF-4158 add AnimalDetails container test
SayakaOno Apr 20, 2024
c9936dc
LF-4158 update Input component to update errors when input is cleared
SayakaOno Apr 22, 2024
12d1871
LF-4158 send trigger prop to Input component
SayakaOno Apr 22, 2024
8666103
LF-4158 update mockData for AnimalDetails
SayakaOno Apr 22, 2024
db78b83
Revert "LF-4158 add AnimalDetails container test"
SayakaOno Apr 22, 2024
f83bd6c
Revert "LF-4158 add API config for animal attributes options"
SayakaOno Apr 22, 2024
60e642d
LF-4158 update comments and mockData
SayakaOno Apr 22, 2024
d7f95cd
LF-4158 add padding-bottom to 'use' ReactSelect style
SayakaOno Apr 22, 2024
1850847
LF-4158 move translations to appropriate place
SayakaOno Apr 26, 2024
58e674a
LF-4158 format scss file
SayakaOno Apr 26, 2024
96b9da2
LF-4158 fix 'production' to 'reproduction'
SayakaOno Apr 26, 2024
6f204ec
LF-4158 update animal details components to use useFormContext
SayakaOno Apr 26, 2024
60e090a
Merge branch 'integration' into LF-4158/Create_Animal_creation_detail…
SayakaOno Apr 29, 2024
e3d3492
LF-4158 move ImagePicker component to /component
SayakaOno Apr 30, 2024
8b7a1f1
LF-4158 remove MediaWithAuthentication from ImagePicker
SayakaOno May 1, 2024
044e24e
LF-4158 clean up ImagePicker stories
SayakaOno May 1, 2024
26016fe
LF-4158 format scss
SayakaOno May 1, 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
44 changes: 35 additions & 9 deletions packages/webapp/public/locales/en/animal.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
{
"BREED": {
"ANGUS": "Angus",
"HEREFORD": "Hereford",
"CHAROLAIS": "Charolais",
"YORKSHIRE_LARGE_WHITE": "Yorkshire Large White",
"LANDRACE": "Landrace",
"DUROC": "Duroc",
"CORNISH_CROSS": "Cornish Cross",
"ROSS_308": "Ross 308",
"COBB_500": "Cobb 500",
"CORNISH_CROSS": "Cornish Cross",
"DUROC": "Duroc",
"HEREFORD": "Hereford",
"LANDRACE": "Landrace",
"LEGHORN": "Leghorn",
"PLYMOUTH_ROCK": "Plymouth Rock",
"RHODE_ISLAND_RED": "Rhode Island Red",
"PLYMOUTH_ROCK": "Plymouth Rock"
"ROSS_308": "Ross 308",
"YORKSHIRE_LARGE_WHITE": "Yorkshire Large White"
},
"ORIGIN": {
"BORN_AT_FARM": "Born at the farm",
"BROUGHT_IN": "Brought in"
},
"SEX": {
"MALE": "Male",
"FEMALE": "Female"
},
"TAG_COLOR": {
"BLUE": "Blue",
"GREEN": "Green",
"ORANGE": "Orange",
"RED": "Red",
"WHITE": "White",
"YELLOW": "Yellow"
},
"TAG_PLACEMENT": {
"LEFT_EAR": "Left ear",
"LEFT_LEG": "Left leg",
"RIGHT_EAR": "Right ear",
"RIGHT_LEG": "Right leg"
},
"TAG_TYPE": {
"EAR_TAG": "Ear tag",
"LEG_BAND": "Leg band"
},
"TYPE": {
"CATTLE": "Cattle",
"PIGS": "Pigs",
"CHICKEN": "Chicken"
"CHICKEN": "Chicken",
"PIGS": "Pigs"
},
"USE": {
"MILK": "Milk",
Expand Down
6 changes: 6 additions & 0 deletions packages/webapp/public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"CREATE_A_TASK": "Create a task",
"DATE": "Date",
"DELETE": "Delete",
"DO_NOT_KNOW": "I don't know",
"DO_NOT_SHOW": "Don’t show this message again.",
"EDIT": "Edit",
"EDIT_DATE": "Edit date",
Expand All @@ -43,15 +44,18 @@
"NEEDS_PLAN": "Needs plan",
"NEXT": "Next",
"NO": "No",
"NON_ORGANIC": "Non-organic",
"NONE": "none",
"NOT_SURE": "Not sure",
"NOTES": "Notes",
"OK": "OK",
"OPTIONAL": "(optional)",
"OR": "or",
"ORGANIC": "Organic",
"OTHER": "Other",
"PAST": "Past",
"PLANNED": "Planned",
"PRICE": "Price",
"PROCEED": "Proceed",
"QUANTITY": "Quantity",
"REMOVE": "Remove",
Expand All @@ -76,11 +80,13 @@
"THATS_FINE": "That’s fine",
"TODAY": "Today",
"TOTAL": "Total",
"TRANSITIONING": "Transitioning",
"TYPE": "Type",
"TYPES": "Types",
"UPDATE": "Update",
"UPLOAD": "Upload",
"UPLOADING": "Uploading...",
"USE": "Use",
"WORD_LIMIT_ERROR": "Only {{value}} characters can be displayed",
"YEAR": "Year",
"YES": "Yes",
Expand Down
48 changes: 47 additions & 1 deletion packages/webapp/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,27 @@
"ANIMALS_TOTAL_other": "{{count}} animals total",
"ANIMALS_UNSPECIFIED_one": "{{count}} unspecified",
"ANIMALS_UNSPECIFIED_other": "{{count}} unspecified",
"GENERAL_DETAILS": "General details",
"ORIGIN": "Origin",
"OTHER_DETAILS": "Other details",
"OUT_OF_COUNT_one": "{{animalNumber}} out of {{count}}",
"OUT_OF_COUNT_other": "{{animalNumber}} out of {{count}}",
"PLACEHOLDER": {
"BATCH_NAME": "Type in the batch name",
"DAM": "Type in a dam",
"MERCHANT": "Type in a merchant",
"NAME": "Type in a name",
"ORGANIC_STATUS": "What's the organic status?",
"OTHER_DETAILS": "Enter a description",
"PRICE": "How much did it cost?",
"SIRE": "Type in a sire",
"TAG_COLOUR": "What colour is the tag?",
"TAG_NUMBER": "Type in the tag number",
"TAG_PLACEMENT": "Where is the tag located?",
"TAG_PLACEMENT_INFO": "Tell us where the tag is",
"TAG_TYPE": "What is the tag type?",
"TAG_TYPE_INFO": "Please describe your tag type"
},
"REMOVE_CONFIRM": "Do you really want to remove?",
"SELECT_SEXES": "Select sexes",
"SEX_DETAIL": "Sex detail",
Expand All @@ -23,7 +42,9 @@
"BATCH_SUMMARY_COUNT_other": "{{count}} batches",
"HERE_IS_SUMMARY": "Here is a summary of your added animals:",
"MAIN": "You successfully added {{animalCount}} {{and}} {{batchCount}} to your inventory."
}
},
"UNIQUE_DETAILS": "Unique details",
"USED_FOR_REPRODUCTION": "Used for reproduction?"
},
"ADD_FARM": {
"ADDRESS_IS_REQUIRED": "Address is required",
Expand Down Expand Up @@ -193,6 +214,24 @@
"ANIMAL_LOCATIONS": "Location",
"ANIMAL_SEXES": "Sex",
"ANIMAL_TYPE": "Type",
"ATTRIBUTE": {
"ANIMAL_IMAGE": "Animal image",
"BATCH_IMAGE": "Batch image",
"BATCH_NAME": "Batch name",
"DAM": "Dam",
"DATE_OF_BIRTH": "Date of birth",
"MERCHANT": "Merchant",
"ORGANIC_STATUS": "Organic status",
"OTHER_DETAILS_ANIMAL": "Other animal details",
"OTHER_DETAILS_BATCH": "Batch details",
"SIRE": "Sire",
"TAG_COLOUR": "Tag colour",
"TAG_NUMBER": "Tag number",
"TAG_PLACEMENT": "Tag placement",
"TAG_PLACEMENT_INFO": "Specify tag placement",
"TAG_TYPE": "Tag type",
"WEANING_DATE": "Weaning date"
},
"BATCH": "Batch",
"FILTER": {
"BATCHES": "Batches",
Expand Down Expand Up @@ -1927,6 +1966,13 @@
"MAYBE_LATER": "Maybe it’ll turnip later.",
"UNKNOWN_RECORD": "Unknown record"
},
"UPLOADER": {
"CHANGE_IMAGE": "Change Image",
"CLICK_TO_UPLOAD": "Click to upload",
"DRAG_DROP": "or drag and drop",
"REMOVE_IMAGE": "Remove Image",
"UPLOAD_IMAGE": "Upload Image"
},
"WAGE": {
"ERROR": "Wage must be a valid, non-negative decimal number",
"HOURLY_WAGE": "Hourly Wage",
Expand Down
44 changes: 35 additions & 9 deletions packages/webapp/public/locales/es/animal.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
{
"BREED": {
"ANGUS": "MISSING",
"HEREFORD": "MISSING",
"CHAROLAIS": "MISSING",
"YORKSHIRE_LARGE_WHITE": "MISSING",
"LANDRACE": "MISSING",
"DUROC": "MISSING",
"CORNISH_CROSS": "MISSING",
"ROSS_308": "MISSING",
"COBB_500": "MISSING",
"CORNISH_CROSS": "MISSING",
"DUROC": "MISSING",
"HEREFORD": "MISSING",
"LANDRACE": "MISSING",
"LEGHORN": "MISSING",
"PLYMOUTH_ROCK": "MISSING",
"RHODE_ISLAND_RED": "MISSING",
"PLYMOUTH_ROCK": "MISSING"
"ROSS_308": "MISSING",
"YORKSHIRE_LARGE_WHITE": "MISSING"
},
"ORIGIN": {
"BORN_AT_FARM": "MISSING",
"BROUGHT_IN": "MISSING"
},
"SEX": {
"MALE": "MISSING",
"FEMALE": "MISSING"
},
"TAG_COLOR": {
"BLUE": "MISSING",
"GREEN": "MISSING",
"ORANGE": "MISSING",
"RED": "MISSING",
"WHITE": "MISSING",
"YELLOW": "MISSING"
},
"TAG_PLACEMENT": {
"LEFT_EAR": "MISSING",
"LEFT_LEG": "MISSING",
"RIGHT_EAR": "MISSING",
"RIGHT_LEG": "MISSING"
},
"TAG_TYPE": {
"EAR_TAG": "MISSING",
"LEG_BAND": "MISSING"
},
"TYPE": {
"CATTLE": "MISSING",
"PIGS": "MISSING",
"CHICKEN": "MISSING"
"CHICKEN": "MISSING",
"PIGS": "MISSING"
},
"USE": {
"MILK": "MISSING",
Expand Down
6 changes: 6 additions & 0 deletions packages/webapp/public/locales/es/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"CREATE_A_TASK": "MISSING",
"DATE": "Fecha",
"DELETE": "Borrar",
"DO_NOT_KNOW": "MISSING",
"DO_NOT_SHOW": "No vuelva a mostrar este mensaje.",
"EDIT": "Editar",
"EDIT_DATE": "Editar fecha",
Expand All @@ -43,15 +44,18 @@
"NEEDS_PLAN": "Necesita un plan",
"NEXT": "Próximo",
"NO": "No",
"NON_ORGANIC": "No orgánico",
"NONE": "MISSING",
"NOT_SURE": "No estoy seguro/a",
"NOTES": "Notas",
"OK": "Está bien",
"OPTIONAL": "(opcional)",
"OR": "MISSING",
"ORGANIC": "Orgánico",
"OTHER": "Otro",
"PAST": "Pasado",
"PLANNED": "Planificado",
"PRICE": "MISSING",
"PROCEED": "Proceder",
"QUANTITY": "Cantidad",
"REMOVE": "MISSING",
Expand All @@ -76,11 +80,13 @@
"THATS_FINE": "Está bien",
"TODAY": "Hoy",
"TOTAL": "Total",
"TRANSITIONING": "En transición",
"TYPE": "Tipo",
"TYPES": "MISSING",
"UPDATE": "Actualizar",
"UPLOAD": "Subir",
"UPLOADING": "Subiendo",
"USE": "MISSING",
"WORD_LIMIT_ERROR": "Solo se pueden mostrar {{value}} caracteres",
"YEAR": "Año",
"YES": "Sí",
Expand Down
48 changes: 47 additions & 1 deletion packages/webapp/public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,28 @@
"ANIMALS_UNSPECIFIED_one": "MISSING",
"ANIMALS_UNSPECIFIED_many": "MISSING",
"ANIMALS_UNSPECIFIED_other": "MISSING",
"GENERAL_DETAILS": "MISSING",
"ORIGIN": "MISSING",
"OTHER_DETAILS": "MISSING",
"OUT_OF_COUNT_one": "MISSING",
"OUT_OF_COUNT_many": "MISSING",
"OUT_OF_COUNT_other": "MISSING",
"PLACEHOLDER": {
"BATCH_NAME": "MISSING",
"DAM": "MISSING",
"MERCHANT": "MISSING",
"NAME": "MISSING",
"ORGANIC_STATUS": "MISSING",
"OTHER_DETAILS": "MISSING",
"PRICE": "MISSING",
"SIRE": "MISSING",
"TAG_COLOUR": "MISSING",
"TAG_NUMBER": "MISSING",
"TAG_PLACEMENT": "MISSING",
"TAG_PLACEMENT_INFO": "MISSING",
"TAG_TYPE": "MISSING",
"TAG_TYPE_INFO": "MISSING"
},
"REMOVE_CONFIRM": "MISSING",
"SELECT_SEXES": "MISSING",
"SEX_DETAIL": "MISSING",
Expand All @@ -24,7 +43,9 @@
"ALL_DONE": "MISSING",
"HERE_IS_SUMMARY": "MISSING",
"MAIN": "MISSING"
}
},
"UNIQUE_DETAILS": "MISSING",
"USED_FOR_REPRODUCTION": "MISSING"
},
"ADD_FARM": {
"ADDRESS_IS_REQUIRED": "MISSING",
Expand Down Expand Up @@ -178,6 +199,24 @@
"ANIMAL_LOCATIONS": "MISSING",
"ANIMAL_SEXES": "MISSING",
"ANIMAL_TYPE": "MISSING",
"ATTRIBUTE": {
"ANIMAL_IMAGE": "MISSING",
"BATCH_IMAGE": "MISSING",
"BATCH_NAME": "MISSING",
"DAM": "MISSING",
"DATE_OF_BIRTH": "MISSING",
"MERCHANT": "MISSING",
"ORGANIC_STATUS": "MISSING",
"OTHER_DETAILS_ANIMAL": "MISSING",
"OTHER_DETAILS_BATCH": "MISSING",
"SIRE": "MISSING",
"TAG_COLOUR": "MISSING",
"TAG_NUMBER": "MISSING",
"TAG_PLACEMENT": "MISSING",
"TAG_PLACEMENT_INFO": "MISSING",
"TAG_TYPE": "MISSING",
"WEANING_DATE": "MISSING"
},
"BATCH": "MISSING",
"FILTER": {
"BATCHES": "MISSING",
Expand Down Expand Up @@ -1725,6 +1764,13 @@
"MAYBE_LATER": "MISSING",
"UNKNOWN_RECORD": "MISSING"
},
"UPLOADER": {
"CHANGE_IMAGE": "Cambiar imagen",
"CLICK_TO_UPLOAD": "Clickee para subir",
"DRAG_DROP": "o arrastre y suelte",
"REMOVE_IMAGE": "Eliminar imagen",
"UPLOAD_IMAGE": "Subir imagen"
},
"WAGE": {
"ERROR": "MISSING",
"HOURLY_WAGE": "MISSING",
Expand Down
Loading
Loading