still working on view/form refactoring

totoro
1 parent 23eeeae8
Showing 4 changed files with 28 additions and 14 deletions Show diff stats
view/jqgrid.anubis
view/types/hk_view.anubis
view/view_table_manager_types.anubis
view/view_table_renderer.anubis
@@ -9,6 +9,7 @@
 read calexium_lib/web/CXM_making_a_web_site.anubis
 read hayamiki_lib/types/hayamiki.anubis
 read hayamiki_lib/view/types/hk_form.anubis
+read hayamiki_lib/view/types/hk_view.anubis
 define String
   to_jqGrid_selector
@@ -9,6 +9,7 @@ read calexium_lib/web/CXM_making_a_web_site.anubis
 transmit calexium_lib/web/CXM_common.anubis
 read hayamiki_lib/types/hayamiki.anubis
 read hayamiki_lib/view/types/hk_form_table.anubis
+read hayamiki_lib/view/types/hk_form_tab.anubis
 //public type VT_edit_selector:
 //  vt_edit_selector((SQLite3DataBase  db, HK_Referer referer, String filter) -> List((List(CoreAttrs), WebArgValue, String)) get).
@@ -43,14 +44,14 @@ read hayamiki_lib/view/types/hk_form_table.anubis
 //public define VT_edit_entry information(String s_name, String c_name, String v_name, HK_Help_Text help) = information(s_name, c_name, v_name, 0, help).
-public type HK_Form_Tab: //HK_V_Edit_Tab:
-  hk_ve_form_tab(String fk_table_name, String fk_col_name, String list_view_name)
-.
+//public type HK_Form_Tab: //HK_V_Edit_Tab:
+//  hk_ve_form_tab(String fk_table_name, String fk_col_name, String list_view_name)
+//.
-public type HK_Form: //VT_edit:
-  hk_form_in_list (String table_name, String view_name, List(HK_Form_Entry) list, List(HK_Form_Tab) tabs),
-  hk_form_in_table(String table_name, String view_name, HK_Form_Table ve_table)
-.
+//public type HK_Form: //VT_edit:
+//  hk_form_in_list (String table_name, String view_name, List(HK_Form_Entry) list, List(HK_Form_Tab) tabs),
+//  hk_form_in_table(String table_name, String view_name, HK_Form_Table ve_table)
+//.
 public type VT_view_model_entry:
@@ -7,6 +7,7 @@
  */
 read hayamiki_lib/view/types/hk_form.anubis
+read hayamiki_lib/view/types/hk_view.anubis
 read calexium_lib/web/CXM_common.anubis
 public type VTM_edit:
@@ -8,6 +8,7 @@
 read hayamiki_lib/view/types/hk_form_entry.anubis
 read hayamiki_lib/view/types/hk_form.anubis
+read hayamiki_lib/view/types/hk_view.anubis
 read hayamiki_lib/view/jqgrid.anubis
 read hayamiki_lib/view/view_table_manager_types.anubis
 read hayamiki_lib/view/view_table_manager.anubis
@@ -477,14 +478,18 @@ public define HTML_Partial_Content
     (String) -> String    _T,
     String                lang,
     String                web_site_directory,
+    String                table_name,
+    String                view_name,
+    List(HK_Form_Entry)   list_entries,
+    List(HK_Form_Tab)     list_tabs,
     List(Web_arg)         lwa,
-    HK_Form               edit_form,
+    //HK_Form               edit_form,
     VTM                   vtm,
     String                clause,
     String                fk_clause,
     HK_Referer            table_referer   //from which table and row id that editor is called
   ) =
-  with table_name  = vt_elist.table_name,
+  //with table_name  = vt_elist.table_name,
                      //true if need to create row or false for updating
   with create      = if get_String(lwa, "id","none") = "none" then true else false,
   with id          = get_String(lwa, "id","none"),
@@ -495,10 +500,10 @@ public define HTML_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
+    get_editor_header(list_entries), //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, [])+
+        edit_form_lines(db, "", table_referer, _T, list_entries, 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)]),
@@ -511,7 +516,7 @@ public define HTML_Partial_Content
      else
       map( (HK_Form_Tab tab)
           |-> 
-          since tab is hk_v_edit_tab(fk_table_name, fk_col_name, list_view_name),
+          since tab is hk_form_tab(fk_table_name, fk_col_name, list_view_name),
           with referer = hk_referer(table_name, id, fk_table_name, fk_col_name),
           if table_in_list_view_only(db, _T, lang,  web_site_directory, fk_table_name, list_view_name, "edit", "", referer, fk_clause, vtm) is
           {
@@ -519,7 +524,7 @@ public define HTML_Partial_Content
             success(p_content)  then partial(p_content)
           }
           //text("Foreign Key from table ["+fk_table_name+"] columns ["+fk_col_name+"] view to use ["+list_view_name+"]")
-     ,vt_elist.tabs)
+     ,list_tabs)
      )).
 public define Maybe(HTML_Partial_Content) 
@@ -543,7 +548,13 @@ public define Maybe(HTML_Partial_Content)
     failure        then failure,
     success(vtm_e) then 
       since vtm_e is vtm_edit(_, get_edit), 
-        success(edit_table_form(db, _T, lang, web_site_directory, lwa, get_edit(db, action, view_name), vtm, clause, fk_clause, referer))
+        if get_edit(db, action, view_name) is
+        {
+            hk_form_in_list(tb_name,  view_name, list_form_entres, list_tabs) then  
+              success(render_edit_form(db, _T, lang, web_site_directory, lwa, vtm, tb_name, view_name, list_form_entries, list_tabs, clause, fk_clause, referer)),
+            hk_form_in_table(tb_name, view_name, form_in_table          then ,
+        
+        }
   }.