David RENÉ / hayamiki

Commit 3fee013d29b159f953d8443b6c4eb11a4944342f

Authored by totoro
1 parent 902ded87

manage the renaming of HK_List_View into HK_Viewer and HK_Edit_View into HK_Editor

Showing 12 changed files with 52 additions and 45 deletions   Show diff stats
Inline Side-by-side
calexium_lib @ b3734f8f0b4
1   -Subproject commit 891e24cfc2eca3152e2cf33c5963979d963b7bae
  1 +Subproject commit b3734f8f0b4bf27ade1712f3c159380ddd828acb
... ...
densaku_lib @ e19a5e659e2
1   -Subproject commit aaa50241ac140b5441e8cfb34bd4e884a4828af7
  1 +Subproject commit e19a5e659e24d4bf9c97e5a4f313f80a86414f5e
... ...
hayamiki_lib @ 69ab6263429
1   -Subproject commit 7a53f1c12572de03f815376ca5ee3b04590c962c
  1 +Subproject commit 69ab62634297a08d77f0be8147aaf1177ba61827
... ...
src/check.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -10,7 +10,7 @@ read hayamiki_lib/types/hayamiki.anubis
10 10 read system/string.anubis
11 11 read tools/list.anubis
12 12 read tools/basis.anubis
13   -transmit hayamiki_lib/view/types/hk_edit_view.anubis
  13 +transmit hayamiki_lib/view/types/hk_editor.anubis
14 14  
15 15 public define Maybe(List(String))
16 16 get_all_apps_name
... ... @@ -110,12 +110,12 @@ define Maybe(HK_FK_View)
110 110 }
111 111 .
112 112  
113   -define Maybe(HK_Edit_View)
  113 +define Maybe(HK_Editor)
114 114 resolve_HK_Edit_View_foreign
115 115 (
116 116 List(String) apps_name, //list of all knows app name
117 117 String app_name, //current app name
118   - HK_Edit_View _edit_view
  118 + HK_Editor _edit_view
119 119 )=
120 120 if _edit_view is
121 121 {
... ... @@ -127,17 +127,17 @@ define Maybe(HK_Edit_View)
127 127 failure then failure,
128 128 success(n_fk_views) then success(edit_view_list_form(v, c, n_fk_views))
129 129 }
130   - edit_view_table_form(v, t) then success(edit_view_table_form(v, t))
  130 + form_table(v, t) then success(form_table(v, t))
131 131 }
132 132 .
133 133  
134   -define Maybe(List(HK_Edit_View))
  134 +define Maybe(List(HK_Editor))
135 135 resolve_foreign
136 136 (
137 137 List(String) apps_name, //list of all knows app name
138 138 String app_name, //current app name
139   - List(HK_Edit_View) list_edits, //edit view to check
140   - List(HK_Edit_View) so_far //already checked edit view
  139 + List(HK_Editor) list_edits, //edit view to check
  140 + List(HK_Editor) so_far //already checked edit view
141 141 )=
142 142 if list_edits is
143 143 {
... ...
src/generation/cxm_lib_menu.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -46,7 +46,7 @@ define String
46 46 map_append((HK_Table table) |->
47 47 since table is hk_table(table_name, short_name, model, display),
48 48 since display is hk_display(list_views, _),
49   - map((HK_List_View view ) |->
  49 + map((HK_Viewer view ) |->
50 50 with view_name = if view is list_view(v_name, _, _) then v_name else "default",
51 51 indent+" "+"menu_item("+
52 52 fill("\""+short_name+(if view_name="default" then "" else " "+view_name)+"\",",max_space)+
... ...
src/generation/densaku.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -98,8 +98,8 @@ public define One
98 98  
99 99 read densaku_lib/types/densaku.anubis
100 100  
101   -public define List(DS_Type) hayamiki_types_list =
102   - [\n"))
  101 +public define List(DS_Type_File) hayamiki_types_list =
  102 + [ ds_type_file(auto, auto, [\n"))
103 103 }
104 104 else
105 105 unique
... ... @@ -119,7 +119,8 @@ public define One
119 119 success(fd) then
120 120 with strm = make_stream(fd),
121 121 forget(write_string(strm,
122   -" ]
  122 +" ])
  123 + ]
123 124 .\n"))
124 125 }
125 126 else
... ...
src/generation/edit_view_table_form.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -10,12 +10,22 @@ read hayamiki_lib/types/hayamiki.anubis
10 10 read tools/streams.anubis
11 11 read columns.anubis
12 12  
  13 +define String
  14 + make_lines
  15 + (
  16 + List(HK_Editor_Table_Line) lines,
  17 + List(HK_Model_Column) columns,
  18 + String table_name,
  19 + String indent
  20 + ).
  21 +
13 22 public define String
14 23 make_cell
15 24 (
16   - HK_Edit_View_Table_Cell cell_description, //
  25 + HK_Editor_Table_Cell cell_description, //
17 26 List(HK_Model_Column) columns,
18   - String type_name
  27 + String type_name,
  28 + String indent
19 29 )=
20 30 if cell_description is
21 31 {
... ... @@ -32,14 +42,10 @@ public define String
32 42 }
33 43 }
34 44 label(label_str) then "label(\""+label_str+"\")"
35   - cell(cells) then
36   - "cell(\""+
37   - join(", ",
38   - map((HK_Edit_View_Table_Cell _cell)
39   - |->
40   - make_cell(_cell, columns, type_name),
41   - cells))+
42   - ")"
  45 + table(lines) then
  46 + "cell(["+
  47 + make_lines(lines, columns, type_name, indent)+
  48 + "])"
43 49 }
44 50 .
45 51  
... ... @@ -49,7 +55,7 @@ public define String
49 55 public define String
50 56 make_cells
51 57 (
52   - List(HK_Edit_View_Table_Cell) cells,
  58 + List(HK_Editor_Table_Cell) cells,
53 59 List(HK_Model_Column) columns,
54 60 String table_name,
55 61 String indent
... ... @@ -57,7 +63,7 @@ public define String
57 63 if is_empty(cells) then
58 64 ""
59 65 else
60   - "\n"+indent+ join(",\n"+indent, map((HK_Edit_View_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name) +")", cells))
  66 + "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name, indent) +")", cells))
61 67 .
62 68  
63 69  
... ... @@ -75,7 +81,7 @@ public define String
75 81 define String
76 82 make_lines
77 83 (
78   - List(HK_Edit_View_Table_Line) lines,
  84 + List(HK_Editor_Table_Line) lines,
79 85 List(HK_Model_Column) columns,
80 86 String table_name,
81 87 String indent
... ... @@ -83,7 +89,7 @@ define String
83 89 if is_empty(lines) then
84 90 ""
85 91 else
86   - "\n"+indent+ join(",\n"+indent, map((HK_Edit_View_Table_Line line) |-> "hk_form_table_line(["+ make_cells(line.cells, columns, table_name, indent+" ") +"\n"+indent+"])", lines))
  92 + "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Line line) |-> "hk_form_table_line(["+ make_cells(line.cells, columns, table_name, indent+" ") +"\n"+indent+"])", lines))
87 93 .
88 94  
89 95  
... ... @@ -96,7 +102,7 @@ public define Maybe(One)
96 102 Stream stream, //stream file where to write
97 103 HK_Table table, //
98 104 String view_name,
99   - HK_Edit_View_Table form_in_table //edit view to generate
  105 + HK_Editor_Table form_in_table //edit view to generate
100 106 )=
101 107 since table is hk_table(table_name, short_name, model, display),
102 108 since model is hk_model( columns, _),
... ...
src/generation/hk_menu.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -41,7 +41,7 @@ define String
41 41 map_append((HK_Table table) |->
42 42 since table is hk_table(table_name, short_name, model, display),
43 43 since display is hk_display(list_views, _),
44   - map((HK_List_View view ) |->
  44 + map((HK_Viewer view ) |->
45 45 with view_name = if view is list_view(v_name, _, _) then v_name else "default",
46 46 indent+" "+"hk_menu_item("+fill("\""+table_name+"\",",max_space)+ "\"view_table\", "+
47 47 fill("help_text(\""+short_name+(if view_name="default" then "" else " "+view_name)+"\"),",max_space)+
... ...
src/generation/html.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -112,7 +112,7 @@ public define String
112 112 HK_Table table, //table to format
113 113 String data_name, //name of data
114 114 String indent, //indentation string to use
115   - HK_List_View list_view //list view to generate
  115 + HK_Viewer list_view //list view to generate
116 116 )=
117 117 since table is hk_table(table_name, short, model, _), //get name and model of the table
118 118 since model is hk_model( columns, _), //get all columns of table
... ...
src/generation/vt_edit.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -26,7 +26,7 @@ public define Maybe(One)
26 26 (
27 27 Stream stream, //stream file where to write
28 28 HK_Table table, //
29   - HK_Edit_View edit_view //edit view to generate
  29 + HK_Editor edit_view //edit view to generate
30 30 )=
31 31 since table is hk_table(table_name, short_name, model, display),
32 32 since model is hk_model( columns, _),
... ... @@ -49,7 +49,7 @@ public define Maybe(One)
49 49 success(got_columns) then
50 50 generate_edit_view_list_form(stream, table, v_name, got_columns, lfk)
51 51 }
52   - edit_view_table_form(v_name, table_description) then
  52 + form_table(v_name, table_description) then
53 53 generate_edit_view_table_form(stream, table, v_name, table_description)
54 54 //generate the table form
55 55  
... ... @@ -67,7 +67,7 @@ public define Maybe(One)
67 67 (
68 68 Stream stream, //stream file where to write
69 69 HK_Table table, //
70   - List(HK_Edit_View) edit_view, //edit view to generate
  70 + List(HK_Editor) edit_view, //edit view to generate
71 71 Bool has_default //set to true if a default view was encountered.
72 72 )=
73 73 if edit_view is
... ... @@ -92,7 +92,7 @@ public define Maybe(One)
92 92 edit_view_list_form(view_name, _, _) then
93 93 //if not we search for view named 'default'
94 94 if view_name = "default" then true else false
95   - edit_view_table_form(view_name, _) then
  95 + form_table(view_name, _) then
96 96 //if not we search for view named 'default'
97 97 if view_name = "default" then true else false
98 98 },
... ... @@ -107,7 +107,7 @@ public define String
107 107 _generate_get_editable_if_else
108 108 (
109 109 String table_name, //
110   - List(HK_Edit_View) edit_view, //edit view to generate
  110 + List(HK_Editor) edit_view, //edit view to generate
111 111 String so_far
112 112 )=
113 113 if edit_view is
... ... @@ -121,7 +121,7 @@ public define String
121 121 {
122 122 edit_view_all then "default",
123 123 edit_view_list_form(view_name, _, _) then view_name
124   - edit_view_table_form(view_name, _) then view_name
  124 + form_table(view_name, _) then view_name
125 125 },
126 126 _generate_get_editable_if_else( table_name, t,
127 127 so_far +
... ... @@ -139,7 +139,7 @@ public define Maybe(One)
139 139 (
140 140 Stream stream, //stream file where to write
141 141 HK_Table table, //
142   - List(HK_Edit_View) edit_view //list view to generate
  142 + List(HK_Editor) edit_view //list view to generate
143 143 )=
144 144 since table is hk_table(table_name, short_name, model, display),
145 145 if write_string(stream,
... ...
src/generation/vt_view.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -106,7 +106,7 @@ public define Maybe(One)
106 106 (
107 107 Stream stream, //stream file where to write
108 108 HK_Table table, //
109   - HK_List_View list_view //list view to generate
  109 + HK_Viewer list_view //list view to generate
110 110 )=
111 111 since table is hk_table(table_name, short_name, model, display),
112 112 since model is hk_model( columns, _),
... ... @@ -182,7 +182,7 @@ public define Maybe(One)
182 182 (
183 183 Stream stream, //stream file where to write
184 184 HK_Table table, //
185   - List(HK_List_View) list_view, //list view to generate
  185 + List(HK_Viewer) list_view, //list view to generate
186 186 Bool has_default //set to true if a default view was encountered.
187 187 )=
188 188 if list_view is
... ... @@ -219,7 +219,7 @@ public define String
219 219 _generate_get_viewable_if_else
220 220 (
221 221 String table_name, //
222   - List(HK_List_View) list_view, //list view to generate
  222 + List(HK_Viewer) list_view, //list view to generate
223 223 String so_far
224 224 )=
225 225 if list_view is
... ... @@ -250,7 +250,7 @@ public define Maybe(One)
250 250 (
251 251 Stream stream, //stream file where to write
252 252 HK_Table table, //
253   - List(HK_List_View) list_view //list view to generate
  253 + List(HK_Viewer) list_view //list view to generate
254 254 )=
255 255 since table is hk_table(table_name, short_name, model, display),
256 256 if write_string(stream,
... ... @@ -273,7 +273,7 @@ public define List(String)
273 273 */
274 274 _generate_list_view_name
275 275 (
276   - List(HK_List_View) list_view, //list view to generate
  276 + List(HK_Viewer) list_view, //list view to generate
277 277 List(String) so_far,
278 278 Bool has_default //set to true if a default view was encountered.
279 279 )=
... ... @@ -310,7 +310,7 @@ public define Maybe(One)
310 310 (
311 311 Stream stream,
312 312 HK_Table table, //
313   - List(HK_List_View) list_view
  313 + List(HK_Viewer) list_view
314 314 )=
315 315 since table is hk_table(table_name, short_name, model, display),
316 316 if write_string(stream,
... ...
src/model.3.0.0.anubis
  Show/Hide comments   View file @3fee013
... ... @@ -577,7 +577,7 @@ public define HK_Table role_table =
577 577 ],
578 578 //list_edit
579 579 [ edit_view_list_form("default", ["role_name", "description", "comments"]),
580   - edit_view_table_form("table",
  580 + form_table("table",
581 581 table([
582 582 line([label("role_name"), column("role_name")]),
583 583 line([empty, column("description")]),
... ...