David RENÉ / hayamiki

Commit 8ba222731ed13d7926608e092ccb039fbed7c364

Authored by totoro
1 parent 3fee013d

manage the generation of hk_form_table_cell_table

Showing 4 changed files with 14 additions and 11 deletions   Show diff stats
Inline Side-by-side
densaku_lib @ fedd3d94917
1   -Subproject commit e19a5e659e24d4bf9c97e5a4f313f80a86414f5e
  1 +Subproject commit fedd3d949174b60ead3215c6aea0f8bf3e73e053
... ...
hayamiki_generator.aproj
  Show/Hide comments   View file @8ba2227
... ... @@ -49,6 +49,8 @@
49 49 <Compile Include="calexium_lib\database\vtm\view_table_manager_types.anubis" />
50 50 <Compile Include="calexium_lib\database\vtm\view_table_renderer.anubis" />
51 51 <Compile Include="calexium_lib\database\vtm\view_table_types.anubis" />
  52 + <Compile Include="calexium_lib\ds_files\ds_messages.anubis" />
  53 + <Compile Include="calexium_lib\ds_files\ds_types.anubis" />
52 54 <Compile Include="calexium_lib\extensions\json.anubis" />
53 55 <Compile Include="calexium_lib\mail\authentication.anubis" />
54 56 <Compile Include="calexium_lib\mail\lexers\enhanced_status.anubis" />
... ... @@ -696,6 +698,7 @@
696 698 <Folder Include="calexium_lib\database" />
697 699 <Folder Include="calexium_lib\database\model" />
698 700 <Folder Include="calexium_lib\database\vtm" />
  701 + <Folder Include="calexium_lib\ds_files" />
699 702 <Folder Include="calexium_lib\extensions" />
700 703 <Folder Include="calexium_lib\mail" />
701 704 <Folder Include="calexium_lib\mail\lexers" />
... ...
hayamiki_lib @ b0635c56b0f
1   -Subproject commit 69ab62634297a08d77f0be8147aaf1177ba61827
  1 +Subproject commit b0635c56b0ff5113b85301a06aee7b71ce76bc22
... ...
src/generation/edit_view_table_form.anubis
  Show/Hide comments   View file @8ba2227
... ... @@ -29,23 +29,23 @@ public define String
29 29 )=
30 30 if cell_description is
31 31 {
32   - empty then "empty"
  32 + empty then "hk_form_table_cell(empty)"
33 33 column(col_name) then
34 34 if get_column_type_from_name(columns, col_name) is
35 35 {
36   - failure then "label(\"column ["+col_name+"] not found\")",
  36 + failure then "hk_form_table_cell(label(\"column ["+col_name+"] not found\"))",
37 37 success(col_type) then
38 38 if get_HK_Form_Entry(col_type, type_name) is
39 39 {
40   - failure then "label(\" form for column ["+col_name+"] not found\")",
41   - success(form_string) then form_string
  40 + failure then "hk_form_table_cell(label(\" form for column ["+col_name+"] not found\"))",
  41 + success(form_string) then "hk_form_table_cell("+form_string+")"
42 42 }
43 43 }
44   - label(label_str) then "label(\""+label_str+"\")"
  44 + label(label_str) then "hk_form_table_cell(label(\""+label_str+"\"))"
45 45 table(lines) then
46   - "cell(["+
47   - make_lines(lines, columns, type_name, indent)+
48   - "])"
  46 + "hk_form_table_cell_table(["+
  47 + make_lines(lines, columns, type_name, indent+" ")+
  48 + "\n"+indent+"])"
49 49 }
50 50 .
51 51  
... ... @@ -63,7 +63,7 @@ public define String
63 63 if is_empty(cells) then
64 64 ""
65 65 else
66   - "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name, indent) +")", cells))
  66 + "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |-> make_cell(cell, columns, table_name, indent), cells))
67 67 .
68 68  
69 69  
... ...