continue refactoring

totoro
1 parent 7a8ff83c
Showing 6 changed files with 31 additions and 28 deletions Show diff stats
view/jqgrid.anubis
view/types/hk_form_table_cell.anubis
view/view_editor_renderer.anubis
view/view_table_manager.anubis
view/view_table_manager_types.anubis
view/view_table_renderer.anubis
@@ -8,7 +8,7 @@
 read calexium_lib/web/CXM_making_a_web_site.anubis
 read hayamiki_lib/types/hayamiki.anubis
-read view_table_types.anubis
+read hayamiki_lib/view/types/hk_form.anubis
 define String
   to_jqGrid_selector
-/*
+/*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
  * Date: 2017-04-04
@@ -33,9 +33,9 @@ public define Message
   {
     //Alternative hk_form_table_cell
     hk_form_table_cell(_form_entry) then 
-      forget(add_string(_hk_form_table_cell_message, "__TYPE_ALT__", "hk_form_table_cell"));
+      forget(add_string(_hk_form_table_cell_message, "__TYPE_ALT__", "hk_form_table_cell"))
       // [type = HK_Form_Entry] hk_form_table_cell.form_entry
-      forget(add_message(_hk_form_table_cell_message, "form_entry", to_Message(_form_entry))),
+      //forget(add_message(_hk_form_table_cell_message, "form_entry", to_Message(_form_entry))),
   };
   _hk_form_table_cell_message
@@ -52,8 +52,8 @@ public define Maybe(HK_Form_Table_Cell)
       //Alternative hk_form_table_cell
       if __type_alt__ = "hk_form_table_cell" then //Alternative hk_form_table_cell
         // [type = HK_Form_Entry] hk_form_table_cell.form_entry
-        if find_message(_hk_form_table_cell_message, "form_entry") is {failure then failure,  success(form_entry_msg) then
-          if (Maybe(HK_Form_Entry))from_Message(form_entry_msg)  is {failure then failure,  success(form_entry) then
+        //if find_message(_hk_form_table_cell_message, "form_entry") is {failure then failure,  success(form_entry_msg) then
+        //  if (Maybe(HK_Form_Entry))from_Message(form_entry_msg)  is {failure then failure,  success(form_entry) then
         success(hk_form_table_cell(form_entry))
       }}
@@ -12,7 +12,7 @@ read hayamiki_lib/view/view_table_manager_types.anubis
 read hayamiki_lib/view/view_table_manager.anubis
 read hayamiki_lib/types/hayamiki.anubis
-public define Maybe(HTML_Partial_Content) 
+ public define Maybe(HTML_Partial_Content) 
   view_editor_content 
   (
     SQLite3DataBase       db,
@@ -22,7 +22,7 @@ public define Maybe(HTML_Partial_Content)
     List(Web_arg)         lwa,
     String                table,      //table name
     String                view_name,  //view name to use
-    VT_action             action,     //new_entry or edit an existing record
+    HK_Form_action        action,     //new_entry or edit an existing record
     VTM                   vtm,
     String                clause,
     String                fk_clause,
@@ -6,7 +6,7 @@
  */
 read tools/basis.anubis
-transmit hayamiki_lib/view/view_table_types.anubis
+transmit hayamiki_lib/view/types/hk_form.anubis
 transmit hayamiki_lib/view/view_table_manager_types.anubis
 public define Maybe(VTM_view)
@@ -6,11 +6,11 @@
  * 
  */
-read hayamiki_lib/view/view_table_types.anubis
+read hayamiki_lib/view/types/hk_form.anubis
 read calexium_lib/web/CXM_common.anubis
 public type VTM_edit:
-  vtm_edit(String table_name, (SQLite3DataBase  db, VT_action action, String edit_view_name) -> VT_edit get_edit).
+  vtm_edit(String table_name, (SQLite3DataBase  db, HK_Form_action action, String edit_view_name) -> HK_Form get_edit).
 public type VTM_edit_list:
   vtm_edit_list(List(VTM_edit) list).
@@ -7,6 +7,7 @@
  */
 read hayamiki_lib/view/types/hk_form_entry.anubis
+read hayamiki_lib/view/types/hk_form.anubis
 read hayamiki_lib/view/jqgrid.anubis
 read hayamiki_lib/view/view_table_manager_types.anubis
 read hayamiki_lib/view/view_table_manager.anubis
@@ -390,7 +391,9 @@ public define List(CXM_Form_Field)
         {
           hidden(name, value)        then
             //print("hidden "+name+" = "+value);
-            [hidden(html_Id(""), wan(name), wav(value))],          
+            [hidden(html_Id(""), wan(name), wav(value))],
+          label(name)               then
+            [div([],text(name))],
           primary_key(idx)          then 
             [hidden(html_Id(""), wan("id"), wav(idx))],
           information(s_name, c_name, value, width, help) then
@@ -444,10 +447,10 @@ public define List(CXM_Form_Field)
 define HTML_Head_Tag
   get_rich_editor_inline
   (
-    List(VT_edit_entry)   list
+    List(HK_Form_Entry)   list
   )=
   js_inline(jquery_ready(
-    join("",map_select((VT_edit_entry entry) |->
+    join("",map_select((HK_Form_Entry entry) |->
     if entry is text_area(s_name, c_name, value, txt_editor, help)  then
       if txt_editor is { none then failure,
         rich_editor then success(" CKEDITOR.replace( '"+c_name+"_editor' );")
@@ -468,14 +471,14 @@ define List(HTML_Head_Tag)
   .
 public define HTML_Partial_Content 
-  edit_table_form
+  renderer_edit_form
   (
     SQLite3DataBase       db,
     (String) -> String    _T,
     String                lang,
     String                web_site_directory,
     List(Web_arg)         lwa,
-    VT_edit               vt_elist,
+    HK_Form               edit_form,
     VTM                   vtm,
     String                clause,
     String                fk_clause,
@@ -487,26 +490,26 @@ public define HTML_Partial_Content
   with id          = get_String(lwa, "id","none"),
   with button_name = if create then _T("CREATE") else _T("UPDATE"),
   with button_name_and_new = if create then _T("CREATE_AND_EDIT_NEW") else _T("UPDATE_AND_EDIT_NEW"),
-
+  
   partial_content(
     [ js(js_file("js/jscolor.min.js"))
     ]+
     jq_datetimepicker_init(lang) +
     get_editor_header(vt_elist.list), //add editor header if need. Like init ck_editor
     sequence([
-    cxm_form( table_name, lwa,      
-      edit_form_lines(db, "", table_referer, _T, vt_elist.list, create, [])+
-     [ one_line_fields([
-        submit(if create then hkc_save_row else hkc_update_row,                 failure, button_name,         [("table_name", table_name)]),
-        submit(if create then hkc_save_row_and_new else hkc_update_row_and_new, failure, button_name_and_new, [("table_name", table_name)]),
-        submit(hkc_cancel, failure, _T("CANCEL"))
-        ])
-     ]
-     )]+
+      cxm_form( table_name, lwa,      
+        edit_form_lines(db, "", table_referer, _T, vt_elist.list, create, [])+
+        [ one_line_fields([
+          submit(if create then hkc_save_row else hkc_update_row,                 failure, button_name,         [("table_name", table_name)]),
+          submit(if create then hkc_save_row_and_new else hkc_update_row_and_new, failure, button_name_and_new, [("table_name", table_name)]),
+          submit(hkc_cancel, failure, _T("CANCEL"))
+          ])
+        ]
+      )]+
      if id = "none" then
       []
      else
-      map( (HK_V_Edit_Tab tab)
+      map( (HK_Form_Tab tab)
           |-> 
           since tab is hk_v_edit_tab(fk_table_name, fk_col_name, list_view_name),
           with referer = hk_referer(table_name, id, fk_table_name, fk_col_name),
@@ -529,7 +532,7 @@ public define Maybe(HTML_Partial_Content)
     List(Web_arg)         lwa,
     String                table,      //table name
     String                view_name,  //view name to use
-    VT_action             action,     //new_entry or edit an existing record
+    HK_Form_action        action,     //new_entry or edit an existing record
     VTM                   vtm,
     String                clause,
     String                fk_clause,