David RENÉ / hayamiki

Commit 8974f9cf22898529a9499f11e1293caff4deb59b

Authored by totoro
1 parent 3a2d3aaa

add generation of WEB_Action_Name

Showing 9 changed files with 55 additions and 13 deletions   Show diff stats
Inline Side-by-side
@@ -4,3 +4,6 @@ @@ -4,3 +4,6 @@
4 [submodule "hayamiki_lib"] 4 [submodule "hayamiki_lib"]
5 path = hayamiki_lib 5 path = hayamiki_lib
6 url = ssh://git@gitlab.calexium.com:33022/calexium/hayamiki_lib.git 6 url = ssh://git@gitlab.calexium.com:33022/calexium/hayamiki_lib.git
  7 +[submodule "densaku_lib"]
  8 + path = densaku_lib
  9 + url = git@gitlab.anubis-language.com:totoro/densaku_lib.git
densaku_lib @ 5c7cd864b6c
  1 +Subproject commit 5c7cd864b6cc8232c2e719fe3a1e3740288cc0e2
hayamiki_generator.aproj
  Show/Hide comments   View file @8974f9c
@@ -121,6 +121,34 @@ @@ -121,6 +121,34 @@
121 <Compile Include="hayamiki_lib\controller\hk_controller.anubis" /> 121 <Compile Include="hayamiki_lib\controller\hk_controller.anubis" />
122 <Compile Include="hayamiki_lib\controller\hk_delete.anubis" /> 122 <Compile Include="hayamiki_lib\controller\hk_delete.anubis" />
123 <Compile Include="hayamiki_lib\hk_generator.anubis" /> 123 <Compile Include="hayamiki_lib\hk_generator.anubis" />
  124 + <Compile Include="hayamiki_lib\model\app.anubis" />
  125 + <Compile Include="hayamiki_lib\model\columns.anubis" />
  126 + <Compile Include="hayamiki_lib\model\database.anubis" />
  127 + <Compile Include="hayamiki_lib\model\display.anubis" />
  128 + <Compile Include="hayamiki_lib\model\fields.anubis" />
  129 + <Compile Include="hayamiki_lib\model\help.anubis" />
  130 + <Compile Include="hayamiki_lib\model\icons.anubis" />
  131 + <Compile Include="hayamiki_lib\model\model.anubis" />
  132 + <Compile Include="hayamiki_lib\model\tables.anubis" />
  133 + <Compile Include="hayamiki_lib\model\types\hk_app.anubis" />
  134 + <Compile Include="hayamiki_lib\model\types\hk_app_name.anubis" />
  135 + <Compile Include="hayamiki_lib\model\types\hk_database.anubis" />
  136 + <Compile Include="hayamiki_lib\model\types\hk_datetime_field_attr.anubis" />
  137 + <Compile Include="hayamiki_lib\model\types\hk_display.anubis" />
  138 + <Compile Include="hayamiki_lib\model\types\hk_edit_view.anubis" />
  139 + <Compile Include="hayamiki_lib\model\types\hk_help_text.anubis" />
  140 + <Compile Include="hayamiki_lib\model\types\hk_icon.anubis" />
  141 + <Compile Include="hayamiki_lib\model\types\hk_int_choice.anubis" />
  142 + <Compile Include="hayamiki_lib\model\types\hk_int_choices.anubis" />
  143 + <Compile Include="hayamiki_lib\model\types\hk_list_view.anubis" />
  144 + <Compile Include="hayamiki_lib\model\types\hk_model.anubis" />
  145 + <Compile Include="hayamiki_lib\model\types\hk_model_attr.anubis" />
  146 + <Compile Include="hayamiki_lib\model\types\hk_model_column.anubis" />
  147 + <Compile Include="hayamiki_lib\model\types\hk_model_field.anubis" />
  148 + <Compile Include="hayamiki_lib\model\types\hk_table.anubis" />
  149 + <Compile Include="hayamiki_lib\model\types\hk_text_choice.anubis" />
  150 + <Compile Include="hayamiki_lib\model\types\hk_text_choices.anubis" />
  151 + <Compile Include="hayamiki_lib\model\types\hk_text_field_attr.anubis" />
124 <Compile Include="hayamiki_lib\types\hayamiki.anubis" /> 152 <Compile Include="hayamiki_lib\types\hayamiki.anubis" />
125 <Compile Include="hayamiki_lib\types\model\app.anubis" /> 153 <Compile Include="hayamiki_lib\types\model\app.anubis" />
126 <Compile Include="hayamiki_lib\types\model\columns.anubis" /> 154 <Compile Include="hayamiki_lib\types\model\columns.anubis" />
@@ -681,6 +709,9 @@ @@ -681,6 +709,9 @@
681 <Folder Include="calexium_lib\web\widgets" /> 709 <Folder Include="calexium_lib\web\widgets" />
682 <Folder Include="hayamiki_lib" /> 710 <Folder Include="hayamiki_lib" />
683 <Folder Include="hayamiki_lib\controller" /> 711 <Folder Include="hayamiki_lib\controller" />
  712 + <Folder Include="hayamiki_lib\model" />
  713 + <Folder Include="hayamiki_lib\model\types" />
  714 + <Folder Include="hayamiki_lib\model\types\generated" />
684 <Folder Include="hayamiki_lib\types" /> 715 <Folder Include="hayamiki_lib\types" />
685 <Folder Include="hayamiki_lib\types\model" /> 716 <Folder Include="hayamiki_lib\types\model" />
686 <Folder Include="hayamiki_lib\types\view" /> 717 <Folder Include="hayamiki_lib\types\view" />
hayamiki_generator.ide
  Show/Hide comments   View file @8974f9c
@@ -4,6 +4,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00 @@ -4,6 +4,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
4 # SharpDevelop 1.0.12.108 4 # SharpDevelop 1.0.12.108
5 Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" 5 Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45"
6 EndProject 6 EndProject
  7 +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_ds_types", "hayamiki_ds_types.aproj", "{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}"
  8 +EndProject
7 Global 9 Global
8 GlobalSection(SolutionConfigurationPlatforms) = preSolution 10 GlobalSection(SolutionConfigurationPlatforms) = preSolution
9 Debug|Any CPU = Debug|Any CPU 11 Debug|Any CPU = Debug|Any CPU
@@ -18,5 +20,9 @@ Global @@ -18,5 +20,9 @@ Global
18 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU 20 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU 21 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU
20 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU 22 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU
  23 + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
  24 + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  25 + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.Build.0 = Release|Any CPU
  26 + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
21 EndGlobalSection 27 EndGlobalSection
22 EndGlobal 28 EndGlobal
hayamiki_lib @ 0f97a53e954
1 -Subproject commit cd8a0a45283d63e8a75a1fd799b6af3eea579d21 1 +Subproject commit 0f97a53e954d365d416021a78dad323610d54da5
src/generation/columns.anubis
  Show/Hide comments   View file @8974f9c
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 8
9 read system/string.anubis 9 read system/string.anubis
10 read tools/list.anubis 10 read tools/list.anubis
11 -read hayamiki_lib/types/model/columns.anubis  
12 -read hayamiki_lib/types/model/fields.anubis 11 +read hayamiki_lib/model/columns.anubis
  12 +read hayamiki_lib/model/fields.anubis
13 13
14 read fields.anubis 14 read fields.anubis
15 15
src/generation/fields.anubis
  Show/Hide comments   View file @8974f9c
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 read system/string.anubis 9 read system/string.anubis
10 read tools/basis.anubis 10 read tools/basis.anubis
11 11
12 -read hayamiki_lib/types/model/fields.anubis  
13 -read hayamiki_lib/types/model/columns.anubis 12 +read hayamiki_lib/model/fields.anubis
  13 +read hayamiki_lib/model/columns.anubis
14 14
15 read model.anubis 15 read model.anubis
16 16
src/generation/html.anubis
  Show/Hide comments   View file @8974f9c
@@ -8,8 +8,9 @@ @@ -8,8 +8,9 @@
8 8
9 read system/string.anubis 9 read system/string.anubis
10 read tools/basis.anubis 10 read tools/basis.anubis
11 - 11 +read calexium_lib/web/CXM_making_a_web_site.anubis
12 read hayamiki_lib/types/hayamiki.anubis 12 read hayamiki_lib/types/hayamiki.anubis
  13 +
13 read icons.anubis 14 read icons.anubis
14 read columns.anubis 15 read columns.anubis
15 16
@@ -46,9 +47,9 @@ public define String @@ -46,9 +47,9 @@ public define String
46 HK_Model_Column column, 47 HK_Model_Column column,
47 String data_name, 48 String data_name,
48 String general_type_name, 49 String general_type_name,
49 - String action_name 50 + WEB_Action_Name action_name
50 )= 51 )=
51 - "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", \""+action_name+"\")". 52 + "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", \""+format_web_action_name(action_name)+"\")".
52 53
53 54
54 public define String 55 public define String
@@ -58,13 +59,13 @@ public define String @@ -58,13 +59,13 @@ public define String
58 String column_name, 59 String column_name,
59 String data_name, 60 String data_name,
60 String general_type_name, 61 String general_type_name,
61 - String action_name 62 + WEB_Action_Name action_name
62 )= 63 )=
63 if get_column_type_from_name(columns, column_name) is 64 if get_column_type_from_name(columns, column_name) is
64 { 65 {
65 failure then "column name "+column_name+"doesn't exist", 66 failure then "column name "+column_name+"doesn't exist",
66 success(column) then 67 success(column) then
67 - if action_name = "" then 68 + if action_name = no_action then
68 to_HTML_cell_link(column, data_name, general_type_name) 69 to_HTML_cell_link(column, data_name, general_type_name)
69 else 70 else
70 to_HTML_cell_link_id_action(column, data_name, general_type_name, action_name) 71 to_HTML_cell_link_id_action(column, data_name, general_type_name, action_name)
@@ -119,7 +120,7 @@ public define String @@ -119,7 +120,7 @@ public define String
119 }, 120 },
120 with action_name = if list_view is 121 with action_name = if list_view is
121 { 122 {
122 - list_view_all then "" 123 + list_view_all then no_action,
123 list_view(_, _, an) then an 124 list_view(_, _, an) then an
124 }, 125 },
125 126
src/generation/icons.anubis
  Show/Hide comments   View file @8974f9c
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 8
9 read calexium_lib/web/widgets/icons_set.anubis 9 read calexium_lib/web/widgets/icons_set.anubis
10 10
11 -read hayamiki_lib/types/model/columns.anubis  
12 -read hayamiki_lib/types/model/icons.anubis 11 +read hayamiki_lib/model/columns.anubis
  12 +read hayamiki_lib/model/icons.anubis
13 13
14 public define String 14 public define String
15 /** to_String return the String of the given model of the column 'col' 15 /** to_String return the String of the given model of the column 'col'