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

…alexium_lib into release/ANUBIS_1_14 Conflicts: web/CXM_form.anubis

Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…
…alexium_lib into release/ANUBIS_1_14 Conflicts: web/CXM_form.anubis
totoro
2 parents 6fe1d581 56fa599f
Showing 13 changed files with 199 additions and 69 deletions Show diff stats
database/db_types.anubis
database/vtm/view_table_manager.anubis
database/vtm/view_table_manager_types.anubis
database/vtm/view_table_renderer.anubis
database/vtm/view_table_types.anubis
mail/send_mail.anubis
web/CXM_common.anubis
web/CXM_form.anubis
web/CXM_making_a_web_site.anubis
web/CXM_multihost_http_server.anubis
web/CXM_web_arg_utils.anubis
web/jQuery/CXM_jquery_dialog.anubis
web/widgets/button.anubis
@@ -35,6 +35,17 @@ public define String
     none        then "none",
     db_id(_idx) then abs_to_decimal(_idx)
   }.
+
+public define Int
+  to_Int
+  (
+    DB_id idx
+  )=
+  if idx is
+  {
+    none        then (Int)-1,
+    db_id(_idx) then _idx
+  }.
  
 public define String
   to_String
@@ -6,8 +6,8 @@
  */
  
 read tools/basis.anubis
-read calexium_lib/database/vtm/view_table_types.anubis
-read calexium_lib/database/vtm/view_table_manager_types.anubis
+transmit calexium_lib/database/vtm/view_table_types.anubis
+transmit calexium_lib/database/vtm/view_table_manager_types.anubis
  
 public define Maybe(VTM_view)
   _vtm_get_view
@@ -84,3 +84,28 @@ public define Maybe(TM_writer)
     TM_writer_list  tm_wlist
   ) = 
   _tm_get_writer(table_name, tm_wlist.list).
+
+public define Maybe((SQLite3DataBase db, List(Int) l_int) -> Maybe(One))
+  _tm_get_delete
+  (
+    String          table_name,
+    List(TM_delete) list
+  ) = 
+  if list is
+  {
+    []        then  failure,
+    [ h . t ] then
+      since h is tm_delete(tb_name, delete_func),
+        if tb_name = table_name then
+          success(delete_func)
+        else
+          _tm_get_delete(table_name, t)
+  }.
+  
+public define Maybe((SQLite3DataBase db, List(Int) l_int) -> Maybe(One))
+  tm_get_delete
+  (
+    String          table_name,
+    TM_delete_list  tm_dlist
+  ) = 
+  _tm_get_delete(table_name, tm_dlist.list).
@@ -21,6 +21,11 @@ public type TM_writer:
 public type TM_writer_list:
   tm_writer_list(List(TM_writer) list).
  
+public type TM_delete:
+  tm_delete(String table_name, (SQLite3DataBase db, List(Int) l_int) -> Maybe(One) delete).
+
+public type TM_delete_list:
+  tm_delete_list(List(TM_delete) list).
  
 public type VTM_view:
   vtm_view(String table_name, (SQLite3DataBase  db, String view_name) -> VT_view get_view).
@@ -29,4 +34,7 @@ public type VTM_view_list:
   vtm_view_list(List(VTM_view) list).
  
 public type VTM:
-  vtm(VTM_view_list view_list, VTM_edit_list edit_list, TM_writer_list writer_list).
+  vtm(VTM_view_list view_list, 
+      VTM_edit_list edit_list, 
+      TM_writer_list writer_list,
+      TM_delete_list delete_list).
@@ -20,13 +20,16 @@ read system/convert.anubis
 //read utils.anubis
 read locale/L3LanguageInfo.anubis
 read calexium_lib/web/CXM_common.anubis
+read calexium_lib/web/CXM_web_arg_utils.anubis
 read calexium_lib/web/CXM_making_a_web_site.anubis
 read calexium_lib/web/CXM_multihost_http_server.anubis
 read calexium_lib/web/jQuery/CXM_jquery_datatable.anubis
 read calexium_lib/web/jQuery/CXM_jquery_datatable_types.anubis
+read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis
 read calexium_lib/web/jQuery/ui-addon/datetimepicker.anubis
 read calexium_lib/web/CXM_form.anubis
 read calexium_lib/web/widgets/css_helper.anubis
+read calexium_lib/web/widgets/button.anubis
  
 define CXM_Form_Field
   help_line
@@ -76,9 +79,9 @@ public define List(CXM_Form_Field)
           integer(s_name, c_name, value, help) then  
             [input(_T(s_name), wan(c_name), init(abs_to_decimal(value)), small, mandatory), help_line(help, _T)],
           date(s_name, c_name, value, help) then  
-            [input([class("datepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), narrow, non_mandatory), help_line(help, _T)],
+            [input([class("datepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)],
           datetime(s_name, c_name, value, help) then  
-            [input([class("datetimepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), narrow, mandatory), help_line(help, _T)],
+            [input([class("datetimepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), small, mandatory), help_line(help, _T)],
         },
      edit_form_lines(db, _T, t, reverse(line)+so_far)
   }.
@@ -92,15 +95,13 @@ public define HTML_Partial_Content
     List(Web_arg)         lwa,
     VT_edit               vt_elist
   ) =
-  //if tb is tool_box(lang, _T, _, _, db, _) then
-  with table_name = vt_elist.table_name,
+  with table_name  = vt_elist.table_name,
+  with button_name = if get_String(lwa, "id","none") = "none" then _T("CREATE") else _T("UPDATE"),
   partial_content(jq_datetimepicker_init(lang),
-  partial(html_wave_box(
-    _T(to_upper(table_name)),
     cxm_form( table_name, htmlId(table_name), lwa,      
       edit_form_lines(db, _T, vt_elist.list, [])+
-     [ submit("create", failure, _T("CREATE"), [("table_name", table_name)]) ]
-     )))).
+     [ submit("create", failure, button_name, [("table_name", table_name)]) ]
+     )).
  
 public define Maybe(HTML_Partial_Content) 
   edit_table_content 
@@ -125,41 +126,48 @@ public define Maybe(HTML_Partial_Content)
   // View table part
 define HTML_Row(HTML_Off_Form)  make_line
   (
-    //ToolBox             tb,
     String              table_name,
     String              action_name,            //default is "edit_table", but can be surcharged for own use
     List(VT_view_entry) entries,
-    List(HTML_Cell(HTML_Off_Form)) so_far,
-    Int                 odd_even
+    List(HTML_Cell(HTML_Off_Form)) so_far
   )=
   if entries is
   {
-    []      then  
-        with line = if odd_even = 0 then "tr_even" else "tr_odd",
-        row( [core_attrs([class(line)])], reverse(so_far)),
+    []      then  row( [], reverse(so_far)),
     [h . t] then
       with cell = if h is
                   {
                     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)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, ""))
                   },
-      make_line(table_name, action_name, t, [cell . so_far], odd_even)
+      make_line(table_name, action_name, t, [cell . so_far])
   }.
  
-define List(HTML_Row(HTML_Off_Form))  make_lines
+define List(HTML_Row(HTML_Off_Form))  
+  make_lines
   (
-//    ToolBox           tb,
+    (String) -> String  _T,       //translator  
     String            table_name,
     String            action_name,
     List(VT_view_row) entries,
-    List(HTML_Row(HTML_Off_Form))  so_far,
-    Int                 odd_even
+    List(HTML_Row(HTML_Off_Form))  so_far
   )=
   if entries is
   {
     []      then  reverse(so_far),
-    [h . t] then  make_lines(table_name, action_name, t, [make_line(table_name, action_name, h.list, [], odd_even). so_far], 1 - odd_even )
+    [h . t] then  
+      //compute each line
+      //prepare here the first cell for actioner
+      with actions_cell = (HTML_Cell(HTML_Off_Form))
+        cell([],
+          sequence([
+            partial(img_button_confirm(icn16_cross, _T("CONFIRMATION_REQUEST"), _T("CONFIRM_LINE_DELETION") , _T("OK"), _T("CANCEL"), jQuery_actioner(same, jqlink, "hk_del_row" + format_extra_operands([("table_name", table_name),("id",to_String(h.db_id))])))),
+            partial(img_button(icn16_edit, [event(onclick, jq_dialog_open(dialog_id(action_name+"_dlg_ajax"), "'id="+to_String(h.db_id)+"'"))], "", [])),           
+          ])
+        ),
+      make_lines(_T, table_name, action_name, t, [make_line(table_name, action_name, h.list, [actions_cell]). so_far] )
   }.
  
   // View table part
@@ -170,7 +178,6 @@ define HTML_Header_Row(HTML_Off_Form)
     List(VT_view_entry)                   entries,
     List(HTML_Header_Cell(HTML_Off_Form)) so_far
   )=
-  //if tb is tool_box(lang, _T, _, _, db, _) then
   if entries is
   {
     []      then  header_row( [], reverse(so_far)),
@@ -184,20 +191,26 @@ define HTML_Header_Row(HTML_Off_Form)
       make_header(_T, t, [cell . so_far])
   }.
  
+
  
-public define HTML_Partial_Content  view_table_form
+public define HTML_Partial_Content  
+  view_table_form
   (
     (String) -> String    _T,
     String                action_name,
     VT_view               rows
   )=
-  //if tb is tool_box(_, _T, _, _, db, _) then
-  partial_content(div( [class("tableau")],
+ with action_header_cell = header_cell((HTML_Off_Form)text(_T("ACTION"))),
+  partial_content(
+      div( [/*class("tableau")*/],
           sequence(
            [  actioner(same,same, link([class("my_button")],_T("NEW")),"edit_table",[("table_name", rows.table_name)]),
-              table([core_attrs([id("table_view"), class("display compact nowrap")])],
-                    make_header(_T, rows.header.list, []),
-                    make_lines(rows.table_name, action_name, rows.list, [], 0))
+              //dialog used by datatable entries
+              partial(jq_dialog_create(dialog_id("edit_table_dlg_ajax"), ajax("?a=ajax_edit_table&table_name="+rows.table_name))),
+              
+              table([core_attrs([id("table_view"), class("tableau display compact nowrap")])],
+                    make_header(_T, rows.header.list, [action_header_cell]),
+                    make_lines(_T, rows.table_name, action_name, rows.list, []))
            ]
            )
       ))
@@ -216,9 +229,9 @@ public define HTML_Partial_Content
 //  if tb is tool_box(lang, _T, _, _, db, _) then
 //  println("view_table_page - lang : "+lang);
 //  println("view_table_page - web_site_directory : "+web_site_directory);
-  partial_content(
-    [html_wave_box_wide(_T(to_upper(rows.table_name)), 
-                       jquery_datatable("table_view", view_table_form(_T, action_name, rows), true, false, jq_dt_pt_full_numbers, scrollY(500), true, true, true, lang, no_extra, web_site_directory))]).
+  partial_content(jq_dialog_init + jq_datetimepicker_init(lang),
+    [partial(html_wave_box_wide(_T(to_upper(rows.table_name)), 
+                       jquery_datatable("table_view", view_table_form(_T, action_name, rows), true, false, jq_dt_pt_full_numbers, scrollY(500), true, true, true, lang, no_extra, web_site_directory)))]).
  
 public define Maybe(HTML_Partial_Content)
   view_table_content
@@ -38,12 +38,15 @@ public type VT_view_entry:
   text(String text),
   link(String id, String text),
   icon(String icon_path).
+
+public type VT_view_row_header:
+  vt_view_row_header(List(VT_view_entry) list).
  
 public type VT_view_row:
-  vt_view_row(List(VT_view_entry) list).
+  vt_view_row(Int db_id, List(VT_view_entry) list).
  
 public type VT_view:
-  vt_view(String table_name, String view_name, VT_view_row header, List(VT_view_row) list).
+  vt_view(String table_name, String view_name, VT_view_row_header header, List(VT_view_row) list).
  
  
 public type VT_action:
@@ -210,7 +210,7 @@ public define Result(SmtpClientResult, One)
   ) =
   send_mail(conn, 
             param, 
-            (SmtpClientSession sm_session, Send_Param param) |-> ok(param),
+            (SmtpClientSession sm_session, Send_Param parameter) |-> ok(parameter),
             handle_result
             ).
  
@@ -2,12 +2,15 @@
  *Project*                            The Anubis Project
  *Title*                         Some common stuff for the web. 
  
- *Copyright*                    Copyright (c) Alain Prouté 2003. 
+ *Copyright*                    
+  Copyright (c) Alain Prouté 2003~2007.
+  © Calexium 2007~2016
  
  
- 
- *Author* Alain Prouté
-
+ *Authors:* 
+  Alain Prouté
+  David René
+  
  *Public*
  *Name* HTTP_header
  *Description*  
@@ -142,6 +142,14 @@ public type CXM_Form_Field:
                    WebArgValue    web_arg_value,
                    Bool           checked,
                    Mandatory      mandatory), 
+  //radio_button_hide_show
+  radio_button_hide_show(
+                    List(InputAttrs)  options,
+                    String            label,
+                    WebArgName        web_arg_name, 
+                    WebArgValue       web_arg_value,
+                    Bool              checked,
+                    List(CXM_Form_Field)   fields),                   
    // the same one, but with the tag on the right of the radio_button
    radio_buttonr  (List(InputAttrs) options,
                    String         label, 
@@ -408,12 +416,19 @@ 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([event(onclick, "checkbox_hide_show_element('"+div_id+"', this);")], label, htmlId(""), wan, val, get_Bool(lwa, wan.name, checked)),
+        check_box([class("in"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], label, htmlId(""), 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")], cxm_format_form_field(ff2, lwa)),fields)))
               ]),
  
     radio_button(options, label, id, wan, val, checked, mand) then
-      radio_button([class("in") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+      radio_button([class("in"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+
+    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"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);")], label, htmlId(""), 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")], cxm_format_form_field(ff2, lwa)),fields)))
+              ]),
  
     radio_buttonr(options, label, id, wan, val, checked, mand) then
       radio_button_r([class("in") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
@@ -753,6 +753,7 @@ public type CoreAttrs:
 public define CoreAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
  
 public type InputAttrs:
+  id        (String),
   class     (String),
   style     (String),
   title     (String),
@@ -761,7 +762,9 @@ public type InputAttrs:
   accesskey  (Word8),
   tabindex  (Int),
   attr      (String, String),
-  event      (HtmlEvents, String).
+  event      (HtmlEvents, String),
+  //HTML5
+  data      (String name, String value).
  
 public define InputAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
  
@@ -3225,6 +3228,8 @@ define String
     [h . t] then 
       with current = if h is
       {
+        id(id_name)          then
+           " id=\"" + id_name + "\"",
         class(class_name) then 
            format_attrs(t, [class_name. classes], styles),
         style(style_string)  then
@@ -3251,6 +3256,8 @@ define String
  
         event(e, value) then  
            " " + event_name(e) + "=\"" + value + "\"",
+        data(name, value) then
+          " data-" + to_lower(name) + "=\"" + value + "\"",
       },
       current + format_attrs(t, classes, styles)
   }.
@@ -3457,10 +3464,17 @@ define Printable_tree
                           "</a>"
                         ], 
        img_link(options, img, alt_text)       then
-                        [
-                          "<a href=\"", url,"\"", format_attrs(options),"><img src=\"", img,
-                          "\" alt=\"" + alt_text + "\" border=\"0\"></a>"
-                        ],
+                        //if action name is empty, format options on image because maybe there onclick action
+                        if action_name ="" then
+                          [
+                            "<img src=\"", img,"\"",
+                            format_attrs(options)," alt=\"" + alt_text + "\" border=\"0\">"
+                          ]                          
+                        else
+                          [
+                            "<a href=\"", url,"\"", format_attrs(options),"><img src=\"", img,
+                            "\" alt=\"" + alt_text + "\" border=\"0\"></a>"
+                          ],
        push_button(options, text) then 
          [
            if action is 
@@ -3220,8 +3220,8 @@ define One
  
                   if get_socket_from_connection(conn(connection)) is
                   {
-                    failure         then println("can't get socket"),
-                    success(source) then
+                    failure               then println("can't get socket"),
+                    success(socket_type)  then
  
                     with tmp_body_file = "/temp/" + virtual_machine_id + "-" + now,
                     if (Maybe(RWStream))file(desc.site_directory +  tmp_body_file, new) is
@@ -3238,18 +3238,37 @@ define One
                         {
                           failure    then println("Can't flush the buffer"),
                           success(_) then
-                            if copy_file(weaken(source), weaken(target), body_size - buffer_size) is  copy_ok(read_size) then
-
-                              with duration = (UTime) unow - t0,
-                              println("Read body "+read_size+" duration: " + __utime_to_string(duration));
-
-                              multipart_form_data_answer(host_name, desc, connection.conn, ip_addr, rqline2, headers, desc.site_directory + tmp_body_file, generate_tt, s);
-
-                              //it's HTTP 1.1 keep-alive is default
-                               http_https_handler(sites, connection, is_https, dos, s)
-
-                            else
-                              println("Can't copy data from stream to temporary file ")
+                            if socket_type is
+                            {
+                              tcp_socket(source) then
+                            
+                                if copy_file(weaken(source), weaken(target), body_size - buffer_size) is  copy_ok(read_size) then
+    
+                                  with duration = (UTime) unow - t0,
+                                  println("Read body "+read_size+" duration: " + __utime_to_string(duration));
+    
+                                  multipart_form_data_answer(host_name, desc, connection.conn, ip_addr, rqline2, headers, desc.site_directory + tmp_body_file, generate_tt, s);
+    
+                                  //it's HTTP 1.1 keep-alive is default
+                                   http_https_handler(sites, connection, is_https, dos, s)
+    
+                                else
+                                  println("Can't copy data from stream to temporary file "),
+                                  
+                               ssl_socket(source) then
+                                if copy_file(source, weaken(target), body_size - buffer_size) is  copy_ok(read_size) then
+    
+                                  with duration = (UTime) unow - t0,
+                                  println("Read body "+read_size+" duration: " + __utime_to_string(duration));
+    
+                                  multipart_form_data_answer(host_name, desc, connection.conn, ip_addr, rqline2, headers, desc.site_directory + tmp_body_file, generate_tt, s);
+    
+                                  //it's HTTP 1.1 keep-alive is default
+                                   http_https_handler(sites, connection, is_https, dos, s)
+    
+                                else
+                                  println("Can't copy data from stream to temporary file ")                               
+                             }
                         }}}
                        else
                         println("body_size = 0 !")
@@ -30,6 +30,7 @@ public define DB_id
           success(_value) then db_id(_value)
         }
   }.
+  
 public define Maybe(DB_date)
   get_DB_date
   (
@@ -225,10 +226,10 @@ public define Maybe(Word32)
   ) =
   if get_Word32(lwa, name) is
   {
-    failure         then /*logDebug(debug_log, "Can't convert argument '" + name + "' to integer.");*/ failure
+    failure         then  failure
     success(value)  then
       if value +< min | value >+ max then
-        /*logDebug(debug_log, "The entered value (" + val + ")is out of boundaries [" + min + "," + max + "].");*/ failure
+         failure
       else
         success(value)
   }.
@@ -270,10 +271,10 @@ public define Maybe(Word8)
   ) =
   if get_Word8(lwa, name) is
   {
-    failure         then /*logDebug(debug_log, "Can't convert argument '" + name + "' to integer.");*/ failure
+    failure         then failure
     success(value)  then
       if value +< min | value >+ max then
-        /*logDebug(debug_log, "The entered value (" + val + ")is out of boundaries [" + min + "," + max + "].");*/ failure
+        failure
       else
         success(value)
   }.  
@@ -100,7 +100,25 @@ public define String
     String            params
   )= 
   _jq_dialog_open(success(html), dialog_id, params).
-  
+
+public define HTML_Partial_Content
+  jq_dialog_open
+  (
+    String            html,
+    JQuery_dialog_id  dialog_id,
+    String            params
+  )= 
+  partial_content([],
+    literal(_jq_dialog_open(success(html), dialog_id, params))).
+
+public define String
+  jq_dialog_open
+  (
+    JQuery_dialog_id  dialog_id,
+    String            params
+  )= 
+  _jq_dialog_open(failure, dialog_id, params).
+    
 public define String
   jq_dialog_open
   (
@@ -7,7 +7,7 @@
  */
  
 read calexium_lib/web/CXM_making_a_web_site.anubis
-read calexium_lib/web/CXM_jquery.anubis
+transmit calexium_lib/web/CXM_jquery.anubis
 read calexium_lib/web/CXM_json.anubis
 read calexium_lib/web/js_tools.anubis
 transmit calexium_lib/web/widgets/icons_set.anubis
@@ -51,7 +51,7 @@ public define HTML_Partial_Content
     String                  url,
     List((String, String))  extra_ops
   )=
-  partial_content(actioner(same, same, img_link(core_attrs, img_path, ""), url, extra_ops)).
+  partial_content(actioner(same, same, img_link(core_attrs+[style("cursor: pointer")], img_path, ""), url, extra_ops)).
  
 public define HTML_Partial_Content
   img_button