From 7a8ff83c22790cfdf3ed774a66df739b006b8914 Mon Sep 17 00:00:00 2001 From: totoro Date: Tue, 4 Apr 2017 18:08:40 +0200 Subject: [PATCH] continue working on HK form... Still not finished --- ds_files/ds_types.anubis | 22 ++++++++++++++++++++++ model/types/hk_app.anubis | 2 +- model/types/hk_app_name.anubis | 2 +- model/types/hk_database.anubis | 2 +- model/types/hk_datetime_field_attr.anubis | 2 +- model/types/hk_display.anubis | 2 +- model/types/hk_edit_view.anubis | 2 +- model/types/hk_edit_view_table.anubis | 2 +- model/types/hk_edit_view_table_cell.anubis | 2 +- model/types/hk_edit_view_table_line.anubis | 2 +- model/types/hk_fk_view.anubis | 2 +- model/types/hk_help_text.anubis | 2 +- model/types/hk_icon.anubis | 2 +- model/types/hk_int_choice.anubis | 2 +- model/types/hk_int_choices.anubis | 2 +- model/types/hk_list_view.anubis | 2 +- model/types/hk_model.anubis | 2 +- model/types/hk_model_attr.anubis | 2 +- model/types/hk_model_column.anubis | 2 +- model/types/hk_model_field.anubis | 2 +- model/types/hk_table.anubis | 2 +- model/types/hk_text_choice.anubis | 2 +- model/types/hk_text_choices.anubis | 2 +- model/types/hk_text_field_attr.anubis | 2 +- view/types/hk_form.anubis | 128 +++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- view/types/hk_form_tab.anubis | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/types/hk_form_table.anubis | 2 +- view/types/hk_form_table_cell.anubis | 2 +- view/types/hk_form_table_line.anubis | 2 +- view/types/hk_view.anubis | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ view/view_table_renderer.anubis | 6 +++--- 31 files changed, 257 insertions(+), 132 deletions(-) create mode 100644 view/types/hk_form_tab.anubis create mode 100644 view/types/hk_view.anubis diff --git a/ds_files/ds_types.anubis b/ds_files/ds_types.anubis index 817728c..cd12dc1 100644 --- a/ds_files/ds_types.anubis +++ b/ds_files/ds_types.anubis @@ -254,5 +254,27 @@ public define List(DS_Type) hayamiki_lib_types_description = ]) ]), + ds_type("HK_Form_Tab", [ + alternative("hk_form_tab", [ + component(string, "fk_table_name"), + component(string, "fk_col_name"), + component(string, "list_view_name") + ]) + ]), + + ds_type("HK_Form", no_message, [ + alternative("hk_form_in_list", [ + component(string, "table_name", comment("database table name which belonging this form")), + component(string, "view_name", comment("name of the view")), + component(list, extern_type("HK_Form_Entry", view_types+"hk_form_entry.anubis"), "list"), + component(list, extern_type("HK_Form_Tab", view_types+"hk_form_tab.anubis"), "tabs") + ]), + alternative("hk_form_in_table", [ + component(string, "table_name", comment("database table name which belonging this form")), + component(string, "view_name", comment("name of the view")), + component(extern_type("HK_Form_Table", view_types+"hk_form_table.anubis"), "form_in_table") + ]) + ]) + ] . diff --git a/model/types/hk_app.anubis b/model/types/hk_app.anubis index a6327b1..e326bde 100644 --- a/model/types/hk_app.anubis +++ b/model/types/hk_app.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_app_name.anubis b/model/types/hk_app_name.anubis index 6a24ea4..dde743d 100644 --- a/model/types/hk_app_name.anubis +++ b/model/types/hk_app_name.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_database.anubis b/model/types/hk_database.anubis index cb132cf..3d3b545 100644 --- a/model/types/hk_database.anubis +++ b/model/types/hk_database.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_datetime_field_attr.anubis b/model/types/hk_datetime_field_attr.anubis index 61f2df8..c5f0ea8 100644 --- a/model/types/hk_datetime_field_attr.anubis +++ b/model/types/hk_datetime_field_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_display.anubis b/model/types/hk_display.anubis index b107baa..307cb72 100644 --- a/model/types/hk_display.anubis +++ b/model/types/hk_display.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_edit_view.anubis b/model/types/hk_edit_view.anubis index cef3cf1..a8d1de6 100644 --- a/model/types/hk_edit_view.anubis +++ b/model/types/hk_edit_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_edit_view_table.anubis b/model/types/hk_edit_view_table.anubis index 8fae477..4081cca 100644 --- a/model/types/hk_edit_view_table.anubis +++ b/model/types/hk_edit_view_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_edit_view_table_cell.anubis b/model/types/hk_edit_view_table_cell.anubis index d6730f1..82e7510 100644 --- a/model/types/hk_edit_view_table_cell.anubis +++ b/model/types/hk_edit_view_table_cell.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_edit_view_table_line.anubis b/model/types/hk_edit_view_table_line.anubis index f7e78e7..5071d91 100644 --- a/model/types/hk_edit_view_table_line.anubis +++ b/model/types/hk_edit_view_table_line.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_fk_view.anubis b/model/types/hk_fk_view.anubis index a95b03e..0b8bcac 100644 --- a/model/types/hk_fk_view.anubis +++ b/model/types/hk_fk_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_help_text.anubis b/model/types/hk_help_text.anubis index cdfee4b..53d475d 100644 --- a/model/types/hk_help_text.anubis +++ b/model/types/hk_help_text.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_icon.anubis b/model/types/hk_icon.anubis index 3785c34..95f3c43 100644 --- a/model/types/hk_icon.anubis +++ b/model/types/hk_icon.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_int_choice.anubis b/model/types/hk_int_choice.anubis index 1f9521a..cffe766 100644 --- a/model/types/hk_int_choice.anubis +++ b/model/types/hk_int_choice.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_int_choices.anubis b/model/types/hk_int_choices.anubis index c447fcb..914fd3b 100644 --- a/model/types/hk_int_choices.anubis +++ b/model/types/hk_int_choices.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_list_view.anubis b/model/types/hk_list_view.anubis index b55de95..15cbc9f 100644 --- a/model/types/hk_list_view.anubis +++ b/model/types/hk_list_view.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_model.anubis b/model/types/hk_model.anubis index 696b37f..facbc82 100644 --- a/model/types/hk_model.anubis +++ b/model/types/hk_model.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_model_attr.anubis b/model/types/hk_model_attr.anubis index aa10d65..7823732 100644 --- a/model/types/hk_model_attr.anubis +++ b/model/types/hk_model_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_model_column.anubis b/model/types/hk_model_column.anubis index e2cce8b..2447d56 100644 --- a/model/types/hk_model_column.anubis +++ b/model/types/hk_model_column.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_model_field.anubis b/model/types/hk_model_field.anubis index 4589415..be5d4af 100644 --- a/model/types/hk_model_field.anubis +++ b/model/types/hk_model_field.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_table.anubis b/model/types/hk_table.anubis index 9db931a..7965da1 100644 --- a/model/types/hk_table.anubis +++ b/model/types/hk_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_text_choice.anubis b/model/types/hk_text_choice.anubis index 4ec20fc..58ec6c3 100644 --- a/model/types/hk_text_choice.anubis +++ b/model/types/hk_text_choice.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_text_choices.anubis b/model/types/hk_text_choices.anubis index 2d88428..be4149e 100644 --- a/model/types/hk_text_choices.anubis +++ b/model/types/hk_text_choices.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/model/types/hk_text_field_attr.anubis b/model/types/hk_text_field_attr.anubis index 4cd2a3e..77874ef 100644 --- a/model/types/hk_text_field_attr.anubis +++ b/model/types/hk_text_field_attr.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:12:46 * */ diff --git a/view/types/hk_form.anubis b/view/types/hk_form.anubis index 4203b03..881acf7 100644 --- a/view/types/hk_form.anubis +++ b/view/types/hk_form.anubis @@ -1,107 +1,29 @@ -/* - * Created by PyramIDE. - * User: Totoro - * Date: 15/11/2011 - * Time: 20:32 +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 17:26:31 + * */ -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 +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + +transmit hayamiki_lib/view/types/hk_form_table.anubis +transmit hayamiki_lib/view/types/hk_form_tab.anubis +transmit hayamiki_lib/view/types/hk_form_entry.anubis + +public type HK_Form: + hk_form_in_list( + String table_name, //database table name which belonging this form + String view_name, //name of the view + List(HK_Form_Entry) list, + List(HK_Form_Tab) tabs + ), + hk_form_in_table( + String table_name, //database table name which belonging this form + String view_name, //name of the view + HK_Form_Table form_in_table ) . - -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_tab.anubis b/view/types/hk_form_tab.anubis new file mode 100644 index 0000000..0635b0b --- /dev/null +++ b/view/types/hk_form_tab.anubis @@ -0,0 +1,74 @@ +/* + * Created by 伝作 (Densaku). + * Types & Messages generator written by フランスのトトロ aka (David RENÉ) + * Date: 2017-04-04 + * Time: 17:26:31 + * + */ + +transmit system/muscle.anubis +transmit system/convert.anubis +transmit tools/basis.anubis + + +public type HK_Form_Tab: + hk_form_tab( + String fk_table_name, + String fk_col_name, + String list_view_name + ) +. + + HK_Form_Tab message format + ========================== + + +public define Message + to_Message + ( + HK_Form_Tab _hk_form_tab + )= + with _hk_form_tab_message = message((Word32)0), // + forget(add_string(_hk_form_tab_message, "__TYPE__", "HK_Form_Tab")); + if _hk_form_tab is + { + //Alternative hk_form_tab + hk_form_tab(_fk_table_name, _fk_col_name, _list_view_name) then + forget(add_string(_hk_form_tab_message, "__TYPE_ALT__", "hk_form_tab")); + // [type = String] hk_form_tab.fk_table_name + forget(add_string(_hk_form_tab_message, "fk_table_name", _fk_table_name)); + // [type = String] hk_form_tab.fk_col_name + forget(add_string(_hk_form_tab_message, "fk_col_name", _fk_col_name)); + // [type = String] hk_form_tab.list_view_name + forget(add_string(_hk_form_tab_message, "list_view_name", _list_view_name)), + + }; + _hk_form_tab_message +. + +public define Maybe(HK_Form_Tab) + from_Message + ( + Message _hk_form_tab_message + )= + if find_string(_hk_form_tab_message, "__TYPE__") is {failure then failure, success(__type__) then + if find_string(_hk_form_tab_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then + if __type__ = "HK_Form_Tab" then + //Alternative hk_form_tab + if __type_alt__ = "hk_form_tab" then //Alternative hk_form_tab + // [type = String] hk_form_tab.fk_table_name + if find_string(_hk_form_tab_message, "fk_table_name") is {failure then failure, success(fk_table_name) then + // [type = String] hk_form_tab.fk_col_name + if find_string(_hk_form_tab_message, "fk_col_name") is {failure then failure, success(fk_col_name) then + // [type = String] hk_form_tab.list_view_name + if find_string(_hk_form_tab_message, "list_view_name") is {failure then failure, success(list_view_name) then + + success(hk_form_tab(fk_table_name, fk_col_name, list_view_name)) + }}} + else + failure //No valid Alternative found ! + else + failure //Type not found in message ! + }} +. + diff --git a/view/types/hk_form_table.anubis b/view/types/hk_form_table.anubis index 43f7127..8efb127 100644 --- a/view/types/hk_form_table.anubis +++ b/view/types/hk_form_table.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:26:31 * */ diff --git a/view/types/hk_form_table_cell.anubis b/view/types/hk_form_table_cell.anubis index 20eef4a..64b01c5 100644 --- a/view/types/hk_form_table_cell.anubis +++ b/view/types/hk_form_table_cell.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:26:31 * */ diff --git a/view/types/hk_form_table_line.anubis b/view/types/hk_form_table_line.anubis index b4cdecb..63919ca 100644 --- a/view/types/hk_form_table_line.anubis +++ b/view/types/hk_form_table_line.anubis @@ -2,7 +2,7 @@ * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) * Date: 2017-04-04 - * Time: 01:16:47 + * Time: 17:26:31 * */ diff --git a/view/types/hk_view.anubis b/view/types/hk_view.anubis new file mode 100644 index 0000000..4203b03 --- /dev/null +++ b/view/types/hk_view.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/view_table_renderer.anubis b/view/view_table_renderer.anubis index 2ef01c9..888803d 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -6,7 +6,7 @@ * */ -read hayamiki_lib/view/view_table_types.anubis +read hayamiki_lib/view/types/hk_form_entry.anubis read hayamiki_lib/view/jqgrid.anubis read hayamiki_lib/view/view_table_manager_types.anubis read hayamiki_lib/view/view_table_manager.anubis @@ -377,7 +377,7 @@ public define List(CXM_Form_Field) String fk_clause, HK_Referer table_referer, (String) -> String _T, - List(VT_edit_entry) list, + List(HK_Form_Entry) list, Bool new_entry, List(CXM_Form_Field) so_far )= @@ -460,7 +460,7 @@ define HTML_Head_Tag define List(HTML_Head_Tag) get_editor_header ( - List(VT_edit_entry) list + List(HK_Form_Entry) list )= [js(js_file("ckeditor/ckeditor.js")), get_rich_editor_inline(list), -- libgit2 0.21.4