From 7f333a2aaa0f65a1c0abc66bf1327dde19661562 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 14 Feb 2016 18:02:06 +0100 Subject: [PATCH] end of use of the calexium_lib/database/model/db_model.anubis --- calexium_lib | 2 +- hayamiki_lib | 2 +- src/generation/columns.anubis | 7 +++++-- src/generation/create_table.anubis | 7 ++++++- src/generation/fields.anubis | 6 ++++++ src/generation/files.anubis | 4 +++- src/generation/header.anubis | 2 +- src/generation/html.anubis | 10 +++++++--- src/generation/icons.anubis | 3 +++ src/generation/menu.anubis | 14 +++++--------- src/generation/model.anubis | 5 ++++- src/generation/types.anubis | 4 +++- src/main.anubis | 2 +- src/utils/utils.anubis | 2 ++ 14 files changed, 48 insertions(+), 22 deletions(-) diff --git a/calexium_lib b/calexium_lib index ac55560..94b434c 160000 --- a/calexium_lib +++ b/calexium_lib @@ -1 +1 @@ -Subproject commit ac555606b821b42dda3018f3e64240790b038161 +Subproject commit 94b434c75a443c7426ce437df4224b61e3ecc1e2 diff --git a/hayamiki_lib b/hayamiki_lib index 5982fb9..d684d8d 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit 5982fb919cc198b09154cab6aca30f83eadb5ef7 +Subproject commit d684d8d709b015c4d396c9b24f4e882628e3b65f diff --git a/src/generation/columns.anubis b/src/generation/columns.anubis index 9655dbd..1d3e273 100644 --- a/src/generation/columns.anubis +++ b/src/generation/columns.anubis @@ -6,8 +6,11 @@ * © Calexium */ +read system/string.anubis read hayamiki_lib/types/model/columns.anubis +read fields.anubis + define List(String) /* return the list of all columns name */ @@ -254,7 +257,7 @@ public define String indent+join(",\n"+indent, map((String text) |-> "text(\""+to_upper(text)+"\")", list_view)). public define Maybe(HK_Model_Column) - get_column_type + get_column_type_from_name ( List(HK_Model_Column) columns, //columns in wich we search String name_to_find //Column name to find in previous list @@ -267,7 +270,7 @@ public define Maybe(HK_Model_Column) if name_to_find = name then success(h) else - get_column_type(t, name_to_find) + get_column_type_from_name(t, name_to_find) }. public define String diff --git a/src/generation/create_table.anubis b/src/generation/create_table.anubis index e7b6bdc..a9ab56f 100644 --- a/src/generation/create_table.anubis +++ b/src/generation/create_table.anubis @@ -7,7 +7,7 @@ */ -read calexium_lib/database/model/db_model.anubis +read hayamiki_lib/types/hayamiki.anubis read tools/basis.anubis read tools/int.anubis read system/string.anubis @@ -15,6 +15,11 @@ read system/files.anubis read tools/streams.anubis read tools/ISO-8601.anubis +read fields.anubis +read columns.anubis + +read utils/utils.anubis + define String create_table_generate_one_column ( diff --git a/src/generation/fields.anubis b/src/generation/fields.anubis index c8d719f..9d78c73 100644 --- a/src/generation/fields.anubis +++ b/src/generation/fields.anubis @@ -6,7 +6,13 @@ * © Calexium */ +read system/string.anubis +read tools/basis.anubis + read hayamiki_lib/types/model/fields.anubis +read hayamiki_lib/types/model/columns.anubis + +read model.anubis public define String to_Anubis_type diff --git a/src/generation/files.anubis b/src/generation/files.anubis index 0dadaa6..e798706 100644 --- a/src/generation/files.anubis +++ b/src/generation/files.anubis @@ -10,6 +10,8 @@ read system/string.anubis read system/files.anubis read hayamiki_lib/types/hayamiki.anubis +read hayamiki_lib/hk_generator.anubis + read tools/basis.anubis read tools/streams.anubis read tools/ISO-8601.anubis @@ -192,7 +194,7 @@ define Maybe(One) }. -global define HK_API +global define HK_Generator_API hk_gen = hk_api(generate_model_files). diff --git a/src/generation/header.anubis b/src/generation/header.anubis index 0f11675..817b8eb 100644 --- a/src/generation/header.anubis +++ b/src/generation/header.anubis @@ -62,7 +62,7 @@ read data_base/db_tools.anubis read calexium_lib/database/db_utils.anubis read calexium_lib/database/db_types.anubis read calexium_lib/database/vtm/view_table_types.anubis -read calexium_lib/database/model/db_model.anubis +read hayamiki_lib/types/hayamiki.anubis read system/logger.anubis read system/datetime.anubis diff --git a/src/generation/html.anubis b/src/generation/html.anubis index d115b67..e98981a 100644 --- a/src/generation/html.anubis +++ b/src/generation/html.anubis @@ -6,8 +6,12 @@ * © Calexium */ -read hayamiki_lib/types/model/columns.anubis +read system/string.anubis +read tools/basis.anubis + +read hayamiki_lib/types/hayamiki.anubis read icons.anubis +read columns.anubis public define String to_HTML_cell_icon @@ -44,7 +48,7 @@ public define String String data_name, String general_type_name )= - if get_column_type(columns, column_name) is + if get_column_type_from_name(columns, column_name) is { failure then "column name "+column_name+"doesn't exist", success(column) then to_HTML_cell_link(column, data_name, general_type_name) @@ -60,7 +64,7 @@ public define String String data_name, String general_type_name )= - if get_column_type(columns, column_name) is + if get_column_type_from_name(columns, column_name) is { failure then "column name "+column_name+"doesn't exist", success(column) then diff --git a/src/generation/icons.anubis b/src/generation/icons.anubis index e4bbc11..53f992c 100644 --- a/src/generation/icons.anubis +++ b/src/generation/icons.anubis @@ -6,7 +6,10 @@ * © Calexium */ +read calexium_lib/web/widgets/icons_set.anubis + read hayamiki_lib/types/model/columns.anubis +read hayamiki_lib/types/model/icons.anubis public define String /** to_String return the String of the given model of the column 'col' diff --git a/src/generation/menu.anubis b/src/generation/menu.anubis index 9607473..cf771f2 100644 --- a/src/generation/menu.anubis +++ b/src/generation/menu.anubis @@ -14,6 +14,7 @@ read system/files.anubis read tools/streams.anubis read tools/ISO-8601.anubis +read utils/utils.anubis define String generate_application_menu @@ -43,7 +44,7 @@ define String map((HK_List_View view ) |-> with view_name = if view is list_view(v_name, _) then v_name else "default", indent+" "+"hk_menu_item("+fill("\""+table_name+"\",",max_space)+ "\"view_table\", "+ - fill_or_cut("\""+short_name+(if view_name="default" then "" else " "+view_name)+"\",",max_space, ' ')+ + fill("help_text(\""+short_name+(if view_name="default" then "" else " "+view_name)+"\"),",max_space)+ "[(\"table_name\", "+fill("\""+table_name+"\",",max_space)+"),(\"view_name\", \""+view_name+"\")])", list_views), tables))+"\n"+indent+"])", apps)). @@ -72,20 +73,15 @@ public define Maybe(One) * Time: "+_Int_to_ISO_8601_time(now)+" */ -transmis calexium_lib/database/model/db_model.anubis transmit types/hk_menu_types.anubis -public define HK_Menu - admin_menu +public define HK_Menu_Item + applications_menu = -hk_menu([ - hk_menu_item(\"\", \"\", \"HOME\", []), hk_menu_list(\"managers\", help_text_TAG(\"APPLICATIONS\"), [\n"+ generate_application_menu(apps, " ")+"\n - ]), - ] -).\n") + ]).\n") } . diff --git a/src/generation/model.anubis b/src/generation/model.anubis index e5c58fb..db739d6 100644 --- a/src/generation/model.anubis +++ b/src/generation/model.anubis @@ -6,8 +6,11 @@ * © Calexium */ +read system/string.anubis -define String +read hayamiki_lib/types/hayamiki.anubis + +public define String format_attributes ( List(HK_Model_Attr) attributes diff --git a/src/generation/types.anubis b/src/generation/types.anubis index 7ce23e5..73143e1 100644 --- a/src/generation/types.anubis +++ b/src/generation/types.anubis @@ -10,7 +10,9 @@ read hayamiki_lib/types/hayamiki.anubis read tools/basis.anubis read tools/streams.anubis read system/string.anubis - +read fields.anubis +read columns.anubis +read html.anubis define List(String) /** diff --git a/src/main.anubis b/src/main.anubis index 1759d6e..976d9b1 100644 --- a/src/main.anubis +++ b/src/main.anubis @@ -15,7 +15,7 @@ read tools/string.anubis read tools/basis.anubis -//read generation/files.anubis +read generation/files.anubis read hayamiki_lib/hk_generator.anubis read model.3.0.0.anubis diff --git a/src/utils/utils.anubis b/src/utils/utils.anubis index 124855f..4c2a021 100644 --- a/src/utils/utils.anubis +++ b/src/utils/utils.anubis @@ -6,6 +6,8 @@ * © Calexium */ +read tools/basis.anubis +read hayamiki_lib/types/hayamiki.anubis public define Int longest_table_name_size -- libgit2 0.21.4