diff --git a/ds_files/ds_types.anubis b/ds_files/ds_types.anubis index e7a35cc..5422223 100644 --- a/ds_files/ds_types.anubis +++ b/ds_files/ds_types.anubis @@ -230,7 +230,10 @@ public define List(DS_Type) hayamiki_lib_types_description = component(string, "column_name") ]), alternative("label", [ - component(string, "label") + component(string, "label"), + ]), + alternative("cell", [ + component(list, extern_type("HK_Edit_View_Table_Cell", view_types+"hk_edit_view_table_cell.anubis"), "cell") ]) ]), diff --git a/model/types/hk_app.anubis b/model/types/hk_app.anubis index 43708f4..3144058 100644 --- a/model/types/hk_app.anubis +++ b/model/types/hk_app.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_app_name.anubis b/model/types/hk_app_name.anubis index 69feaf0..8eec30f 100644 --- a/model/types/hk_app_name.anubis +++ b/model/types/hk_app_name.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_database.anubis b/model/types/hk_database.anubis index 4fdd694..121a19c 100644 --- a/model/types/hk_database.anubis +++ b/model/types/hk_database.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_datetime_field_attr.anubis b/model/types/hk_datetime_field_attr.anubis index 29e2003..99377c8 100644 --- a/model/types/hk_datetime_field_attr.anubis +++ b/model/types/hk_datetime_field_attr.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_help_text.anubis b/model/types/hk_help_text.anubis index a5fe1b4..4de71a3 100644 --- a/model/types/hk_help_text.anubis +++ b/model/types/hk_help_text.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_icon.anubis b/model/types/hk_icon.anubis index bca9a29..fd8fd37 100644 --- a/model/types/hk_icon.anubis +++ b/model/types/hk_icon.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_int_choice.anubis b/model/types/hk_int_choice.anubis index 3d3c1d9..98ffef6 100644 --- a/model/types/hk_int_choice.anubis +++ b/model/types/hk_int_choice.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_int_choices.anubis b/model/types/hk_int_choices.anubis index b7055a4..d226aa5 100644 --- a/model/types/hk_int_choices.anubis +++ b/model/types/hk_int_choices.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_model.anubis b/model/types/hk_model.anubis index bfecc54..a6e2f49 100644 --- a/model/types/hk_model.anubis +++ b/model/types/hk_model.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_model_attr.anubis b/model/types/hk_model_attr.anubis index 1d45ad5..a2126a6 100644 --- a/model/types/hk_model_attr.anubis +++ b/model/types/hk_model_attr.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_model_column.anubis b/model/types/hk_model_column.anubis index faad5a6..78f7e8f 100644 --- a/model/types/hk_model_column.anubis +++ b/model/types/hk_model_column.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_model_field.anubis b/model/types/hk_model_field.anubis index 5855a2f..21c6664 100644 --- a/model/types/hk_model_field.anubis +++ b/model/types/hk_model_field.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_table.anubis b/model/types/hk_table.anubis index 01c139b..dde040e 100644 --- a/model/types/hk_table.anubis +++ b/model/types/hk_table.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_text_choice.anubis b/model/types/hk_text_choice.anubis index 5932fb5..8f4f703 100644 --- a/model/types/hk_text_choice.anubis +++ b/model/types/hk_text_choice.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_text_choices.anubis b/model/types/hk_text_choices.anubis index f1bece1..4c481e6 100644 --- a/model/types/hk_text_choices.anubis +++ b/model/types/hk_text_choices.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/model/types/hk_text_field_attr.anubis b/model/types/hk_text_field_attr.anubis index f5624bc..31b24a8 100644 --- a/model/types/hk_text_field_attr.anubis +++ b/model/types/hk_text_field_attr.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_display.anubis b/view/types/hk_display.anubis index cb762f6..d0f7de7 100644 --- a/view/types/hk_display.anubis +++ b/view/types/hk_display.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_edit_view.anubis b/view/types/hk_edit_view.anubis index ca53aba..8b8f956 100644 --- a/view/types/hk_edit_view.anubis +++ b/view/types/hk_edit_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_edit_view_table.anubis b/view/types/hk_edit_view_table.anubis index c33ad6f..b0a482b 100644 --- a/view/types/hk_edit_view_table.anubis +++ b/view/types/hk_edit_view_table.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_edit_view_table_cell.anubis b/view/types/hk_edit_view_table_cell.anubis index e20d8e9..530cb00 100644 --- a/view/types/hk_edit_view_table_cell.anubis +++ b/view/types/hk_edit_view_table_cell.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ @@ -10,14 +10,18 @@ transmit system/muscle.anubis transmit system/convert.anubis transmit tools/basis.anubis +transmit hayamiki_lib/view/types/hk_edit_view_table_cell.anubis public type HK_Edit_View_Table_Cell: - empty, + empty, column( - String column_name + String column_name ), label( - String label + String label + ), + cell( + List(HK_Edit_View_Table_Cell) cell ) . @@ -50,6 +54,12 @@ public define Message // [type = String] label.label forget(add_string(_hk_edit_view_table_cell_message, "label", _label)), + //Alternative cell + cell(__cell) then + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "cell")); + // [type = List(HK_Edit_View_Table_Cell)] cell.cell + map_forget((HK_Edit_View_Table_Cell _cell) |-> add_message(_hk_edit_view_table_cell_message, "cell", to_Message(_cell)), __cell), + }; _hk_edit_view_table_cell_message . @@ -79,6 +89,14 @@ public define Maybe(HK_Edit_View_Table_Cell) success(label(_label_)) } + else //Alternative cell + if __type_alt__ = "cell" then //Alternative cell + // [type = List(HK_Edit_View_Table_Cell)] cell.cell + with mb__cell_ = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_cell_message, "cell")), + if mb__cell_ is {failure then failure, success(_cell_) then + + success(cell(_cell_)) + } else failure //No valid Alternative found ! else diff --git a/view/types/hk_edit_view_table_line.anubis b/view/types/hk_edit_view_table_line.anubis index 5471676..00c87d1 100644 --- a/view/types/hk_edit_view_table_line.anubis +++ b/view/types/hk_edit_view_table_line.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_fk_view.anubis b/view/types/hk_fk_view.anubis index 4e04d8b..39878b8 100644 --- a/view/types/hk_fk_view.anubis +++ b/view/types/hk_fk_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form.anubis b/view/types/hk_form.anubis index a038526..dbe06b7 100644 --- a/view/types/hk_form.anubis +++ b/view/types/hk_form.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form_tab.anubis b/view/types/hk_form_tab.anubis index 6382222..9724f94 100644 --- a/view/types/hk_form_tab.anubis +++ b/view/types/hk_form_tab.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form_table.anubis b/view/types/hk_form_table.anubis index 5986893..8fd692f 100644 --- a/view/types/hk_form_table.anubis +++ b/view/types/hk_form_table.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form_table_attribute.anubis b/view/types/hk_form_table_attribute.anubis index 9f696ea..7faf594 100644 --- a/view/types/hk_form_table_attribute.anubis +++ b/view/types/hk_form_table_attribute.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form_table_cell.anubis b/view/types/hk_form_table_cell.anubis index cfa5c86..24f6f3d 100644 --- a/view/types/hk_form_table_cell.anubis +++ b/view/types/hk_form_table_cell.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_form_table_line.anubis b/view/types/hk_form_table_line.anubis index 1703a31..b247a8f 100644 --- a/view/types/hk_form_table_line.anubis +++ b/view/types/hk_form_table_line.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ diff --git a/view/types/hk_list_view.anubis b/view/types/hk_list_view.anubis index 203de4a..324dc4f 100644 --- a/view/types/hk_list_view.anubis +++ b/view/types/hk_list_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-09 - * Time: 21:26:44 + * Date: 2017-04-10 + * Time: 09:51:00 * */ -- libgit2 0.21.4