From 7ed7fe529878708ef0b0a37fcc8c504425431777 Mon Sep 17 00:00:00 2001 From: totoro Date: Tue, 4 Apr 2017 01:32:48 +0200 Subject: [PATCH] refactoring in progress... Not finished --- model/types/hk_app.anubis | 4 ++-- model/types/hk_app_name.anubis | 4 ++-- model/types/hk_database.anubis | 4 ++-- model/types/hk_datetime_field_attr.anubis | 4 ++-- model/types/hk_display.anubis | 4 ++-- model/types/hk_edit_view.anubis | 20 ++++++++++---------- model/types/hk_edit_view_cell.anubis | 64 ---------------------------------------------------------------- model/types/hk_edit_view_line.anubis | 66 ------------------------------------------------------------------ model/types/hk_edit_view_table.anubis | 32 ++++++++++++++++---------------- model/types/hk_edit_view_table_cell.anubis | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ model/types/hk_edit_view_table_line.anubis | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ model/types/hk_fk_view.anubis | 4 ++-- model/types/hk_help_text.anubis | 4 ++-- model/types/hk_icon.anubis | 4 ++-- model/types/hk_int_choice.anubis | 4 ++-- model/types/hk_int_choices.anubis | 4 ++-- model/types/hk_list_view.anubis | 4 ++-- model/types/hk_model.anubis | 4 ++-- model/types/hk_model_attr.anubis | 4 ++-- model/types/hk_model_column.anubis | 4 ++-- model/types/hk_model_field.anubis | 4 ++-- model/types/hk_table.anubis | 4 ++-- model/types/hk_text_choice.anubis | 4 ++-- model/types/hk_text_choices.anubis | 4 ++-- model/types/hk_text_field_attr.anubis | 4 ++-- view/types/hk_form.anubis | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_form_entry.anubis | 45 +++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_form_table.anubis | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_form_table_cell.anubis | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_form_table_line.anubis | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_view_editor_cell.anubis | 66 ------------------------------------------------------------------ view/types/hk_view_editor_line.anubis | 66 ------------------------------------------------------------------ view/types/hk_view_editor_table.anubis | 66 ------------------------------------------------------------------ view/view_editor_renderer.anubis | 37 +++++++++++++++++++++++++++++++++++++ view/view_table_types.anubis | 105 --------------------------------------------------------------------------------------------------------- view/web_action.anubis | 1 + 36 files changed, 582 insertions(+), 497 deletions(-) delete mode 100644 model/types/hk_edit_view_cell.anubis delete mode 100644 model/types/hk_edit_view_line.anubis create mode 100644 model/types/hk_edit_view_table_cell.anubis create mode 100644 model/types/hk_edit_view_table_line.anubis create mode 100644 view/types/hk_form.anubis create mode 100644 view/types/hk_form_entry.anubis create mode 100644 view/types/hk_form_table.anubis create mode 100644 view/types/hk_form_table_cell.anubis create mode 100644 view/types/hk_form_table_line.anubis delete mode 100644 view/types/hk_view_editor_cell.anubis delete mode 100644 view/types/hk_view_editor_line.anubis delete mode 100644 view/types/hk_view_editor_table.anubis create mode 100644 view/view_editor_renderer.anubis delete mode 100644 view/view_table_types.anubis diff --git a/model/types/hk_app.anubis b/model/types/hk_app.anubis index 4e54b42..a6327b1 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_app_name.anubis b/model/types/hk_app_name.anubis index f648091..6a24ea4 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_database.anubis b/model/types/hk_database.anubis index cc79318..cb132cf 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_datetime_field_attr.anubis b/model/types/hk_datetime_field_attr.anubis index 5f2957a..61f2df8 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_display.anubis b/model/types/hk_display.anubis index 50a92ed..b107baa 100644 --- a/model/types/hk_display.anubis +++ b/model/types/hk_display.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_edit_view.anubis b/model/types/hk_edit_view.anubis index e7ea826..cef3cf1 100644 --- a/model/types/hk_edit_view.anubis +++ b/model/types/hk_edit_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ @@ -22,7 +22,7 @@ public type HK_Edit_View: ), edit_view_table_form( String view_name, - HK_Edit_View_Table ev_table + HK_Edit_View_Table form_table ) . @@ -54,12 +54,12 @@ public define Message map_forget((HK_FK_View _fk_view) |-> add_message(_hk_edit_view_message, "fk_view", to_Message(_fk_view)), __fk_view), //Alternative edit_view_table_form - edit_view_table_form(_view_name, _ev_table) then + edit_view_table_form(_view_name, _form_table) then forget(add_string(_hk_edit_view_message, "__TYPE_ALT__", "edit_view_table_form")); // [type = String] edit_view_table_form.view_name forget(add_string(_hk_edit_view_message, "view_name", _view_name)); - // [type = HK_Edit_View_Table] edit_view_table_form.ev_table - forget(add_message(_hk_edit_view_message, "ev_table", to_Message(_ev_table))), + // [type = HK_Edit_View_Table] edit_view_table_form.form_table + forget(add_message(_hk_edit_view_message, "form_table", to_Message(_form_table))), }; _hk_edit_view_message @@ -92,11 +92,11 @@ public define Maybe(HK_Edit_View) if __type_alt__ = "edit_view_table_form" then //Alternative edit_view_table_form // [type = String] edit_view_table_form.view_name if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(view_name) then - // [type = HK_Edit_View_Table] edit_view_table_form.ev_table - if find_message(_hk_edit_view_message, "ev_table") is {failure then failure, success(ev_table_msg) then - if (Maybe(HK_Edit_View_Table))from_Message(ev_table_msg) is {failure then failure, success(ev_table) then + // [type = HK_Edit_View_Table] edit_view_table_form.form_table + if find_message(_hk_edit_view_message, "form_table") is {failure then failure, success(form_table_msg) then + if (Maybe(HK_Edit_View_Table))from_Message(form_table_msg) is {failure then failure, success(form_table) then - success(edit_view_table_form(view_name, ev_table)) + success(edit_view_table_form(view_name, form_table)) }}} else failure //No valid Alternative found ! diff --git a/model/types/hk_edit_view_cell.anubis b/model/types/hk_edit_view_cell.anubis deleted file mode 100644 index 229541b..0000000 --- a/model/types/hk_edit_view_cell.anubis +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Created by 伝作 (Densaku). - * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 - * - */ - -transmit system/muscle.anubis -transmit system/convert.anubis -transmit tools/basis.anubis - - -public type HK_Edit_View_Cell: - ev_cell( - String column_name - ) -. - - HK_Edit_View_Cell message format - ================================ - - -public define Message - to_Message - ( - HK_Edit_View_Cell _hk_edit_view_cell - )= - with _hk_edit_view_cell_message = message((Word32)0), // - forget(add_string(_hk_edit_view_cell_message, "__TYPE__", "HK_Edit_View_Cell")); - if _hk_edit_view_cell is - { - //Alternative ev_cell - ev_cell(_column_name) then - forget(add_string(_hk_edit_view_cell_message, "__TYPE_ALT__", "ev_cell")); - // [type = String] ev_cell.column_name - forget(add_string(_hk_edit_view_cell_message, "column_name", _column_name)), - - }; - _hk_edit_view_cell_message -. - -public define Maybe(HK_Edit_View_Cell) - from_Message - ( - Message _hk_edit_view_cell_message - )= - if find_string(_hk_edit_view_cell_message, "__TYPE__") is {failure then failure, success(__type__) then - if find_string(_hk_edit_view_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then - if __type__ = "HK_Edit_View_Cell" then - //Alternative ev_cell - if __type_alt__ = "ev_cell" then //Alternative ev_cell - // [type = String] ev_cell.column_name - if find_string(_hk_edit_view_cell_message, "column_name") is {failure then failure, success(column_name) then - - success(ev_cell(column_name)) - } - else - failure //No valid Alternative found ! - else - failure //Type not found in message ! - }} -. - diff --git a/model/types/hk_edit_view_line.anubis b/model/types/hk_edit_view_line.anubis deleted file mode 100644 index 61f662b..0000000 --- a/model/types/hk_edit_view_line.anubis +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Created by 伝作 (Densaku). - * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 - * - */ - -transmit system/muscle.anubis -transmit system/convert.anubis -transmit tools/basis.anubis - -transmit hayamiki_lib/model/types/hk_edit_view_cell.anubis - -public type HK_Edit_View_Line: - ev_line( - List(HK_Edit_View_Cell) ev_cells - ) -. - - HK_Edit_View_Line message format - ================================ - - -public define Message - to_Message - ( - HK_Edit_View_Line _hk_edit_view_line - )= - with _hk_edit_view_line_message = message((Word32)0), // - forget(add_string(_hk_edit_view_line_message, "__TYPE__", "HK_Edit_View_Line")); - if _hk_edit_view_line is - { - //Alternative ev_line - ev_line(__ev_cells) then - forget(add_string(_hk_edit_view_line_message, "__TYPE_ALT__", "ev_line")); - // [type = List(HK_Edit_View_Cell)] ev_line.ev_cells - map_forget((HK_Edit_View_Cell _ev_cells) |-> add_message(_hk_edit_view_line_message, "ev_cells", to_Message(_ev_cells)), __ev_cells), - - }; - _hk_edit_view_line_message -. - -public define Maybe(HK_Edit_View_Line) - from_Message - ( - Message _hk_edit_view_line_message - )= - if find_string(_hk_edit_view_line_message, "__TYPE__") is {failure then failure, success(__type__) then - if find_string(_hk_edit_view_line_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then - if __type__ = "HK_Edit_View_Line" then - //Alternative ev_line - if __type_alt__ = "ev_line" then //Alternative ev_line - // [type = List(HK_Edit_View_Cell)] ev_line.ev_cells - with mb_ev_cells = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Cell)) from_Message(msg), find_messages(_hk_edit_view_line_message, "ev_cells")), - if mb_ev_cells is {failure then failure, success(ev_cells) then - - success(ev_line(ev_cells)) - } - else - failure //No valid Alternative found ! - else - failure //Type not found in message ! - }} -. - diff --git a/model/types/hk_edit_view_table.anubis b/model/types/hk_edit_view_table.anubis index d41b7a3..8fae477 100644 --- a/model/types/hk_edit_view_table.anubis +++ b/model/types/hk_edit_view_table.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ @@ -10,11 +10,11 @@ transmit system/muscle.anubis transmit system/convert.anubis transmit tools/basis.anubis -transmit hayamiki_lib/model/types/hk_edit_view_line.anubis +transmit hayamiki_lib/model/types/hk_edit_view_table_line.anubis public type HK_Edit_View_Table: - ev_table( - List(HK_Edit_View_Line) ev_lines + table( + List(HK_Edit_View_Table_Line) lines ) . @@ -31,11 +31,11 @@ public define Message forget(add_string(_hk_edit_view_table_message, "__TYPE__", "HK_Edit_View_Table")); if _hk_edit_view_table is { - //Alternative ev_table - ev_table(__ev_lines) then - forget(add_string(_hk_edit_view_table_message, "__TYPE_ALT__", "ev_table")); - // [type = List(HK_Edit_View_Line)] ev_table.ev_lines - map_forget((HK_Edit_View_Line _ev_lines) |-> add_message(_hk_edit_view_table_message, "ev_lines", to_Message(_ev_lines)), __ev_lines), + //Alternative table + table(__lines) then + forget(add_string(_hk_edit_view_table_message, "__TYPE_ALT__", "table")); + // [type = List(HK_Edit_View_Table_Line)] table.lines + map_forget((HK_Edit_View_Table_Line _lines) |-> add_message(_hk_edit_view_table_message, "lines", to_Message(_lines)), __lines), }; _hk_edit_view_table_message @@ -49,13 +49,13 @@ public define Maybe(HK_Edit_View_Table) if find_string(_hk_edit_view_table_message, "__TYPE__") is {failure then failure, success(__type__) then if find_string(_hk_edit_view_table_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then if __type__ = "HK_Edit_View_Table" then - //Alternative ev_table - if __type_alt__ = "ev_table" then //Alternative ev_table - // [type = List(HK_Edit_View_Line)] ev_table.ev_lines - with mb_ev_lines = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "ev_lines")), - if mb_ev_lines is {failure then failure, success(ev_lines) then + //Alternative table + if __type_alt__ = "table" then //Alternative table + // [type = List(HK_Edit_View_Table_Line)] table.lines + with mb_lines = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "lines")), + if mb_lines is {failure then failure, success(lines) then - success(ev_table(ev_lines)) + success(table(lines)) } else failure //No valid Alternative found ! diff --git a/model/types/hk_edit_view_table_cell.anubis b/model/types/hk_edit_view_table_cell.anubis new file mode 100644 index 0000000..d6730f1 --- /dev/null +++ b/model/types/hk_edit_view_table_cell.anubis @@ -0,0 +1,64 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 01:16:47 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + + +public type HK_Edit_View_Table_Cell: + cell( + String column_name + ) +. + + HK_Edit_View_Table_Cell message format + ====================================== + + +public define Message + to_Message + ( + HK_Edit_View_Table_Cell _hk_edit_view_table_cell + )= + with _hk_edit_view_table_cell_message = message((Word32)0), // + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE__", "HK_Edit_View_Table_Cell")); + if _hk_edit_view_table_cell is + { + //Alternative cell + cell(_column_name) then + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "cell")); + // [type = String] cell.column_name + forget(add_string(_hk_edit_view_table_cell_message, "column_name", _column_name)), + + }; + _hk_edit_view_table_cell_message +. + +public define Maybe(HK_Edit_View_Table_Cell) + from_Message + ( + Message _hk_edit_view_table_cell_message + )= + if find_string(_hk_edit_view_table_cell_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Edit_View_Table_Cell" then + //Alternative cell + if __type_alt__ = "cell" then //Alternative cell + // [type = String] cell.column_name + if find_string(_hk_edit_view_table_cell_message, "column_name") is {failure then failure, success(column_name) then + + success(cell(column_name)) + } + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/model/types/hk_edit_view_table_line.anubis b/model/types/hk_edit_view_table_line.anubis new file mode 100644 index 0000000..f7e78e7 --- /dev/null +++ b/model/types/hk_edit_view_table_line.anubis @@ -0,0 +1,66 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 01:16:47 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + +transmit hayamiki_lib/model/types/hk_edit_view_table_cell.anubis + +public type HK_Edit_View_Table_Line: + line( + List(HK_Edit_View_Table_Cell) cells + ) +. + + HK_Edit_View_Table_Line message format + ====================================== + + +public define Message + to_Message + ( + HK_Edit_View_Table_Line _hk_edit_view_table_line + )= + with _hk_edit_view_table_line_message = message((Word32)0), // + forget(add_string(_hk_edit_view_table_line_message, "__TYPE__", "HK_Edit_View_Table_Line")); + if _hk_edit_view_table_line is + { + //Alternative line + line(__cells) then + forget(add_string(_hk_edit_view_table_line_message, "__TYPE_ALT__", "line")); + // [type = List(HK_Edit_View_Table_Cell)] line.cells + map_forget((HK_Edit_View_Table_Cell _cells) |-> add_message(_hk_edit_view_table_line_message, "cells", to_Message(_cells)), __cells), + + }; + _hk_edit_view_table_line_message +. + +public define Maybe(HK_Edit_View_Table_Line) + from_Message + ( + Message _hk_edit_view_table_line_message + )= + if find_string(_hk_edit_view_table_line_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_edit_view_table_line_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Edit_View_Table_Line" then + //Alternative line + if __type_alt__ = "line" then //Alternative line + // [type = List(HK_Edit_View_Table_Cell)] line.cells + with mb_cells = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_line_message, "cells")), + if mb_cells is {failure then failure, success(cells) then + + success(line(cells)) + } + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/model/types/hk_fk_view.anubis b/model/types/hk_fk_view.anubis index 411dceb..a95b03e 100644 --- a/model/types/hk_fk_view.anubis +++ b/model/types/hk_fk_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_help_text.anubis b/model/types/hk_help_text.anubis index 687f269..cdfee4b 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_icon.anubis b/model/types/hk_icon.anubis index c41e652..3785c34 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_int_choice.anubis b/model/types/hk_int_choice.anubis index 929ed5a..1f9521a 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_int_choices.anubis b/model/types/hk_int_choices.anubis index 1ed6e5f..c447fcb 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_list_view.anubis b/model/types/hk_list_view.anubis index 1baf85b..b55de95 100644 --- a/model/types/hk_list_view.anubis +++ b/model/types/hk_list_view.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_model.anubis b/model/types/hk_model.anubis index 3256757..696b37f 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_model_attr.anubis b/model/types/hk_model_attr.anubis index 6b7b420..aa10d65 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_model_column.anubis b/model/types/hk_model_column.anubis index b198a1f..e2cce8b 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_model_field.anubis b/model/types/hk_model_field.anubis index a1a60df..4589415 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_table.anubis b/model/types/hk_table.anubis index 2e498cb..9db931a 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_text_choice.anubis b/model/types/hk_text_choice.anubis index b242a2a..4ec20fc 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_text_choices.anubis b/model/types/hk_text_choices.anubis index b7304ae..2d88428 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/model/types/hk_text_field_attr.anubis b/model/types/hk_text_field_attr.anubis index 44a1c91..4cd2a3e 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-03 - * Time: 23:52:46 + * Date: 2017-04-04 + * Time: 01:16:47 * */ diff --git a/view/types/hk_form.anubis b/view/types/hk_form.anubis new file mode 100644 index 0000000..4203b03 --- /dev/null +++ b/view/types/hk_form.anubis @@ -0,0 +1,107 @@ +/* + * Created by PyramIDE. + * User: Totoro + * Date: 15/11/2011 + * Time: 20:32 + */ + +read calexium_lib/web/CXM_making_a_web_site.anubis +transmit calexium_lib/web/CXM_common.anubis +read hayamiki_lib/types/hayamiki.anubis +read hayamiki_lib/view/types/hk_form_table.anubis + +//public type VT_edit_selector: +// vt_edit_selector((SQLite3DataBase db, HK_Referer referer, String filter) -> List((List(CoreAttrs), WebArgValue, String)) get). +// +// +//public type VT_edit_entry: +// hidden (String name, String value), +// label (String s_name), +// primary_key (String idx), +// information (String s_name, String c_name, String v_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show +// text (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name +// password (String s_name, String c_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name +// foreign_text(String s_name, String c_name, DB_id selected, VT_edit_selector selector, HK_Help_Text help), +// choices_text(String s_name, String c_name, String selected, VT_edit_selector selector, HK_Help_Text help), +// text_area (String s_name, String c_name, String value, HK_Text_Field_Attr area_att, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name +// boolean (String s_name, String c_name, Bool value, HK_Help_Text help), +// integer (String s_name, String c_name, Int value, HK_Help_Text help), +// float (String s_name, String c_name, Float value, HK_Help_Text help), +// choices_int (String s_name, String c_name, Int selected, VT_edit_selector selector, HK_Help_Text help), +// date (String s_name, String c_name, String value, HK_Help_Text help), +// time (String s_name, String c_name, String value, HK_Help_Text help), +// datetime (String s_name, String c_name, String value, HK_Help_Text help), +// color (String s_name, String c_name, String value, HK_Help_Text help) +//. + +//public define VT_edit_entry text (String s_name, String c_name, String value) = text(s_name, c_name, value, no_help_text). +//public define VT_edit_entry foreign_text(String s_name, String c_name, DB_id selected, VT_edit_selector selector) = foreign_text(s_name, c_name, selected, selector, no_help_text). +//public define VT_edit_entry text_area (String s_name, String c_name, String value) = text_area(s_name, c_name, value, none, no_help_text). +//public define VT_edit_entry boolean(String s_name, String c_name, Bool value) = boolean(s_name, c_name, value, no_help_text). +//public define VT_edit_entry integer(String s_name, String c_name, Int value) = integer(s_name, c_name, value, no_help_text). +//public define VT_edit_entry float(String s_name, String c_name, Float value) = float(s_name, c_name, value, no_help_text). +//public define VT_edit_entry information(String s_name, String c_name, String v_name, HK_Help_Text help) = information(s_name, c_name, v_name, 0, help). + + +public type HK_Form_Tab: //HK_V_Edit_Tab: + hk_ve_form_tab(String fk_table_name, String fk_col_name, String list_view_name) +. + +public type HK_Form: //VT_edit: + hk_form_in_list (String table_name, String view_name, List(HK_Form_Entry) list, List(HK_Form_Tab) tabs), + hk_form_in_table(String table_name, String view_name, HK_Form_Table ve_table) +. + + +public type VT_view_model_entry: + //hidden (String name, String value), + primary_key , + information (String label, String column_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show + text (String label, String column_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name + password (String label, String column_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name + foreign_text(String label, String column_name, HK_Form_Selector selector, HK_Help_Text help), + choices_text(String label, String column_name, HK_Form_Selector selector, HK_Help_Text help), + text_area (String label, String column_name, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name + boolean (String label, String column_name, HK_Help_Text help), + integer (String label, String column_name, HK_Help_Text help), + float (String label, String column_name, HK_Help_Text help), + choices_int (String label, String column_name, HK_Form_Selector selector, HK_Help_Text help), + date (String label, String column_name, HK_Help_Text help), + time (String label, String column_name, HK_Help_Text help), + datetime (String label, String column_name, HK_Help_Text help), + color (String label, String column_name, HK_Help_Text help). + + +public type VT_view_model: + vt_view_model(List(VT_view_model_entry) list). + +public type VT_view_entry: + text(String text), + link(String id, String text), + link_id_action(String id, String text, WEB_Action_Name link_id_action), + icon(String icon_path). + +public type VT_view_row_header: + vt_view_row_header(List(VT_view_entry) list). + +public type VT_view_row: + vt_view_row(Int db_id, List(VT_view_entry) list). + +public type VT_View_DB_Calls: + vt_view_db_calls( + (SQLite3DataBase db, String clause) -> Int get_count, + (SQLite3DataBase db, HK_Referer referer, String clause) -> JsonMember get_rows_json +// (SQLite3DataBase db, String clause) -> List(VT_view_row) get_rows + ) +. + +public type VT_view: + vt_view(String table_name, String view_name, VT_view_model view_model, VT_view_row_header header, VT_View_DB_Calls db_calls). + + +public type HK_Form_action: + new_entry, + edit_entry(String idx). + +public define String default_select = "--------------------". //20 dash +public define (List(CoreAttrs),WebArgValue,String) selector_default_entry = ([], wav("none"),default_select). diff --git a/view/types/hk_form_entry.anubis b/view/types/hk_form_entry.anubis new file mode 100644 index 0000000..5eb78c3 --- /dev/null +++ b/view/types/hk_form_entry.anubis @@ -0,0 +1,45 @@ +/* + * Created by PyramIDE. + * User: フランスのトトロ aka (David RENÉ) + * Date: 04/04/2017 + * Time: 00:22 + * © Calexium + */ + + +read calexium_lib/web/CXM_making_a_web_site.anubis +transmit calexium_lib/web/CXM_common.anubis +read hayamiki_lib/types/hayamiki.anubis + + +public type HK_Form_Selector: + hk_form_selector((SQLite3DataBase db, HK_Referer referer, String filter) -> List((List(CoreAttrs), WebArgValue, String)) get). + + +public type HK_Form_Entry: //legacy VT_Edit + hidden (String name, String value), + label (String s_name), + primary_key (String idx), + information (String s_name, String c_name, String v_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show + text (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name + password (String s_name, String c_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name + foreign_text(String s_name, String c_name, DB_id selected, HK_Form_Selector selector, HK_Help_Text help), + choices_text(String s_name, String c_name, String selected, HK_Form_Selector selector, HK_Help_Text help), + text_area (String s_name, String c_name, String value, HK_Text_Field_Attr area_att, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name + boolean (String s_name, String c_name, Bool value, HK_Help_Text help), + integer (String s_name, String c_name, Int value, HK_Help_Text help), + float (String s_name, String c_name, Float value, HK_Help_Text help), + choices_int (String s_name, String c_name, Int selected, HK_Form_Selector selector, HK_Help_Text help), + date (String s_name, String c_name, String value, HK_Help_Text help), + time (String s_name, String c_name, String value, HK_Help_Text help), + datetime (String s_name, String c_name, String value, HK_Help_Text help), + color (String s_name, String c_name, String value, HK_Help_Text help) +. + +public define HK_Form_Entry text (String s_name, String c_name, String value) = text (s_name, c_name, value, no_help_text). +public define HK_Form_Entry foreign_text(String s_name, String c_name, DB_id selected, HK_Form_Selector selector) = foreign_text(s_name, c_name, selected, selector, no_help_text). +public define HK_Form_Entry text_area (String s_name, String c_name, String value) = text_area (s_name, c_name, value, none, no_help_text). +public define HK_Form_Entry boolean (String s_name, String c_name, Bool value) = boolean (s_name, c_name, value, no_help_text). +public define HK_Form_Entry integer (String s_name, String c_name, Int value) = integer (s_name, c_name, value, no_help_text). +public define HK_Form_Entry float (String s_name, String c_name, Float value) = float (s_name, c_name, value, no_help_text). +public define HK_Form_Entry information (String s_name, String c_name, String v_name, HK_Help_Text help) = information(s_name, c_name, v_name, 0, help). diff --git a/view/types/hk_form_table.anubis b/view/types/hk_form_table.anubis new file mode 100644 index 0000000..43f7127 --- /dev/null +++ b/view/types/hk_form_table.anubis @@ -0,0 +1,66 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 01:16:47 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + +transmit hayamiki_lib/view/types/hk_form_table_line.anubis + +public type HK_Form_Table: + hk_form_table( + List(HK_Form_Table_Line) form_lines + ) +. + + HK_Form_Table message format + ============================ + + +public define Message + to_Message + ( + HK_Form_Table _hk_form_table + )= + with _hk_form_table_message = message((Word32)0), // + forget(add_string(_hk_form_table_message, "__TYPE__", "HK_Form_Table")); + if _hk_form_table is + { + //Alternative hk_form_table + hk_form_table(__form_lines) then + forget(add_string(_hk_form_table_message, "__TYPE_ALT__", "hk_form_table")); + // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines + map_forget((HK_Form_Table_Line _form_lines) |-> add_message(_hk_form_table_message, "form_lines", to_Message(_form_lines)), __form_lines), + + }; + _hk_form_table_message +. + +public define Maybe(HK_Form_Table) + from_Message + ( + Message _hk_form_table_message + )= + if find_string(_hk_form_table_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_form_table_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Form_Table" then + //Alternative hk_form_table + if __type_alt__ = "hk_form_table" then //Alternative hk_form_table + // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines + with mb_form_lines = map_escape(( Message msg ) |-> (Maybe(HK_Form_Table_Line)) from_Message(msg), find_messages(_hk_form_table_message, "form_lines")), + if mb_form_lines is {failure then failure, success(form_lines) then + + success(hk_form_table(form_lines)) + } + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/view/types/hk_form_table_cell.anubis b/view/types/hk_form_table_cell.anubis new file mode 100644 index 0000000..20eef4a --- /dev/null +++ b/view/types/hk_form_table_cell.anubis @@ -0,0 +1,66 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 01:16:47 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + +transmit hayamiki_lib/view/types/hk_form_entry.anubis + +public type HK_Form_Table_Cell: + hk_form_table_cell( + HK_Form_Entry form_entry + ) +. + + HK_Form_Table_Cell message format + ================================= + + +public define Message + to_Message + ( + HK_Form_Table_Cell _hk_form_table_cell + )= + with _hk_form_table_cell_message = message((Word32)0), // + forget(add_string(_hk_form_table_cell_message, "__TYPE__", "HK_Form_Table_Cell")); + if _hk_form_table_cell is + { + //Alternative hk_form_table_cell + hk_form_table_cell(_form_entry) then + forget(add_string(_hk_form_table_cell_message, "__TYPE_ALT__", "hk_form_table_cell")); + // [type = HK_Form_Entry] hk_form_table_cell.form_entry + forget(add_message(_hk_form_table_cell_message, "form_entry", to_Message(_form_entry))), + + }; + _hk_form_table_cell_message +. + +public define Maybe(HK_Form_Table_Cell) + from_Message + ( + Message _hk_form_table_cell_message + )= + if find_string(_hk_form_table_cell_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_form_table_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Form_Table_Cell" then + //Alternative hk_form_table_cell + if __type_alt__ = "hk_form_table_cell" then //Alternative hk_form_table_cell + // [type = HK_Form_Entry] hk_form_table_cell.form_entry + if find_message(_hk_form_table_cell_message, "form_entry") is {failure then failure, success(form_entry_msg) then + if (Maybe(HK_Form_Entry))from_Message(form_entry_msg) is {failure then failure, success(form_entry) then + + success(hk_form_table_cell(form_entry)) + }} + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/view/types/hk_form_table_line.anubis b/view/types/hk_form_table_line.anubis new file mode 100644 index 0000000..b4cdecb --- /dev/null +++ b/view/types/hk_form_table_line.anubis @@ -0,0 +1,66 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 01:16:47 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + +transmit hayamiki_lib/view/types/hk_form_table_cell.anubis + +public type HK_Form_Table_Line: + hk_form_table_line( + List(HK_Form_Table_Cell) form_table_cells + ) +. + + HK_Form_Table_Line message format + ================================= + + +public define Message + to_Message + ( + HK_Form_Table_Line _hk_form_table_line + )= + with _hk_form_table_line_message = message((Word32)0), // + forget(add_string(_hk_form_table_line_message, "__TYPE__", "HK_Form_Table_Line")); + if _hk_form_table_line is + { + //Alternative hk_form_table_line + hk_form_table_line(__form_table_cells) then + forget(add_string(_hk_form_table_line_message, "__TYPE_ALT__", "hk_form_table_line")); + // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells + map_forget((HK_Form_Table_Cell _form_table_cells) |-> add_message(_hk_form_table_line_message, "form_table_cells", to_Message(_form_table_cells)), __form_table_cells), + + }; + _hk_form_table_line_message +. + +public define Maybe(HK_Form_Table_Line) + from_Message + ( + Message _hk_form_table_line_message + )= + if find_string(_hk_form_table_line_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_form_table_line_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Form_Table_Line" then + //Alternative hk_form_table_line + if __type_alt__ = "hk_form_table_line" then //Alternative hk_form_table_line + // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells + with mb_form_table_cells = map_escape(( Message msg ) |-> (Maybe(HK_Form_Table_Cell)) from_Message(msg), find_messages(_hk_form_table_line_message, "form_table_cells")), + if mb_form_table_cells is {failure then failure, success(form_table_cells) then + + success(hk_form_table_line(form_table_cells)) + } + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/view/types/hk_view_editor_cell.anubis b/view/types/hk_view_editor_cell.anubis deleted file mode 100644 index 30aeb68..0000000 --- a/view/types/hk_view_editor_cell.anubis +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Created by 伝作 (Densaku). - * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 - * - */ - -transmit system/muscle.anubis -transmit system/convert.anubis -transmit tools/basis.anubis - -transmit hayamiki_lib/view/view_table_types.anubis - -public type HK_View_Editor_Cell: - ve_cell( - VT_edit_entry edit_entry - ) -. - - HK_View_Editor_Cell message format - ================================== - - -public define Message - to_Message - ( - HK_View_Editor_Cell _hk_view_editor_cell - )= - with _hk_view_editor_cell_message = message((Word32)0), // - forget(add_string(_hk_view_editor_cell_message, "__TYPE__", "HK_View_Editor_Cell")); - if _hk_view_editor_cell is - { - //Alternative ve_cell - ve_cell(_edit_entry) then - forget(add_string(_hk_view_editor_cell_message, "__TYPE_ALT__", "ve_cell")); - // [type = VT_edit_entry] ve_cell.edit_entry - forget(add_message(_hk_view_editor_cell_message, "edit_entry", to_Message(_edit_entry))), - - }; - _hk_view_editor_cell_message -. - -public define Maybe(HK_View_Editor_Cell) - from_Message - ( - Message _hk_view_editor_cell_message - )= - if find_string(_hk_view_editor_cell_message, "__TYPE__") is {failure then failure, success(__type__) then - if find_string(_hk_view_editor_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then - if __type__ = "HK_View_Editor_Cell" then - //Alternative ve_cell - if __type_alt__ = "ve_cell" then //Alternative ve_cell - // [type = VT_edit_entry] ve_cell.edit_entry - if find_message(_hk_view_editor_cell_message, "edit_entry") is {failure then failure, success(edit_entry_msg) then - if (Maybe(VT_edit_entry))from_Message(edit_entry_msg) is {failure then failure, success(edit_entry) then - - success(ve_cell(edit_entry)) - }} - else - failure //No valid Alternative found ! - else - failure //Type not found in message ! - }} -. - diff --git a/view/types/hk_view_editor_line.anubis b/view/types/hk_view_editor_line.anubis deleted file mode 100644 index c2a81f2..0000000 --- a/view/types/hk_view_editor_line.anubis +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Created by 伝作 (Densaku). - * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 - * - */ - -transmit system/muscle.anubis -transmit system/convert.anubis -transmit tools/basis.anubis - -transmit hayamiki_lib/view/types/hk_view_editor_cell.anubis - -public type HK_View_Editor_Line: - ve_line( - List(HK_View_Editor_Cell) ve_cells - ) -. - - HK_View_Editor_Line message format - ================================== - - -public define Message - to_Message - ( - HK_View_Editor_Line _hk_view_editor_line - )= - with _hk_view_editor_line_message = message((Word32)0), // - forget(add_string(_hk_view_editor_line_message, "__TYPE__", "HK_View_Editor_Line")); - if _hk_view_editor_line is - { - //Alternative ve_line - ve_line(__ve_cells) then - forget(add_string(_hk_view_editor_line_message, "__TYPE_ALT__", "ve_line")); - // [type = List(HK_View_Editor_Cell)] ve_line.ve_cells - map_forget((HK_View_Editor_Cell _ve_cells) |-> add_message(_hk_view_editor_line_message, "ve_cells", to_Message(_ve_cells)), __ve_cells), - - }; - _hk_view_editor_line_message -. - -public define Maybe(HK_View_Editor_Line) - from_Message - ( - Message _hk_view_editor_line_message - )= - if find_string(_hk_view_editor_line_message, "__TYPE__") is {failure then failure, success(__type__) then - if find_string(_hk_view_editor_line_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then - if __type__ = "HK_View_Editor_Line" then - //Alternative ve_line - if __type_alt__ = "ve_line" then //Alternative ve_line - // [type = List(HK_View_Editor_Cell)] ve_line.ve_cells - with mb_ve_cells = map_escape(( Message msg ) |-> (Maybe(HK_View_Editor_Cell)) from_Message(msg), find_messages(_hk_view_editor_line_message, "ve_cells")), - if mb_ve_cells is {failure then failure, success(ve_cells) then - - success(ve_line(ve_cells)) - } - else - failure //No valid Alternative found ! - else - failure //Type not found in message ! - }} -. - diff --git a/view/types/hk_view_editor_table.anubis b/view/types/hk_view_editor_table.anubis deleted file mode 100644 index 80957db..0000000 --- a/view/types/hk_view_editor_table.anubis +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Created by 伝作 (Densaku). - * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-03 - * Time: 23:52:46 - * - */ - -transmit system/muscle.anubis -transmit system/convert.anubis -transmit tools/basis.anubis - -transmit hayamiki_lib/view/types/hk_view_editor_line.anubis - -public type HK_View_Editor_Table: - ve_table( - List(HK_View_Editor_Line) ve_lines - ) -. - - HK_View_Editor_Table message format - =================================== - - -public define Message - to_Message - ( - HK_View_Editor_Table _hk_view_editor_table - )= - with _hk_view_editor_table_message = message((Word32)0), // - forget(add_string(_hk_view_editor_table_message, "__TYPE__", "HK_View_Editor_Table")); - if _hk_view_editor_table is - { - //Alternative ve_table - ve_table(__ve_lines) then - forget(add_string(_hk_view_editor_table_message, "__TYPE_ALT__", "ve_table")); - // [type = List(HK_View_Editor_Line)] ve_table.ve_lines - map_forget((HK_View_Editor_Line _ve_lines) |-> add_message(_hk_view_editor_table_message, "ve_lines", to_Message(_ve_lines)), __ve_lines), - - }; - _hk_view_editor_table_message -. - -public define Maybe(HK_View_Editor_Table) - from_Message - ( - Message _hk_view_editor_table_message - )= - if find_string(_hk_view_editor_table_message, "__TYPE__") is {failure then failure, success(__type__) then - if find_string(_hk_view_editor_table_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then - if __type__ = "HK_View_Editor_Table" then - //Alternative ve_table - if __type_alt__ = "ve_table" then //Alternative ve_table - // [type = List(HK_View_Editor_Line)] ve_table.ve_lines - with mb_ve_lines = map_escape(( Message msg ) |-> (Maybe(HK_View_Editor_Line)) from_Message(msg), find_messages(_hk_view_editor_table_message, "ve_lines")), - if mb_ve_lines is {failure then failure, success(ve_lines) then - - success(ve_table(ve_lines)) - } - else - failure //No valid Alternative found ! - else - failure //Type not found in message ! - }} -. - diff --git a/view/view_editor_renderer.anubis b/view/view_editor_renderer.anubis new file mode 100644 index 0000000..5ef0fde --- /dev/null +++ b/view/view_editor_renderer.anubis @@ -0,0 +1,37 @@ +/* + * Created by PyramIDE. + * User: フランスのトトロ aka (David RENÉ) + * Date: 03/04/2017 + * Time: 21:26 + * © Calexium + */ + +read calexium_lib/web/CXM_making_a_web_site.anubis +read calexium_lib/web/CXM_form.anubis +read hayamiki_lib/view/view_table_manager_types.anubis +read hayamiki_lib/view/view_table_manager.anubis +read hayamiki_lib/types/hayamiki.anubis + +public define Maybe(HTML_Partial_Content) + view_editor_content + ( + SQLite3DataBase db, + (String) -> String _T, + String lang, + String web_site_directory, + List(Web_arg) lwa, + String table, //table name + String view_name, //view name to use + VT_action action, //new_entry or edit an existing record + VTM vtm, + String clause, + String fk_clause, + HK_Referer referer + ) = + if vtm_get_edit(table, vtm.edit_list) is + { + failure then failure, + success(vtm_e) then + since vtm_e is vtm_edit(_, get_edit), + success(edit_table_form(db, _T, lang, web_site_directory, lwa, get_edit(db, action, view_name), vtm, clause, fk_clause, referer)) + }. diff --git a/view/view_table_types.anubis b/view/view_table_types.anubis deleted file mode 100644 index 1935a1c..0000000 --- a/view/view_table_types.anubis +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Created by PyramIDE. - * User: Totoro - * Date: 15/11/2011 - * Time: 20:32 - */ - -read calexium_lib/web/CXM_making_a_web_site.anubis -transmit calexium_lib/web/CXM_common.anubis -read hayamiki_lib/types/hayamiki.anubis - -public type VT_edit_selector: - vt_edit_selector((SQLite3DataBase db, HK_Referer referer, String filter) -> List((List(CoreAttrs), WebArgValue, String)) get). - - -public type VT_edit_entry: - hidden (String name, String value), - label (String s_name), - primary_key (String idx), - information (String s_name, String c_name, String v_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show - text (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name - password (String s_name, String c_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name - foreign_text(String s_name, String c_name, DB_id selected, VT_edit_selector selector, HK_Help_Text help), - choices_text(String s_name, String c_name, String selected, VT_edit_selector selector, HK_Help_Text help), - text_area (String s_name, String c_name, String value, HK_Text_Field_Attr area_att, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name - boolean (String s_name, String c_name, Bool value, HK_Help_Text help), - integer (String s_name, String c_name, Int value, HK_Help_Text help), - float (String s_name, String c_name, Float value, HK_Help_Text help), - choices_int (String s_name, String c_name, Int selected, VT_edit_selector selector, HK_Help_Text help), - date (String s_name, String c_name, String value, HK_Help_Text help), - time (String s_name, String c_name, String value, HK_Help_Text help), - datetime (String s_name, String c_name, String value, HK_Help_Text help), - color (String s_name, String c_name, String value, HK_Help_Text help) -. - -public define VT_edit_entry text (String s_name, String c_name, String value) = text(s_name, c_name, value, no_help_text). -public define VT_edit_entry foreign_text(String s_name, String c_name, DB_id selected, VT_edit_selector selector) = foreign_text(s_name, c_name, selected, selector, no_help_text). -public define VT_edit_entry text_area (String s_name, String c_name, String value) = text_area(s_name, c_name, value, none, no_help_text). -public define VT_edit_entry boolean(String s_name, String c_name, Bool value) = boolean(s_name, c_name, value, no_help_text). -public define VT_edit_entry integer(String s_name, String c_name, Int value) = integer(s_name, c_name, value, no_help_text). -public define VT_edit_entry float(String s_name, String c_name, Float value) = float(s_name, c_name, value, no_help_text). -public define VT_edit_entry information(String s_name, String c_name, String v_name, HK_Help_Text help) = information(s_name, c_name, v_name, 0, help). - - -public type HK_V_Edit_Tab: - hk_v_edit_tab(String fk_table_name, String fk_col_name, String list_view_name) -. - -public type VT_edit: - vt_edit_list_form(String table_name, String view_name, List(VT_edit_entry) list, List(HK_V_Edit_Tab) tabs), - vt_edit_table_form(String table_name, String view_name, - - -public type VT_view_model_entry: - //hidden (String name, String value), - primary_key , - information (String label, String column_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show - text (String label, String column_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name - password (String label, String column_name, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name - foreign_text(String label, String column_name, VT_edit_selector selector, HK_Help_Text help), - choices_text(String label, String column_name, VT_edit_selector selector, HK_Help_Text help), - text_area (String label, String column_name, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name - boolean (String label, String column_name, HK_Help_Text help), - integer (String label, String column_name, HK_Help_Text help), - float (String label, String column_name, HK_Help_Text help), - choices_int (String label, String column_name, VT_edit_selector selector, HK_Help_Text help), - date (String label, String column_name, HK_Help_Text help), - time (String label, String column_name, HK_Help_Text help), - datetime (String label, String column_name, HK_Help_Text help), - color (String label, String column_name, HK_Help_Text help). - - -public type VT_view_model: - vt_view_model(List(VT_view_model_entry) list). - -public type VT_view_entry: - text(String text), - link(String id, String text), - link_id_action(String id, String text, WEB_Action_Name link_id_action), - icon(String icon_path). - -public type VT_view_row_header: - vt_view_row_header(List(VT_view_entry) list). - -public type VT_view_row: - vt_view_row(Int db_id, List(VT_view_entry) list). - -public type VT_View_DB_Calls: - vt_view_db_calls( - (SQLite3DataBase db, String clause) -> Int get_count, - (SQLite3DataBase db, HK_Referer referer, String clause) -> JsonMember get_rows_json -// (SQLite3DataBase db, String clause) -> List(VT_view_row) get_rows - ) -. - -public type VT_view: - vt_view(String table_name, String view_name, VT_view_model view_model, VT_view_row_header header, VT_View_DB_Calls db_calls). - - -public type VT_action: - new_entry, - edit_entry(String idx). - -public define String default_select = "--------------------". //20 dash -public define (List(CoreAttrs),WebArgValue,String) selector_default_entry = ([], wav("none"),default_select). diff --git a/view/web_action.anubis b/view/web_action.anubis index b357a70..0fbd0f9 100644 --- a/view/web_action.anubis +++ b/view/web_action.anubis @@ -11,6 +11,7 @@ read calexium_lib/web/CXM_making_a_web_site.anubis here are defined all action managed by Hayamiki Controller public define WEB_Action_Name hkc_edit_table = controller_action("hk_c", "edit_table"). +public define WEB_Action_Name hkc_view_editor = controller_action("hk_c", "view_editor"). public define WEB_Action_Name hkc_grid_view = controller_action("hk_c", "grid_view"). public define WEB_Action_Name hkc_grid_action = controller_action("hk_c", "grid_action"). public define WEB_Action_Name hkc_list_view = controller_action("hk_c", "view_table"). -- libgit2 0.21.4