$mol_view_tree2 refactor, hyoo-ru/mam_mol#646

hyoo-ru · Dec 3, 2023 · 3112d8c · 3112d8c
1 parent 3c27307
commit 3112d8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/animal/edit/edit.view.tree b/animal/edit/edit.view.tree
@@ -25,12 +25,12 @@ $hyoo_shelter_animal_edit $mol_page
 						enabled <= enabled
 				<= Card_field $mol_form_field
 					name \Номер карточки
-					Content <= Сard $mol_string
+					Content <= Card $mol_string
 						value?val <=> card?val \
 						enabled <= enabled
 				<= Chip_field $mol_form_field
 					name \Номер чипа
-					Content <= Сhip $mol_string
+					Content <= Chip $mol_string
 						value?val <=> chip?val \
 						enabled <= enabled
 				<= Cage_field $mol_form_field

diff --git a/shelter/shelter.ts b/shelter/shelter.ts
@@ -15,8 +15,8 @@ namespace $ {
 			id: $mol_data_integer,
 			weight: $mol_data_number,
 			readyForDepart: $mol_data_boolean,
-			gender: $mol_data_variant( $mol_data_const( 'Male' ), $mol_data_const( 'Female' ) ),
-			kind: $mol_data_variant( $mol_data_const( 'Cat' ), $mol_data_const( 'Dog' ) ),
+			gender: $mol_data_optional($mol_data_variant( $mol_data_const( 'Male' as const), $mol_data_const( 'Female' as const) )),
+			kind: $mol_data_optional($mol_data_variant( $mol_data_const( 'Cat' as const), $mol_data_const( 'Dog' as const) )),
 			size: $mol_data_string,
 			tail: $mol_data_string,
 			shelterId: $mol_data_number,