rename web action name by adding hkc_ as prefix

add jqgrid init in partial content init jqgrid, translate label in colModel

rename web action name by adding hkc_ as prefix
add jqgrid init in partial content init jqgrid, translate label in colModel
totoro
1 parent 229894d6
Showing 4 changed files with 47 additions and 42 deletions Show diff stats
view/jqgrid.anubis
view/view_apps_renderer.anubis
view/view_table_renderer.anubis
view/web_action.anubis
@@ -24,35 +24,36 @@ define String
   to_jqGrid_ColModel
   (
     SQLite3DataBase     db,
-    VT_view_model_entry model
+    VT_view_model_entry model,
+    (String) -> String  _T
   )=
   if model is
   {
-     primary_key                                    then "{ name: \"id\" }", 
-     information(label,column_name,width,help)      then "{ name: \""+column_name+"\", label: \""+label+"\" }",
-     text(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true }",
-     password(label,column_name,help)               then "{ name: \""+column_name+"\", label: \""+label+"\" }", 
+     primary_key                                    then "{ name: \"id\", hidden:true }", 
+     information(label,column_name,width,help)      then "{ name: \""+column_name+"\", label: \""+_T(label)+"\" }",
+     text(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true }",
+     password(label,column_name,help)               then "{ name: \""+column_name+"\", label: \""+_T(label)+"\" }", 
      foreign_text(label,column_name,selector,help)  then 
-      "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
+      "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "  formatter: \"select\","+
       "  formatoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "}",
      choices_text(label,column_name,selector,help)  then 
-      "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
+      "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "  formatter: \"select\","+
       "  formatoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "}",
-     text_area(label,column_name,help)              then "{ name: \""+column_name+"\", label: \""+label+"\" }",
-     boolean(label,column_name,help)                then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, template: \"booleanCheckboxFa\" }",
-     integer(label,column_name,help)                then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, template: \"integer\" }",
-     float(label,column_name,help)                  then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, template: \"number\"  }", 
-     choices_int(label,column_name,selector,help)   then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
+     text_area(label,column_name,help)              then "{ name: \""+column_name+"\", label: \""+_T(label)+"\" }",
+     boolean(label,column_name,help)                then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, template: \"booleanCheckboxFa\" }",
+     integer(label,column_name,help)                then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, template: \"integer\" }",
+     float(label,column_name,help)                  then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, template: \"number\"  }", 
+     choices_int(label,column_name,selector,help)   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, edittype:\"select\", editoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "  formatter: \"select\","+
       "  formatoptions:{value: "+to_jqGrid_selector(selector.get(db,""))+"},"+
       "}", 
-     date(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true, formatter: \"date\", formatoptions: { newformat: \"Y-M-d\" }}", 
-     time(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true }",
-     datetime(label,column_name,help)               then "{ name: \""+column_name+"\", label: \""+label+"\", editable:true }", 
+     date(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, formatter: \"date\", formatoptions: { newformat: \"Y-M-d\" }}", 
+     time(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true }",
+     datetime(label,column_name,help)               then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true }", 
   }
 .
  
@@ -60,12 +61,13 @@ public define String
   to_jqGrid_ColModel
   (
     SQLite3DataBase           db,
+    (String) -> String        _T,
     List(VT_view_model_entry) models
   )=
   "colModel: [\n"+
     join(",\n            ", 
       [ "{name: 'myac', label: 'Action', width:60, fixed:true, sortable:false, resize:false, formatter:'actions', formatoptions:{keys:true}}" .
-        map((VT_view_model_entry col_model) |-> to_jqGrid_ColModel(db, col_model), models)
+        map((VT_view_model_entry col_model) |-> to_jqGrid_ColModel(db, col_model, _T), models)
       ]
       )+
   "]"
@@ -34,7 +34,7 @@ define List(HTML_Row(HTML_Off_Form))
             cell(
               sequence([
                 partial(img_button(icn16_add,       [event(onclick, jq_dialog_open(dialog_id("edit_table_dlg_ajax"), "'table_name="+table_name+"'"))], "", [])),
-                partial(img_button(icn16_view_list, view_table, [("table_name",table_name)]))
+                partial(img_button(icn16_view_list, hkc_view_table, [("table_name",table_name)]))
               ])
             )
           ])
@@ -30,6 +30,7 @@ read calexium_lib/web/jQuery/CXM_jquery_datatable_types.anubis
 read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis      
 read calexium_lib/web/jQuery/CXM_jquery_button.anubis
 read calexium_lib/web/jQuery/ui-addon/datetimepicker.anubis
+read calexium_lib/web/jQuery/jqgrid.anubis
 read calexium_lib/web/CXM_form.anubis
 read calexium_lib/web/widgets/css_helper.anubis
 read calexium_lib/web/widgets/button.anubis
@@ -102,7 +103,7 @@ define HTML_Header_Row(HTML_Off_Form)
       with cell = if h is
                   {
                     text(string)      then header_cell((HTML_Off_Form)text(_T(string))),
-                    link(id, string)  then header_cell((HTML_Off_Form)actioner(same, same, link(string), edit_table,[])), //TODO
+                    link(id, string)  then header_cell((HTML_Off_Form)actioner(same, same, link(string), hkc_edit_table,[])), //TODO
                     link_id_action(id, text, action)  then header_cell((HTML_Off_Form)actioner(same,same, link(text), action,[("id",id)])), //TODO
                     icon(icon_path)   then header_cell((HTML_Off_Form)image([], icon_path, ""))
                   },
@@ -164,18 +165,19 @@ public define HTML_Partial_Content
     String              uid,
     VT_view             rows,
     (String) -> String  _T,
+    String              lang,    
     String              clause
   )=
   with filter_clause = if clause = "" then "" else "&clause="+url_quote(clause),
   with js = js_inline(jquery_ready("$(\"#"+uid+"_grid\").jqGrid({\n"+
   "url:'?aws_controller=hk_c&aws_action=grid_view&table_name="+rows.table_name+"&view_name="+rows.view_name+filter_clause+"',"+
   "datatype: \"json\","+
-   to_jqGrid_ColModel(db, rows.view_model.list)+","+
+   to_jqGrid_ColModel(db, _T, rows.view_model.list)+","+
 //   rows.json_data_string+
    jqGrid_options(uid, rows, _T)+
    "})")),
  
-  partial_content([js],
+  partial_content(jqgrid_init(lang) + [js],
     div([],
       sequence([
         table([core_attrs([id(uid+"_grid")])],[]),
@@ -206,7 +208,7 @@ public define HTML_Partial_Content
       sequence([
         partial(jq_dialog_create(dialog_id(uid+action_name+"_dlg_ajax"), ajax(controller_action("hk_c", "ajax_edit_table&table_name="+rows.table_name)))),      
         partial(img_button(icn16_add, [event(onclick, jq_dialog_open(dialog_id(uid+action_name+"_dlg_ajax")))], "", [])),
-        partial(jqGrid_table(db, uid, rows, _T, clause))
+        partial(jqGrid_table(db, uid, rows, _T, lang, clause))
         //partial(jquery_datatable(uid+"table_view", view_table_form(_T, uid, action_name, rows), true, false, jq_dt_pt_full_numbers, false, scrollY(500), true, true, true, lang, no_extra, web_site_directory))
       ]))]).
  
@@ -226,11 +228,13 @@ public define HTML_Partial_Content
 //  println("view_table_page - lang : "+lang);
 //  println("view_table_page - web_site_directory : "+web_site_directory);
   with uid = generate_random_string(20)+"_",
-  partial_content(jq_dialog_init + jq_datetimepicker_init(lang),
+  partial_content(
+      jq_dialog_init +
+      jq_datetimepicker_init(lang),
     [
       partial(jq_dialog_create(dialog_id(uid+action_name+"_dlg_ajax"), ajax(controller_action("hk_c", "ajax_edit_table&table_name="+rows.table_name)))),
       partial(img_button(icn16_add, [event(onclick, jq_dialog_open(dialog_id(uid+action_name+"_dlg_ajax")))], "", [])),    
-      partial(jqGrid_table(db, uid, rows, _T, clause)),
+      partial(jqGrid_table(db, uid, rows, _T, lang, clause)),
       //partial(jquery_datatable(uid+"table_view", view_table_form(_T, uid, action_name, rows), true, false, jq_dt_pt_full_numbers, false, scrollY(200), true, true, true, lang, no_extra, web_site_directory))
     ]).
  
@@ -251,8 +255,7 @@ public define Maybe(HTML_Partial_Content)
   {
     failure        then failure,
     success(vtm_v) then 
-      since vtm_v is vtm_view(_, get_view), 
-        success(view_table_page(db, _T, lang, web_site_directory, action_name, get_view(view_name), clause))
+      success(view_table_page(db, _T, lang, web_site_directory, action_name, vtm_v.get_view(view_name), clause))
   }.
  
 public define Maybe(HTML_Partial_Content)
@@ -272,9 +275,7 @@ public define Maybe(HTML_Partial_Content)
   {
     failure        then failure,
     success(vtm_v) then 
-      since vtm_v is vtm_view(_, get_view), 
-//        success(view_table(_T, lang, web_site_directory, action_name, get_view(db, view_name, clause)))
-        success(view_table(db, _T, lang, web_site_directory, action_name, get_view(view_name), clause))
+      success(view_table(db, _T, lang, web_site_directory, action_name, vtm_v.get_view(view_name), clause))
   }.
  
 define CXM_Form_Field
@@ -410,9 +411,9 @@ public define HTML_Partial_Content
     cxm_form( table_name, lwa,      
       edit_form_lines(db, _T, vt_elist.list, create, [])+
      [ one_line_fields([
-        submit(if create then save_row else update_row,                 failure, button_name,         [("table_name", table_name)]),
-        submit(if create then save_row_and_new else update_row_and_new, failure, button_name_and_new, [("table_name", table_name)]),
-        submit(hk_cancel, failure, _T("CANCEL"))
+        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"))
         ])
      ]
      )]+
@@ -8,14 +8,16 @@
  
 read calexium_lib/web/CXM_making_a_web_site.anubis
  
-public define WEB_Action_Name edit_table          = controller_action("hk_c", "edit_table").
-public define WEB_Action_Name grid_view           = controller_action("hk_c", "grid_view").
-public define WEB_Action_Name view_table          = controller_action("hk_c", "view_table").
-public define WEB_Action_Name save_row            = controller_action("hk_c", "save_row").
-public define WEB_Action_Name save_row_and_new    = controller_action("hk_c", "save_row_and_new").
-public define WEB_Action_Name update_row          = controller_action("hk_c", "update_row").
-public define WEB_Action_Name update_row_and_new  = controller_action("hk_c", "update_row_and_new").
-public define WEB_Action_Name delete_row          = controller_action("hk_c", "delete_row").
-public define WEB_Action_Name hk_cancel           = controller_action("hk_c", "cancel").
-public define WEB_Action_Name ajax_edit_table     = controller_action("hk_c", "ajax_edit_table").
-public define WEB_Action_Name show_apps           = controller_action("hk_c", "show_apps").
+ here are defined all action managed by Hayamiki Controller
+ 
+public define WEB_Action_Name hkc_edit_table          = controller_action("hk_c", "edit_table").
+public define WEB_Action_Name hkc_grid_view           = controller_action("hk_c", "grid_view").
+public define WEB_Action_Name hkc_view_table          = controller_action("hk_c", "view_table").
+public define WEB_Action_Name hkc_save_row            = controller_action("hk_c", "save_row").
+public define WEB_Action_Name hkc_save_row_and_new    = controller_action("hk_c", "save_row_and_new").
+public define WEB_Action_Name hkc_update_row          = controller_action("hk_c", "update_row").
+public define WEB_Action_Name hkc_update_row_and_new  = controller_action("hk_c", "update_row_and_new").
+public define WEB_Action_Name hkc_delete_row          = controller_action("hk_c", "delete_row").
+public define WEB_Action_Name hkc_cancel              = controller_action("hk_c", "cancel").
+public define WEB_Action_Name hkc_ajax_edit_table     = controller_action("hk_c", "ajax_edit_table").
+public define WEB_Action_Name hkc_show_apps           = controller_action("hk_c", "show_apps").