add support of cell in table description

totoro
1 parent fed6db13
Showing 30 changed files with 83 additions and 62 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_edit_view.anubis
view/types/hk_edit_view_table.anubis
@@ -230,7 +230,10 @@ public define List(DS_Type)  hayamiki_lib_types_description =
         component(string, "column_name")
       ]),
       alternative("label", [
-        component(string, "label")
+        component(string, "label"),
+      ]),
+      alternative("cell", [
+        component(list, extern_type("HK_Edit_View_Table_Cell", view_types+"hk_edit_view_table_cell.anubis"), "cell")
       ])
     ]),
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
@@ -10,14 +10,18 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
+transmit hayamiki_lib/view/types/hk_edit_view_table_cell.anubis
 public type HK_Edit_View_Table_Cell:
-  empty,               
+  empty,                                      
   column(
-    String  column_name 
+    String                         column_name 
   ),
   label(
-    String  label      
+    String                         label      
+  ),
+  cell(
+    List(HK_Edit_View_Table_Cell)  cell       
   )
 .
@@ -50,6 +54,12 @@ public define Message
       // [type = String] label.label
       forget(add_string(_hk_edit_view_table_cell_message, "label", _label)),
+    //Alternative cell
+    cell(__cell) then 
+      forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "cell"));
+      // [type = List(HK_Edit_View_Table_Cell)] cell.cell
+      map_forget((HK_Edit_View_Table_Cell _cell) |-> add_message(_hk_edit_view_table_cell_message, "cell", to_Message(_cell)), __cell),
+
   };
   _hk_edit_view_table_cell_message
 .
@@ -79,6 +89,14 @@ public define Maybe(HK_Edit_View_Table_Cell)
         success(label(_label_))
       }
+      else //Alternative cell
+      if __type_alt__ = "cell" then //Alternative cell
+        // [type = List(HK_Edit_View_Table_Cell)] cell.cell
+        with mb__cell_ = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_cell_message, "cell")),
+          if mb__cell_ is {failure then failure,  success(_cell_) then
+
+        success(cell(_cell_))
+      }
       else 
         failure  //No valid Alternative found !
     else
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-09
- * Time: 21:26:44
+ * Date: 2017-04-10
+ * Time: 09:51:00
  * 
  */