end of use of the calexium_lib/database/model/db_model.anubis

totoro
1 parent 18b5b14f
Showing 14 changed files with 48 additions and 22 deletions Show diff stats
calexium_lib
hayamiki_lib
src/generation/columns.anubis
src/generation/create_table.anubis
src/generation/fields.anubis
src/generation/files.anubis
src/generation/header.anubis
src/generation/html.anubis
src/generation/icons.anubis
src/generation/menu.anubis
src/generation/model.anubis
src/generation/types.anubis
src/main.anubis
src/utils/utils.anubis
-Subproject commit ac555606b821b42dda3018f3e64240790b038161
+Subproject commit 94b434c75a443c7426ce437df4224b61e3ecc1e2
-Subproject commit 5982fb919cc198b09154cab6aca30f83eadb5ef7
+Subproject commit d684d8d709b015c4d396c9b24f4e882628e3b65f
@@ -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
@@ -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
   (
@@ -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
@@ -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).
  
@@ -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
@@ -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 
@@ -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'
@@ -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")
   }
  
 .
@@ -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
@@ -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)
 /** 
@@ -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
  
@@ -6,6 +6,8 @@
  * © Calexium 
  */
  
+read tools/basis.anubis
+read hayamiki_lib/types/hayamiki.anubis
  
 public define Int 
   longest_table_name_size