David RENÉ / hayamiki_lib

Commit 23eeeae84177732211b508466d55b46abae6fb17

Authored by totoro
1 parent 546d5e5d

move some definition from model to view 

still working on refactoring of the view and from
Showing 30 changed files with 207 additions and 381 deletions   Show diff stats
Inline Side-by-side
ds_files/ds_types.anubis
  Show/Hide comments   View file @23eeeae
... ... @@ -51,8 +51,8 @@ public define List(DS_Type) hayamiki_lib_types_description =
51 51 alternative("hk_table", [
52 52 component(string, "name", comment("name of the table")),
53 53 component(string, "short_name", comment("table name without app_name in prefix")),
54   - component(extern_type("HK_Model", model_types+"hk_model.anubis"), "model"),
55   - component(extern_type("HK_Display", model_types+"hk_display.anubis"), "display")
  54 + component(extern_type("HK_Model", model_types+"hk_model.anubis"), "model"),
  55 + component(extern_type("HK_Display", view_types+ "hk_display.anubis"), "display")
56 56 ])
57 57 ]),
58 58  
... ... @@ -71,7 +71,7 @@ public define List(DS_Type) hayamiki_lib_types_description =
71 71 component( extern_type("HK_Help_Text", model_types+"hk_help_text.anubis"), "help")
72 72 ])
73 73 ]),
74   -
  74 +
75 75 ds_type("HK_Model_Field", [
76 76 enum("p_key"),
77 77 enum("boolean_field", comment("true or false")),
... ... @@ -169,20 +169,13 @@ public define List(DS_Type) hayamiki_lib_types_description =
169 169 enum("not_null"),
170 170 ]),
171 171  
172   - ds_type("HK_Model_Column", [
173   - alternative("hk_column", [
174   - component(string, "name", comment("name of ordinary column (i.e. all but 'id')")),
175   - component(extern_type("HK_Model_Field", model_types+"hk_model_field.anubis"), "type"),
176   - component(list, extern_type("HK_Model_Attr", model_types+"hk_model_attr.anubis"), "attributes"),
177   - component(extern_type("HK_Help_Text", model_types+"hk_help_text.anubis"), "help")
178   - ])
179   - ]),
  172 +
180 173  
181 174 //HK_DISPLAY
182 175 ds_type("HK_Display", [
183 176 alternative("hk_display", [
184   - component(list, extern_type("HK_List_View", model_types+"hk_list_view.anubis"), "list_views"),
185   - component(list, extern_type("HK_Edit_View", model_types+"hk_edit_view.anubis"), "list_edits"),
  177 + component(list, extern_type("HK_List_View", view_types+"hk_list_view.anubis"), "list_views"),
  178 + component(list, extern_type("HK_Edit_View", view_types+"hk_edit_view.anubis"), "list_edits"),
186 179 ])
187 180 ]),
188 181  
... ... @@ -205,39 +198,43 @@ public define List(DS_Type) hayamiki_lib_types_description =
205 198 ])
206 199 ]),
207 200  
208   - ds_type("HK_Form_Table_Cell", [
  201 + ds_type("HK_Form_Table_Cell", no_message, [
209 202 alternative("hk_form_table_cell", [
210 203 component(extern_type("HK_Form_Entry", view_types+"hk_form_entry.anubis"), "form_entry")
211 204 ])
212 205 ]),
213 206  
214   - ds_type("HK_Form_Table_Line", [
  207 + ds_type("HK_Form_Table_Line", no_message, [
215 208 alternative("hk_form_table_line", [
216 209 component(list, extern_type("HK_Form_Table_Cell", view_types+"hk_form_table_cell.anubis"), "form_table_cells")
217 210 ])
218 211 ]),
219 212  
220   - ds_type("HK_Form_Table", [
  213 + ds_type("HK_Form_Table", no_message, [
221 214 alternative("hk_form_table", [
222 215 component(list, extern_type("HK_Form_Table_Line", view_types+"hk_form_table_line.anubis"), "form_lines")
223 216 ])
224 217 ]),
225 218  
226 219 ds_type("HK_Edit_View_Table_Cell", [
227   - alternative("cell", [
  220 + enum("empty"),
  221 + alternative("column", [
228 222 component(string, "column_name")
  223 + ]),
  224 + alternative("label", [
  225 + component(string, "label")
229 226 ])
230 227 ]),
231 228  
232 229 ds_type("HK_Edit_View_Table_Line", [
233 230 alternative("line", [
234   - component(list, extern_type("HK_Edit_View_Table_Cell", model_types+"hk_edit_view_table_cell.anubis"), "cells")
  231 + component(list, extern_type("HK_Edit_View_Table_Cell", view_types+"hk_edit_view_table_cell.anubis"), "cells")
235 232 ])
236 233 ]),
237 234  
238 235 ds_type("HK_Edit_View_Table", [
239 236 alternative("table", [
240   - component(list, extern_type("HK_Edit_View_Table_Line", model_types+"hk_edit_view_table_line.anubis"), "lines")
  237 + component(list, extern_type("HK_Edit_View_Table_Line", view_types+"hk_edit_view_table_line.anubis"), "lines")
241 238 ])
242 239 ]),
243 240  
... ... @@ -246,15 +243,15 @@ public define List(DS_Type) hayamiki_lib_types_description =
246 243 alternative("edit_view_list_form", [
247 244 component(string, "view_name"),
248 245 component(list, string, "columns"),
249   - component(list, extern_type("HK_FK_View", model_types+"hk_fk_view.anubis"), "fk_view")
  246 + component(list, extern_type("HK_FK_View", view_types+"hk_fk_view.anubis"), "fk_view")
250 247 ]),
251 248 alternative("edit_view_table_form", [
252 249 component(string, "view_name"),
253   - component(extern_type("HK_Edit_View_Table", model_types+"hk_edit_view_table.anubis"), "form_table")
  250 + component(extern_type("HK_Edit_View_Table", view_types+"hk_edit_view_table.anubis"), "form_table")
254 251 ])
255 252 ]),
256 253  
257   - ds_type("HK_Form_Tab", [
  254 + ds_type("HK_Form_Tab", no_message, [
258 255 alternative("hk_form_tab", [
259 256 component(string, "fk_table_name"),
260 257 component(string, "fk_col_name"),
... ...
model/display.anubis
  Show/Hide comments   View file @23eeeae
... ... @@ -11,10 +11,10 @@ transmit tools/basis.anubis
11 11 transmit calexium_lib/CXM_message_constants.anubis
12 12 transmit calexium_lib/web/CXM_json.anubis
13 13  
14   -transmit hayamiki_lib/model/types/hk_display.anubis
15   -transmit hayamiki_lib/model/types/hk_list_view.anubis
16   -transmit hayamiki_lib/model/types/hk_edit_view.anubis
17   -transmit hayamiki_lib/model/types/hk_fk_view.anubis
  14 +transmit hayamiki_lib/view/types/hk_display.anubis
  15 +transmit hayamiki_lib/view/types/hk_list_view.anubis
  16 +transmit hayamiki_lib/view/types/hk_edit_view.anubis
  17 +transmit hayamiki_lib/view/types/hk_fk_view.anubis
18 18 transmit hayamiki_lib/model/types/hk_icon.anubis
19 19  
20 20 public define HK_List_View
... ...
model/types/hk_app.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -63,18 +63,18 @@ public define Maybe(HK_App)
63 63 //Alternative hk_app
64 64 if __type_alt__ = "hk_app" then //Alternative hk_app
65 65 // [type = String] hk_app.app_name
66   - if find_string(_hk_app_message, "app_name") is {failure then failure, success(app_name) then
  66 + if find_string(_hk_app_message, "app_name") is {failure then failure, success(_app_name_) then
67 67 // [type = HK_Icon] hk_app.icon
68   - if find_message(_hk_app_message, "icon") is {failure then failure, success(icon_msg) then
69   - if (Maybe(HK_Icon))from_Message(icon_msg) is {failure then failure, success(icon) then
  68 + if find_message(_hk_app_message, "icon") is {failure then failure, success(_icon__msg) then
  69 + if (Maybe(HK_Icon))from_Message(_icon__msg) is {failure then failure, success(_icon_) then
70 70 // [type = HK_Help_Text] hk_app.help
71   - if find_message(_hk_app_message, "help") is {failure then failure, success(help_msg) then
72   - if (Maybe(HK_Help_Text))from_Message(help_msg) is {failure then failure, success(help) then
  71 + if find_message(_hk_app_message, "help") is {failure then failure, success(_help__msg) then
  72 + if (Maybe(HK_Help_Text))from_Message(_help__msg) is {failure then failure, success(_help_) then
73 73 // [type = List(HK_Table)] hk_app.hk_tables
74 74 with mb_hk_tables = map_escape(( Message msg ) |-> (Maybe(HK_Table)) from_Message(msg), find_messages(_hk_app_message, "hk_tables")),
75 75 if mb_hk_tables is {failure then failure, success(hk_tables) then
76 76  
77   - success(hk_app(app_name, icon, help, hk_tables))
  77 + success(hk_app(_app_name_, _icon_, _help_, _hk_tables_))
78 78 }}}}}}
79 79 else
80 80 failure //No valid Alternative found !
... ...
model/types/hk_app_name.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -64,9 +64,9 @@ public define Maybe(HK_App_Name)
64 64 else //Alternative app_name
65 65 if __type_alt__ = "app_name" then //Alternative app_name
66 66 // [type = String] app_name.name
67   - if find_string(_hk_app_name_message, "name") is {failure then failure, success(name) then
  67 + if find_string(_hk_app_name_message, "name") is {failure then failure, success(_name_) then
68 68  
69   - success(app_name(name))
  69 + success(app_name(_name_))
70 70 }
71 71 else //Alternative none (NO TYPE)
72 72 if __type_alt__ = "none" then
... ...
model/types/hk_database.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -55,12 +55,12 @@ public define Maybe(HK_Database)
55 55 //Alternative hk_database
56 56 if __type_alt__ = "hk_database" then //Alternative hk_database
57 57 // [type = String] hk_database.name
58   - if find_string(_hk_database_message, "name") is {failure then failure, success(name) then
  58 + if find_string(_hk_database_message, "name") is {failure then failure, success(_name_) then
59 59 // [type = List(HK_App)] hk_database.apps
60 60 with mb_apps = map_escape(( Message msg ) |-> (Maybe(HK_App)) from_Message(msg), find_messages(_hk_database_message, "apps")),
61 61 if mb_apps is {failure then failure, success(apps) then
62 62  
63   - success(hk_database(name, apps))
  63 + success(hk_database(_name_, _apps_))
64 64 }}
65 65 else
66 66 failure //No valid Alternative found !
... ...
model/types/hk_datetime_field_attr.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ...
model/types/hk_help_text.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -68,16 +68,16 @@ public define Maybe(HK_Help_Text)
68 68 else //Alternative help_text_TAG
69 69 if __type_alt__ = "help_text_TAG" then //Alternative help_text_TAG
70 70 // [type = String] help_text_TAG.h_text_tag
71   - if find_string(_hk_help_text_message, "h_text_tag") is {failure then failure, success(h_text_tag) then
  71 + if find_string(_hk_help_text_message, "h_text_tag") is {failure then failure, success(_h_text_tag_) then
72 72  
73   - success(help_text_TAG(h_text_tag))
  73 + success(help_text_TAG(_h_text_tag_))
74 74 }
75 75 else //Alternative help_text
76 76 if __type_alt__ = "help_text" then //Alternative help_text
77 77 // [type = String] help_text.h_text
78   - if find_string(_hk_help_text_message, "h_text") is {failure then failure, success(h_text) then
  78 + if find_string(_hk_help_text_message, "h_text") is {failure then failure, success(_h_text_) then
79 79  
80   - success(help_text(h_text))
  80 + success(help_text(_h_text_))
81 81 }
82 82 else
83 83 failure //No valid Alternative found !
... ...
model/types/hk_icon.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -59,9 +59,9 @@ public define Maybe(HK_Icon)
59 59 else //Alternative icon16
60 60 if __type_alt__ = "icon16" then //Alternative icon16
61 61 // [type = String] icon16.name
62   - if find_string(_hk_icon_message, "name") is {failure then failure, success(name) then
  62 + if find_string(_hk_icon_message, "name") is {failure then failure, success(_name_) then
63 63  
64   - success(icon16(name))
  64 + success(icon16(_name_))
65 65 }
66 66 else
67 67 failure //No valid Alternative found !
... ...
model/types/hk_int_choice.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -54,12 +54,12 @@ public define Maybe(HK_Int_Choice)
54 54 //Alternative hk_int_choice
55 55 if __type_alt__ = "hk_int_choice" then //Alternative hk_int_choice
56 56 // [type = Int] hk_int_choice.value
57   - if find_string(_hk_int_choice_message, "value") is {failure then failure, success(_value) then
58   - if decimal_scan(_value) is { failure then failure, success(value) then
  57 + if find_string(_hk_int_choice_message, "value") is {failure then failure, success(__value_) then
  58 + if decimal_scan(__value_) is { failure then failure, success(_value_) then
59 59 // [type = String] hk_int_choice.visible
60   - if find_string(_hk_int_choice_message, "visible") is {failure then failure, success(visible) then
  60 + if find_string(_hk_int_choice_message, "visible") is {failure then failure, success(_visible_) then
61 61  
62   - success(hk_int_choice(value, visible))
  62 + success(hk_int_choice(_value_, _visible_))
63 63 }}}
64 64 else
65 65 failure //No valid Alternative found !
... ...
model/types/hk_int_choices.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -63,7 +63,7 @@ public define Maybe(HK_Int_Choices)
63 63 with mb_hk_int_choice = map_escape(( Message msg ) |-> (Maybe(HK_Int_Choice)) from_Message(msg), find_messages(_hk_int_choices_message, "hk_int_choice")),
64 64 if mb_hk_int_choice is {failure then failure, success(hk_int_choice) then
65 65  
66   - success(int_choices(hk_int_choice))
  66 + success(int_choices(_hk_int_choice_))
67 67 }
68 68 else
69 69 failure //No valid Alternative found !
... ...
model/types/hk_model.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -58,9 +58,9 @@ public define Maybe(HK_Model)
58 58 with mb_columns = map_escape(( Message msg ) |-> (Maybe(HK_Model_Column)) from_Message(msg), find_messages(_hk_model_message, "columns")),
59 59 if mb_columns is {failure then failure, success(columns) then
60 60 // [type = String] hk_model.show_string
61   - if find_string(_hk_model_message, "show_string") is {failure then failure, success(show_string) then
  61 + if find_string(_hk_model_message, "show_string") is {failure then failure, success(_show_string_) then
62 62  
63   - success(hk_model(columns, show_string))
  63 + success(hk_model(_columns_, _show_string_))
64 64 }}
65 65 else
66 66 failure //No valid Alternative found !
... ...
model/types/hk_model_attr.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -64,9 +64,9 @@ public define Maybe(HK_Model_Attr)
64 64 else //Alternative default
65 65 if __type_alt__ = "default" then //Alternative default
66 66 // [type = String] default.default_str
67   - if find_string(_hk_model_attr_message, "default_str") is {failure then failure, success(default_str) then
  67 + if find_string(_hk_model_attr_message, "default_str") is {failure then failure, success(_default_str_) then
68 68  
69   - success(default(default_str))
  69 + success(default(_default_str_))
70 70 }
71 71 else //Alternative not_null (NO TYPE)
72 72 if __type_alt__ = "not_null" then
... ...
model/types/hk_model_column.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -63,18 +63,18 @@ public define Maybe(HK_Model_Column)
63 63 //Alternative hk_column
64 64 if __type_alt__ = "hk_column" then //Alternative hk_column
65 65 // [type = String] hk_column.name
66   - if find_string(_hk_model_column_message, "name") is {failure then failure, success(name) then
  66 + if find_string(_hk_model_column_message, "name") is {failure then failure, success(_name_) then
67 67 // [type = HK_Model_Field] hk_column.type
68   - if find_message(_hk_model_column_message, "type") is {failure then failure, success(type_msg) then
69   - if (Maybe(HK_Model_Field))from_Message(type_msg) is {failure then failure, success(type) then
  68 + if find_message(_hk_model_column_message, "type") is {failure then failure, success(_type__msg) then
  69 + if (Maybe(HK_Model_Field))from_Message(_type__msg) is {failure then failure, success(_type_) then
70 70 // [type = List(HK_Model_Attr)] hk_column.attributes
71 71 with mb_attributes = map_escape(( Message msg ) |-> (Maybe(HK_Model_Attr)) from_Message(msg), find_messages(_hk_model_column_message, "attributes")),
72 72 if mb_attributes is {failure then failure, success(attributes) then
73 73 // [type = HK_Help_Text] hk_column.help
74   - if find_message(_hk_model_column_message, "help") is {failure then failure, success(help_msg) then
75   - if (Maybe(HK_Help_Text))from_Message(help_msg) is {failure then failure, success(help) then
  74 + if find_message(_hk_model_column_message, "help") is {failure then failure, success(_help__msg) then
  75 + if (Maybe(HK_Help_Text))from_Message(_help__msg) is {failure then failure, success(_help_) then
76 76  
77   - success(hk_column(name, type, attributes, help))
  77 + success(hk_column(_name_, _type_, _attributes_, _help_))
78 78 }}}}}}
79 79 else
80 80 failure //No valid Alternative found !
... ...
model/types/hk_model_field.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -157,45 +157,45 @@ public define Maybe(HK_Model_Field)
157 157 else //Alternative date_field
158 158 if __type_alt__ = "date_field" then //Alternative date_field
159 159 // [type = HK_Datetime_Field_Attr] date_field.hk_dt_f_attr
160   - if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(hk_dt_f_attr_msg) then
161   - if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg) is {failure then failure, success(hk_dt_f_attr) then
  160 + if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(_hk_dt_f_attr__msg) then
  161 + if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg) is {failure then failure, success(_hk_dt_f_attr_) then
162 162  
163   - success(date_field(hk_dt_f_attr))
  163 + success(date_field(_hk_dt_f_attr_))
164 164 }}
165 165 else //Alternative time_field
166 166 if __type_alt__ = "time_field" then //Alternative time_field
167 167 // [type = HK_Datetime_Field_Attr] time_field.hk_dt_f_attr
168   - if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(hk_dt_f_attr_msg) then
169   - if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg) is {failure then failure, success(hk_dt_f_attr) then
  168 + if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(_hk_dt_f_attr__msg) then
  169 + if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg) is {failure then failure, success(_hk_dt_f_attr_) then
170 170  
171   - success(time_field(hk_dt_f_attr))
  171 + success(time_field(_hk_dt_f_attr_))
172 172 }}
173 173 else //Alternative datetime_field
174 174 if __type_alt__ = "datetime_field" then //Alternative datetime_field
175 175 // [type = HK_Datetime_Field_Attr] datetime_field.hk_dt_f_attr
176   - if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(hk_dt_f_attr_msg) then
177   - if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg) is {failure then failure, success(hk_dt_f_attr) then
  176 + if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure, success(_hk_dt_f_attr__msg) then
  177 + if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg) is {failure then failure, success(_hk_dt_f_attr_) then
178 178  
179   - success(datetime_field(hk_dt_f_attr))
  179 + success(datetime_field(_hk_dt_f_attr_))
180 180 }}
181 181 else //Alternative foreign_key
182 182 //foreign key to 'id' in another (or same) table and column_name for choice selector)
183 183 if __type_alt__ = "foreign_key" then //Alternative foreign_key
184 184 // [type = HK_App_Name] foreign_key.app_name
185   - if find_message(_hk_model_field_message, "app_name") is {failure then failure, success(app_name_msg) then
186   - if (Maybe(HK_App_Name))from_Message(app_name_msg) is {failure then failure, success(app_name) then
  185 + if find_message(_hk_model_field_message, "app_name") is {failure then failure, success(_app_name__msg) then
  186 + if (Maybe(HK_App_Name))from_Message(_app_name__msg) is {failure then failure, success(_app_name_) then
187 187 // [type = String] foreign_key.table_name
188   - if find_string(_hk_model_field_message, "table_name") is {failure then failure, success(table_name) then
  188 + if find_string(_hk_model_field_message, "table_name") is {failure then failure, success(_table_name_) then
189 189  
190   - success(foreign_key(app_name, table_name))
  190 + success(foreign_key(_app_name_, _table_name_))
191 191 }}}
192 192 else //Alternative integer_field
193 193 if __type_alt__ = "integer_field" then //Alternative integer_field
194 194 // [type = HK_Int_Choices] integer_field.choices
195   - if find_message(_hk_model_field_message, "choices") is {failure then failure, success(choices_msg) then
196   - if (Maybe(HK_Int_Choices))from_Message(choices_msg) is {failure then failure, success(choices) then
  195 + if find_message(_hk_model_field_message, "choices") is {failure then failure, success(_choices__msg) then
  196 + if (Maybe(HK_Int_Choices))from_Message(_choices__msg) is {failure then failure, success(_choices_) then
197 197  
198   - success(integer_field(choices))
  198 + success(integer_field(_choices_))
199 199 }}
200 200 else //Alternative float_field (NO TYPE)
201 201 if __type_alt__ = "float_field" then
... ... @@ -203,30 +203,30 @@ public define Maybe(HK_Model_Field)
203 203 else //Alternative char_field
204 204 if __type_alt__ = "char_field" then //Alternative char_field
205 205 // [type = HK_Text_Choices] char_field.choices
206   - if find_message(_hk_model_field_message, "choices") is {failure then failure, success(choices_msg) then
207   - if (Maybe(HK_Text_Choices))from_Message(choices_msg) is {failure then failure, success(choices) then
  206 + if find_message(_hk_model_field_message, "choices") is {failure then failure, success(_choices__msg) then
  207 + if (Maybe(HK_Text_Choices))from_Message(_choices__msg) is {failure then failure, success(_choices_) then
208 208 // [type = Int] char_field.size
209   - if find_string(_hk_model_field_message, "size") is {failure then failure, success(_size) then
210   - if decimal_scan(_size) is { failure then failure, success(size) then
  209 + if find_string(_hk_model_field_message, "size") is {failure then failure, success(__size_) then
  210 + if decimal_scan(__size_) is { failure then failure, success(_size_) then
211 211  
212   - success(char_field(choices, size))
  212 + success(char_field(_choices_, _size_))
213 213 }}}}
214 214 else //Alternative password_field
215 215 if __type_alt__ = "password_field" then //Alternative password_field
216 216 // [type = Int] password_field.min_size
217   - if find_string(_hk_model_field_message, "min_size") is {failure then failure, success(_min_size) then
218   - if decimal_scan(_min_size) is { failure then failure, success(min_size) then
  217 + if find_string(_hk_model_field_message, "min_size") is {failure then failure, success(__min_size_) then
  218 + if decimal_scan(__min_size_) is { failure then failure, success(_min_size_) then
219 219  
220   - success(password_field(min_size))
  220 + success(password_field(_min_size_))
221 221 }}
222 222 else //Alternative text_field
223 223 //text of variable size
224 224 if __type_alt__ = "text_field" then //Alternative text_field
225 225 // [type = HK_Text_Field_Attr] text_field.hk_text_field_attr
226   - if find_message(_hk_model_field_message, "hk_text_field_attr") is {failure then failure, success(hk_text_field_attr_msg) then
227   - if (Maybe(HK_Text_Field_Attr))from_Message(hk_text_field_attr_msg) is {failure then failure, success(hk_text_field_attr) then
  226 + if find_message(_hk_model_field_message, "hk_text_field_attr") is {failure then failure, success(_hk_text_field_attr__msg) then
  227 + if (Maybe(HK_Text_Field_Attr))from_Message(_hk_text_field_attr__msg) is {failure then failure, success(_hk_text_field_attr_) then
228 228  
229   - success(text_field(hk_text_field_attr))
  229 + success(text_field(_hk_text_field_attr_))
230 230 }}
231 231 else //Alternative color_field (NO TYPE)
232 232 if __type_alt__ = "color_field" then
... ...
model/types/hk_table.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -10,7 +10,7 @@ transmit system/muscle.anubis
10 10 transmit system/convert.anubis
11 11 transmit tools/basis.anubis
12 12  
13   -transmit hayamiki_lib/model/types/hk_display.anubis
  13 +transmit hayamiki_lib/view/types/hk_display.anubis
14 14 transmit hayamiki_lib/model/types/hk_model.anubis
15 15  
16 16 public type HK_Table:
... ... @@ -62,17 +62,17 @@ public define Maybe(HK_Table)
62 62 //Alternative hk_table
63 63 if __type_alt__ = "hk_table" then //Alternative hk_table
64 64 // [type = String] hk_table.name
65   - if find_string(_hk_table_message, "name") is {failure then failure, success(name) then
  65 + if find_string(_hk_table_message, "name") is {failure then failure, success(_name_) then
66 66 // [type = String] hk_table.short_name
67   - if find_string(_hk_table_message, "short_name") is {failure then failure, success(short_name) then
  67 + if find_string(_hk_table_message, "short_name") is {failure then failure, success(_short_name_) then
68 68 // [type = HK_Model] hk_table.model
69   - if find_message(_hk_table_message, "model") is {failure then failure, success(model_msg) then
70   - if (Maybe(HK_Model))from_Message(model_msg) is {failure then failure, success(model) then
  69 + if find_message(_hk_table_message, "model") is {failure then failure, success(_model__msg) then
  70 + if (Maybe(HK_Model))from_Message(_model__msg) is {failure then failure, success(_model_) then
71 71 // [type = HK_Display] hk_table.display
72   - if find_message(_hk_table_message, "display") is {failure then failure, success(display_msg) then
73   - if (Maybe(HK_Display))from_Message(display_msg) is {failure then failure, success(display) then
  72 + if find_message(_hk_table_message, "display") is {failure then failure, success(_display__msg) then
  73 + if (Maybe(HK_Display))from_Message(_display__msg) is {failure then failure, success(_display_) then
74 74  
75   - success(hk_table(name, short_name, model, display))
  75 + success(hk_table(_name_, _short_name_, _model_, _display_))
76 76 }}}}}}
77 77 else
78 78 failure //No valid Alternative found !
... ...
model/types/hk_text_choice.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -54,11 +54,11 @@ public define Maybe(HK_Text_Choice)
54 54 //Alternative hk_text_choice
55 55 if __type_alt__ = "hk_text_choice" then //Alternative hk_text_choice
56 56 // [type = String] hk_text_choice.value
57   - if find_string(_hk_text_choice_message, "value") is {failure then failure, success(value) then
  57 + if find_string(_hk_text_choice_message, "value") is {failure then failure, success(_value_) then
58 58 // [type = String] hk_text_choice.visible
59   - if find_string(_hk_text_choice_message, "visible") is {failure then failure, success(visible) then
  59 + if find_string(_hk_text_choice_message, "visible") is {failure then failure, success(_visible_) then
60 60  
61   - success(hk_text_choice(value, visible))
  61 + success(hk_text_choice(_value_, _visible_))
62 62 }}
63 63 else
64 64 failure //No valid Alternative found !
... ...
model/types/hk_text_choices.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -63,7 +63,7 @@ public define Maybe(HK_Text_Choices)
63 63 with mb_hk_text_choice = map_escape(( Message msg ) |-> (Maybe(HK_Text_Choice)) from_Message(msg), find_messages(_hk_text_choices_message, "hk_text_choice")),
64 64 if mb_hk_text_choice is {failure then failure, success(hk_text_choice) then
65 65  
66   - success(text_choices(hk_text_choice))
  66 + success(text_choices(_hk_text_choice_))
67 67 }
68 68 else
69 69 failure //No valid Alternative found !
... ...
model/types/hk_text_field_attr.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ...
model/types/hk_display.anubis renamed to view/types/hk_display.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -10,8 +10,8 @@ transmit system/muscle.anubis
10 10 transmit system/convert.anubis
11 11 transmit tools/basis.anubis
12 12  
13   -transmit hayamiki_lib/model/types/hk_edit_view.anubis
14   -transmit hayamiki_lib/model/types/hk_list_view.anubis
  13 +transmit hayamiki_lib/view/types/hk_edit_view.anubis
  14 +transmit hayamiki_lib/view/types/hk_list_view.anubis
15 15  
16 16 public type HK_Display:
17 17 hk_display(
... ... @@ -62,7 +62,7 @@ public define Maybe(HK_Display)
62 62 with mb_list_edits = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View)) from_Message(msg), find_messages(_hk_display_message, "list_edits")),
63 63 if mb_list_edits is {failure then failure, success(list_edits) then
64 64  
65   - success(hk_display(list_views, list_edits))
  65 + success(hk_display(_list_views_, _list_edits_))
66 66 }}
67 67 else
68 68 failure //No valid Alternative found !
... ...
model/types/hk_edit_view.anubis renamed to view/types/hk_edit_view.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -10,8 +10,8 @@ transmit system/muscle.anubis
10 10 transmit system/convert.anubis
11 11 transmit tools/basis.anubis
12 12  
13   -transmit hayamiki_lib/model/types/hk_edit_view_table.anubis
14   -transmit hayamiki_lib/model/types/hk_fk_view.anubis
  13 +transmit hayamiki_lib/view/types/hk_edit_view_table.anubis
  14 +transmit hayamiki_lib/view/types/hk_fk_view.anubis
15 15  
16 16 public type HK_Edit_View:
17 17 edit_view_all,
... ... @@ -79,24 +79,24 @@ public define Maybe(HK_Edit_View)
79 79 else //Alternative edit_view_list_form
80 80 if __type_alt__ = "edit_view_list_form" then //Alternative edit_view_list_form
81 81 // [type = String] edit_view_list_form.view_name
82   - if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(view_name) then
  82 + if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(_view_name_) then
83 83 // [type = List(String)] edit_view_list_form.columns
84 84 with columns = find_string_list(_hk_edit_view_message, "columns"),
85 85 // [type = List(HK_FK_View)] edit_view_list_form.fk_view
86 86 with mb_fk_view = map_escape(( Message msg ) |-> (Maybe(HK_FK_View)) from_Message(msg), find_messages(_hk_edit_view_message, "fk_view")),
87 87 if mb_fk_view is {failure then failure, success(fk_view) then
88 88  
89   - success(edit_view_list_form(view_name, columns, fk_view))
  89 + success(edit_view_list_form(_view_name_, _columns_, _fk_view_))
90 90 }}
91 91 else //Alternative edit_view_table_form
92 92 if __type_alt__ = "edit_view_table_form" then //Alternative edit_view_table_form
93 93 // [type = String] edit_view_table_form.view_name
94   - if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(view_name) then
  94 + if find_string(_hk_edit_view_message, "view_name") is {failure then failure, success(_view_name_) then
95 95 // [type = HK_Edit_View_Table] edit_view_table_form.form_table
96   - if find_message(_hk_edit_view_message, "form_table") is {failure then failure, success(form_table_msg) then
97   - if (Maybe(HK_Edit_View_Table))from_Message(form_table_msg) is {failure then failure, success(form_table) then
  96 + if find_message(_hk_edit_view_message, "form_table") is {failure then failure, success(_form_table__msg) then
  97 + if (Maybe(HK_Edit_View_Table))from_Message(_form_table__msg) is {failure then failure, success(_form_table_) then
98 98  
99   - success(edit_view_table_form(view_name, form_table))
  99 + success(edit_view_table_form(_view_name_, _form_table_))
100 100 }}}
101 101 else
102 102 failure //No valid Alternative found !
... ...
model/types/hk_edit_view_table.anubis renamed to view/types/hk_edit_view_table.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -10,7 +10,7 @@ transmit system/muscle.anubis
10 10 transmit system/convert.anubis
11 11 transmit tools/basis.anubis
12 12  
13   -transmit hayamiki_lib/model/types/hk_edit_view_table_line.anubis
  13 +transmit hayamiki_lib/view/types/hk_edit_view_table_line.anubis
14 14  
15 15 public type HK_Edit_View_Table:
16 16 table(
... ... @@ -55,7 +55,7 @@ public define Maybe(HK_Edit_View_Table)
55 55 with mb_lines = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "lines")),
56 56 if mb_lines is {failure then failure, success(lines) then
57 57  
58   - success(table(lines))
  58 + success(table(_lines_))
59 59 }
60 60 else
61 61 failure //No valid Alternative found !
... ...
model/types/hk_edit_view_table_cell.anubis renamed to view/types/hk_edit_view_table_cell.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -12,8 +12,12 @@ transmit tools/basis.anubis
12 12  
13 13  
14 14 public type HK_Edit_View_Table_Cell:
15   - cell(
  15 + empty,
  16 + column(
16 17 String column_name
  18 + ),
  19 + label(
  20 + String label
17 21 )
18 22 .
19 23  
... ... @@ -30,12 +34,22 @@ public define Message
30 34 forget(add_string(_hk_edit_view_table_cell_message, "__TYPE__", "HK_Edit_View_Table_Cell"));
31 35 if _hk_edit_view_table_cell is
32 36 {
33   - //Alternative cell
34   - cell(_column_name) then
35   - forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "cell"));
36   - // [type = String] cell.column_name
  37 + //Alternative empty (NO TYPE)
  38 + empty then
  39 + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "empty")),
  40 +
  41 + //Alternative column
  42 + column(_column_name) then
  43 + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "column"));
  44 + // [type = String] column.column_name
37 45 forget(add_string(_hk_edit_view_table_cell_message, "column_name", _column_name)),
38 46  
  47 + //Alternative label
  48 + label(_label) then
  49 + forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "label"));
  50 + // [type = String] label.label
  51 + forget(add_string(_hk_edit_view_table_cell_message, "label", _label)),
  52 +
39 53 };
40 54 _hk_edit_view_table_cell_message
41 55 .
... ... @@ -48,12 +62,22 @@ public define Maybe(HK_Edit_View_Table_Cell)
48 62 if find_string(_hk_edit_view_table_cell_message, "__TYPE__") is {failure then failure, success(__type__) then
49 63 if find_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then
50 64 if __type__ = "HK_Edit_View_Table_Cell" then
51   - //Alternative cell
52   - if __type_alt__ = "cell" then //Alternative cell
53   - // [type = String] cell.column_name
54   - if find_string(_hk_edit_view_table_cell_message, "column_name") is {failure then failure, success(column_name) then
  65 + //Alternative empty (NO TYPE)
  66 + if __type_alt__ = "empty" then
  67 + success(empty)
  68 + else //Alternative column
  69 + if __type_alt__ = "column" then //Alternative column
  70 + // [type = String] column.column_name
  71 + if find_string(_hk_edit_view_table_cell_message, "column_name") is {failure then failure, success(_column_name_) then
  72 +
  73 + success(column(_column_name_))
  74 + }
  75 + else //Alternative label
  76 + if __type_alt__ = "label" then //Alternative label
  77 + // [type = String] label.label
  78 + if find_string(_hk_edit_view_table_cell_message, "label") is {failure then failure, success(_label_) then
55 79  
56   - success(cell(column_name))
  80 + success(label(_label_))
57 81 }
58 82 else
59 83 failure //No valid Alternative found !
... ...
model/types/hk_edit_view_table_line.anubis renamed to view/types/hk_edit_view_table_line.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -10,7 +10,7 @@ transmit system/muscle.anubis
10 10 transmit system/convert.anubis
11 11 transmit tools/basis.anubis
12 12  
13   -transmit hayamiki_lib/model/types/hk_edit_view_table_cell.anubis
  13 +transmit hayamiki_lib/view/types/hk_edit_view_table_cell.anubis
14 14  
15 15 public type HK_Edit_View_Table_Line:
16 16 line(
... ... @@ -55,7 +55,7 @@ public define Maybe(HK_Edit_View_Table_Line)
55 55 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")),
56 56 if mb_cells is {failure then failure, success(cells) then
57 57  
58   - success(line(cells))
  58 + success(line(_cells_))
59 59 }
60 60 else
61 61 failure //No valid Alternative found !
... ...
model/types/hk_fk_view.anubis renamed to view/types/hk_fk_view.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -58,14 +58,14 @@ public define Maybe(HK_FK_View)
58 58 //Alternative fk_view
59 59 if __type_alt__ = "fk_view" then //Alternative fk_view
60 60 // [type = HK_App_Name] fk_view.app_name
61   - if find_message(_hk_fk_view_message, "app_name") is {failure then failure, success(app_name_msg) then
62   - if (Maybe(HK_App_Name))from_Message(app_name_msg) is {failure then failure, success(app_name) then
  61 + if find_message(_hk_fk_view_message, "app_name") is {failure then failure, success(_app_name__msg) then
  62 + if (Maybe(HK_App_Name))from_Message(_app_name__msg) is {failure then failure, success(_app_name_) then
63 63 // [type = String] fk_view.table_name
64   - if find_string(_hk_fk_view_message, "table_name") is {failure then failure, success(table_name) then
  64 + if find_string(_hk_fk_view_message, "table_name") is {failure then failure, success(_table_name_) then
65 65 // [type = String] fk_view.fk_col_name
66   - if find_string(_hk_fk_view_message, "fk_col_name") is {failure then failure, success(fk_col_name) then
  66 + if find_string(_hk_fk_view_message, "fk_col_name") is {failure then failure, success(_fk_col_name_) then
67 67  
68   - success(fk_view(app_name, table_name, fk_col_name))
  68 + success(fk_view(_app_name_, _table_name_, _fk_col_name_))
69 69 }}}}
70 70 else
71 71 failure //No valid Alternative found !
... ...
view/types/hk_form.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:26:31
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ...
view/types/hk_form_tab.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:26:31
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -18,57 +18,3 @@ public type HK_Form_Tab:
18 18 String list_view_name
19 19 )
20 20 .
21   -
22   - HK_Form_Tab message format
23   - ==========================
24   -
25   -
26   -public define Message
27   - to_Message
28   - (
29   - HK_Form_Tab _hk_form_tab
30   - )=
31   - with _hk_form_tab_message = message((Word32)0), //
32   - forget(add_string(_hk_form_tab_message, "__TYPE__", "HK_Form_Tab"));
33   - if _hk_form_tab is
34   - {
35   - //Alternative hk_form_tab
36   - hk_form_tab(_fk_table_name, _fk_col_name, _list_view_name) then
37   - forget(add_string(_hk_form_tab_message, "__TYPE_ALT__", "hk_form_tab"));
38   - // [type = String] hk_form_tab.fk_table_name
39   - forget(add_string(_hk_form_tab_message, "fk_table_name", _fk_table_name));
40   - // [type = String] hk_form_tab.fk_col_name
41   - forget(add_string(_hk_form_tab_message, "fk_col_name", _fk_col_name));
42   - // [type = String] hk_form_tab.list_view_name
43   - forget(add_string(_hk_form_tab_message, "list_view_name", _list_view_name)),
44   -
45   - };
46   - _hk_form_tab_message
47   -.
48   -
49   -public define Maybe(HK_Form_Tab)
50   - from_Message
51   - (
52   - Message _hk_form_tab_message
53   - )=
54   - if find_string(_hk_form_tab_message, "__TYPE__") is {failure then failure, success(__type__) then
55   - if find_string(_hk_form_tab_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then
56   - if __type__ = "HK_Form_Tab" then
57   - //Alternative hk_form_tab
58   - if __type_alt__ = "hk_form_tab" then //Alternative hk_form_tab
59   - // [type = String] hk_form_tab.fk_table_name
60   - if find_string(_hk_form_tab_message, "fk_table_name") is {failure then failure, success(fk_table_name) then
61   - // [type = String] hk_form_tab.fk_col_name
62   - if find_string(_hk_form_tab_message, "fk_col_name") is {failure then failure, success(fk_col_name) then
63   - // [type = String] hk_form_tab.list_view_name
64   - if find_string(_hk_form_tab_message, "list_view_name") is {failure then failure, success(list_view_name) then
65   -
66   - success(hk_form_tab(fk_table_name, fk_col_name, list_view_name))
67   - }}}
68   - else
69   - failure //No valid Alternative found !
70   - else
71   - failure //Type not found in message !
72   - }}
73   -.
74   -
... ...
view/types/hk_form_table.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:26:31
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -17,50 +17,3 @@ public type HK_Form_Table:
17 17 List(HK_Form_Table_Line) form_lines
18 18 )
19 19 .
20   -
21   - HK_Form_Table message format
22   - ============================
23   -
24   -
25   -public define Message
26   - to_Message
27   - (
28   - HK_Form_Table _hk_form_table
29   - )=
30   - with _hk_form_table_message = message((Word32)0), //
31   - forget(add_string(_hk_form_table_message, "__TYPE__", "HK_Form_Table"));
32   - if _hk_form_table is
33   - {
34   - //Alternative hk_form_table
35   - hk_form_table(__form_lines) then
36   - forget(add_string(_hk_form_table_message, "__TYPE_ALT__", "hk_form_table"));
37   - // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines
38   - map_forget((HK_Form_Table_Line _form_lines) |-> add_message(_hk_form_table_message, "form_lines", to_Message(_form_lines)), __form_lines),
39   -
40   - };
41   - _hk_form_table_message
42   -.
43   -
44   -public define Maybe(HK_Form_Table)
45   - from_Message
46   - (
47   - Message _hk_form_table_message
48   - )=
49   - if find_string(_hk_form_table_message, "__TYPE__") is {failure then failure, success(__type__) then
50   - if find_string(_hk_form_table_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then
51   - if __type__ = "HK_Form_Table" then
52   - //Alternative hk_form_table
53   - if __type_alt__ = "hk_form_table" then //Alternative hk_form_table
54   - // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines
55   - with mb_form_lines = map_escape(( Message msg ) |-> (Maybe(HK_Form_Table_Line)) from_Message(msg), find_messages(_hk_form_table_message, "form_lines")),
56   - if mb_form_lines is {failure then failure, success(form_lines) then
57   -
58   - success(hk_form_table(form_lines))
59   - }
60   - else
61   - failure //No valid Alternative found !
62   - else
63   - failure //Type not found in message !
64   - }}
65   -.
66   -
... ...
view/types/hk_form_table_cell.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:26:31
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -17,50 +17,3 @@ public type HK_Form_Table_Cell:
17 17 HK_Form_Entry form_entry
18 18 )
19 19 .
20   -
21   - HK_Form_Table_Cell message format
22   - =================================
23   -
24   -
25   -public define Message
26   - to_Message
27   - (
28   - HK_Form_Table_Cell _hk_form_table_cell
29   - )=
30   - with _hk_form_table_cell_message = message((Word32)0), //
31   - forget(add_string(_hk_form_table_cell_message, "__TYPE__", "HK_Form_Table_Cell"));
32   - if _hk_form_table_cell is
33   - {
34   - //Alternative hk_form_table_cell
35   - hk_form_table_cell(_form_entry) then
36   - forget(add_string(_hk_form_table_cell_message, "__TYPE_ALT__", "hk_form_table_cell"))
37   - // [type = HK_Form_Entry] hk_form_table_cell.form_entry
38   - //forget(add_message(_hk_form_table_cell_message, "form_entry", to_Message(_form_entry))),
39   -
40   - };
41   - _hk_form_table_cell_message
42   -.
43   -
44   -public define Maybe(HK_Form_Table_Cell)
45   - from_Message
46   - (
47   - Message _hk_form_table_cell_message
48   - )=
49   - if find_string(_hk_form_table_cell_message, "__TYPE__") is {failure then failure, success(__type__) then
50   - if find_string(_hk_form_table_cell_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then
51   - if __type__ = "HK_Form_Table_Cell" then
52   - //Alternative hk_form_table_cell
53   - if __type_alt__ = "hk_form_table_cell" then //Alternative hk_form_table_cell
54   - // [type = HK_Form_Entry] hk_form_table_cell.form_entry
55   - //if find_message(_hk_form_table_cell_message, "form_entry") is {failure then failure, success(form_entry_msg) then
56   - // if (Maybe(HK_Form_Entry))from_Message(form_entry_msg) is {failure then failure, success(form_entry) then
57   -
58   - success(hk_form_table_cell(form_entry))
59   - }}
60   - else
61   - failure //No valid Alternative found !
62   - else
63   - failure //Type not found in message !
64   - }}
65   -.
66   -
... ...
view/types/hk_form_table_line.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:26:31
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -17,50 +17,3 @@ public type HK_Form_Table_Line:
17 17 List(HK_Form_Table_Cell) form_table_cells
18 18 )
19 19 .
20   -
21   - HK_Form_Table_Line message format
22   - =================================
23   -
24   -
25   -public define Message
26   - to_Message
27   - (
28   - HK_Form_Table_Line _hk_form_table_line
29   - )=
30   - with _hk_form_table_line_message = message((Word32)0), //
31   - forget(add_string(_hk_form_table_line_message, "__TYPE__", "HK_Form_Table_Line"));
32   - if _hk_form_table_line is
33   - {
34   - //Alternative hk_form_table_line
35   - hk_form_table_line(__form_table_cells) then
36   - forget(add_string(_hk_form_table_line_message, "__TYPE_ALT__", "hk_form_table_line"));
37   - // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells
38   - 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),
39   -
40   - };
41   - _hk_form_table_line_message
42   -.
43   -
44   -public define Maybe(HK_Form_Table_Line)
45   - from_Message
46   - (
47   - Message _hk_form_table_line_message
48   - )=
49   - if find_string(_hk_form_table_line_message, "__TYPE__") is {failure then failure, success(__type__) then
50   - if find_string(_hk_form_table_line_message, "__TYPE_ALT__") is {failure then failure, success(__type_alt__) then
51   - if __type__ = "HK_Form_Table_Line" then
52   - //Alternative hk_form_table_line
53   - if __type_alt__ = "hk_form_table_line" then //Alternative hk_form_table_line
54   - // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells
55   - 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")),
56   - if mb_form_table_cells is {failure then failure, success(form_table_cells) then
57   -
58   - success(hk_form_table_line(form_table_cells))
59   - }
60   - else
61   - failure //No valid Alternative found !
62   - else
63   - failure //Type not found in message !
64   - }}
65   -.
66   -
... ...
model/types/hk_list_view.anubis renamed to view/types/hk_list_view.anubis
  Show/Hide comments   View file @23eeeae
1 1 /*
2 2 * Created by 伝作 (Densaku).
3 3 * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
4   - * Date: 2017-04-04
5   - * Time: 17:12:46
  4 + * Date: 2017-04-09
  5 + * Time: 00:57:36
6 6 *
7 7 */
8 8  
... ... @@ -66,14 +66,14 @@ public define Maybe(HK_List_View)
66 66 else //Alternative list_view
67 67 if __type_alt__ = "list_view" then //Alternative list_view
68 68 // [type = String] list_view.view_name
69   - if find_string(_hk_list_view_message, "view_name") is {failure then failure, success(view_name) then
  69 + if find_string(_hk_list_view_message, "view_name") is {failure then failure, success(_view_name_) then
70 70 // [type = List(String)] list_view.columns
71 71 with columns = find_string_list(_hk_list_view_message, "columns"),
72 72 // [type = WEB_Action_Name] list_view.link_id_action
73   - if find_message(_hk_list_view_message, "link_id_action") is {failure then failure, success(link_id_action_msg) then
74   - if (Maybe(WEB_Action_Name))from_Message(link_id_action_msg) is {failure then failure, success(link_id_action) then
  73 + if find_message(_hk_list_view_message, "link_id_action") is {failure then failure, success(_link_id_action__msg) then
  74 + if (Maybe(WEB_Action_Name))from_Message(_link_id_action__msg) is {failure then failure, success(_link_id_action_) then
75 75  
76   - success(list_view(view_name, columns, link_id_action))
  76 + success(list_view(_view_name_, _columns_, _link_id_action_))
77 77 }}}
78 78 else
79 79 failure //No valid Alternative found !
... ...