Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…

…alexium_lib into release/ANUBIS_1_14

Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…
…alexium_lib into release/ANUBIS_1_14
Julien Verneuil
2 parents 2b9fd7b5 510e96da
Showing 6 changed files with 57 additions and 18 deletions Show diff stats
database/db_types.anubis
database/vtm/view_table_renderer.anubis
database/vtm/view_table_types.anubis
web/CXM_form.anubis
web/CXM_making_a_web_site.anubis
web/jQuery/CXM_jquery_datatable.anubis
@@ -8,9 +8,14 @@
 transmit tools/basis.anubis
 transmit tools/ISO-8601.anubis
+/* DB_id will is deprecated. Please use next version below all upper case */
 public type DB_id:
   none,
   db_id(Int value).
+
+public type DB_ID:
+  none,
+  pk(Int value).
 public type DB_datetime:
   db_datetime(String datetime). //Date and time in ISO8601 format "YYYY-MM-DD hh:mm:ss"
@@ -35,7 +40,7 @@ public define String
     none        then "none",
     db_id(_idx) then abs_to_decimal(_idx)
   }.
-
+  
 public define Int
   to_Int
   (
@@ -50,6 +55,30 @@ public define Int
 public define String
   to_String
   (
+    DB_ID idx
+  )=
+  if idx is
+  {
+    none     then "none",
+    pk(_idx) then abs_to_decimal(_idx)
+  }.
+
+public define Int
+  to_Int
+  (
+    DB_ID idx
+  )=
+  if idx is
+  {
+    none     then (Int)-1,
+    pk(_idx) then _idx
+  }.
+  
+
+  
+public define String
+  to_String
+  (
     DB_date d
   )=
   date(d).
@@ -144,8 +144,9 @@ define HTML_Row(HTML_Off_Form)  make_line
                   {
                     text(string)     then cell((HTML_Off_Form)text(string)),
 //                    link(id, string) then cell((HTML_Off_Form)actioner(same,same, link(string), action_name, [("table_name", table_name),("id",id)])),
-                    link(id, string) then cell((HTML_Off_Form)literal(jq_dialog_open(string, dialog_id(action_name+"_dlg_ajax"), "'id="+id+"'"))),
-                    icon(icon_path)  then cell((HTML_Off_Form)image([], icon_path, ""))
+                    link(id, string)                  then cell((HTML_Off_Form)literal(jq_dialog_open(string, dialog_id(action_name+"_dlg_ajax"), "'id="+id+"'"))),
+                    link_id_action(id, name, action)  then cell((HTML_Off_Form)actioner(same,same, link(name), action, [("id",id)])),
+                    icon(icon_path)                   then cell((HTML_Off_Form)image([], icon_path, ""))
                   },
       make_line(table_name, action_name, t, [cell . so_far])
   }.
@@ -191,6 +192,7 @@ define HTML_Header_Row(HTML_Off_Form)
                   {
                     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_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, ""))
                   },
       make_header(_T, t, [cell . so_far])
@@ -40,6 +40,7 @@ public type VT_edit:
 public type VT_view_entry:
   text(String text),
   link(String id, String text),
+  link_id_action(String id, String text, String link_id_action),
   icon(String icon_path).
 public type VT_view_row_header:
@@ -488,7 +488,7 @@ public define HTML_In_Form
     checkbox_hide_show(options, _label, wan, val, checked, fields)  then  
       with div_id = generate_random_string(15),
       sequence([
-        check_box([data("show_id", div_id), class("in"), class("cxm_checkbox_hide_show"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], _label, html_Id(""), wan, val, get_Bool(lwa, wan.name, checked)),
+        check_box([data("show_id", div_id), class("in"), class("cxm_checkbox_hide_show"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], _label, html_Id("checkbox_"+div_id), wan, val, get_Bool(lwa, wan.name, checked)),
         div([id(div_id), style("display:"+if checked then "block" else "none")], sequence(map((CXM_Form_Field ff2) |-> div([class("form_field")], format_CXM_Form_Field(ff2, lwa)),fields)))
               ]),
@@ -498,7 +498,7 @@ public define HTML_In_Form
     radio_button_hide_show(options, _label, wan, val, checked, fields)  then  
       with div_id = generate_random_string(15),
       sequence([
-        radio_button([data("show_id", div_id), class("in"), class("cxm_radio_hide_show"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);")], _label, html_Id(""), wan, val, get_Bool(lwa, wan.name, checked)),
+        radio_button([data("show_id", div_id), class("in"), class("cxm_radio_hide_show"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);")], _label, html_Id("radio_button_hide_show_"+div_id), wan, val, get_Bool(lwa, wan.name, checked)),
         div([id(div_id), style("display:"+if checked then "block" else "none")], sequence(map((CXM_Form_Field ff2) |-> div([class("form_field")], format_CXM_Form_Field(ff2, lwa)),fields)))
               ]),
@@ -1252,6 +1252,8 @@ public type HTML_In_Form:
    'HTML_In_Form'  defines all  the  elements  you may  put  within a  form.  We define  a
    convenience function:
+public define HTML_In_Form  text_input(HTML_Label label,  HTML_Id id, WebArgName name, InitialValue init, Int width) = text_input([], label, id, name, init, width).
+
 public define HTML_In_Form literal(Printable_tree t) = literal_pt(t). 
 public define HTML_In_Form image(String url) = image([], url, url).
@@ -46,11 +46,15 @@ public define List(HTML_Head_Tag)
     [ 
       //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables.min.css")),
       //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables_themeroller.css")),
-      js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.min.js")),
-      js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) ,       //only for datatable 1.10
-      css(css_file("js/jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")),   //only for datatable 1.10
-      css(css_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")),
-      js(js_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")),
+      
+      js(js_file("js/jquery/plug-in/datatables.min.js")),
+      css(css_file("css/jquery/datatables.min.css")),
+      //js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.min.js")),
+      //js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) ,       //only for datatable 1.10
+      //css(css_file("js/jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")),   //only for datatable 1.10
+      //css(css_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")),
+      //js(js_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")),
+      
 //      css(css_file("jquery/plug-in/DataTables-1.10.7/extensions/Responsive/css/dataTables.responsive.css")),
 //      js(js_file("jquery/plug-in/DataTables-1.10.7/extensions/responsive/js/dataTables.responsive.js")),
     ]
@@ -78,7 +82,7 @@ public define HTML_Partial_Content
   =
     if enable_jqueryui then
       partial_content( jquery_datatables_1_10_init +
-        [ js_inline(jquery_ready("$('#"+table_id+"').dataTable({\"bJQueryUI\":true});")) ],
+        [ js_inline(jquery_ready("$('#"+table_id+"').dataTable({\"jQueryUI\":true});")) ],
         table
       )
     else
@@ -106,22 +110,23 @@ public define HTML_Partial_Content
     partial_content( jquery_datatables_1_10_init +
                       [ 
                         js_inline(jquery_ready("
+                        $.fn.dataTable.ext.legacy.ajax = true;
                                 $('#"+table_id+"').dataTable(
                                 {
                                   \"jQueryUI\":"+to_String(enable_jqueryui)+",
-                                  \"sPaginationType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"',
-                                  \"bFilter\":"+to_String(enable_search_field)+",
-                                  \"bPaginate\":"+to_String(enable_pagination)+","+
+                                  \"pagingType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"',
+                                  \"searching\":"+to_String(enable_search_field)+",
+                                  \"paging\":"+to_String(enable_pagination)+","+
               //                     responsive: true,"+
                                   if scrollY is
                                    {
                                     no_scroll     then "",
-                                    scrollY(size) then "\"sScrollY\": \""+size+"px\","
+                                    scrollY(size) then "\"scrollY\": \""+size+"px\","
                                    }+
-                                  "\"bStateSave\": true,
-                                  \"bLengthChange\":"+to_String(enable_change_page_length)+",
-                                  \"bSort\":"+to_String(enable_columns_sorting)+","+
+                                  "\"stateSave\": true,
+                                  \"lengthChange\":"+to_String(enable_change_page_length)+",
+                                  \"ordering\":"+to_String(enable_columns_sorting)+","+
                                   get_datatable_translation(lang, web_dir)+
                                   jquery_datatable_extra_to_string(extra)+
                                   "});