add hk_form_table_cell_table, which enable to add table inside cell

totoro
1 parent 69ab6263
Showing 28 changed files with 168 additions and 177 deletions Show diff stats
ds_files/ds_types.anubis
model/types/hk_app.anubis
model/types/hk_app_name.anubis
model/types/hk_database.anubis
model/types/hk_datetime_field_attr.anubis
model/types/hk_help_text.anubis
model/types/hk_icon.anubis
model/types/hk_int_choice.anubis
model/types/hk_int_choices.anubis
model/types/hk_model.anubis
model/types/hk_model_attr.anubis
model/types/hk_model_column.anubis
model/types/hk_model_field.anubis
model/types/hk_table.anubis
model/types/hk_text_choice.anubis
model/types/hk_text_choices.anubis
model/types/hk_text_field_attr.anubis
view/types/hk_display.anubis
view/types/hk_editor.anubis
view/types/hk_editor_table.anubis
@@ -200,31 +200,7 @@ public define List(DS_Type_File)  hayamiki_lib_types_description =
         ])
       ]),
-      ds_type("HK_Form_Table_Cell", no_message, [
-        alternative("hk_form_table_cell", [
-          component(extern_type("HK_Form_Entry", view_types+"hk_form_entry.anubis"), "form_entry")
-        ])
-      ]),
-      
-      ds_type("HK_Form_Table_Line", no_message, [
-        alternative("hk_form_table_line", [
-          component(list, extern_type("HK_Form_Table_Cell", view_types+"hk_form_table_cell.anubis"), "form_table_cells")
-        ])
-      ]),
-      
-      ds_type("HK_Form_Table_Attribute", [
-        alternative("hidden", [
-          component(string, "name"),
-          component(string, "value")
-        ])
-     ]),
-     
-      ds_type("HK_Form_Table", no_message, [
-        alternative("hk_form_table", [
-          component(list, extern_type("HK_Form_Table_Attribute", view_types+"hk_form_table_attribute.anubis"), "table_attr"),
-          component(list, extern_type("HK_Form_Table_Line", view_types+"hk_form_table_line.anubis"), "form_lines")
-        ])
-      ]),
+
@@ -293,6 +269,38 @@ public define List(DS_Type_File)  hayamiki_lib_types_description =
         ])
       ]),      
+  ]),
+  
+  ds_type_file(auto, name("hk_form_table"),
+  [
+      ds_type("HK_Form_Table_Cell", no_message, [
+        alternative("hk_form_table_cell", [
+          component(extern_type("HK_Form_Entry", view_types+"hk_form_entry.anubis"), "form_entry")
+        ]),
+        alternative("hk_form_table_cell_table", [
+          component(list, ds_type("HK_Form_Table_Line"), "form_lines")
+        ])
+      ]),
+      
+      ds_type("HK_Form_Table_Line", no_message, [
+        alternative("hk_form_table_line", [
+          component(list, ds_type("HK_Form_Table_Cell"), "form_table_cells")
+        ])
+      ]),
+      
+      ds_type("HK_Form_Table_Attribute", [
+        alternative("hidden", [
+          component(string, "name"),
+          component(string, "value")
+        ])
+     ]),
+     
+      ds_type("HK_Form_Table", no_message, [
+        alternative("hk_form_table", [
+          component(list, ds_type("HK_Form_Table_Attribute"), "table_attr"),
+          component(list, ds_type("HK_Form_Table_Line"), "form_lines")
+        ])
+      ]),  
   ])
   ]
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
-/*
+/*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -13,6 +13,20 @@ transmit tools/basis.anubis
 public type HK_Editor_Table_Line:...
+public define Maybe(HK_Editor_Table_Line)
+  from_Message
+  (
+    Message _hk_editor_table_line_message
+  )
+.
+
+public define Message
+  to_Message
+  (
+    HK_Editor_Table_Line _hk_editor_table_line
+  ).
+
+
 public type HK_Editor_Table_Cell:
   empty,                                   
   column(
@@ -40,21 +54,9 @@ public type HK_Editor_Table:
   )
 .
-public define Maybe(HK_Editor_Table_Line)
-  from_Message
-  (
-    Message _hk_editor_table_line_message
-  )
-.
-  
   HK_Editor_Table_Cell message format
   ===================================
-public define Message
-  to_Message
-  (
-    HK_Editor_Table_Line _hk_editor_table_line
-  ).
 public define Message
   to_Message
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */
@@ -10,9 +10,47 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/view/types/hk_form_table_line.anubis
-transmit hayamiki_lib/view/types/hk_form_table_attribute.anubis
+transmit hayamiki_lib/view/types/hk_form_entry.anubis
+public type HK_Form_Table_Line:...
+
+public define Maybe(HK_Form_Table_Line)
+  from_Message
+  (
+    Message _hk_form_table_line_message
+  )
+.
+
+public define Message
+  to_Message
+  (
+    HK_Form_Table_Line _hk_form_table_line
+  ).
+
+
+public type HK_Form_Table_Cell:
+  hk_form_table_cell(
+    HK_Form_Entry             form_entry 
+  ),
+  hk_form_table_cell_table(
+    List(HK_Form_Table_Line)  form_lines 
+  )
+.
+
+
+public type HK_Form_Table_Line:
+  hk_form_table_line(
+    List(HK_Form_Table_Cell)  form_table_cells 
+  )
+.
+
+
+public type HK_Form_Table_Attribute:
+  hidden(
+    String  name, 
+    String  value 
+  )
+.
 public type HK_Form_Table:
@@ -21,3 +59,59 @@ public type HK_Form_Table:
     List(HK_Form_Table_Line)       form_lines              
   )
 .
+
+
+
+
+
+  HK_Form_Table_Attribute message format
+  ======================================
+
+
+public define Message
+  to_Message
+  (
+    HK_Form_Table_Attribute _hk_form_table_attribute
+  )=
+  with _hk_form_table_attribute_message = message((Word32)0),  //
+  forget(add_string(_hk_form_table_attribute_message, "__TYPE__", "HK_Form_Table_Attribute"));
+  if _hk_form_table_attribute is
+  {
+    //Alternative hidden
+    hidden(_name, _value) then 
+      forget(add_string(_hk_form_table_attribute_message, "__TYPE_ALT__", "hidden"));
+      // [type = String] hidden.name
+      forget(add_string(_hk_form_table_attribute_message, "name", _name));
+      // [type = String] hidden.value
+      forget(add_string(_hk_form_table_attribute_message, "value", _value)),
+
+  };
+  _hk_form_table_attribute_message
+.
+
+public define Maybe(HK_Form_Table_Attribute)
+  from_Message
+  (
+    Message _hk_form_table_attribute_message
+  )=
+  if find_string(_hk_form_table_attribute_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
+  if find_string(_hk_form_table_attribute_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
+    if __type__ = "HK_Form_Table_Attribute" then 
+      //Alternative hidden
+      if __type_alt__ = "hidden" then //Alternative hidden
+        // [type = String] hidden.name
+        if find_string(_hk_form_table_attribute_message, "name") is {failure then failure,  success(_name_) then
+        // [type = String] hidden.value
+        if find_string(_hk_form_table_attribute_message, "value") is {failure then failure,  success(_value_) then
+
+        success(hidden(_name_, _value_))
+      }}
+      else 
+        failure  //No valid Alternative found !
+    else
+      failure    //Type not found in message !
+  }}
+.
+
+
+
-/*
- * Created by 伝作 (Densaku).
- * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-12
- * Time: 22:22:45
- * 
- */
-
-transmit system/muscle.anubis
-transmit system/convert.anubis
-transmit tools/basis.anubis
-
-
-
-
-public type HK_Form_Table_Attribute:
-  hidden(
-    String  name, 
-    String  value 
-  )
-.
-
-  HK_Form_Table_Attribute message format
-  ======================================
-
-
-public define Message
-  to_Message
-  (
-    HK_Form_Table_Attribute _hk_form_table_attribute
-  )=
-  with _hk_form_table_attribute_message = message((Word32)0),  //
-  forget(add_string(_hk_form_table_attribute_message, "__TYPE__", "HK_Form_Table_Attribute"));
-  if _hk_form_table_attribute is
-  {
-    //Alternative hidden
-    hidden(_name, _value) then 
-      forget(add_string(_hk_form_table_attribute_message, "__TYPE_ALT__", "hidden"));
-      // [type = String] hidden.name
-      forget(add_string(_hk_form_table_attribute_message, "name", _name));
-      // [type = String] hidden.value
-      forget(add_string(_hk_form_table_attribute_message, "value", _value)),
-
-  };
-  _hk_form_table_attribute_message
-.
-
-public define Maybe(HK_Form_Table_Attribute)
-  from_Message
-  (
-    Message _hk_form_table_attribute_message
-  )=
-  if find_string(_hk_form_table_attribute_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
-  if find_string(_hk_form_table_attribute_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
-    if __type__ = "HK_Form_Table_Attribute" then 
-      //Alternative hidden
-      if __type_alt__ = "hidden" then //Alternative hidden
-        // [type = String] hidden.name
-        if find_string(_hk_form_table_attribute_message, "name") is {failure then failure,  success(_name_) then
-        // [type = String] hidden.value
-        if find_string(_hk_form_table_attribute_message, "value") is {failure then failure,  success(_value_) then
-
-        success(hidden(_name_, _value_))
-      }}
-      else 
-        failure  //No valid Alternative found !
-    else
-      failure    //Type not found in message !
-  }}
-.
-
-/*
- * Created by 伝作 (Densaku).
- * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-12
- * Time: 22:22:45
- * 
- */
-
-transmit system/muscle.anubis
-transmit system/convert.anubis
-transmit tools/basis.anubis
-
-transmit hayamiki_lib/view/types/hk_form_entry.anubis
-
-
-
-public type HK_Form_Table_Cell:
-  hk_form_table_cell(
-    HK_Form_Entry  form_entry 
-  )
-.
-/*
- * Created by 伝作 (Densaku).
- * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-12
- * Time: 22:22:45
- * 
- */
-
-transmit system/muscle.anubis
-transmit system/convert.anubis
-transmit tools/basis.anubis
-
-transmit hayamiki_lib/view/types/hk_form_table_cell.anubis
-
-
-
-public type HK_Form_Table_Line:
-  hk_form_table_line(
-    List(HK_Form_Table_Cell)  form_table_cells 
-  )
-.
@@ -2,7 +2,7 @@
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-12
- * Time: 22:22:45
+ * Time: 23:52:21
  * 
  */