From f5fc19a6ab82276c0b2dc72aada173622c79031e Mon Sep 17 00:00:00 2001 From: Julien Verneuil Date: Tue, 29 Mar 2016 20:09:31 +0200 Subject: [PATCH] add "width" parameter to information add "time" alternative to VT_edit_entry change datetime input width --- database/vtm/view_table_renderer.anubis | 10 ++++++---- database/vtm/view_table_types.anubis | 16 +++++++++------- net_services_protocols/logger_service.anubis | 59 +++++++++++++++++++++++++++++------------------------------ 3 files changed, 44 insertions(+), 41 deletions(-) diff --git a/database/vtm/view_table_renderer.anubis b/database/vtm/view_table_renderer.anubis index 4c42cde..9a2a0de 100644 --- a/database/vtm/view_table_renderer.anubis +++ b/database/vtm/view_table_renderer.anubis @@ -63,12 +63,12 @@ public define List(CXM_Form_Field) if h is { hidden(name, value) then - print("hidden "+name+" = "+value); + //print("hidden "+name+" = "+value); [hidden(htmlId(""), wan(name), init(value))], primary_key(idx) then [hidden(htmlId(""), wan("id"), init(idx))], - information(s_name, c_name, value, help) then - [input_readonly(_T(s_name), wan(c_name), init(value), narrow), help_line(help, _T)], + information(s_name, c_name, value, width, help) then + [input_readonly(_T(s_name), wan(c_name), init(value), if width > 0 then custom(width) else narrow), help_line(help, _T)], text(s_name, c_name, value, help) then [input(_T(s_name), wan(c_name), init(value), narrow, mandatory), help_line(help, _T)], foreign_text(s_name, c_name, value, select, help) then @@ -81,8 +81,10 @@ public define List(CXM_Form_Field) [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), small, non_mandatory), help_line(help, _T)], + time(s_name, c_name, value, help) then + [input([class("timepicker")], _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), small, mandatory), help_line(help, _T)], + [input([class("datetimepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), custom(18), mandatory), help_line(help, _T)], }, edit_form_lines(db, _T, t, reverse(line)+so_far) }. diff --git a/database/vtm/view_table_types.anubis b/database/vtm/view_table_types.anubis index 1474673..805212d 100644 --- a/database/vtm/view_table_types.anubis +++ b/database/vtm/view_table_types.anubis @@ -15,20 +15,22 @@ public type VT_edit_selector: public type VT_edit_entry: hidden (String name, String value), primary_key (String idx), - information (String s_name, String c_name, String v_name, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show - text (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name + information (String s_name, String c_name, String v_name, Int width, HK_Help_Text help), //s_name = show_name for translation, v_name = string to show + text (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translation, c_name = table column name foreign_text(String s_name, String c_name, Int selected, VT_edit_selector selector, HK_Help_Text help), - text_area (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name - boolean (String s_name, String c_name, Bool value, HK_Help_Text help), - integer (String s_name, String c_name, Int value, HK_Help_Text help), - date (String s_name, String c_name, String value, HK_Help_Text help), - datetime (String s_name, String c_name, String value, HK_Help_Text help). + text_area (String s_name, String c_name, String value, HK_Help_Text help), //s_name = show_name for translate, c_name = table column name + boolean (String s_name, String c_name, Bool value, HK_Help_Text help), + integer (String s_name, String c_name, Int value, HK_Help_Text help), + date (String s_name, String c_name, String value, HK_Help_Text help), + time (String s_name, String c_name, String value, HK_Help_Text help), + datetime (String s_name, String c_name, String value, HK_Help_Text help). public define VT_edit_entry text (String s_name, String c_name, String value) = text(s_name, c_name, value, no_help_text). public define VT_edit_entry foreign_text(String s_name, String c_name, Int selected, VT_edit_selector selector) = foreign_text(s_name, c_name, selected, selector, no_help_text). public define VT_edit_entry text_area (String s_name, String c_name, String value) = text_area(s_name, c_name, value, no_help_text). public define VT_edit_entry boolean(String s_name, String c_name, Bool value) = boolean(s_name, c_name, value, no_help_text). public define VT_edit_entry integer(String s_name, String c_name, Int value) = integer(s_name, c_name, value, no_help_text). +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 VT_edit: diff --git a/net_services_protocols/logger_service.anubis b/net_services_protocols/logger_service.anubis index f88b4ef..0ff9dc8 100644 --- a/net_services_protocols/logger_service.anubis +++ b/net_services_protocols/logger_service.anubis @@ -116,8 +116,8 @@ define Bool success(log_name) then if get_logger(logs, log_name) is { - failure then println("can't find log ["+log_name+"]");false, - success(log) then process_log(log, msg) + failure then println("can't find log ["+log_name+"]");false, + success(log) then process_log(log, msg) } }. @@ -183,32 +183,31 @@ public define String firsts_bytes = extract(data, 0, max), "Length=" + l + "; String='"+to_string(firsts_bytes)+"' Buffer=[" + to_ascii(firsts_bytes) + (if l > max then "...]" else "]"). - -define (UDP_Socket, ByteArray, Truncation, Word32, Word32) -> One +define (UDP_Socket, ByteArray, Truncation, Word32, Word32) -> One make_udp_handler ( List(Logger) logs, Logger debug_logger - ) = - ( - UDP_Socket socket, - ByteArray data, - Truncation truncation, - Word32 ip_address, - Word32 ip_port - ) |-> - with ip = ip_addr_to_string(ip_address), - logTrace(debug_logger, logMask("Logger"), "LoggerServer: data received (" + length(data) + " bytes) from IP " + ip + "... "); - if receive_message_from_io(make_data_io(data)) is - { - failure then logWarning(debug_logger, "LoggerServer: Bad data packet received from IP " + ip + ": " + data_preview(data, 20)), - success(msg) then + ) = + ( + UDP_Socket socket, + ByteArray data, + Truncation truncation, + Word32 ip_address, + Word32 ip_port + ) |-> + with ip = ip_addr_to_string(ip_address), + logTrace(debug_logger, logMask("Logger"), "LoggerServer: data received (" + length(data) + " bytes) from IP " + ip + "... "); + if receive_message_from_io(make_data_io(data)) is + { + failure then logWarning(debug_logger, "LoggerServer: Bad data packet received from IP " + ip + ": " + data_preview(data, 20)), + success(msg) then if *msg.what = _CXM_LOGGER_LOG then forget(process_log(logs, msg)) else println("LoggerService: wrong message_received. [" + to_hexa(*msg.what) + "] is not _CXM_LOGGER_LOG ") - }. - +}. + define One my_notify ( @@ -229,8 +228,8 @@ public define Maybe(UDP_Server) my_notify) is { cannot_create_the_socket then logError(debug_logger, "Cannot create the listening socket."); failure, - cannot_bind_address_port then logError(debug_logger, "Cannot bind to port " + logger_port + ".");failure, - access_denied then logError(debug_logger, "Cannot listen on port " + logger_port + ".");failure, + cannot_bind_address_port then logError(debug_logger, "Cannot bind to port " + logger_port + "."); failure, + access_denied then logError(debug_logger, "Cannot listen on port " + logger_port + "."); failure, ok(server) then logInfo(debug_logger, "LocalLog Server started on port " + logger_port + "."); success(server) }. @@ -284,16 +283,16 @@ define Message String log_name ) = if log_name = debug_log then "debug.log" - else if log_name = "SendMail" then "debug.log" + else if log_name = "SendMail" then "debug.log" else if log_name = config_log then "config.log" else if log_name = incoming_log then "incoming.log" - else if log_name = outgoing_log then "outgoing.log" - else if log_name = pop3_log then "pop3.log" - else if log_name = mailing_log then "mailing.log" - else if log_name = errors_log then "errors.log" - else if log_name = "DB" then "errors.log" - else if log_name = "SQL" then "sql_profiling.log" - else if log_name = security_log then "security.log" + else if log_name = outgoing_log then "outgoing.log" + else if log_name = pop3_log then "pop3.log" + else if log_name = mailing_log then "mailing.log" + else if log_name = errors_log then "errors.log" + else if log_name = "DB" then "errors.log" + else if log_name = "SQL" then "sql_profiling.log" + else if log_name = security_log then "security.log" else if log_name = spams_log then "spams.log" else if log_name = api_log then "api.log" else if log_name = internal_log then "internal" -- libgit2 0.21.4