Merge branch 'hotfix/Hotfix-14'

rimosso vincolo su variazione del 20% in accettazione merce da campo
Finish FixGetAuthorization
2025-04-11 12:57:52 +02:00 · 2025-04-11 12:56:45 +02:00 · 2025-04-09 12:23:46 +02:00 · 2025-04-09 12:23:19 +02:00 · 2025-04-08 13:28:14 +02:00 · 2025-04-08 13:27:17 +02:00
1186 changed files with 85382 additions and 36939 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.git*
+.idea
+.env
+.eslint*
+**/node_modules/
+**/dist
+**/cache
+docker-compose.yml
+run-docker.ps1
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,840 @@
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+trim_trailing_whitespace = true
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = true
+ij_smart_tabs = false
+ij_visual_guides =
+ij_wrap_on_typing = false
+
+[*.blade.php]
+ij_blade_keep_indents_on_empty_lines = false
+
+[*.css]
+ij_css_align_closing_brace_with_properties = false
+ij_css_blank_lines_around_nested_selector = 1
+ij_css_blank_lines_between_blocks = 1
+ij_css_block_comment_add_space = false
+ij_css_brace_placement = end_of_line
+ij_css_enforce_quotes_on_format = false
+ij_css_hex_color_long_format = false
+ij_css_hex_color_lower_case = false
+ij_css_hex_color_short_format = false
+ij_css_hex_color_upper_case = false
+ij_css_keep_blank_lines_in_code = 2
+ij_css_keep_indents_on_empty_lines = false
+ij_css_keep_single_line_blocks = false
+ij_css_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_css_space_after_colon = true
+ij_css_space_before_opening_brace = true
+ij_css_use_double_quotes = true
+ij_css_value_alignment = do_not_align
+
+[*.feature]
+indent_size = 2
+ij_gherkin_keep_indents_on_empty_lines = false
+
+[*.less]
+indent_size = 2
+ij_less_align_closing_brace_with_properties = false
+ij_less_blank_lines_around_nested_selector = 1
+ij_less_blank_lines_between_blocks = 1
+ij_less_block_comment_add_space = false
+ij_less_brace_placement = 0
+ij_less_enforce_quotes_on_format = false
+ij_less_hex_color_long_format = false
+ij_less_hex_color_lower_case = false
+ij_less_hex_color_short_format = false
+ij_less_hex_color_upper_case = false
+ij_less_keep_blank_lines_in_code = 2
+ij_less_keep_indents_on_empty_lines = false
+ij_less_keep_single_line_blocks = false
+ij_less_line_comment_add_space = false
+ij_less_line_comment_at_first_column = false
+ij_less_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_less_space_after_colon = true
+ij_less_space_before_opening_brace = true
+ij_less_use_double_quotes = true
+ij_less_value_alignment = 0
+
+[*.sass]
+indent_size = 2
+ij_sass_align_closing_brace_with_properties = false
+ij_sass_blank_lines_around_nested_selector = 1
+ij_sass_blank_lines_between_blocks = 1
+ij_sass_brace_placement = 0
+ij_sass_enforce_quotes_on_format = false
+ij_sass_hex_color_long_format = false
+ij_sass_hex_color_lower_case = false
+ij_sass_hex_color_short_format = false
+ij_sass_hex_color_upper_case = false
+ij_sass_keep_blank_lines_in_code = 2
+ij_sass_keep_indents_on_empty_lines = false
+ij_sass_keep_single_line_blocks = false
+ij_sass_line_comment_add_space = false
+ij_sass_line_comment_at_first_column = false
+ij_sass_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_sass_space_after_colon = true
+ij_sass_space_before_opening_brace = true
+ij_sass_use_double_quotes = true
+ij_sass_value_alignment = 0
+
+[*.scss]
+indent_size = 2
+ij_scss_align_closing_brace_with_properties = false
+ij_scss_blank_lines_around_nested_selector = 1
+ij_scss_blank_lines_between_blocks = 1
+ij_scss_block_comment_add_space = false
+ij_scss_brace_placement = 0
+ij_scss_enforce_quotes_on_format = false
+ij_scss_hex_color_long_format = false
+ij_scss_hex_color_lower_case = false
+ij_scss_hex_color_short_format = false
+ij_scss_hex_color_upper_case = false
+ij_scss_keep_blank_lines_in_code = 2
+ij_scss_keep_indents_on_empty_lines = false
+ij_scss_keep_single_line_blocks = false
+ij_scss_line_comment_add_space = false
+ij_scss_line_comment_at_first_column = false
+ij_scss_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_scss_space_after_colon = true
+ij_scss_space_before_opening_brace = true
+ij_scss_use_double_quotes = true
+ij_scss_value_alignment = 0
+
+[*.twig]
+ij_twig_keep_indents_on_empty_lines = false
+ij_twig_spaces_inside_comments_delimiters = true
+ij_twig_spaces_inside_delimiters = true
+ij_twig_spaces_inside_variable_delimiters = true
+
+[*.vue]
+indent_size = 2
+tab_width = 2
+ij_continuation_indent_size = 4
+ij_vue_indent_children_of_top_level = template
+ij_vue_interpolation_new_line_after_start_delimiter = true
+ij_vue_interpolation_new_line_before_end_delimiter = true
+ij_vue_interpolation_wrap = off
+ij_vue_keep_indents_on_empty_lines = false
+ij_vue_spaces_within_interpolation_expressions = true
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
+ij_xml_align_attributes = true
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.ats,*.cts,*.mts,*.ts}]
+ij_continuation_indent_size = 4
+ij_typescript_align_imports = false
+ij_typescript_align_multiline_array_initializer_expression = false
+ij_typescript_align_multiline_binary_operation = false
+ij_typescript_align_multiline_chained_methods = false
+ij_typescript_align_multiline_extends_list = false
+ij_typescript_align_multiline_for = true
+ij_typescript_align_multiline_parameters = true
+ij_typescript_align_multiline_parameters_in_calls = false
+ij_typescript_align_multiline_ternary_operation = false
+ij_typescript_align_object_properties = 0
+ij_typescript_align_union_types = false
+ij_typescript_align_var_statements = 0
+ij_typescript_array_initializer_new_line_after_left_brace = false
+ij_typescript_array_initializer_right_brace_on_new_line = false
+ij_typescript_array_initializer_wrap = off
+ij_typescript_assignment_wrap = off
+ij_typescript_binary_operation_sign_on_next_line = false
+ij_typescript_binary_operation_wrap = off
+ij_typescript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
+ij_typescript_blank_lines_after_imports = 1
+ij_typescript_blank_lines_around_class = 1
+ij_typescript_blank_lines_around_field = 0
+ij_typescript_blank_lines_around_field_in_interface = 0
+ij_typescript_blank_lines_around_function = 1
+ij_typescript_blank_lines_around_method = 1
+ij_typescript_blank_lines_around_method_in_interface = 1
+ij_typescript_block_brace_style = end_of_line
+ij_typescript_block_comment_add_space = false
+ij_typescript_block_comment_at_first_column = true
+ij_typescript_call_parameters_new_line_after_left_paren = false
+ij_typescript_call_parameters_right_paren_on_new_line = false
+ij_typescript_call_parameters_wrap = off
+ij_typescript_catch_on_new_line = false
+ij_typescript_chained_call_dot_on_new_line = true
+ij_typescript_class_brace_style = end_of_line
+ij_typescript_class_decorator_wrap = split_into_lines
+ij_typescript_class_field_decorator_wrap = off
+ij_typescript_class_method_decorator_wrap = off
+ij_typescript_comma_on_new_line = false
+ij_typescript_do_while_brace_force = never
+ij_typescript_else_on_new_line = false
+ij_typescript_enforce_trailing_comma = keep
+ij_typescript_enum_constants_wrap = on_every_item
+ij_typescript_extends_keyword_wrap = off
+ij_typescript_extends_list_wrap = off
+ij_typescript_field_prefix = _
+ij_typescript_file_name_style = relaxed
+ij_typescript_finally_on_new_line = false
+ij_typescript_for_brace_force = never
+ij_typescript_for_statement_new_line_after_left_paren = false
+ij_typescript_for_statement_right_paren_on_new_line = false
+ij_typescript_for_statement_wrap = off
+ij_typescript_force_quote_style = false
+ij_typescript_force_semicolon_style = false
+ij_typescript_function_expression_brace_style = end_of_line
+ij_typescript_function_parameter_decorator_wrap = off
+ij_typescript_if_brace_force = never
+ij_typescript_import_merge_members = global
+ij_typescript_import_prefer_absolute_path = global
+ij_typescript_import_sort_members = true
+ij_typescript_import_sort_module_name = false
+ij_typescript_import_use_node_resolution = true
+ij_typescript_imports_wrap = on_every_item
+ij_typescript_indent_case_from_switch = true
+ij_typescript_indent_chained_calls = true
+ij_typescript_indent_package_children = 0
+ij_typescript_jsdoc_include_types = false
+ij_typescript_jsx_attribute_value = braces
+ij_typescript_keep_blank_lines_in_code = 2
+ij_typescript_keep_first_column_comment = true
+ij_typescript_keep_indents_on_empty_lines = false
+ij_typescript_keep_line_breaks = true
+ij_typescript_keep_simple_blocks_in_one_line = false
+ij_typescript_keep_simple_methods_in_one_line = false
+ij_typescript_line_comment_add_space = true
+ij_typescript_line_comment_at_first_column = false
+ij_typescript_method_brace_style = end_of_line
+ij_typescript_method_call_chain_wrap = off
+ij_typescript_method_parameters_new_line_after_left_paren = false
+ij_typescript_method_parameters_right_paren_on_new_line = false
+ij_typescript_method_parameters_wrap = off
+ij_typescript_object_literal_wrap = on_every_item
+ij_typescript_object_types_wrap = on_every_item
+ij_typescript_parentheses_expression_new_line_after_left_paren = false
+ij_typescript_parentheses_expression_right_paren_on_new_line = false
+ij_typescript_place_assignment_sign_on_next_line = false
+ij_typescript_prefer_as_type_cast = false
+ij_typescript_prefer_explicit_types_function_expression_returns = false
+ij_typescript_prefer_explicit_types_function_returns = false
+ij_typescript_prefer_explicit_types_vars_fields = false
+ij_typescript_prefer_parameters_wrap = false
+ij_typescript_property_prefix =
+ij_typescript_reformat_c_style_comments = false
+ij_typescript_space_after_colon = true
+ij_typescript_space_after_comma = true
+ij_typescript_space_after_dots_in_rest_parameter = false
+ij_typescript_space_after_generator_mult = true
+ij_typescript_space_after_property_colon = true
+ij_typescript_space_after_quest = true
+ij_typescript_space_after_type_colon = true
+ij_typescript_space_after_unary_not = false
+ij_typescript_space_before_async_arrow_lparen = true
+ij_typescript_space_before_catch_keyword = true
+ij_typescript_space_before_catch_left_brace = true
+ij_typescript_space_before_catch_parentheses = true
+ij_typescript_space_before_class_lbrace = true
+ij_typescript_space_before_class_left_brace = true
+ij_typescript_space_before_colon = true
+ij_typescript_space_before_comma = false
+ij_typescript_space_before_do_left_brace = true
+ij_typescript_space_before_else_keyword = true
+ij_typescript_space_before_else_left_brace = true
+ij_typescript_space_before_finally_keyword = true
+ij_typescript_space_before_finally_left_brace = true
+ij_typescript_space_before_for_left_brace = true
+ij_typescript_space_before_for_parentheses = true
+ij_typescript_space_before_for_semicolon = false
+ij_typescript_space_before_function_left_parenth = true
+ij_typescript_space_before_generator_mult = false
+ij_typescript_space_before_if_left_brace = true
+ij_typescript_space_before_if_parentheses = true
+ij_typescript_space_before_method_call_parentheses = false
+ij_typescript_space_before_method_left_brace = true
+ij_typescript_space_before_method_parentheses = false
+ij_typescript_space_before_property_colon = false
+ij_typescript_space_before_quest = true
+ij_typescript_space_before_switch_left_brace = true
+ij_typescript_space_before_switch_parentheses = true
+ij_typescript_space_before_try_left_brace = true
+ij_typescript_space_before_type_colon = false
+ij_typescript_space_before_unary_not = false
+ij_typescript_space_before_while_keyword = true
+ij_typescript_space_before_while_left_brace = true
+ij_typescript_space_before_while_parentheses = true
+ij_typescript_spaces_around_additive_operators = true
+ij_typescript_spaces_around_arrow_function_operator = true
+ij_typescript_spaces_around_assignment_operators = true
+ij_typescript_spaces_around_bitwise_operators = true
+ij_typescript_spaces_around_equality_operators = true
+ij_typescript_spaces_around_logical_operators = true
+ij_typescript_spaces_around_multiplicative_operators = true
+ij_typescript_spaces_around_relational_operators = true
+ij_typescript_spaces_around_shift_operators = true
+ij_typescript_spaces_around_unary_operator = false
+ij_typescript_spaces_within_array_initializer_brackets = false
+ij_typescript_spaces_within_brackets = false
+ij_typescript_spaces_within_catch_parentheses = false
+ij_typescript_spaces_within_for_parentheses = false
+ij_typescript_spaces_within_if_parentheses = false
+ij_typescript_spaces_within_imports = false
+ij_typescript_spaces_within_interpolation_expressions = false
+ij_typescript_spaces_within_method_call_parentheses = false
+ij_typescript_spaces_within_method_parentheses = false
+ij_typescript_spaces_within_object_literal_braces = false
+ij_typescript_spaces_within_object_type_braces = true
+ij_typescript_spaces_within_parentheses = false
+ij_typescript_spaces_within_switch_parentheses = false
+ij_typescript_spaces_within_type_assertion = false
+ij_typescript_spaces_within_union_types = true
+ij_typescript_spaces_within_while_parentheses = false
+ij_typescript_special_else_if_treatment = true
+ij_typescript_ternary_operation_signs_on_next_line = false
+ij_typescript_ternary_operation_wrap = off
+ij_typescript_union_types_wrap = on_every_item
+ij_typescript_use_chained_calls_group_indents = false
+ij_typescript_use_double_quotes = true
+ij_typescript_use_explicit_js_extension = auto
+ij_typescript_use_import_type = auto
+ij_typescript_use_path_mapping = always
+ij_typescript_use_public_modifier = false
+ij_typescript_use_semicolon_after_statement = true
+ij_typescript_var_declaration_wrap = normal
+ij_typescript_while_brace_force = never
+ij_typescript_while_on_new_line = false
+ij_typescript_wrap_comments = false
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.cjs,*.es6,*.js,*.mjs}]
+ij_continuation_indent_size = 4
+ij_javascript_align_imports = false
+ij_javascript_align_multiline_array_initializer_expression = false
+ij_javascript_align_multiline_binary_operation = false
+ij_javascript_align_multiline_chained_methods = false
+ij_javascript_align_multiline_extends_list = false
+ij_javascript_align_multiline_for = true
+ij_javascript_align_multiline_parameters = true
+ij_javascript_align_multiline_parameters_in_calls = false
+ij_javascript_align_multiline_ternary_operation = false
+ij_javascript_align_object_properties = 0
+ij_javascript_align_union_types = false
+ij_javascript_align_var_statements = 0
+ij_javascript_array_initializer_new_line_after_left_brace = false
+ij_javascript_array_initializer_right_brace_on_new_line = false
+ij_javascript_array_initializer_wrap = off
+ij_javascript_assignment_wrap = off
+ij_javascript_binary_operation_sign_on_next_line = false
+ij_javascript_binary_operation_wrap = off
+ij_javascript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
+ij_javascript_blank_lines_after_imports = 1
+ij_javascript_blank_lines_around_class = 1
+ij_javascript_blank_lines_around_field = 0
+ij_javascript_blank_lines_around_function = 1
+ij_javascript_blank_lines_around_method = 1
+ij_javascript_block_brace_style = end_of_line
+ij_javascript_block_comment_add_space = false
+ij_javascript_block_comment_at_first_column = true
+ij_javascript_call_parameters_new_line_after_left_paren = false
+ij_javascript_call_parameters_right_paren_on_new_line = false
+ij_javascript_call_parameters_wrap = off
+ij_javascript_catch_on_new_line = false
+ij_javascript_chained_call_dot_on_new_line = true
+ij_javascript_class_brace_style = end_of_line
+ij_javascript_class_decorator_wrap = split_into_lines
+ij_javascript_class_field_decorator_wrap = off
+ij_javascript_class_method_decorator_wrap = off
+ij_javascript_comma_on_new_line = false
+ij_javascript_do_while_brace_force = never
+ij_javascript_else_on_new_line = false
+ij_javascript_enforce_trailing_comma = keep
+ij_javascript_extends_keyword_wrap = off
+ij_javascript_extends_list_wrap = off
+ij_javascript_field_prefix = _
+ij_javascript_file_name_style = relaxed
+ij_javascript_finally_on_new_line = false
+ij_javascript_for_brace_force = never
+ij_javascript_for_statement_new_line_after_left_paren = false
+ij_javascript_for_statement_right_paren_on_new_line = false
+ij_javascript_for_statement_wrap = off
+ij_javascript_force_quote_style = false
+ij_javascript_force_semicolon_style = false
+ij_javascript_function_expression_brace_style = end_of_line
+ij_javascript_function_parameter_decorator_wrap = off
+ij_javascript_if_brace_force = never
+ij_javascript_import_merge_members = global
+ij_javascript_import_prefer_absolute_path = global
+ij_javascript_import_sort_members = true
+ij_javascript_import_sort_module_name = false
+ij_javascript_import_use_node_resolution = true
+ij_javascript_imports_wrap = on_every_item
+ij_javascript_indent_case_from_switch = true
+ij_javascript_indent_chained_calls = true
+ij_javascript_indent_package_children = 0
+ij_javascript_jsx_attribute_value = braces
+ij_javascript_keep_blank_lines_in_code = 2
+ij_javascript_keep_first_column_comment = true
+ij_javascript_keep_indents_on_empty_lines = false
+ij_javascript_keep_line_breaks = true
+ij_javascript_keep_simple_blocks_in_one_line = false
+ij_javascript_keep_simple_methods_in_one_line = false
+ij_javascript_line_comment_add_space = true
+ij_javascript_line_comment_at_first_column = false
+ij_javascript_method_brace_style = end_of_line
+ij_javascript_method_call_chain_wrap = off
+ij_javascript_method_parameters_new_line_after_left_paren = false
+ij_javascript_method_parameters_right_paren_on_new_line = false
+ij_javascript_method_parameters_wrap = off
+ij_javascript_object_literal_wrap = on_every_item
+ij_javascript_object_types_wrap = on_every_item
+ij_javascript_parentheses_expression_new_line_after_left_paren = false
+ij_javascript_parentheses_expression_right_paren_on_new_line = false
+ij_javascript_place_assignment_sign_on_next_line = false
+ij_javascript_prefer_as_type_cast = false
+ij_javascript_prefer_explicit_types_function_expression_returns = false
+ij_javascript_prefer_explicit_types_function_returns = false
+ij_javascript_prefer_explicit_types_vars_fields = false
+ij_javascript_prefer_parameters_wrap = false
+ij_javascript_property_prefix =
+ij_javascript_reformat_c_style_comments = false
+ij_javascript_space_after_colon = true
+ij_javascript_space_after_comma = true
+ij_javascript_space_after_dots_in_rest_parameter = false
+ij_javascript_space_after_generator_mult = true
+ij_javascript_space_after_property_colon = true
+ij_javascript_space_after_quest = true
+ij_javascript_space_after_type_colon = true
+ij_javascript_space_after_unary_not = false
+ij_javascript_space_before_async_arrow_lparen = true
+ij_javascript_space_before_catch_keyword = true
+ij_javascript_space_before_catch_left_brace = true
+ij_javascript_space_before_catch_parentheses = true
+ij_javascript_space_before_class_lbrace = true
+ij_javascript_space_before_class_left_brace = true
+ij_javascript_space_before_colon = true
+ij_javascript_space_before_comma = false
+ij_javascript_space_before_do_left_brace = true
+ij_javascript_space_before_else_keyword = true
+ij_javascript_space_before_else_left_brace = true
+ij_javascript_space_before_finally_keyword = true
+ij_javascript_space_before_finally_left_brace = true
+ij_javascript_space_before_for_left_brace = true
+ij_javascript_space_before_for_parentheses = true
+ij_javascript_space_before_for_semicolon = false
+ij_javascript_space_before_function_left_parenth = true
+ij_javascript_space_before_generator_mult = false
+ij_javascript_space_before_if_left_brace = true
+ij_javascript_space_before_if_parentheses = true
+ij_javascript_space_before_method_call_parentheses = false
+ij_javascript_space_before_method_left_brace = true
+ij_javascript_space_before_method_parentheses = false
+ij_javascript_space_before_property_colon = false
+ij_javascript_space_before_quest = true
+ij_javascript_space_before_switch_left_brace = true
+ij_javascript_space_before_switch_parentheses = true
+ij_javascript_space_before_try_left_brace = true
+ij_javascript_space_before_type_colon = false
+ij_javascript_space_before_unary_not = false
+ij_javascript_space_before_while_keyword = true
+ij_javascript_space_before_while_left_brace = true
+ij_javascript_space_before_while_parentheses = true
+ij_javascript_spaces_around_additive_operators = true
+ij_javascript_spaces_around_arrow_function_operator = true
+ij_javascript_spaces_around_assignment_operators = true
+ij_javascript_spaces_around_bitwise_operators = true
+ij_javascript_spaces_around_equality_operators = true
+ij_javascript_spaces_around_logical_operators = true
+ij_javascript_spaces_around_multiplicative_operators = true
+ij_javascript_spaces_around_relational_operators = true
+ij_javascript_spaces_around_shift_operators = true
+ij_javascript_spaces_around_unary_operator = false
+ij_javascript_spaces_within_array_initializer_brackets = false
+ij_javascript_spaces_within_brackets = false
+ij_javascript_spaces_within_catch_parentheses = false
+ij_javascript_spaces_within_for_parentheses = false
+ij_javascript_spaces_within_if_parentheses = false
+ij_javascript_spaces_within_imports = false
+ij_javascript_spaces_within_interpolation_expressions = false
+ij_javascript_spaces_within_method_call_parentheses = false
+ij_javascript_spaces_within_method_parentheses = false
+ij_javascript_spaces_within_object_literal_braces = false
+ij_javascript_spaces_within_object_type_braces = true
+ij_javascript_spaces_within_parentheses = false
+ij_javascript_spaces_within_switch_parentheses = false
+ij_javascript_spaces_within_type_assertion = false
+ij_javascript_spaces_within_union_types = true
+ij_javascript_spaces_within_while_parentheses = false
+ij_javascript_special_else_if_treatment = true
+ij_javascript_ternary_operation_signs_on_next_line = false
+ij_javascript_ternary_operation_wrap = off
+ij_javascript_union_types_wrap = on_every_item
+ij_javascript_use_chained_calls_group_indents = false
+ij_javascript_use_double_quotes = true
+ij_javascript_use_explicit_js_extension = auto
+ij_javascript_use_import_type = auto
+ij_javascript_use_path_mapping = always
+ij_javascript_use_public_modifier = false
+ij_javascript_use_semicolon_after_statement = true
+ij_javascript_var_declaration_wrap = normal
+ij_javascript_while_brace_force = never
+ij_javascript_while_on_new_line = false
+ij_javascript_wrap_comments = false
+
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
+ij_continuation_indent_size = 4
+ij_php_align_assignments = false
+ij_php_align_class_constants = false
+ij_php_align_enum_cases = false
+ij_php_align_group_field_declarations = false
+ij_php_align_inline_comments = false
+ij_php_align_key_value_pairs = false
+ij_php_align_match_arm_bodies = false
+ij_php_align_multiline_array_initializer_expression = true
+ij_php_align_multiline_binary_operation = true
+ij_php_align_multiline_chained_methods = false
+ij_php_align_multiline_extends_list = false
+ij_php_align_multiline_for = true
+ij_php_align_multiline_parameters = true
+ij_php_align_multiline_parameters_in_calls = false
+ij_php_align_multiline_ternary_operation = false
+ij_php_align_named_arguments = false
+ij_php_align_phpdoc_comments = false
+ij_php_align_phpdoc_param_names = false
+ij_php_anonymous_brace_style = end_of_line
+ij_php_api_weight = 28
+ij_php_array_initializer_new_line_after_left_brace = true
+ij_php_array_initializer_right_brace_on_new_line = true
+ij_php_array_initializer_wrap = normal
+ij_php_assignment_wrap = normal
+ij_php_attributes_wrap = off
+ij_php_author_weight = 28
+ij_php_binary_operation_sign_on_next_line = true
+ij_php_binary_operation_wrap = normal
+ij_php_blank_lines_after_class_header = 0
+ij_php_blank_lines_after_function = 1
+ij_php_blank_lines_after_imports = 1
+ij_php_blank_lines_after_opening_tag = 0
+ij_php_blank_lines_after_package = 0
+ij_php_blank_lines_around_class = 1
+ij_php_blank_lines_around_constants = 0
+ij_php_blank_lines_around_enum_cases = 0
+ij_php_blank_lines_around_field = 0
+ij_php_blank_lines_around_method = 1
+ij_php_blank_lines_before_class_end = 0
+ij_php_blank_lines_before_imports = 1
+ij_php_blank_lines_before_method_body = 0
+ij_php_blank_lines_before_package = 1
+ij_php_blank_lines_before_return_statement = 0
+ij_php_blank_lines_between_imports = 0
+ij_php_block_brace_style = end_of_line
+ij_php_call_parameters_new_line_after_left_paren = false
+ij_php_call_parameters_right_paren_on_new_line = false
+ij_php_call_parameters_wrap = off
+ij_php_catch_on_new_line = false
+ij_php_category_weight = 28
+ij_php_class_brace_style = end_of_line
+ij_php_comma_after_last_argument = false
+ij_php_comma_after_last_argument_style = when_multiline
+ij_php_comma_after_last_array_element = false
+ij_php_comma_after_last_closure_use_var = false
+ij_php_comma_after_last_closure_use_var_style = when_multiline
+ij_php_comma_after_last_match_arm = false
+ij_php_comma_after_last_parameter = false
+ij_php_comma_after_last_parameter_style = when_multiline
+ij_php_concat_spaces = true
+ij_php_copyright_weight = 28
+ij_php_deprecated_weight = 28
+ij_php_do_while_brace_force = always
+ij_php_else_if_style = as_is
+ij_php_else_on_new_line = false
+ij_php_example_weight = 28
+ij_php_extends_keyword_wrap = off
+ij_php_extends_list_wrap = off
+ij_php_fields_default_visibility = private
+ij_php_filesource_weight = 28
+ij_php_finally_on_new_line = false
+ij_php_for_brace_force = never
+ij_php_for_statement_new_line_after_left_paren = false
+ij_php_for_statement_right_paren_on_new_line = false
+ij_php_for_statement_wrap = off
+ij_php_force_empty_classes_in_one_line = false
+ij_php_force_empty_methods_in_one_line = true
+ij_php_force_short_declaration_array_style = false
+ij_php_getters_setters_naming_style = camel_case
+ij_php_getters_setters_order_style = getters_first
+ij_php_global_weight = 28
+ij_php_group_use_wrap = on_every_item
+ij_php_heredoc_on_same_line = false
+ij_php_if_brace_force = always
+ij_php_if_lparen_on_next_line = false
+ij_php_if_rparen_on_next_line = false
+ij_php_ignore_weight = 28
+ij_php_import_sorting = alphabetic
+ij_php_indent_break_from_case = true
+ij_php_indent_case_from_switch = true
+ij_php_indent_code_in_php_tags = false
+ij_php_internal_weight = 28
+ij_php_keep_blank_lines_after_lbrace = 2
+ij_php_keep_blank_lines_before_right_brace = 2
+ij_php_keep_blank_lines_in_code = 2
+ij_php_keep_blank_lines_in_declarations = 2
+ij_php_keep_control_statement_in_one_line = true
+ij_php_keep_first_column_comment = true
+ij_php_keep_indents_on_empty_lines = false
+ij_php_keep_line_breaks = true
+ij_php_keep_rparen_and_lbrace_on_one_line = false
+ij_php_keep_simple_classes_in_one_line = false
+ij_php_keep_simple_methods_in_one_line = false
+ij_php_lambda_brace_style = end_of_line
+ij_php_license_weight = 28
+ij_php_line_comment_add_space = false
+ij_php_line_comment_at_first_column = true
+ij_php_link_weight = 28
+ij_php_lower_case_boolean_const = true
+ij_php_lower_case_keywords = true
+ij_php_lower_case_null_const = true
+ij_php_method_brace_style = end_of_line
+ij_php_method_call_chain_wrap = off
+ij_php_method_parameters_new_line_after_left_paren = false
+ij_php_method_parameters_right_paren_on_new_line = false
+ij_php_method_parameters_wrap = off
+ij_php_method_weight = 28
+ij_php_modifier_list_wrap = false
+ij_php_multiline_chained_calls_first_call_on_new_line = false
+ij_php_multiline_chained_calls_semicolon_on_new_line = false
+ij_php_multiline_closure_lambda_on_new_line = false
+ij_php_namespace_brace_style = 1
+ij_php_new_line_after_php_opening_tag = true
+ij_php_null_type_position = in_the_end
+ij_php_package_weight = 28
+ij_php_param_weight = 0
+ij_php_parameters_attributes_wrap = off
+ij_php_parentheses_expression_new_line_after_left_paren = false
+ij_php_parentheses_expression_right_paren_on_new_line = false
+ij_php_phpdoc_blank_line_before_tags = false
+ij_php_phpdoc_blank_lines_around_parameters = false
+ij_php_phpdoc_keep_blank_lines = true
+ij_php_phpdoc_param_spaces_between_name_and_description = 1
+ij_php_phpdoc_param_spaces_between_tag_and_type = 1
+ij_php_phpdoc_param_spaces_between_type_and_name = 1
+ij_php_phpdoc_use_fqcn = false
+ij_php_phpdoc_wrap_long_lines = false
+ij_php_place_assignment_sign_on_next_line = true
+ij_php_place_parens_for_constructor = 0
+ij_php_property_read_weight = 28
+ij_php_property_weight = 28
+ij_php_property_write_weight = 28
+ij_php_return_type_on_new_line = false
+ij_php_return_weight = 1
+ij_php_see_weight = 28
+ij_php_since_weight = 28
+ij_php_sort_phpdoc_elements = true
+ij_php_space_after_colon = true
+ij_php_space_after_colon_in_enum_backed_type = true
+ij_php_space_after_colon_in_named_argument = true
+ij_php_space_after_colon_in_return_type = true
+ij_php_space_after_comma = true
+ij_php_space_after_for_semicolon = true
+ij_php_space_after_quest = true
+ij_php_space_after_type_cast = false
+ij_php_space_after_unary_not = false
+ij_php_space_before_array_initializer_left_brace = false
+ij_php_space_before_catch_keyword = true
+ij_php_space_before_catch_left_brace = true
+ij_php_space_before_catch_parentheses = true
+ij_php_space_before_class_left_brace = true
+ij_php_space_before_closure_left_parenthesis = true
+ij_php_space_before_colon = true
+ij_php_space_before_colon_in_enum_backed_type = false
+ij_php_space_before_colon_in_named_argument = false
+ij_php_space_before_colon_in_return_type = false
+ij_php_space_before_comma = false
+ij_php_space_before_do_left_brace = true
+ij_php_space_before_else_keyword = true
+ij_php_space_before_else_left_brace = true
+ij_php_space_before_finally_keyword = true
+ij_php_space_before_finally_left_brace = true
+ij_php_space_before_for_left_brace = true
+ij_php_space_before_for_parentheses = true
+ij_php_space_before_for_semicolon = false
+ij_php_space_before_if_left_brace = true
+ij_php_space_before_if_parentheses = true
+ij_php_space_before_method_call_parentheses = false
+ij_php_space_before_method_left_brace = true
+ij_php_space_before_method_parentheses = false
+ij_php_space_before_quest = true
+ij_php_space_before_short_closure_left_parenthesis = false
+ij_php_space_before_switch_left_brace = true
+ij_php_space_before_switch_parentheses = true
+ij_php_space_before_try_left_brace = true
+ij_php_space_before_unary_not = false
+ij_php_space_before_while_keyword = true
+ij_php_space_before_while_left_brace = true
+ij_php_space_before_while_parentheses = true
+ij_php_space_between_ternary_quest_and_colon = false
+ij_php_spaces_around_additive_operators = true
+ij_php_spaces_around_arrow = false
+ij_php_spaces_around_assignment_in_declare = false
+ij_php_spaces_around_assignment_operators = true
+ij_php_spaces_around_bitwise_operators = true
+ij_php_spaces_around_equality_operators = true
+ij_php_spaces_around_logical_operators = true
+ij_php_spaces_around_multiplicative_operators = true
+ij_php_spaces_around_null_coalesce_operator = true
+ij_php_spaces_around_pipe_in_union_type = false
+ij_php_spaces_around_relational_operators = true
+ij_php_spaces_around_shift_operators = true
+ij_php_spaces_around_unary_operator = false
+ij_php_spaces_around_var_within_brackets = false
+ij_php_spaces_within_array_initializer_braces = false
+ij_php_spaces_within_brackets = false
+ij_php_spaces_within_catch_parentheses = false
+ij_php_spaces_within_for_parentheses = false
+ij_php_spaces_within_if_parentheses = false
+ij_php_spaces_within_method_call_parentheses = false
+ij_php_spaces_within_method_parentheses = false
+ij_php_spaces_within_parentheses = false
+ij_php_spaces_within_short_echo_tags = true
+ij_php_spaces_within_switch_parentheses = false
+ij_php_spaces_within_while_parentheses = false
+ij_php_special_else_if_treatment = true
+ij_php_subpackage_weight = 28
+ij_php_ternary_operation_signs_on_next_line = false
+ij_php_ternary_operation_wrap = off
+ij_php_throws_weight = 2
+ij_php_todo_weight = 28
+ij_php_treat_multiline_arrays_and_lambdas_multiline = false
+ij_php_unknown_tag_weight = 28
+ij_php_upper_case_boolean_const = false
+ij_php_upper_case_null_const = false
+ij_php_uses_weight = 28
+ij_php_var_weight = 28
+ij_php_variable_naming_style = camel_case
+ij_php_version_weight = 28
+ij_php_while_brace_force = always
+ij_php_while_on_new_line = false
+
+[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,.ws-context,composer.lock,jest.config}]
+indent_size = 2
+ij_json_array_wrapping = split_into_lines
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = split_into_lines
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_add_space = false
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title, h1, h2, h3, h4, h5, h6, p
+ij_html_do_not_indent_children_of_tags = html, body, thead, tbody, tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a, abbr, acronym, b, basefont, bdo, big, br, cite, cite, code, dfn, em, font, i, img, input, kbd, label, q, s, samp, select, small, span, strike, strong, sub, sup, textarea, tt, u, var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span, pre, textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+
+[{*.http,*.rest}]
+ij_continuation_indent_size = 4
+ij_http-request_call_parameters_wrap = normal
+ij_http-request_method_parameters_wrap = split_into_lines
+ij_http-request_space_before_comma = true
+ij_http-request_spaces_around_assignment_operators = true
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_format_tables = true
+ij_markdown_insert_quote_arrows_on_wrap = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_inside_blockquotes = true
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_line_comment_add_space = false
+ij_yaml_line_comment_add_space_on_reformat = false
+ij_yaml_line_comment_at_first_column = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true
+
+[*.php]
+insert_final_newline = true
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
-APP_ENV=DEV
+NODE_ENV=development

-AZIENDA=studioml
+AZIENDA=integry
 ENABLED_PROFILES=

 SERVICES_BASE_URL=http://localhost:8080
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh eol=lf
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="PHP">
+      <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default copy" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
  </state>
 </component>
--- a/.idea/codeception.xml
+++ b/.idea/codeception.xml
@@ -9,9 +9,6 @@
        <Configuration>
          <option name="path" value="$PROJECT_DIR$/public_html/tests" />
        </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/public_html/tests" />
-        </Configuration>
      </list>
    </option>
  </component>
--- a/.idea/git_toolbox_blame.xml
+++ b/.idea/git_toolbox_blame.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -9,6 +9,11 @@
  <component name="PHPCodeSnifferOptionsConfiguration">
    <option name="transferred" value="true" />
  </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="1864307c-cd7f-480f-80fe-4bf27e854f94" timeout="30000" />
+    </phpcs_settings>
+  </component>
  <component name="PhpDebugIgnoredPathsSettings">
    <skipped_paths>
      <skipped_path path="$PROJECT_DIR$/../REPO-IMAGES" />
@@ -68,16 +73,17 @@
      <path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/psr/log" />
      <path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/phpmyadmin/motranslator" />
      <path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/psr/cache" />
+      <path value="$PROJECT_DIR$/public_html/vendor/myclabs/php-enum" />
    </include_path>
  </component>
-  <component name="PhpProjectServersManager">
-    <servers>
-      <server host="localpvm" id="5394f34d-47b0-4fe7-87c5-bce404508b30" name="localpvm" />
-    </servers>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.4">
+  <component name="PhpProjectSharedConfiguration">
    <option name="suggestChangeDefaultLanguageLevel" value="false" />
  </component>
+  <component name="PhpStan">
+    <PhpStan_settings>
+      <phpstan_by_interpreter asDefaultInterpreter="true" interpreter_id="1864307c-cd7f-480f-80fe-4bf27e854f94" timeout="60000" />
+    </PhpStan_settings>
+  </component>
  <component name="PhpStanOptionsConfiguration">
    <option name="transferred" value="true" />
  </component>
@@ -86,6 +92,11 @@
      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/public_html/vendor/autoload.php" />
    </phpunit_settings>
  </component>
+  <component name="Psalm">
+    <Psalm_settings>
+      <psalm_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="1864307c-cd7f-480f-80fe-4bf27e854f94" timeout="60000" />
+    </Psalm_settings>
+  </component>
  <component name="PsalmOptionsConfiguration">
    <option name="transferred" value="true" />
  </component>
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -8,6 +8,9 @@
      <PhpSpecSuiteConfiguration>
        <option name="myPath" value="$PROJECT_DIR$/public_html" />
      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$/public_html" />
+      </PhpSpecSuiteConfiguration>
    </suites>
  </component>
 </project>
--- a/.idea/pvm.iml
+++ b/.idea/pvm.iml
@@ -3,68 +3,14 @@
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/public_html/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="DULCIAR" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/magazzino_prod" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/monitoraggio_linee_v2" isTestSource="false" packagePrefix="GRAMM" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LEVANPLAST/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LEVANPLAST" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LICOR" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/modellini/include" isTestSource="false" packagePrefix="Modellini" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/monitoraggio_linee_v2/classes" isTestSource="false" packagePrefix="MonitoraggioLineeV2" />
-      <sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/report_area/classes" isTestSource="false" packagePrefix="ReportArea" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/*" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/vendor/vlucas/phpdotenv" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/vendor/phpoption/phpoption" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/phpmyadmin/motranslator" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/expression-language" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/polyfill-apcu" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/polyfill-php70" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/phpmyadmin/motranslator" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/expression-language" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/polyfill-apcu" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/polyfill-php70" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/phpmyadmin/motranslator" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/expression-language" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/polyfill-apcu" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/polyfill-php70" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/phpmyadmin/motranslator" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/expression-language" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/polyfill-apcu" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/polyfill-php70" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/MtbAartLink" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/geo" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/images" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/mailsSent" />
-      <excludeFolder url="file://$MODULE_DIR$/public_html/cache/pdf" />
+      <sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/public_html/js" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/public_html/cache" />
+      <excludeFolder url="file://$MODULE_DIR$/public_html/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/public_html/vendor" />
      <excludeFolder url="file://$MODULE_DIR$/public_html/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/public_html/vendor/myclabs/php-enum" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/.idea/runConfigurations/Nuovo_Modulo.xml
+++ b/.idea/runConfigurations/Nuovo_Modulo.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Nuovo Modulo" type="js.build_tools.grunt">
+    <node-interpreter value="project" />
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="Nuovo modulo" />
+    </tasks>
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="PROJECT" dialect="TSQL" />
-  </component>
-</project>
--- a/99
+++ b/99
@@ -1,6 +1,97 @@
-FROM php:7.4-fpm
+# syntax=docker/dockerfile:1

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+ARG NODE_VERSION="20"
+ARG PHP_VERSION="7.4"
+ARG AZIENDA="integry"
+ARG NODE_ENV="production"

-RUN chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions gd opcache xdebug imagick zip
+# Compilatore js
+FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-alpine AS builder
+
+WORKDIR /app
+
+COPY . .
+
+ARG NODE_ENV
+ENV NODE_ENV=$NODE_ENV
+ARG TARGETOS
+ARG TARGETARCH
+
+RUN npm install --os $TARGETOS --cpu $TARGETARCH \
+    && npm run build
+
+RUN /bin/sh build.sh
+
+# Unzip compilati
+FROM --platform=$BUILDPLATFORM alpine AS exports
+
+ARG AZIENDA
+ENV AZIENDA=$AZIENDA
+
+COPY --from=builder app/exports/_base.zip .
+RUN unzip _base.zip -d ./unzip
+COPY --from=builder app/exports/${AZIENDA}.zip .
+RUN unzip ${AZIENDA}.zip -d ./unzip
+
+# Immagine finale
+FROM php:${PHP_VERSION}-apache-bullseye AS final
+
+ARG AZIENDA
+ENV AZIENDA=$AZIENDA
+ENV SERVICES_BASE_URL="http://host.docker.internal:8080"
+ENV PUBLIC_URL="http://localhost/pvm"
+
+# Enable Apache modules to ensure proper functionality
+RUN a2enmod rewrite
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+COPY docker/php/php.ini $PHP_INI_DIR/php.ini
+
+# Imposto la lingua delle date
+ENV LC_TIME=it_IT.UTF-8
+
+RUN apt-get update && apt-get install -y --no-install-recommends locales \
+    && apt-get clean \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
+    && echo it_IT.UTF-8 UTF-8 >> /etc/locale.gen \
+    && locale-gen \
+    && install-php-extensions \
+      gd \
+      imagick \
+      zip
+
+COPY docker/apache/000-default.conf $APACHE_CONFDIR/sites-available/000-default.conf
+
+WORKDIR /var/www/html
+
+FROM final AS final-dev
+
+COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+RUN install-php-extensions xdebug
+COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+COPY --from=builder --chown=www-data:www-data app ./pvm
+
+USER www-data
+RUN touch pvm/.env \
+    && printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > pvm/.env
+
+EXPOSE 80
+EXPOSE 9003
+
+FROM final AS final-prod
+
+RUN install-php-extensions opcache
+
+COPY --from=exports --chown=www-data:www-data unzip .
+
+ARG BUILD_VERSION
+ENV BUILD_VERSION=$BUILD_VERSION
+
+USER www-data
+RUN touch .env \
+    && printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > .env
+
+EXPOSE 80
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,6 +16,7 @@ const _arr_aziende = [
    {n: "gramm"},
    {n: "ime_te"},
    {n: "ime_ba"},
+    {n: "integry"},
    {n: "lamonarca"},
    {n: "levanplast"},
    {n: "licor"},
@@ -29,10 +30,10 @@ const _arr_aziende = [
    {n: "of_demo"},
    {n: "produzione"},
    {n: "risto_cash"},
-    {n: "rossogargano"},
+    {n: "rossogargano", sub :["rossogarganocont"]},
    {n: "sapori_veri", sub: ["dispensa"]},
    {n: "smetar"},
-    {n: "suit", sub: ["santantonio", "carni_sardegna", "valpietro"]},
+    {n: "suit", sub: ["santantonio", "carni_sardegna", "valpietro", "suit_puglia"]},
    {n: "tosca_cloud"},
    {n: "tosca_ce"},
    {n: "tosca_ba"},
@@ -226,7 +227,7 @@ module.exports = function (grunt) {
                timestamp: date.getTime()
            }
        };
-        grunt.file.write("public_html/build.json", JSON.stringify(build));
+        grunt.file.write("exports/tmp/build.json", JSON.stringify(build));
    });
    _arr_aziende.forEach(azienda => {
        let nomeAzienda = azienda.n.toLowerCase();
@@ -470,7 +471,16 @@ function copy_getValues(grunt) {

        ret["assets"] = {
            cwd: "public_html",
-            src: ["**", "!config_aziende/**", "!js/**", "!scss/**", "!css/**", "!gest-lib/**/*.js", "!dist/config_aziende/**"],
+            src: [
+                "**",
+                "!config_aziende/**",
+                "!js/**",
+                "!scss/**",
+                "!css/**",
+                "!gest-lib/**/*.js",
+                "!gest-lib/**/*.ts",
+                "!dist/config_aziende/**"
+            ],
            dest: "exports/_base", // + nomeAzienda.toUpperCase(),
            expand: true,
            options: {timestamp: true},
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -0,0 +1,131 @@
+def defineNodeEnv() {
+    if (env.BRANCH_NAME == "master") {
+        return 'production'
+    } else {
+        return 'development'
+    }
+}
+
+pipeline {
+    agent any
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
+        disableConcurrentBuilds()
+        skipDefaultCheckout true
+    }
+
+    environment {
+        AZIENDA = "integry"
+        NODE_ENV = defineNodeEnv()
+    }
+
+    stages {
+        stage("Prepare Ws") {
+            steps {
+                cleanWs deleteDirs: true, patterns: [[pattern: 'exports/', type: 'INCLUDE']]
+                checkout scm
+            }
+        }
+
+        stage("Build") {
+            steps {
+                script {
+                    if (!env.BRANCH_NAME.startsWith('feature/')) {
+                        echo "Building ${env.NODE_ENV} version"
+
+                        nodejs('NodeJS 20.10.0') {
+                            bat 'npm install'
+                            bat 'npm run build'
+
+//                        bat 'cd public_html && npm install --omit=dev'
+
+                            if (NODE_ENV == 'development') {
+                                bat 'MOVE /Y public_html\\classes\\_DEV_Restful.config.json public_html\\classes\\Restful.config.json'
+
+                                bat '7za a public_html.zip "%WORKSPACE%\\public_html" -tzip'
+                            } else if (NODE_ENV == 'production') {
+                                bat 'grunt BuildAll'
+                            }
+                        }
+                    }
+
+                    stash excludes: 'exports,publix_html.zip', name: 'docker-ws'
+                }
+            }
+        }
+
+        stage("Deploy") {
+            parallel {
+                stage("Update Master") {
+                    steps {
+                        script {
+                            if (env.BRANCH_NAME == 'develop') {
+                                archiveArtifacts artifacts: 'public_html.zip', onlyIfSuccessful: true
+                                sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server  (192.168.3.13)', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'sudo /bin/chmod -R 777 /var/www/dev/pvm/cache', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+                                ftpPublisher alwaysPublishFromMaster: false, masterNodeName: '',
+                                        paramPublish: [parameterName: ""], continueOnError: false, failOnError: false,
+                                        publishers: [[configName: 'Production Linux Web Server (ftp.studioml.it)', transfers: [[asciiMode: false, cleanRemote: true, excludes: '', flatten: false, makeEmptyDirs: true, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/dev/pvm', remoteDirectorySDF: false, removePrefix: 'public_html/', sourceFiles: 'public_html/']], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false]]
+                                sshPublisher(publishers: [
+                                        sshPublisherDesc(configName: 'Production Linux Web Server  (192.168.3.13)',
+                                                transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /bin/mkdir /var/www/dev/pvm/cache
+sudo /bin/chmod -R 777 /var/www/dev/pvm/cache''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false,
+                                                        patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false,
+                                                        removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
+                                                useWorkspaceInPromotion: false, verbose: false)])
+                            } else if (env.BRANCH_NAME == 'master') {
+                                archiveArtifacts artifacts: 'exports\\*.zip', onlyIfSuccessful: true
+                                sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server  (192.168.3.13)', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'sudo /bin/chmod -R 777 /var/www/portale/cache', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+                                ftpPublisher alwaysPublishFromMaster: false, masterNodeName: '',
+                                        paramPublish: [parameterName: ""], continueOnError: false, failOnError: false,
+                                        publishers: [[configName: 'Production Linux Web Server (ftp.studioml.it)', transfers: [[asciiMode: false, cleanRemote: true, excludes: 'public_html/cache/', flatten: false, makeEmptyDirs: true, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/portale', remoteDirectorySDF: false, removePrefix: 'public_html/', sourceFiles: 'public_html/']], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false]]
+                                sshPublisher(publishers: [
+                                        sshPublisherDesc(configName: 'Production Linux Web Server  (192.168.3.13)',
+                                                transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /bin/mkdir /var/www/portale/cache
+sudo /bin/chmod -R 777 /var/www/portale/cache''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false,
+                                                        patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false,
+                                                        removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
+                                                useWorkspaceInPromotion: false, verbose: false)])
+                            }
+                        }
+                    }
+                }
+
+                stage('Publish on Azure') {
+                    steps {
+                        script {
+                            if (env.BRANCH_NAME == 'master') {
+                                azureUpload fileShareName: 'storage-ci', filesPath: 'exports/*.zip', removePrefixPath: 'exports/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'pvm'
+                            }
+                        }
+                    }
+                }
+
+                stage('Docker Build') {
+                    steps {
+                        node('server-build') {
+                            cleanWs()
+                            unstash 'docker-ws'
+
+                            echo "Building Docker image"
+
+                            script {
+                                def branchVersion = ""
+                                def target = "final-prod"
+
+                                if (env.BRANCH_NAME != "master") {
+                                    branchVersion = "-${env.BRANCH_NAME.toLowerCase().replace('/', '-')}"
+                                    target = "final-dev"
+                                }
+
+                                bat """
+                                docker buildx build --platform linux/amd64 --push -t "git.studioml.it/integry/pvm${branchVersion}:latest" --build-arg NODE_ENV=${env.NODE_ENV} --build-arg BUILD_VERSION=${env.BUILD_TAG.replace(' ', '-')} --target ${target} .
+                                """
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "${NODE_ENV}" = "production" ]; then
+  npm run grunt -- BuildAll
+fi
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,12 @@
-version: "3.9"
 services:
-  php-fpm:
+  php-apache:
    restart: unless-stopped
    extra_hosts:
      - host.docker.internal:host-gateway
-    build: ./
-    volumes:
-      - ./:/var/www/html/pvm
-      - ./docker/php/php.ini:/usr/local/etc/php/php.ini
-      - ./docker/php/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-      - ./docker/php/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
-  apache:
-    restart: unless-stopped
    build:
-      context: .
-      dockerfile: ./docker/apache/Dockerfile
+      dockerfile: ./Dockerfile
+      target: final-dev
    ports:
      - "80:80"
    volumes:
-      - ./:/var/www/html/pvm
-    depends_on:
-      - php-fpm
+      - .:/var/www/html/pvm
--- a/docker/apache/000-default.conf
+++ b/docker/apache/000-default.conf
@@ -0,0 +1,51 @@
+ServerName localhost
+
+<VirtualHost *:80>
+    # The ServerName directive sets the request scheme, hostname and port that
+    # the server uses to identify itself. This is used when creating
+    # redirection URLs. In the context of virtual hosts, the ServerName
+    # specifies what hostname must appear in the request's Host: header to
+    # match this virtual host. For the default virtual host (this file) this
+    # value is not decisive as it is used as a last resort host regardless.
+    # However, you must set it for any further virtual host explicitly.
+    # ServerName localhost
+
+    ServerAdmin webmaster@localhost
+    DocumentRoot /var/www/html
+
+    # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+    # error, crit, alert, emerg.
+    # It is also possible to configure the loglevel for particular
+    # modules, e.g.
+    #LogLevel info ssl:warn
+
+    # Directory configuration for the DocumentRoot
+    <Directory /var/www/html/>
+        DirectoryIndex index.php
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    # For most configuration files from conf-available/, which are
+    # enabled or disabled at a global level, it is possible to
+    # include a line for only one particular virtual host. For example the
+    # following line enables the CGI configuration for this host only
+    # after it has been globally disabled with "a2disconf".
+    #Include conf-available/serve-cgi-bin.conf
+
+    # Proxy PHP requests to port 9000 PHP-FPM container
+    <IfModule mod_proxy.c>
+        ProxyTimeout 259200
+
+        <FilesMatch \.php$>
+            Require all granted
+            SetHandler proxy:fcgi://${PHP_HOST}:${PHP_PORT}
+        </FilesMatch>
+    </IfModule>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
--- a/docker/apache/Dockerfile
+++ b/docker/apache/Dockerfile
@@ -1,15 +0,0 @@
-FROM httpd:2.4
-
-COPY ./docker/apache/apache.vhost.conf /usr/local/apache2/conf/extra/apache.vhost.conf
-RUN echo "Include /usr/local/apache2/conf/extra/apache.vhost.conf" >> /usr/local/apache2/conf/httpd.conf
-
-# Enable Apache modules to ensure proper functionality
-RUN sed -i \
-   # Uncomment the configuration for mod_deflate to enable compression
-    -e '/#LoadModule deflate_module/s/^#//g' \
-    # Uncomment the configuration for mod_proxy to enable proxying capabilities
-    -e '/#LoadModule proxy_module/s/^#//g' \
-    # Uncomment the configuration for mod_proxy_fcgi to enable FastCGI proxy module
-    -e '/#LoadModule proxy_fcgi_module/s/^#//g' \
-    -e '/#LoadModule rewrite_module/s/^#//g' \
-    /usr/local/apache2/conf/httpd.conf
--- a/docker/apache/apache.vhost.conf
+++ b/docker/apache/apache.vhost.conf
@@ -1,30 +0,0 @@
-# Set the ServerName to localhost
-ServerName localhost
-
-# Configure a VirtualHost to handle requests on port 80
-<VirtualHost *:80>
-    # Proxy PHP requests to port 9000 PHP-FPM container
-    <IfModule mod_proxy.c>
-        ProxyTimeout 259200
-
-        <FilesMatch \.php$>
-            Require all granted
-            SetHandler proxy:fcgi://php-fpm:9000
-        </FilesMatch>
-    </IfModule>
-
-    # Set the DocumentRoot for the virtual host
-    DocumentRoot /var/www/html/
-
-    # Directory configuration for the DocumentRoot
-    <Directory /var/www/html/>
-        DirectoryIndex index.php
-        Options Indexes FollowSymLinks
-        AllowOverride All
-        Require all granted
-    </Directory>
-
-    # Define the CustomLog and ErrorLog destinations
-    CustomLog /proc/self/fd/1 common
-    ErrorLog /proc/self/fd/2
-</VirtualHost>
--- a/docker/php/php.ini
+++ b/docker/php/php.ini
@@ -184,7 +184,7 @@ engine = On
 ; Development Value: Off
 ; Production Value: Off
 ; http://php.net/short-open-tag
-short_open_tag = On
+short_open_tag = Off

 ; The number of significant digits displayed in floating point numbers.
 ; http://php.net/precision
@@ -362,7 +362,7 @@ zend.enable_gc = On
 ;zend.script_encoding =

 ; Allows to include or exclude arguments from stack traces generated for exceptions.
-; In production, it is recommended to turn this setting on to prohibit the output 
+; In production, it is recommended to turn this setting on to prohibit the output
 ; of sensitive information in stack traces
 ; Default: Off
 zend.exception_ignore_args = Off
@@ -406,7 +406,7 @@ max_input_vars = 10000

 ; Maximum amount of memory a script may consume
 ; http://php.net/memory-limit
-memory_limit = 256M
+memory_limit = 2G

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -640,7 +640,7 @@ report_memleaks = On
 ; Development Value: "GPCS"
 ; Production Value: "GPCS";
 ; http://php.net/variables-order
-variables_order = "GPCS"
+variables_order = "EGPCS"

 ; This directive determines which super global data (G,P & C) should be
 ; registered into the super global array REQUEST. If so, it also determines
@@ -1053,7 +1053,7 @@ date.timezone = Europe/Rome
 [Pdo_mysql]
 ; Default socket name for local MySQL connects.  If empty, uses the built-in
 ; MySQL defaults.
-pdo_mysql.default_socket=
+pdo_mysql.default_socket =

 [Phar]
 ; http://php.net/phar.readonly
@@ -1739,16 +1739,16 @@ tidy.clean_output = Off
 [soap]
 ; Enables or disables WSDL caching feature.
 ; http://php.net/soap.wsdl-cache-enabled
-soap.wsdl_cache_enabled=1
+soap.wsdl_cache_enabled = 1

 ; Sets the directory name where SOAP extension will put cache files.
 ; http://php.net/soap.wsdl-cache-dir
-soap.wsdl_cache_dir="/tmp"
+soap.wsdl_cache_dir = "/tmp"

 ; (time to live) Sets the number of second while cached file will be used
 ; instead of original one.
 ; http://php.net/soap.wsdl-cache-ttl
-soap.wsdl_cache_ttl=86400
+soap.wsdl_cache_ttl = 86400

 ; Sets the size of the cache limit. (Max. number of WSDL files to cache)
 soap.wsdl_cache_limit = 5
@@ -1766,20 +1766,20 @@ ldap.max_links = -1

 [opcache]
 ; Determines if Zend OPCache is enabled
-;opcache.enable=1
+opcache.enable=1

 ; Determines if Zend OPCache is enabled for the CLI version of PHP
 ;opcache.enable_cli=0

 ; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
+opcache.memory_consumption=128

 ; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
+opcache.interned_strings_buffer=8

 ; The maximum number of keys (scripts) in the OPcache hash table.
 ; Only numbers between 200 and 1000000 are allowed.
-;opcache.max_accelerated_files=10000
+opcache.max_accelerated_files=4000

 ; The maximum percentage of "wasted" memory until a restart is scheduled.
 ;opcache.max_wasted_percentage=5
@@ -1797,17 +1797,17 @@ ldap.max_links = -1
 ; How often (in seconds) to check file timestamps for changes to the shared
 ; memory storage allocation. ("1" means validate once per second, but only
 ; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
+opcache.revalidate_freq=60

 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0

 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
 ; size of the optimized code.
-;opcache.save_comments=1
+opcache.save_comments=0

 ; Allow file existence override (file_exists, etc.) performance feature.
-;opcache.enable_file_override=0
+opcache.enable_file_override=1

 ; A bitmask, where each bit enables or disables the appropriate OPcache
 ; passes
@@ -1944,4 +1944,4 @@ ldap.max_links = -1
 ;ffi.enable=preload

 ; List of headers files to preload, wildcard patterns allowed.
-;ffi.preload=
+;ffi.preload=
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,17 +8,18 @@
    "test": "test"
  },
  "scripts": {
-    "postinstall": "node postinstall.js",
-    "clean": "rimraf public_html/dist",
-    "lint": "eslint . --fix --cache",
+    "clean": "del-cli public_html/dist",
    "build": "npm run clean && tsc",
    "build:watch": "npm run build -- --watch",
+    "grunt": "grunt",
+    "lint": "eslint . --fix --cache",
+    "postinstall": "node postinstall.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "pre-commit": [
    "lint"
  ],
-  "devDependencies": {
+  "dependencies": {
    "@ihvh/air-datepicker-types": "^2.0.2",
    "@types/bootstrap": "^3.3.42",
    "@types/chart.js": "^2.9.37",
@@ -26,17 +27,17 @@
    "@types/daterangepicker": "^3.1.8",
    "@types/jquery": "^3.5.16",
    "@types/jqueryui": "^1.12.16",
-    "@types/systemjs": "^6.13.1",
    "@types/tableau": "^2.2.4",
    "@typescript-eslint/eslint-plugin": "^5.57.1",
    "@typescript-eslint/parser": "^5.57.1",
+    "del-cli": "^6.0.0",
    "eslint": "^8.37.0",
    "grunt": "^0.4.5",
    "grunt-cli": "^1.2.0",
    "grunt-contrib-clean": "^0.5.0",
    "grunt-contrib-compress": "^1.4.3",
    "grunt-contrib-copy": "^0.4.1",
-    "grunt-contrib-cssmin": "^0.14.0",
+    "grunt-contrib-cssmin": "^5.0.0",
    "grunt-contrib-htmlmin": "^0.6.0",
    "grunt-contrib-rename": "^0.2.0",
    "grunt-contrib-uglify": "^4.0.0",
@@ -53,12 +54,9 @@
    "grunt-string-replace": "^1.3.1",
    "number-ticker": "file:public_html/assets/number-ticker",
    "pre-commit": "^1.2.2",
-    "rimraf": "^4.4.1",
+    "sass": "^1.76.0",
    "typescript": "~5.0.3"
  },
  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "sass": "^1.76.0"
-  }
+  "license": "ISC"
 }
--- a/postinstall.js
+++ b/postinstall.js
@@ -1,7 +1,3 @@
-if (process.env.NODE_ENV === "production") {
-    process.exit();
-}
-
 const {spawn} = require('child_process');

 const cmd = "cd public_html && npm install";
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -1,3 +1,10 @@
 <IfModule mod_mime.c>
  AddType text/javascript js mjs
+</IfModule>
+
+<IfModule headers_module>
+  <FilesMatch "\.(js|mjs|css)$">
+    Header set Cache-Control "public, must-revalidate, max-age=3600"
+    Header unset Etag
+  </FilesMatch>
 </IfModule>
--- a/public_html/contatti_commesse_integry.php
+++ b/public_html/contatti_commesse_integry.php
@@ -1,23 +1,25 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
-include Controller::current_gestpath_include("ajax.php");
+(new Ajax())->checkAjaxRequests();
 ?>
 <!DOCTYPE html>
 <!--html manifest="manifest.appcache"-->
-<html>
+<html lang="it">
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
+<?php include pvm_splashScreen; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +28,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/accettazione.php
+++ b/public_html/accettazione.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -32,6 +33,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/accettazione_floro.php
+++ b/public_html/accettazione_floro.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/allegati.php
+++ b/public_html/allegati.php
@@ -1,15 +1,12 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";

 if (!isset($_GET["render"])) {
    require_once "include_login.php";
 }
-include "config.php";
-/*
-if(!class_exists("Allegati")){
-    include Controller::current_gestpath_classes("Allegati.class.php");
-}*/
+include_once "config.php";
 (new AllegatiAjax())->checkAjaxRequests();
 ?>
 <!DOCTYPE html>
--- a/public_html/allevamento_bande.php
+++ b/public_html/allevamento_bande.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/analisi_budget.php
+++ b/public_html/analisi_budget.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 $className = "AnalisiBudget" . Utility\Str::ucfirst(preg_replace("/[^A-Za-z0-9\\-]/", "", User::get_current_profileDb()));
--- a/public_html/analisi_costi.php
+++ b/public_html/analisi_costi.php
@@ -0,0 +1,33 @@
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
+require_once "include_login.php";
+include_once "config.php";
+include_once "include/module.php";
+
+include Controller::current_mainClasspath();
+(new Ajax())->checkAjaxRequests();
+?>
+<!DOCTYPE html>
+<!--html manifest="manifest.appcache"-->
+<html lang="it">
+<head>
+    <?php include pvm_tagHead; ?>
+</head>
+<body>
+<?php include pvm_headerNavbar; ?>
+<?php include pvm_splashScreen; ?>
+<div id="content">
+    <div><?php
+        include pvm_navTab;
+        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
+            include pvm_unauthorized;
+        } else {
+            include Controller::current_gestpath_mainPage();
+        } ?>
+    </div>
+</div>
+<?php include pvm_footerMinimal; ?>
+</body>
+</html>
--- a/public_html/api.php
+++ b/public_html/api.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";


 $className = null;
@@ -31,4 +32,4 @@ if (isset($methodName) && isset($type)) {
    }
 }

-(new Ajax("\Api\\" . $className))->checkAjaxRequests();
+(new Ajax("\Api\\" . $className))->checkAjaxRequests();
--- a/public_html/approv_ordini_vendita.php
+++ b/public_html/approv_ordini_vendita.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/articoli_anag.php
+++ b/public_html/articoli_anag.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/assets/assets-libs.json
+++ b/public_html/assets/assets-libs.json
@@ -30,8 +30,8 @@
      "date-formats",
      "animate",
      "firebase",
-      "navbar",
-      "sodium"
+      "sodium",
+      "navbar"
    ]
  },
  "jquery": {
@@ -156,12 +156,6 @@
      "assets/graphic/Chart.min.js"
    ]
  },
-  "json-editor": {
-    "js": [
-      "assets/jsoneditor/jsoneditor.min.js",
-      "assets/jsoneditor/jsoneditor.language.it.js"
-    ]
-  },
  "trumbowyg": {
    "js": [
      "assets/trumbowyg/trumbowyg.customized.js",
@@ -222,16 +216,21 @@
  "md5": {
    "js": [
      "assets/md5.js"
+    ],
+    "ts": [
+      "assets/md5.js"
    ]
  },
  "moment": {
    "js": [
      "assets/moment-with-locales.js",
-      "assets/moment-duration-format.js"
+      "assets/moment-duration-format.js",
+      "assets/moment-config.js"
    ],
    "ts": [
      "assets/moment-with-locales.js",
-      "assets/moment-duration-format.js"
+      "assets/moment-duration-format.js",
+      "assets/moment-config.js"
    ]
  },
  "URI": {
@@ -396,8 +395,8 @@
      "assets/kendo/js/messages/kendo.messages.it-IT.min.js"
    ],
    "css": [
-      "https://unpkg.com/@progress/kendo-font-icons/dist/index.css",
-      "assets/kendo/styles/default-main.css"
+      "assets/kendo/styles/default-main.css",
+      "assets/kendo/kendo-font-icons/compiled/index.css"
    ]
  },
  "amcharts": {
@@ -494,11 +493,6 @@
      "assets/printThis/printThis.min.js"
    ]
  },
-  "systemjs": {
-    "js": [
-      "assets/system.min.js"
-    ]
-  },
  "tableau": {
    "js": [
      "https://online.tableau.com/javascripts/api/tableau-2.9.1.min.js"
@@ -512,11 +506,6 @@
      "assets/visibility/visibility.min.js"
    ]
  },
-  "navbar": {
-    "js": [
-      "assets/navbar/navbar.js"
-    ]
-  },
  "sodium": {
    "js": [
      "node_modules/sodium-plus/dist/sodium-plus.min.js"
@@ -524,5 +513,18 @@
    "ts": [
      "node_modules/sodium-plus/dist/sodium-plus.min.js"
    ]
+  },
+  "masonry": {
+    "js": [
+      "assets/masonry.pkgd.min.js"
+    ]
+  },
+  "navbar": {
+    "js": [
+      "dist/js/navbar.module.js"
+    ],
+    "ts": [
+      "dist/js/navbar.module.js"
+    ]
  }
 }
--- a/public_html/assets/jquery-dropzone/jquery-dropzone.js
+++ b/public_html/assets/jquery-dropzone/jquery-dropzone.js
@@ -8,16 +8,20 @@
            onDrop: undefined,
            dragBackgroundColor: "#e6ffe6",
            dragBorderColor: "#38fc38",
-            multiple: true
+            multiple: true,
+            accept: undefined,
+            body: undefined
        }, options);

        // language=HTML
        this.html(`
            <label for="dropzoneInput" class="dropzone font-weight-normal">
                <i class="fad fa-upload my-10"></i>
-                <span>Trascina qui i file per caricarli</span>
-                <span>oppure clicca nel riquadro o incolla qui</span>
-                <input type="file" id="dropzoneInput" class="mb-10 hidden" ${settings.multiple ? "multiple" : ""}/>
+                ${settings.body || `<span>Trascina qui i file per caricarli</span>
+                <span>oppure clicca nel riquadro o incolla qui</span>`}
+                <input type="file" id="dropzoneInput" class="mb-10 hidden"
+                       ${settings.multiple ? "multiple" : ""}
+                       ${settings.accept ? `accept=${settings.accept}` : ""}/>
                <button type="button" id="retryButton" class="btn btn-primary btn-sm mb-10 hidden">
                    <i class="fa fa-redo-alt"></i> Riprova
                </button>
--- a/public_html/assets/jsoneditor/jsoneditor.language.it.js
+++ b/public_html/assets/jsoneditor/jsoneditor.language.it.js
@@ -1,209 +0,0 @@
-JSONEditor.defaults.languages.it = {
-  /**
-   * When a property is not set
-   */
-  error_notset: "Property must be set",
-  /**
-   * When a string must not be empty
-   */
-  error_notempty: "Value required",
-  /**
-   * When a value is not one of the enumerated values
-   */
-  error_enum: "Value must be one of the enumerated values",
-  /**
-   * When a value doesn't validate any schema of a 'anyOf' combination
-   */
-  error_anyOf: "Value must validate against at least one of the provided schemas",
-  /**
-   * When a value doesn't validate
-   * @variables This key takes one variable: The number of schemas the value does not validate
-   */
-  error_oneOf: 'Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.',
-  /**
-   * When a value does not validate a 'not' schema
-   */
-  error_not: "Value must not validate against the provided schema",
-  /**
-   * When a value does not match any of the provided types
-   */
-  error_type_union: "Value must be one of the provided types",
-  /**
-   * When a value does not match the given type
-   * @variables This key takes one variable: The type the value should be of
-   */
-  error_type: "Value must be of type {{0}}",
-  /**
-   *  When the value validates one of the disallowed types
-   */
-  error_disallow_union: "Value must not be one of the provided disallowed types",
-  /**
-   *  When the value validates a disallowed type
-   * @variables This key takes one variable: The type the value should not be of
-   */
-  error_disallow: "Value must not be of type {{0}}",
-  /**
-   * When a value is not a multiple of or divisible by a given number
-   * @variables This key takes one variable: The number mentioned above
-   */
-  error_multipleOf: "Value must be a multiple of {{0}}",
-  /**
-   * When a value is greater than it's supposed to be (exclusive)
-   * @variables This key takes one variable: The maximum
-   */
-  error_maximum_excl: "Value must be less than {{0}}",
-  /**
-   * When a value is greater than it's supposed to be (inclusive
-   * @variables This key takes one variable: The maximum
-   */
-  error_maximum_incl: "Value must be at most {{0}}",
-  /**
-   * When a value is lesser than it's supposed to be (exclusive)
-   * @variables This key takes one variable: The minimum
-   */
-  error_minimum_excl: "Value must be greater than {{0}}",
-  /**
-   * When a value is lesser than it's supposed to be (inclusive)
-   * @variables This key takes one variable: The minimum
-   */
-  error_minimum_incl: "Value must be at least {{0}}",
-  /**
-   * When a value have too many characters
-   * @variables This key takes one variable: The maximum character count
-   */
-  error_maxLength: "Value must be at most {{0}} characters long",
-  /**
-   * When a value does not have enough characters
-   * @variables This key takes one variable: The minimum character count
-   */
-  error_minLength: "Value must be at least {{0}} characters long",
-  /**
-   * When a value does not match a given pattern
-   */
-  error_pattern: "Value must match the pattern {{0}}",
-  /**
-   * When an array has additional items whereas it is not supposed to
-   */
-  error_additionalItems: "No additional items allowed in this array",
-  /**
-   * When there are to many items in an array
-   * @variables This key takes one variable: The maximum item count
-   */
-  error_maxItems: "Value must have at most {{0}} items",
-  /**
-   * When there are not enough items in an array
-   * @variables This key takes one variable: The minimum item count
-   */
-  error_minItems: "Value must have at least {{0}} items",
-  /**
-   * When an array is supposed to have unique items but has duplicates
-   */
-  error_uniqueItems: "Array must have unique items",
-  /**
-   * When there are too many properties in an object
-   * @variables This key takes one variable: The maximum property count
-   */
-  error_maxProperties: "Object must have at most {{0}} properties",
-  /**
-   * When there are not enough properties in an object
-   * @variables This key takes one variable: The minimum property count
-   */
-  error_minProperties: "Object must have at least {{0}} properties",
-  /**
-   * When a required property is not defined
-   * @variables This key takes one variable: The name of the missing property
-   */
-  error_required: "Object is missing the required property '{{0}}'",
-  /**
-   * When there is an additional property is set whereas there should be none
-   * @variables This key takes one variable: The name of the additional property
-   */
-  error_additional_properties: "No additional properties allowed, but property {{0}} is set",
-  /**
-   * When a dependency is not resolved
-   * @variables This key takes one variable: The name of the missing property for the dependency
-   */
-  error_dependency: "Must have property {{0}}",
-  /**
-   * When a date is in incorrect format
-   * @variables This key takes one variable: The valid format
-   */
-  error_date: 'Date must be in the format {{0}}',
-  /**
-   * When a time is in incorrect format
-   * @variables This key takes one variable: The valid format
-   */
-  error_time: 'Time must be in the format {{0}}',
-  /**
-   * When a datetime-local is in incorrect format
-   * @variables This key takes one variable: The valid format
-   */
-  error_datetime_local: 'Datetime must be in the format {{0}}',
-  /**
-   * When a integer date is less than 1 January 1970
-   */
-  error_invalid_epoch: 'Date must be greater than 1 January 1970',
-
-  /**
-   * Text on Delete All buttons
-   */
-  button_delete_all: "Tutto",
-  /**
-   * Title on Delete All buttons
-   */
-  button_delete_all_title: "Elimina tutto",
-  /**
-    * Text on Delete Last buttons
-    * @variable This key takes one variable: The title of object to delete
-    */
-  button_delete_last: "Ultimo {{0}}",
-  /**
-    * Title on Delete Last buttons
-    * @variable This key takes one variable: The title of object to delete
-    */
-  button_delete_last_title: "Elimina ultimo {{0}}",
-  /**
-    * Title on Add Row buttons
-    * @variable This key takes one variable: The title of object to add
-    */
-  button_add_row_title: "Aggiungi {{0}}",
-  /**
-    * Title on Move Down buttons
-    */
-  button_move_down_title: "Sposta giù",
-  /**
-    * Title on Move Up buttons
-    */
-  button_move_up_title: "Sposta su",
-  /**
-    * Title on Delete Row buttons
-    * @variable This key takes one variable: The title of object to delete
-    */
-  button_delete_row_title: "Elimina {{0}}",
-  /**
-    * Title on Delete Row buttons, short version (no parameter with the object title)
-    */
-  button_delete_row_title_short: "Elimina",
-  /**
-    * Title on Collapse buttons
-    */
-  button_collapse: "Compatta",
-  /**
-    * Title on Expand buttons
-    */
-  button_expand: "Espandi",
-  /**
-    * Title on Flatpickr toggle buttons
-    */
-  flatpickr_toggle_button: "Toggle",
-  /**
-    * Title on Flatpickr clear buttons
-    */
-  flatpickr_clear_button: "Clear",
-  object_properties: "Proprietà object",
-  add: "Aggiungi",
-  property_name: "Nome proprietà"
-};
-JSONEditor.defaults.language = "it";
-JSONEditor.defaults.theme = "bootstrap3";
-//JSONEditor.defaults.iconlib = "fontawesome5";
--- a/public_html/assets/jsoneditor/jsoneditor.min.js
+++ b/public_html/assets/jsoneditor/jsoneditor.min.js
--- a/public_html/assets/jsoneditor/jsoneditor.min.js.map
+++ b/public_html/assets/jsoneditor/jsoneditor.min.js.map
--- a/public_html/assets/kendo/js/kendo-plugins.js
+++ b/public_html/assets/kendo/js/kendo-plugins.js
@@ -50,15 +50,20 @@ const maskedTextboxPlugin = (function (init) {
            init.call(that, element, options);

            that.element.on("keyup", that._keyup.bind(that));
+            that.element.on("keypress", that._keypress.bind(that));
        },
        options: {
            name: "MaskedTextBox",
            autoBind: true
        },
-        events: [...kendo.ui.MaskedTextBox.fn.events, "keyup"],
+        events: [...kendo.ui.MaskedTextBox.fn.events, "keyup", "keypress"],
        _keyup: function (e) {
            const that = this;
            that.trigger("keyup", {event: e});
+        },
+        _keypress: function (e) {
+            const that = this;
+            that.trigger("keypress", {event: e});
        }
    });
 })(kendo.ui.MaskedTextBox.fn.init);
@@ -90,4 +95,17 @@ const observeDOM = (function () {
 observeDOM(document, function () {
    $(["fa", "fas", "far", "fal", "fad"].map(clas => `.k-font-icon.${clas}`).join(", "))
        .each((_, el) => $(el).removeClass("k-font-icon"));
-});
+});
+
+/**
+ * Fix per gestire il toJSON nei model di kendo form
+ * L'id non viene preso in considerazione
+ */
+const originalToJSON = kendo.data.Model.prototype.toJSON;
+kendo.data.Model.prototype.toJSON = function () {
+    const json = originalToJSON.call(this);
+
+    json.id ??= this.id;
+
+    return json;
+}
--- a/public_html/assets/kendo/kendo-font-icons/compiled/icon-list.json
+++ b/public_html/assets/kendo/kendo-font-icons/compiled/icon-list.json
--- a/public_html/assets/kendo/kendo-font-icons/compiled/icons.json
+++ b/public_html/assets/kendo/kendo-font-icons/compiled/icons.json
--- a/public_html/assets/kendo/kendo-font-icons/compiled/index.css
+++ b/public_html/assets/kendo/kendo-font-icons/compiled/index.css
--- a/public_html/assets/kendo/kendo-font-icons/compiled/kendo-font-icons.ttf
+++ b/public_html/assets/kendo/kendo-font-icons/compiled/kendo-font-icons.ttf
--- a/public_html/assets/kendo/styles/kendo-font-icons/index.css
+++ b/public_html/assets/kendo/styles/kendo-font-icons/index.css
--- a/public_html/assets/masonry.pkgd.min.js
+++ b/public_html/assets/masonry.pkgd.min.js
--- a/public_html/assets/moment-config.js
+++ b/public_html/assets/moment-config.js
@@ -0,0 +1 @@
+moment.locale("it");
--- a/public_html/assets/navbar/navbar.js
+++ b/public_html/assets/navbar/navbar.js
@@ -1,40 +0,0 @@
-$(function () {
-
-});
-
-const _navbar = {
-    enableNotifications: true,
-
-    init: function () {
-    },
-
-    initNotification: function (options) {
-        const $navbarNotifications = $("#navbar-notifications");
-
-        $navbarNotifications.on("click", async function (e) {
-            const $this = $(this);
-            const $visibleIcon = $(this).find("i:visible");
-            const attivaNotifiche = $visibleIcon.hasClass("notificationOff");
-
-            const response = await _notifiche.modalNotifiche(attivaNotifiche, options);
-
-            if (response) {
-                $this.find(".notificationOff").toggleClass("hidden");
-                $this.find(".notificationOn").toggleClass("hidden");
-            }
-        });
-
-        if (options?.notificheAbilitate) {
-            $navbarNotifications.find(".notificationOff").toggleClass("hidden");
-            $navbarNotifications.find(".notificationOn").toggleClass("hidden");
-        } else if (options?.flagAttivaNotificheSilenziosamente) {
-            $navbarNotifications.trigger("click");
-        }
-
-        if (options?.flagAttivaNotificheSilenziosamente) {
-            $navbarNotifications.addClass("hidden");
-        } else {
-            $navbarNotifications.removeClass("hidden");
-        }
-    }
-}
--- a/public_html/assets/number-ticker/NumberTicker.ts
+++ b/public_html/assets/number-ticker/NumberTicker.ts
@@ -35,7 +35,7 @@ export class NumberTicker {
    private IsSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);


-    constructor(tickerEle: HTMLElement | null, options: Options = {}) {
+    constructor(tickerEle: HTMLElement | undefined, options: Options = {}) {
        this.Options = {
            ...{
                prefix: '',
--- a/public_html/assets/system.min.js
+++ b/public_html/assets/system.min.js
--- a/public_html/assets/system.min.js.map
+++ b/public_html/assets/system.min.js.map
--- a/public_html/associazione_articolo.php
+++ b/public_html/associazione_articolo.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/associazione_report.php
+++ b/public_html/associazione_report.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/autorizza_pagamenti.php
+++ b/public_html/autorizza_pagamenti.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/blacklist_linee_cliente.php
+++ b/public_html/blacklist_linee_cliente.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
--- a/public_html/blank.php
+++ b/public_html/blank.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 (new Ajax())->checkAjaxRequests();
--- a/public_html/budget_vendite.php
+++ b/public_html/budget_vendite.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
--- a/public_html/campagne_marketing.php
+++ b/public_html/campagne_marketing.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/catalogo.php
+++ b/public_html/catalogo.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/catalogo_moda.php
+++ b/public_html/catalogo_moda.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/check_doc_acquisti.php
+++ b/public_html/check_doc_acquisti.php
@@ -1,9 +1,10 @@
-<?
-session_start();
-include "functions.php";
+<?php
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
 <!--html manifest="manifest.appcache"-->
 <html>
 <head>
-    <? include pvm_tagHead; ?>
+    <?php include pvm_tagHead; ?>
 </head>
 <body>
-<? include pvm_headerNavbar; ?>
+<?php include pvm_headerNavbar; ?>
 <div id="content">
-    <div><?
+    <div><?php
        include pvm_navTab;
        if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
            include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
        } ?>
    </div>
 </div>
-<? include pvm_footerMinimal; ?>
+<?php include pvm_footerMinimal; ?>
 </body>
 </html>
--- a/public_html/chiusura_tagli_prezzo.php
+++ b/public_html/chiusura_tagli_prezzo.php
@@ -1,9 +1,10 @@
 <?php
-session_start();
-include "functions.php";
+include_once "session.php";
+$session = getSession();
+include_once "functions.php";
 require_once "include_login.php";
-include "config.php";
-include "include/module.php";
+include_once "config.php";
+include_once "include/module.php";

 include Controller::current_mainClasspath();
 (new ChiusuraTagliPrezzoAjax())->checkAjaxRequests();
--- a/public_html/classes/Ajax.php
+++ b/public_html/classes/Ajax.php
@@ -63,4 +63,4 @@ class Ajax {

        return is_null($methodData["methodName"]) ? null : $methodData;
    }
-}
+}
--- a/public_html/classes/Api/Allegati.php
+++ b/public_html/classes/Api/Allegati.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Api;
+
+use PdfDoc;
+
+class Allegati extends Api {
+    public static function downloadDtbDocPdf($data) {
+        $dataDoc = array_get($data, "dataDoc");
+        $serDoc = array_get($data, "serDoc");
+        $numDoc = array_get($data, "numDoc");
+        $codAnag = array_get($data, "codAnag");
+        $codDtip = array_get($data, "codDtip");
+        $versione = array_get($data, "versione");
+
+        if (array_any_null(array($dataDoc, $serDoc, $numDoc, $codAnag, $codDtip, $versione))) {
+            return \Ret::errorCode(\ErrorHandler::MISSING_PARAMS, __FUNCTION__);
+        }
+
+        return PdfDoc::cache(array(
+            "data_doc" => $dataDoc,
+            "ser_doc" => $serDoc,
+            "num_doc" => $numDoc,
+            "cod_anag" => $codAnag,
+            "cod_dtip" => $codDtip,
+            "versione" => $versione
+        ));
+    }
+}
--- a/public_html/classes/Api/Azienda.php
+++ b/public_html/classes/Api/Azienda.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Api;
+
+class Azienda extends Api {
+    protected static $group = "azienda";
+
+    public static function defaultAzienda() {
+        $imsApi = self::imsApi();
+
+        $imsApi->get("");
+
+        return $imsApi->send();
+    }
+}
--- a/public_html/classes/Api/Permission.php
+++ b/public_html/classes/Api/Permission.php
@@ -0,0 +1,185 @@
+<?php
+
+namespace Api;
+
+use Controller;
+use EntityItem;
+use EntityList;
+use ErrorHandler;
+use Query;
+use Ret;
+
+class Permission extends Api {
+    public static function getAvailablePermissions($data) {
+        $module = array_get($data, "module");
+
+        if (is_null($module)) {
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __METHOD__);
+        }
+
+        $mainClass = Controller::getMainClassName($module);
+
+        if (isset($mainClass) && method_exists($mainClass, "getAvailablePermissions")) {
+            $availablePermissions = $mainClass::getAvailablePermissions();
+
+            $userName = array_get($data, "userName");
+
+            if (isset($userName)) {
+                $ret = self::getPermissions(array("user_name" => $userName));
+
+                if ($ret->is_KO()) {
+                    return $ret;
+                }
+
+                $userPermissions = $ret->get_data();
+
+                if (count($userPermissions) > 0) {
+                    $availablePermissions = from($availablePermissions)
+                        ->where(function ($availablePermission) use ($module, $userPermissions) {
+                            return !from($userPermissions)->any(function ($userPermission) use ($module, $availablePermission) {
+                                return $userPermission["gestName"] == "PVM"
+                                       && $userPermission["dwName"] == $module
+                                       && $userPermission["dwColname"] == $availablePermission;
+                            });
+                        })
+                        ->toValues()
+                        ->toArray();
+                }
+            }
+
+            return Ret::data($availablePermissions);
+        }
+
+        return Ret::data(array());
+    }
+
+    public static function getPermissions($where = null) {
+        $query = new Query();
+
+        $query
+            ->select(
+                "CONCAT(user_name, '-', gest_name, '-', dw_name, '-', dw_colname) AS id",
+                "user_name",
+                "gest_name",
+                "dw_name",
+                "dw_colname",
+                "CAST(IIF(enabled = 'S', 1, 0) AS BIT) AS enabled",
+                "CAST(IIF(visible = 'S', 1, 0) AS BIT) AS visible",
+                "CAST(IIF(required = 'S', 1, 0) AS BIT) AS required"
+            )
+            ->from("stb_edit_limit")
+            ->where("gest_name", "PVM")
+            ->where($where)
+            ->orderBy("1");
+
+        return $query->toRet()->camelCaseColumnName()->cacheResult()->execute();
+    }
+
+    public static function updatePermission($data) {
+        $permissions = array_get($data, "permission.models");
+
+        if (is_null($permissions)) {
+            return Ret::error("Nessun dato da salvare.");
+        }
+
+        $entityList = new EntityList();
+
+        foreach ($permissions as $permission) {
+            /**
+             * @var EntityItem $stbUser
+             */
+            $stbUser = from($entityList->getEntityItems())
+                ->firstOrFallback(
+                    function () use ($permission, $entityList) {
+                        $stbUser = new EntityItem("stb_user");
+
+                        $stbUser
+                            ->no_op()
+                            ->set("userName", array_get($permission, "userName"));
+
+                        $entityList->push($stbUser);
+
+                        return $stbUser;
+                    },
+                    function ($stbUser) use ($permission) {
+                        /**
+                         * @var EntityItem $stbUser
+                         */
+                        return $stbUser->get_field("userName") == array_get($permission, "userName");
+                    }
+                );
+
+            $permission["type"] = "stb_edit_limit";
+            unset($permission["id"]);
+            unset($permission["userName"]);
+
+            $enabled = array_get($permission, "enabled");
+
+            $permission["enabled"] = is_null($enabled) ? null : ($enabled ? "S" : "N");
+
+            $visible = array_get($permission, "visible");
+
+            $permission["visible"] = is_null($visible) ? null : ($visible ? "S" : "N");
+
+            $required = array_get($permission, "required");
+
+            $permission["required"] = is_null($required) ? null : ($required ? "S" : "N");
+
+            $stbEditLimit = EntityItem::fromArray($permission)
+                ->insert_or_update();
+
+            $stbUser->set("stbEditLimit")->append($stbEditLimit);
+        }
+
+        return $entityList->send();
+    }
+
+    public static function destroyPermission($data) {
+        $permissions = array_get($data, "permission.models");
+
+        if (is_null($permissions)) {
+            return Ret::error("Nessun dato da cancellare.");
+        }
+
+        $entityList = new EntityList();
+
+        foreach ($permissions as $permission) {
+            /**
+             * @var EntityItem $stbUser
+             */
+            $stbUser = from($entityList->getEntityItems())
+                ->firstOrFallback(
+                    function () use ($permission, $entityList) {
+                        $stbUser = new EntityItem("stb_user");
+
+                        $stbUser
+                            ->no_op()
+                            ->set("userName", array_get($permission, "userName"));
+
+                        $entityList->push($stbUser);
+
+                        return $stbUser;
+                    },
+                    function ($stbUser) use ($permission) {
+                        /**
+                         * @var EntityItem $stbUser
+                         */
+                        return $stbUser->get_field("userName") == array_get($permission, "userName");
+                    }
+                );
+
+            $stbEditLimit = new EntityItem("stb_edit_limit");
+
+            $stbEditLimit
+                ->delete()
+                ->set("userName", array_get($permission, "userName"))
+                ->set("gestName", array_get($permission, "gestName"))
+                ->set("dwName", array_get($permission, "dwName"))
+                ->set("dwColname", array_get($permission, "dwColname"));
+
+            $stbUser->set("stbEditLimit")->append($stbEditLimit);
+        }
+
+        return $entityList->send();
+    }
+}
--- a/public_html/classes/Api/Production.php
+++ b/public_html/classes/Api/Production.php
@@ -5,11 +5,11 @@ namespace Api;
 class Production extends Api {
    protected static $group = "production";

-    public static function creaOrdineProd($data) {
+    public static function saveOrdineProd($data) {
        $imsApi = self::imsApi();

        $imsApi
-            ->post("creaOrdineProd")
+            ->post("saveOrdineProd")
            ->body(empty($data) ? null : $data);

        return $imsApi->send();
--- a/public_html/classes/Api/Pvm.php
+++ b/public_html/classes/Api/Pvm.php
@@ -8,13 +8,14 @@ use ErrorHandler;
 use GestSetup;
 use Query;
 use Ret;
+use User;

 class Pvm extends Api {
    public static function getColloByBarcode($data) {
        $barcode = array_get($data, "barcode");

        if (is_null($barcode)) {
-            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, "getColloByBarcode");
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
        }

        $imsApi = self::imsApi();
@@ -35,7 +36,7 @@ class Pvm extends Api {
        $maggPrzVend = array_get($data, "maggPrzVend", 0);

        if (array_any_null(array($codVlis, $codMart))) {
-            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, "calcPrzVend");
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
        }

        $query = new Query();
@@ -99,4 +100,87 @@ class Pvm extends Api {

        return $ret;
    }
-}
+
+    public static function getStbNote($data) {
+        $identifier = array_get($data, "identifier");
+
+        if (is_null($identifier)) {
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
+        }
+
+        $query = new Query();
+
+        $query
+            ->setSql("SELECT * FROM stb_note WHERE identifier = '[identifier]'")
+            ->setVar("identifier", $identifier);
+
+        return $query->firstRow()->toRet()->execute();
+    }
+
+    public static function saveStbNote($data) {
+        $identifier = array_get($data, "identifier");
+
+        if (is_null($identifier)) {
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
+        }
+
+        $id = array_get($data, "id");
+        $note = array_get($data, "note");
+
+        $entityItem = new EntityItem("stb_note");
+
+        if (is_null($id)) {
+            $entityItem->insert_or_update();
+        } else {
+            $entityItem
+                ->update()
+                ->set("id", $id);
+        }
+
+        $entityItem
+            ->set("identifier", $identifier)
+            ->set("note", $note);
+
+        return $entityItem->send();
+    }
+
+    public static function getListEmailCodAnag($data) {
+        $codAnag = array_get($data, "codAnag");
+
+        if (is_null($codAnag)) {
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
+        }
+
+        $query = new Query();
+
+        return $query
+            ->importSqlFile(__DIR__ . "/list-emailClieForn")
+            ->setVar("cod_anag", $codAnag)
+            ->setVar("userName", User::get_current_username())
+            ->cacheResult()
+            ->toRet()
+            ->date2ts()
+            ->execute();
+    }
+
+    public static function callExport($data) {
+        $type = array_get($data, "type");
+        $format = array_get($data, "format");
+
+        if (array_any_null(array($type, $format))) {
+            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, __FUNCTION__);
+        }
+
+        $imsApi = self::imsApi();
+
+        $imsApi
+            ->post("export")
+            ->queryParam("type", $type)
+            ->queryParam("format", $format)
+            ->queryParam("binaryDownload", array_get($data, "binaryDownload"))
+            ->queryParam("headless", array_get($data, "headless"))
+            ->body(array_get($data, "body"));
+
+        return $imsApi->send();
+    }
+}
--- a/public_html/classes/Api/StdUtils.php
+++ b/public_html/classes/Api/StdUtils.php
@@ -4,4 +4,4 @@ namespace Api;

 class StdUtils extends \StdUtils {

-}
+}
--- a/public_html/classes/Api/System.php
+++ b/public_html/classes/Api/System.php
@@ -1,17 +0,0 @@
-<?php
-
-namespace Api;
-
-class System extends Api {
-    protected static $group = "system";
-
-    public static function defaultAzienda() {
-        $imsApi = self::imsApi();
-
-        $imsApi
-            ->group(null)
-            ->get("defaultAzienda");
-
-        return $imsApi->send();
-    }
-}
--- a/public_html/classes/Api/WmsMagazzinoBuffer.php
+++ b/public_html/classes/Api/WmsMagazzinoBuffer.php
@@ -9,14 +9,18 @@ class WmsMagazzinoBuffer extends Api {
    protected static $group = "wms/magazzino-buffer";

    public static function getGroup($posizione) {
-        return sprintf("%s/%s", static::$group, $posizione);
+        return $posizione ? sprintf("%s/%s", static::$group, $posizione) : static::$group;
    }

-    public static function makeImsApi($data) {
-        $posizione = array_get($data, "inputMtbColt.posizione");
+    public static function makeImsApi($data, $addPosizione = true) {
+        $posizione = null;
+        if ($addPosizione) {

-        if (is_null($posizione)) {
-            return Ret::errorCode(ErrorHandler::MISSING_PARAMS, static::$group);
+            $posizione = array_get($data, "inputMtbColt.posizione");
+
+            if (is_null($posizione)) {
+                return Ret::errorCode(ErrorHandler::MISSING_PARAMS, static::$group);
+            }
        }

        return (new Ret())->set_data(static::imsApi()
@@ -70,4 +74,36 @@ class WmsMagazzinoBuffer extends Api {

        return $imsApi->send();
    }
+
+    public static function cancelVersamentoMateriale($data) {
+        $ret = static::makeImsApi($data);
+
+        if ($ret->is_KO()) {
+            return $ret;
+        }
+
+        $imsApi = $ret->get_data();
+
+        $imsApi
+            ->post("cancelVersamentoMateriale")
+            ->body(empty($data) ? null : $data);
+
+        return $imsApi->send();
+    }
+
+    public static function editVersamentoMateriale($data) {
+        $ret = static::makeImsApi($data, false);
+
+        if ($ret->is_KO()) {
+            return $ret;
+        }
+
+        $imsApi = $ret->get_data();
+
+        $imsApi
+            ->post("editVersamentoMateriale")
+            ->body(empty($data) ? null : $data);
+
+        return $imsApi->send();
+    }
 }
--- a/public_html/classes/Api/list-emailClieForn.sql
+++ b/public_html/classes/Api/list-emailClieForn.sql
@@ -0,0 +1,32 @@
+SELECT opt_group,
+       e_mail,
+       UPPER(full_name) AS full_name
+FROM (SELECT gtb_anag.e_mail,
+             'Sede Legale' AS full_name,
+             'Fornitore'   AS opt_group
+      FROM gtb_anag
+      WHERE gtb_anag.cod_anag = '[cod_anag]'
+      UNION ALL
+      SELECT vtb_clie_pers_rif.e_mail,
+             vtb_clie_pers_rif.persona_rif,
+             'Fornitore' AS opt_group
+      FROM gtb_anag
+               INNER JOIN vtb_clie_pers_rif ON gtb_anag.cod_anag = vtb_clie_pers_rif.cod_anag
+      WHERE gtb_anag.cod_anag = '[cod_anag]'
+      UNION ALL
+      SELECT vtb_dest.e_mail,
+             destinatario,
+             'Fornitore' AS opt_group
+      FROM gtb_anag
+               INNER JOIN vtb_dest ON gtb_anag.cod_anag = vtb_dest.cod_anag
+      WHERE gtb_anag.cod_anag = '[cod_anag]'
+      UNION ALL
+      SELECT e_mail,
+             full_name,
+             'Interno' AS opt_group
+      FROM stb_user
+      WHERE flag_attivo = 'S'
+        AND e_mail IS NOT NULL
+        AND user_name <> '[userName]') v
+WHERE dbo.f_isValidEmail(e_mail) = 1
+GROUP BY opt_group, e_mail, full_name
--- a/public_html/classes/Authorization.php
+++ b/public_html/classes/Authorization.php
@@ -0,0 +1,86 @@
+<?php
+
+class Authorization {
+    const VISIBLE = 1;
+    const EDITABLE = 2;
+    const ENABLED = 4;
+    const ALL = 7;
+    const REQUIRED = 8;
+
+    private $level = 0;
+
+    private $authorizationName;
+    private $section;
+
+    /**
+     * @param $section
+     * @param $authorizationName
+     */
+    public function __construct($section, $authorizationName, $level = 0) {
+        $this->section = $section;
+        $this->authorizationName = $authorizationName;
+        $this->level = $level;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+
+    /**
+     * @param int $level
+     */
+    public function setLevel($level) {
+        $this->level = $level;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAuthorizationName() {
+        return $this->authorizationName;
+    }
+
+    /**
+     * @param string $authorizationName
+     */
+    public function setAuthorizationName($authorizationName) {
+        $this->authorizationName = $authorizationName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSection() {
+        return $this->section;
+    }
+
+    /**
+     * @param string $section
+     */
+    public function setSection($section) {
+        $this->section = $section;
+    }
+
+    public function isEnabled() {
+        return ($this->level & self::ENABLED) == self::ENABLED;
+
+    }
+
+    public function isVisible() {
+        return ($this->level & self::VISIBLE) == self::VISIBLE;
+
+    }
+
+    public function isEditable() {
+        return ($this->level & self::EDITABLE) == self::EDITABLE;
+    }
+
+    public function isRequired() {
+        return ($this->level & self::REQUIRED) == self::REQUIRED;
+    }
+
+}
--- a/public_html/classes/Azienda.class.php
+++ b/public_html/classes/Azienda.class.php
@@ -3,11 +3,22 @@
 class Azienda {
    private static $datiAzienda = null;

-    private static function getDatiAzienda() {
+    public static function getDatiAzienda() {
        if (is_null(self::$datiAzienda)) {
            $query = new Query;
            $query
-                ->select("nome_ditta AS nome_azienda", "indirizzo", "cap", "citta", "prov", "e_mail", "part_iva", "num_tel", "tipo_azienda", "nazione")
+                ->select(
+                    "nome_ditta AS nome_azienda",
+                    "indirizzo",
+                    "cap",
+                    "citta",
+                    "prov",
+                    "e_mail",
+                    "part_iva",
+                    "num_tel",
+                    "tipo_azienda",
+                    "nazione"
+                )
                ->from("azienda");
            $ret = $query->firstRow()->anonymousAuth()->toRet()->execute();

@@ -137,4 +148,4 @@ class Azienda {
        }
        return $widgets;
    }
-}
+}
--- a/public_html/classes/BC.class.php
+++ b/public_html/classes/BC.class.php
@@ -1,5 +1,4 @@
 <?php // BootstrapComponents
-//include "BC.Alert.class.php";

 class BC {

@@ -54,6 +53,15 @@ class BC {
        }
        return "Portale WEB";
    }
-}

-//include "BC.Icon.class.php";
+    public static function get_shortTitleBarText() {
+        global $pageTitle;
+        $currentModuleTitle = PVM\CurrentModule::getShortTitle();
+        if (!is_null($currentModuleTitle)) {
+            return $currentModuleTitle;
+        } else if (isset($pageTitle)) {
+            return $pageTitle;
+        }
+        return "Portale WEB";
+    }
+}
--- a/public_html/classes/Config.class.php
+++ b/public_html/classes/Config.class.php
@@ -32,10 +32,12 @@ class Config {

    public static function loadComposerAutoload($profileDb) {
        if (isset($profileDb)) {
-            $composerJsonPath = "config_aziende" . DIRECTORY_SEPARATOR . strtoupper($profileDb) . DIRECTORY_SEPARATOR . "composer.json";
+            $composerJsonPath = "config_aziende" . DIRECTORY_SEPARATOR . strtoupper($profileDb) . DIRECTORY_SEPARATOR
+                                . "composer.json";

            if (file_exists($composerJsonPath)) {
-                return "config_aziende" . DIRECTORY_SEPARATOR . strtoupper($profileDb) . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR . "autoload.php";
+                return "config_aziende" . DIRECTORY_SEPARATOR . strtoupper($profileDb) . DIRECTORY_SEPARATOR . "vendor"
+                       . DIRECTORY_SEPARATOR . "autoload.php";
            }
        }

@@ -71,7 +73,7 @@ class Config {
    }

    private static function get_branchProperty($key, $profileDB = null) {
-        $branch = self::is_studioMLHost() ? "studioml" : "cliente";
+        $branch = self::is_studioMLHost() ? "integry" : "cliente";
        $branchConfig = self::get_property($branch, $profileDB);
        if (!is_null($branchConfig) && array_key_exists($key, $branchConfig)) {
            return $branchConfig[$key];
@@ -84,7 +86,13 @@ class Config {
    }

    public static function get_publicUrl($profileDB = null) {
-        return self::get_branchProperty("public_url", $profileDB);
+        $publicUrl = array_get($_ENV, "PUBLIC_URL");
+
+        if (is_null($publicUrl)) {
+            $publicUrl = self::get_branchProperty("public_url", $profileDB);
+        }
+
+        return $publicUrl;
    }

    public static function get_endPoint($profileDB = null) {
@@ -98,7 +106,8 @@ class Config {
            $endPoint = Controller::endPointParsed($endPoint);
        }

-        if (is_number(strpos($endPoint,"192.168.3.15:8080")) && is_number(strpos(ISSET($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:$_SERVER["PHP_SELF"],"/dev/pvm"))){
+        if (is_number(strpos($endPoint, "192.168.3.15:8080"))
+            && is_number(strpos(isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : $_SERVER["PHP_SELF"], "/dev/pvm"))) {
            $endPoint = "http://192.168.2.215:8080";
        }
        return $endPoint;
@@ -129,6 +138,6 @@ class Config {
    }

    private static function is_studioMLHost() {
-        return PVM::getAziendaHost() === "studioml";
+        return PVM::getAziendaHost() === "integry" || PVM::getAziendaHost() === "studioml";
    }
-}
+}
--- a/public_html/classes/Controller.class.php
+++ b/public_html/classes/Controller.class.php
@@ -9,7 +9,8 @@ class Controller {
    //public static $gestname = null;

    public static function current_url() {
-        return (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on" ? "https" : "http") . "://{$_SERVER["HTTP_HOST"]}{$_SERVER["REQUEST_URI"]}";
+        return (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on" ? "https" : "http")
+               . "://{$_SERVER["HTTP_HOST"]}{$_SERVER["REQUEST_URI"]}";
    }

    public static function current_module() { // è data dal nome della gestione .php
@@ -26,7 +27,8 @@ class Controller {
    }

    public static function module_gestpath($moduleName, $requiredExt = null) {
-        return ($requiredExt == "js" ? "dist" . DIRECTORY_SEPARATOR : "") . "gest-lib" . DIRECTORY_SEPARATOR . "{$moduleName}" . DIRECTORY_SEPARATOR;
+        return ($requiredExt == "js" ? "dist" . DIRECTORY_SEPARATOR : "") . "gest-lib" . DIRECTORY_SEPARATOR
+               . "{$moduleName}" . DIRECTORY_SEPARATOR;
    }

    public static function current_gestpath_resource($resource) {
@@ -34,7 +36,8 @@ class Controller {
    }

    public static function module_gestpath_resource($moduleName, $resource, $addRes = true) {
-        return ($resource == "js" || $resource == "ts" ? "dist" . DIRECTORY_SEPARATOR : "") . self::module_gestpath($moduleName) . ($addRes ? $resource . DIRECTORY_SEPARATOR : "");
+        return ($resource == "js" || $resource == "ts" ? "dist" . DIRECTORY_SEPARATOR : "")
+               . self::module_gestpath($moduleName) . ($addRes ? $resource . DIRECTORY_SEPARATOR : "");
    }

    // PATH SERVER-SIDE
@@ -43,7 +46,8 @@ class Controller {
    }

    public static function module_gestpath_classes($moduleName, $fileName = "") {
-        return self::$abs_root_project . DIRECTORY_SEPARATOR . self::module_gestpath_resource($moduleName, "classes") . $fileName;
+        return self::$abs_root_project . DIRECTORY_SEPARATOR . self::module_gestpath_resource($moduleName, "classes")
+               . $fileName;
    }

    // PATH SERVER-SIDE
@@ -52,16 +56,21 @@ class Controller {
        return self::module_gestpath_classes(self::current_module(), $fileName);
    }*/
    public static function module_gestpath_widgets($moduleName, $fileName = "", $resource = "widgets", $addRes = true) {
-        return self::$abs_root_project . DIRECTORY_SEPARATOR . self::module_gestpath_resource($moduleName, $resource, $addRes) . $fileName;
+        return self::$abs_root_project . DIRECTORY_SEPARATOR
+               . self::module_gestpath_resource($moduleName, $resource, $addRes) . $fileName;
    }

    // PATH SERVER-SIDE
-    public static function current_mainClasspath() {
-        return self::module_mainClasspath(self::current_module());
+    public static function current_mainClasspath($includeClass = true) {
+        return self::module_mainClasspath(self::current_module(), $includeClass);
    }

-    public static function module_mainClasspath($moduleName) {
-        $fileName = ucfirst(\Utility\Str::camelCaseEncode($moduleName)) . ".class.php";
+    public static function getMainClassName($moduleName) {
+        return $fileName = ucfirst(\Utility\Str::camelCaseEncode($moduleName));
+    }
+
+    public static function module_mainClasspath($moduleName, $includeClass = true) {
+        $fileName = self::getMainClassName($moduleName) . ($includeClass ? ".class.php" : ".php");
        return self::module_gestpath_classes($moduleName, $fileName);
    }

@@ -72,7 +81,8 @@ class Controller {

    /* here you can understand what module name use to reach your sql file */
    public static function module_gestpath_sql($moduleName, $fileName = "") {
-        return self::$abs_root_project . DIRECTORY_SEPARATOR . self::module_gestpath_resource($moduleName, "sql") . $fileName;
+        return self::$abs_root_project . DIRECTORY_SEPARATOR . self::module_gestpath_resource($moduleName, "sql")
+               . $fileName;
    }

    // PATH SERVER-SIDE
@@ -106,7 +116,8 @@ class Controller {

    // PATH CLIENT-SIDE
    public static function module_gestpath_js($moduleName, $fileName = "", $resource = "js") {
-        return str_replace(DIRECTORY_SEPARATOR, "/", self::module_gestpath_resource($moduleName, $resource)) . $fileName;
+        return str_replace(DIRECTORY_SEPARATOR, "/", self::module_gestpath_resource($moduleName, $resource))
+               . $fileName;
    }

    public static function module_gestpath_audio($moduleName, $fileName = "") {
@@ -208,7 +219,8 @@ class Controller {
        if (count($navTabs) > 0) {
            $idxAttivo = self::getIdxActiveNavTab();
            foreach ($navTabs as $i => $navTab) {
-                if (isset($navTab["usergroups"]) && !array_key_exists(User::get_current_group(), $navTab["usergroups"])) {
+                if (isset($navTab["usergroups"])
+                    && !array_key_exists(User::get_current_group(), $navTab["usergroups"])) {
                    continue;
                }

@@ -317,7 +329,7 @@ class Controller {
            if (isset($lib[$fileType])) {
                foreach ($lib[$fileType] as $file) {
 //                    if (file_exists($file) || Utility::validateUrl($file)) {
-                        $fileList[] = $file;
+                    $fileList[] = $file;
 //                    }
                }
            }
@@ -337,7 +349,8 @@ class Controller {
    }

    public static function is_ajaxRequest() {
-        return isset($_SERVER["HTTP_X_REQUESTED_WITH"]) && \Utility\Str::ciEquals($_SERVER["HTTP_X_REQUESTED_WITH"], "xmlhttprequest");
+        return isset($_SERVER["HTTP_X_REQUESTED_WITH"])
+               && \Utility\Str::ciEquals($_SERVER["HTTP_X_REQUESTED_WITH"], "xmlhttprequest");
    }

    public static function loginRedirect() {
@@ -364,4 +377,4 @@ class Controller {
        }
        return $files;
    }
-}
+}
--- a/public_html/classes/EntityItem.class.php
+++ b/public_html/classes/EntityItem.class.php
@@ -96,7 +96,9 @@ class EntityItem {
    }

    public static function is_entityItem($value) {
-        return !is_null($value) && gettype($value) == "object" && (get_class($value) == "EntityItem" || is_subclass_of($value, "EntityItem"));
+        return !is_null($value) && gettype($value) == "object"
+               && (get_class($value) == "EntityItem"
+                   || is_subclass_of($value, "EntityItem"));
    }

    public function count_entityChildren($key) {
@@ -161,16 +163,22 @@ class EntityItem {
            if ($value instanceof DateTime) {
                $type = Format::strtotimeYMDHMS;
                $value = $value->format($type);
-            } else if (\Utility\Date::isValidUnixtime($value, $numberOnly)) {
-                $value = strftime(Format::strftimeYMDHMS, $value);
            } else {
-                try {
-                    $dateTime = DateTime::createFromFormat(DateTime::ISO8601, $value);
+                if (\Utility\Date::isValidUnixtime($value, $numberOnly)) {
+                    $value = strftime(Format::strftimeYMDHMS, $value);
+                } else {
+                    try {
+                        $dateTime = DateTime::createFromFormat(DateTime::ISO8601, $value);

-                    if ($dateTime) {
-                        $value = $dateTime->format(Format::strtotimeYMDHMS);
+                        if (!$dateTime) {
+                            $dateTime = DateTime::createFromFormat("Y-m-d\TH:i:s", $value);
+                        }
+
+                        if ($dateTime) {
+                            $value = $dateTime->format(Format::strtotimeYMDHMS);
+                        }
+                    } catch (Exception $e) {
                    }
-                } catch (Exception $e) {
                }
            }
        }
@@ -186,9 +194,23 @@ class EntityItem {
                $value = strftime(Format::strftimeYMD, $value);
            } else {
                try {
-                    $dateTime = new DateTime($value);
+                    $dateTime = DateTime::createFromFormat(Format::strtotimeYMD, $value);

-                    $value = $dateTime->format(Format::strtotimeYMD);
+                    if (!$dateTime) {
+                        $dateTime = DateTime::createFromFormat(Format::strtotimeDMY, $value);
+                    }
+
+                    if (!$dateTime) {
+                        $dateTime = DateTime::createFromFormat(DateTime::ISO8601, $value);
+                    }
+
+                    if (!$dateTime) {
+                        $dateTime = DateTime::createFromFormat("Y-m-d\TH:i:s", $value);
+                    }
+
+                    if ($dateTime) {
+                        $value = $dateTime->format(Format::strtotimeYMD);
+                    }
                } catch (Exception $e) {
                }
            }
@@ -231,20 +253,25 @@ class EntityItem {
                        } else {
                            $value = $setNullConstant; // il valore da attribuire al NULL è passato nell'argument
                        }
-                    } else if (is_string($value)) {
-                        if ($key != "query" && $key != "whereCond") {
-                            $value = str_replace("''", "'", $value);
-                        }
+                    } else {
+                        if (is_string($value)) {
+                            if ($key != "query" && $key != "whereCond") {
+                                $value = str_replace("''", "'", $value);
+                            }
+                        } else {
+                            if (gettype($value) == "object" && get_class($value) == "EntityArray") {
+                                $childEntityArray = $this->get_childEntityArray($key);
+                                foreach ($value->get_children() as $EntityItem) {
+                                    $childEntityArray->append($EntityItem);
+                                }

-                    } else if (gettype($value) == "object" && get_class($value) == "EntityArray") {
-                        $childEntityArray = $this->get_childEntityArray($key);
-                        foreach ($value->get_children() as $EntityItem) {
-                            $childEntityArray->append($EntityItem);
+                                return $this;
+                            } else {
+                                if (\Query::is_typeQuery($value)) {
+                                    $value = $value->getSql();
+                                }
+                            }
                        }
-
-                        return $this;
-                    } else if (\Query::is_typeQuery($value)) {
-                        $value = $value->getSql();
                    }

                    $this->arr_fields[$key] = $value;
@@ -261,12 +288,14 @@ class EntityItem {
        if (self::is_entityItem($input)) {
            $this->detail("oldPk", $input);

-        } else if (is_array($input) && count($input) > 0) {
-            $OldPk = new \EntityItem;
-            foreach ($input as $key => $value) {
-                $OldPk->set($key, $value);
+        } else {
+            if (is_array($input) && count($input) > 0) {
+                $OldPk = new \EntityItem;
+                foreach ($input as $key => $value) {
+                    $OldPk->set($key, $value);
+                }
+                return $this->setOldPk($OldPk);
            }
-            return $this->setOldPk($OldPk);
        }

        return $this;
@@ -344,8 +373,10 @@ class EntityItem {
                if ($idx === false) {
                    return $results;

-                } else if (isset($results[$idx])) {
-                    return $results[$idx];
+                } else {
+                    if (isset($results[$idx])) {
+                        return $results[$idx];
+                    }
                }
            }
        }
@@ -366,7 +397,7 @@ class EntityItem {
        }

        foreach ($this->arr_fields as $key => $value) {
-            if (self::is_entityItem($value)) {
+            if (self::is_entityItem($value) || EntityList::is_entityList($value)) {
                $body[$key] = $value->get_body();
            } else {
                $body[$key] = $value;
@@ -505,11 +536,13 @@ class EntityItem {
        if (is_string($this->cacheFile)) {
            $filename = $this->cacheFile;

-        } else if (!is_null($this->type)) {
-            $filename = \Utility\Str::camelCaseEncode($this->type);
-
        } else {
-            $filename = "EntityItem";
+            if (!is_null($this->type)) {
+                $filename = \Utility\Str::camelCaseEncode($this->type);
+
+            } else {
+                $filename = "EntityItem";
+            }
        }

        @Cache::writeR($filename . "_" . date("Ymd-His") . ".json", $this->get_jsonBody(), "logs");
--- a/public_html/classes/EntityList.class.php
+++ b/public_html/classes/EntityList.class.php
@@ -1,6 +1,6 @@
 <?php

-class  EntityList {
+class  EntityList implements Countable {
    private $endPoint = null;
    private $profileDB = null;
    /**
--- a/public_html/classes/ErrorHandler.class.php
+++ b/public_html/classes/ErrorHandler.class.php
@@ -48,7 +48,7 @@ class ErrorHandler {

        } else if ($errorCode === self::EMSHTTP400) {
            return (!is_null($p1) ? "<span class='text-monospace'>Servizio <b>{$p1}</b></span><hr class='mt-0 mb-10'/>" : "")
-                . "La chiamata al servizio ha restituito l'errore http <u>400</u> (Bad Request)";
+                . "La chiamata al servizio ha restituito l'errore http <u>400</u> (Bad Request)" . (!is_null($p2) ? "<div class='mt-10 text-muted text-monospace small'>{$p2}</div>" : "");

        } else if ($errorCode === self::EMSHTTP550) {
            return "<span class='text-monospace'>Licenza <b>non valida</b></span>";
--- a/public_html/classes/Format.class.php
+++ b/public_html/classes/Format.class.php
@@ -1,6 +1,7 @@
 <?php

 class Format {
+    const XLSX = "XLSX";
    const EXCEL = "EXCEL";
    const BMP = "BMP";
    const JPEG = "JPEG";
--- a/public_html/classes/GestSetup.class.php
+++ b/public_html/classes/GestSetup.class.php
@@ -440,7 +440,4 @@ ON stb_gest_setup.query_default = stb_gest_setup_query.cod_query"
            ->set("keySection", $this->key_section);
        return $EntityItem->send();
    }
-}
-
-/*include "GestSetupWebUser.class.php";
-include "GestSetupDepo.class.php";*/
+}
--- a/public_html/classes/GestSetupList.class.php
+++ b/public_html/classes/GestSetupList.class.php
@@ -123,9 +123,4 @@ class GestSetupList {
        $value = $this->getSetup($keySection, $section, $gestName, $defaultValue);
        return @json_decode($value, true);;
    }
-
-
-}
-
-/*include "GestSetupWebUser.class.php";
-include "GestSetupDepo.class.php";*/
+}
--- a/public_html/classes/IMSApi.class.php
+++ b/public_html/classes/IMSApi.class.php
@@ -20,6 +20,7 @@ class IMSApi {
    private $downloadType = "inline";
    private $isDirectDownload = false;
    private $timeout = 0;
+    private $isDirect = false;

    public function __construct($serviceName = null) {
        $this->get()->asJson()->service($serviceName);
@@ -46,6 +47,22 @@ class IMSApi {
        return $this;
    }

+    /**
+     * @return bool
+     */
+    public function isDirect() {
+        return $this->isDirect;
+    }
+
+    /**
+     * @param bool $isDirect
+     * @return IMSApi
+     */
+    public function setIsDirect($isDirect) {
+        $this->isDirect = $isDirect;
+        return $this;
+    }
+
    public function endpoint($value) {
        $this->endpoint = $value;
        return $this;
@@ -105,7 +122,10 @@ class IMSApi {
    }

    public function queryParams($array) {
-        $this->queryParams = array_merge($this->queryParams, $array);
+        if (is_array($array)) {
+            $this->queryParams = array_merge($this->queryParams, $array);
+        }
+
        return $this;
    }

@@ -250,6 +270,7 @@ class IMSApi {
            ->setIsDownload($this->isDownload)
            ->setIsDirectDownload($this->isDirectDownload)
            ->setDownloadType($this->downloadType)
+            ->setIsDirect($this->isDirect)
            ->setProfileDb($this->profileDB)
            ->endPoint($this->endpoint)
            ->body($this->body());
@@ -333,15 +354,3 @@ class IMSApi {
        return $this;
    }
 }
-
-//include "IMSApi.ImportExport.class.php";
-//include "IMSApi.ImportAnagListini.class.php";
-//include "IMSApi.InfoComuni.class.php";
-//include "IMSApi.SearchComuni.class.php";
-//include "IMSApi.CheckPartitaIva.class.php";
-//include "IMSApi.SaveTerminalino.class.php";
-//include "IMSApi.ProcessSql.class.php";
-//include "IMSApi.ProcessStoredProcedure.class.php";
-//include "IMSApi.PrintFile.class.php";
-//include "IMSApi.SqlToExcel.class.php";
-//include "IMSApi.Response.class.php";
--- a/public_html/classes/IMSApi/Enum/TipoValore.php
+++ b/public_html/classes/IMSApi/Enum/TipoValore.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace IMSApi\Enum;
+
+use MyCLabs\Enum\Enum;
+
+/**
+ * @method static self TESTO()
+ * @method static self BOOLEAN()
+ * @method static self INTERO()
+ * @method static self DECIMALE()
+ * @method static self DATE()
+ * @method static self DATETIME()
+ * @method static self TIME()
+ */
+class TipoValore extends Enum {
+    const TESTO = 0;
+    const BOOLEAN = 1;
+    const INTERO = 2;
+    const DECIMALE = 3;
+    const DATE = 4;
+    const DATETIME = 5;
+    const TIME = 6;
+}
--- a/public_html/classes/IMSApi/Enum/TypeAttach.php
+++ b/public_html/classes/IMSApi/Enum/TypeAttach.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace IMSApi\Enum;
+
+use MyCLabs\Enum\Enum;
+
+/**
+ * @method static self NESSUNO()
+ * @method static self FATTURA_PASSIVA()
+ * @method static self SCHEDA_TECNICA()
+ * @method static self FIRMA()
+ */
+class TypeAttach extends Enum {
+    const NESSUNO = null;
+    const FATTURA_PASSIVA = "FP";
+    const SCHEDA_TECNICA = "ST";
+    const FIRMA = "FI";
+}
--- a/public_html/classes/IMSApi/ImportExport.class.php
+++ b/public_html/classes/IMSApi/ImportExport.class.php
@@ -83,8 +83,4 @@ class ImportExport extends \IMSApi {

        return $Ret;
    }
-}
-
-//include "IMSApi.Import.class.php";
-//include "IMSApi.Export.class.php";
-//include "IMSApi.ImportDoc.class.php";
+}
--- a/public_html/classes/JasperProcessor.class.php
+++ b/public_html/classes/JasperProcessor.class.php
@@ -36,6 +36,8 @@ class JasperProcessor {

    private $copies = 0;

+    private $toPrint = false;
+
    public function __construct() {
        $this->asPdf();
    }
@@ -57,10 +59,17 @@ class JasperProcessor {
        }

        if (!is_null($this->reportType)) {
-            $service = "processReportType";
-            $dto = $this->getReportRypeDTO();
+            $service = $this->isToPrint() ? "printReportType" : "processReportType";
+            $dto = $this->getReportTypeDTO();
        } else {
-            $service = $this->useFileHandler ? "downloadReport" : "processReport";
+            if ($this->useFileHandler) {
+                $service = "downloadReport";
+            } else if ($this->isToPrint()) {
+                $service = "processPrintReport";
+            } else {
+                $service = "processReport";
+            }
+
            $dto = $this->getJasperDTO();
        }

@@ -102,6 +111,10 @@ class JasperProcessor {
                    $overwrite = true;

                    switch ($this->_FORMATO_EXPORT) {
+                        case Format::XLSX:
+                        case Format::EXCEL:
+                            $ext = "xlsx";
+                            break;
                        case Format::BMP:
                            $ext = "bmp";
                            break;
@@ -137,7 +150,9 @@ class JasperProcessor {
                    $Ret->set_byte($content);
                }
            } else {
-                $Ret->set_errorCode(\ErrorHandler::NORESULT_REPORT)->set_WARN();
+                if ($service != "printReportType") {
+                    $Ret->set_errorCode(\ErrorHandler::NORESULT_REPORT)->set_WARN();
+                }
            }
        }
        $Ret->setExecutionTime($endTime - $startTime);
@@ -155,7 +170,9 @@ class JasperProcessor {

        $Ret = $this->is_loaded();
        if ($Ret->is_OK()) {
-            if (in_array($this->_FORMATO_EXPORT, array(Format::PDF, Format::PNG, Format::JPEG, Format::BMP))) {
+            if (in_array($this->_FORMATO_EXPORT, array(
+                Format::PDF, Format::PNG, Format::JPEG, Format::BMP, Format::XLSX
+            ))) {
                $Ret = $this->process();
            } else {
                $Ret->set_error("Formato export report non supportato (" . $this->_FORMATO_EXPORT . ")");
@@ -199,9 +216,13 @@ class JasperProcessor {
    }

    public function loadFromJtbDisegni($codProd, $codDisegno = null, $fileTypes = null) {
-        $fileTypes = !is_null($fileTypes) ? array($fileTypes) : array(\JtbDisegniFiles::REPORT_JASPER, \JtbDisegniFiles::SUBREPORT_JASPER);
+        $fileTypes = !is_null($fileTypes) ? array($fileTypes) : array(
+            \JtbDisegniFiles::REPORT_JASPER, \JtbDisegniFiles::SUBREPORT_JASPER
+        );
        $filters = array("cod_prod" => $codProd, "file_type" => $fileTypes);
-        if ($codDisegno) $filters["cod_disegno"] = $codDisegno;
+        if ($codDisegno) {
+            $filters["cod_disegno"] = $codDisegno;
+        }
        $Ret = \JtbDisegniFiles::get_items($filters);
        if ($Ret->is_OK()) {
            $arr_files = $Ret->get_data();
@@ -223,7 +244,10 @@ class JasperProcessor {
                    return $x["file_type"] === \JtbDisegniFiles::SUBREPORT_JASPER;
                })->toArray());
                foreach ($arr_subreportItem as $subreportItem) {
-                    $Report->appendSubreport(array("jasper_filename" => $subreportItem["file_name"], "b64_jasper" => $subreportItem["content"], "id" => $subreportItem["id"]));
+                    $Report->appendSubreport(array(
+                        "jasper_filename" => $subreportItem["file_name"], "b64_jasper" => $subreportItem["content"],
+                        "id" => $subreportItem["id"]
+                    ));
                }

                $Ret = $this->load($Report);
@@ -287,6 +311,10 @@ class JasperProcessor {
                                    case Parameter::TYPE_TEXT_LIKE:
                                        $this->param($param->name, base64_decode($param->expression));
                                        break;
+                                    case Parameter::TYPE_COLLECTION_STRING:
+                                    case Parameter::TYPE_COLLECTION_NUMBER:
+                                        $this->param($param->name, base64_decode($param->expression));
+                                        break;
                                    case Parameter::TYPE_TEXT:
                                    case Parameter::TYPE_WHERE:
                                        $this->param($param->name, base64_decode($param->expression));
@@ -363,7 +391,8 @@ class JasperProcessor {
    }

    public function setJsonSource($v) {
-        if ((is_array($v) || is_object($v)) && !is_string($v)) { // è possibile fornire anche una struttura, la conversione in json string avviene in atuomatico
+        if ((is_array($v) || is_object($v))
+            && !is_string($v)) { // è possibile fornire anche una struttura, la conversione in json string avviene in atuomatico
            $v = json_encode($v);
        }
        $this->_JSON_SOURCE = $v;
@@ -381,8 +410,13 @@ class JasperProcessor {

    public function param($key, $value, $type = null) { // append parametro singolo
        if (!is_null($type)) {
-            if ($type == Format::strftimeYMD || $type == Format::strftimeYMDHMS || $type == Format::strftimeSlashedYMD) {
-                if (Date::isValidUnixtime($value)) {
+            if ($type == Format::strftimeYMD || $type == Format::strftimeYMDHMS || $type == Format::strftimeSlashedYMD
+                || $type == Format::strtotimeYMD
+                || $type == Format::strtotimeYMDHMS
+                || $type == DateTime::ISO8601) {
+                if ($value instanceof DateTime) {
+                    $value = $value->format($type);
+                } else if (Date::isValidUnixtime($value)) {
                    $value = strftime($type, $value);
                } else {
                    try {
@@ -438,7 +472,8 @@ class JasperProcessor {
    }

    public function where($fieldname = null, $value = false, $type = null) { // si puo settare in onetime o in append
-        $this->_WHERE_COND = blankIfNull($this->_WHERE_COND) . Query::process_whereParameters($fieldname, $value, $type) . " AND ";
+        $this->_WHERE_COND = blankIfNull($this->_WHERE_COND) . Query::process_whereParameters($fieldname, $value, $type)
+                             . " AND ";
        return $this;
    }

@@ -486,14 +521,16 @@ class JasperProcessor {

        foreach ($this->_PARAMS as $item) {
            $Param = new EntityItem;
-            $Param->set("name", $item["name"])->set("value", $item["value"]);
+            $value = ($item["value"] === Format::IMS_NULL_STRING
+                      || $item["value"] === Format::IMS_NULL_ANY) ? null : $item["value"];
+            $Param->set("name", $item["name"])->set("value", $value);
            $JasperDTO->set("params")->append($Param);
        }

        return $JasperDTO;
    }

-    private function getReportRypeDTO() {
+    private function getReportTypeDTO() {
        $reportRypeDTO = new EntityItem;
        $reportRypeDTO
            ->set("reportType", $this->reportType->getValue())
@@ -553,6 +590,7 @@ class JasperProcessor {
     */
    public function setCodMdep($codMdep) {
        $this->codMdep = $codMdep;
+        return $this;
    }

    private function getTypeExport() {
@@ -575,4 +613,13 @@ class JasperProcessor {
        $this->copies = $copies;
        return $this;
    }
-}
+
+    public function isToPrint() {
+        return $this->toPrint;
+    }
+
+    public function setToPrint($toPrint) {
+        $this->toPrint = $toPrint;
+        return $this;
+    }
+}
--- a/public_html/classes/KendoQuery.php
+++ b/public_html/classes/KendoQuery.php
@@ -0,0 +1,122 @@
+<?php
+
+class KendoQuery extends Query {
+    private $sqlCount = "SELECT COUNT(*) AS rows_count FROM TempResult";
+    private $sqlOffset = "OFFSET ([pageNum] - 1) * [pageSize] ROWS FETCH NEXT [pageSize] ROWS ONLY";
+    private $sqlSelectResult = "SELECT * FROM TempResult";
+    private $sqlSelectCount = "SELECT * FROM TempCount";
+    private $sqlSelectAll = "SELECT TempCount.*, TempResult.* FROM TempResult, TempCount";
+    private $sqlOrderBy = "[orderBy]";
+    private $pageNum = 1;
+    private $pageSize = 20;
+
+    public function execute() {
+
+        $this->setVar("sqlCount", $this->sqlCount)
+            ->setVar("offset", $this->sqlOffset)
+            ->setVar("orderBy", $this->sqlOrderBy)
+            ->setVar("finalSelect", $this->sqlSelectAll)
+            ->setVar("pageSize", $this->pageSize)
+            ->setVar("pageNum", $this->pageNum);
+        return parent::execute();
+    }
+
+
+    public function executePaginatedQuery() {
+        $queryResult = new Query($this->sql);
+        $queryResult->setVar("sqlCount", $this->sqlCount)
+            ->setVar("offset", $this->sqlOffset)
+            ->setVar("orderBy", $this->sqlOrderBy)
+            ->setVar("finalSelect", $this->sqlSelectResult)
+            ->date2iso()
+            ->toRet();
+        $queryCount = new Query($this->sql);
+        $queryCount
+            ->setVar("sqlCount", $this->sqlCount)
+            ->setVar("offset", "")
+            ->setVar("orderBy", "1")
+            ->setVar("finalSelect", $this->sqlSelectCount)
+            ->toRet()
+            ->date2iso();
+
+        $resultRet = $queryResult->execute();
+        if ($resultRet->is_KO())
+            return $resultRet;
+
+        $countRet = $queryCount->firstRow()->execute();
+        if ($countRet->is_KO())
+            return $countRet;
+
+        return new Ret(array(
+            "data" => $resultRet->get_data(),
+            "count" => $countRet->get_data(),
+            "total" => array_get($countRet->get_data(), "rows_count", 0)
+        ));
+    }
+
+
+    public function getSqlCount() {
+        return $this->sqlCount;
+    }
+
+    public function setSqlCount($sqlCount) {
+        $this->sqlCount = $sqlCount;
+    }
+
+    public function getSqlOffset() {
+        return $this->sqlOffset;
+    }
+
+    public function setSqlOffset($sqlOffset) {
+        $this->sqlOffset = $sqlOffset;
+    }
+
+    public function getSqlSelectResult() {
+        return $this->sqlSelectResult;
+    }
+
+    public function setSqlSelectResult($sqlSelectResult) {
+        $this->sqlSelectResult = $sqlSelectResult;
+    }
+
+    public function getSqlSelectCount() {
+        return $this->sqlSelectCount;
+    }
+
+    public function setSqlSelectCount($sqlSelectCount) {
+        $this->sqlSelectCount = $sqlSelectCount;
+    }
+
+    public function getSqlSelectAll() {
+        return $this->sqlSelectAll;
+    }
+
+    public function setSqlSelectAll($sqlSelectAll) {
+        $this->sqlSelectAll = $sqlSelectAll;
+    }
+
+    public function getSqlOrderBy() {
+        return $this->sqlOrderBy;
+    }
+
+    public function setSqlOrderBy($sqlOrderBy) {
+        $this->sqlOrderBy = $sqlOrderBy;
+    }
+
+    public function getPageNum() {
+        return $this->pageNum;
+    }
+
+    public function setPageNum($pageNum) {
+        $this->pageNum = $pageNum;
+    }
+
+    public function getPageSize() {
+        return $this->pageSize;
+    }
+
+    public function setPageSize($pageSize) {
+        $this->pageSize = $pageSize;
+    }
+
+}
--- a/public_html/classes/KendoService.class.php
+++ b/public_html/classes/KendoService.class.php
@@ -1,55 +1,67 @@
 <?php

 class KendoService {
-    public static function queryInitializerService($data, $sqlFile, $defaultOrderField, $sqlIsString = false, $useTemplate = true) {
+    public static function queryInitializerService($data, $sqlFile, $defaultOrderField, $sqlIsString = false, $useTemplate = true, $customCountQuery = null) {
        $pageSize = array_get($data, "pageSize");
        $page = array_get($data, "page");

-        $query = new Query();
+        $query = new KendoQuery();
+

 //        if (isset($pageSize) && isset($page)) {
-            if ($useTemplate) {
-                $query
-                    ->module("index");
-
-                if (isset($pageSize) && isset($page)) {
-                    $query->importSqlFile("kendo-query-template");
-                } else {
-                    $query->importSqlFile("kendo-query-template-np");
-                }
-            }
-
-            if ($sqlIsString) {
-                if ($useTemplate && !\Utility\Str::contains($sqlFile, "WITH")) {
-                    $query
-                        ->setVar("sql", $sqlFile);
-                } else {
-                    $query->setSql($sqlFile);
-                }
-            } else {
-                $query2 = new Query();
-
-                $query2
-                    ->importSqlFile($sqlFile);
-
-                if ($useTemplate && !\Utility\Str::contains($sqlFile, "WITH")) {
-                    $query
-                        ->setVar("sql", $query2->getSql());
-                } else {
-                    $query = $query2;
-                }
-            }
-
-            $orderBy = $defaultOrderField;
-
-            if (isset($data["sort"]) && count($data["sort"]) > 0) {
-                $orderBy = KendoService::sort($data["sort"]);
-            }
-
+        if ($useTemplate) {
            $query
-                ->setVar("orderBy", $orderBy)
-                ->setVar("pageSize", $pageSize)
-                ->setVar("pageNum", $page);
+                ->module("index");
+
+            if (isset($pageSize) && isset($page)) {
+                $query->importSqlFile("kendo-query-template");
+            } else {
+                $query->importSqlFile("kendo-query-template-np");
+            }
+        }
+
+        if ($sqlIsString) {
+            if ($useTemplate && !\Utility\Str::contains($sqlFile, "WITH")) {
+                $query
+                    ->setVar("sql", $sqlFile);
+            } else {
+                $query->setSql($sqlFile);
+            }
+        } else {
+            $query2 = new KendoQuery();
+
+            $query2
+                ->importSqlFile($sqlFile);
+
+            if ($useTemplate && !\Utility\Str::contains($sqlFile, "WITH")) {
+                $query
+                    ->setVar("sql", $query2->getSql());
+            } else {
+                $query = $query2;
+            }
+        }
+        if ($customCountQuery) {
+            $query->setSqlCount($customCountQuery);
+        }
+
+        $query->setPageSize($pageSize);
+        $query->setPageNum($page);
+
+        $orderBy = $defaultOrderField;
+
+        if (isset($data["sort"]) && count($data["sort"]) > 0) {
+            $orderBy = KendoService::sort($data["sort"]);
+        }
+
+        $queryOrderBy = new Query($query->getSqlOrderBy());
+        $queryOrderBy
+            ->setVar("orderBy", $orderBy ?: "1");
+        $query->setSqlOrderBy($queryOrderBy->getSql());
+
+        $queryOffset = new Query($query->getSqlOffset());
+        $queryOffset->setVar("pageSize", $pageSize)
+            ->setVar("pageNum", $page);
+        $query->setSqlOffset($queryOffset->getSql());
 //        } else {
 //            if ($sqlIsString) {
 //                $query->setSql($sqlFile);
@@ -344,7 +356,9 @@ class KendoService {
                $colonna = array();
                if (!is_null($value)) {
                    switch ($value) {
-                        case in_array($value, array("int", "bigint", "smallint", "tinyint", "real", "decimal", "float", "numeric")):
+                        case in_array($value, array(
+                            "int", "bigint", "smallint", "tinyint", "real", "decimal", "float", "numeric"
+                        )):
                            $type = "number";
                            break;
                        case in_array($value, array("date", "datetime")):
@@ -370,4 +384,4 @@ class KendoService {
        }
        return $Ret;
    }
-}
+}
--- a/public_html/classes/Modulo.class.php
+++ b/public_html/classes/Modulo.class.php
@@ -3,6 +3,7 @@
 class Modulo {
    private $id = null; // camel case decoded
    private $title = null;
+    private $shortTitle = null;
    private $pages = null;
    private $position = null;
    private $libs = null;
@@ -45,6 +46,7 @@ class Modulo {

                $this->id = $id;
                $this->title = self::getObjectValue($infoModulo, "title");
+                $this->shortTitle = self::getObjectValue($infoModulo, "shortTitle", $this->title);
                $this->pages = self::getObjectValue($infoModulo, "pages");
                $this->position = self::getObjectValue($infoModulo, "position");
                $this->libs = self::getObjectValue($infoModulo, "libs");
@@ -86,6 +88,20 @@ class Modulo {
        return $this->group;
    }

+    /**
+     * @return string|null
+     */
+    public function getShortTitle() {
+        return $this->shortTitle;
+    }
+
+    /**
+     * @param string|null $shortTitle
+     */
+    public function setShortTitle($shortTitle) {
+        $this->shortTitle = $shortTitle;
+    }
+
    public function getPosition() {
        if (!is_null($this->getOptionAzienda("position"))) {
            $positions = $this->position;
@@ -234,7 +250,10 @@ class Modulo {
            $idModuloCC = $this->getIdCamelCaseEncoded();

            if (!class_exists($idModuloCC)) {
-                include \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.class.php");
+                if (file_exists(\Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.php")))
+                    include_once \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.php");
+                else
+                    include_once \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.class.php");
            }

            if (class_exists($idModuloCC)) {
@@ -264,6 +283,6 @@ class Modulo {
 /*
 namespace Modulo{
    class OptionsAzienda{
-    
+
    }
 }*/
--- a/public_html/classes/MtbAartLink.class.php
+++ b/public_html/classes/MtbAartLink.class.php
@@ -1,5 +1,7 @@
 <?php

+use Allegati\SourceType;
+
 class MtbAartLink {

    public static function get_items($codMart, $idRiga = null) {
@@ -17,6 +19,7 @@ class MtbAartLink {
            foreach ($arr_rows as $i => $row) {
                $pathLink = $row["path_link"];
                $icon = Utility\File::getFaIcoFromName($pathLink);
+                $arr_rows[$i]["source_type"] = SourceType::ARTICOLO;
                $arr_rows[$i]["file_name"] = $pathLink;
                $arr_rows[$i]["size"] = $arr_rows[$i]["file_size"];
                $arr_rows[$i]["mime_type"] = Utility\File::getMimeTypeFromName($pathLink);
@@ -55,7 +58,7 @@ class MtbAartLink {
            $query->addSelect("descrizione_link");
        }

-        $query->from("mtb_aart_link")->where("cod_mart", $codMart);
+        $query->from("mtb_aart_link")->where("cod_mart", $codMart)->where("b64_content is not null");

        if ($idRiga) {
            $query->where("id_riga", $idRiga);
--- a/public_html/classes/PVM.class.php
+++ b/public_html/classes/PVM.class.php
@@ -14,7 +14,7 @@ class PVM {
    }

    public static function isDebugEnv() {
-        return self::getAziendaHost() === "studioml";
+        return self::getAziendaHost() === "integry";
    }

    public static function isDevMode() {
@@ -63,19 +63,19 @@ class PVM {
        $nomeAzienda = array_get($_ENV, "AZIENDA");

        if (isset($nomeAzienda)) {
-            return $nomeAzienda;
+            return strtolower($nomeAzienda);
        }

        $nomeAzienda = self::rootFileExists("nome_azienda.txt");
        if ($nomeAzienda !== false) {
            $azienda = nullIfBlank(file_get_contents($nomeAzienda));
-            return is_null($azienda) ? "studioml" : strtolower($azienda);
+            return is_null($azienda) ? "integry" : strtolower($azienda);
        }
        return null;
    }

    public static function isDevClient() {
-        return array_key_exists("APP_ENV", $_ENV) ? $_ENV["APP_ENV"] == "DEV" : self::rootFileExists("Gruntfile.js") !== false;
+        return array_key_exists("NODE_ENV", $_ENV) ? $_ENV["NODE_ENV"] == "development" : self::rootFileExists("Gruntfile.js") !== false;
    }

    private static function rootFileExists($filename, $upTo = 5) {
@@ -425,10 +425,4 @@ class PVM {
        asort($arr_ret);
        return $arr_ret;
    }
-}
-
-//include "PVM.CurrentModule.class.php";
-//include "PVM.Mailer.class.php";
-//include "PVM.ModuloUtils.class.php";
-//include "PVM.Ajax.class.php";
-//include "PVM.Tips.class.php";
+}
--- a/public_html/classes/PVM/Ajax.class.php
+++ b/public_html/classes/PVM/Ajax.class.php
@@ -175,7 +175,7 @@ class Ajax {
    }

    public static function stayinAlive() {
-        @session_start();
+        getSession();
        $Ret = new \Ret;
        return $Ret->set_string("stayin' alive, stayin' alive");
    }
@@ -230,7 +230,12 @@ class Ajax {
        }
        $moduleName = $data["module_name"];
        $moduleNameCc = ucfirst(\Utility\Str::camelCaseEncode($moduleName));
-        include \Controller::module_gestpath_classes($moduleName, "{$moduleNameCc}.class.php");
+        if (!class_exists($moduleNameCc)) {
+            if (file_exists(\Controller::module_gestpath_classes($moduleName, "{$moduleNameCc}.php")))
+                include_once \Controller::module_gestpath_classes($moduleName, "{$moduleNameCc}.php");
+            else
+                include_once \Controller::module_gestpath_classes($moduleName, "{$moduleNameCc}.class.php");
+        }
        $templateId = isset($data["template_id"]) ? $data["template_id"] : null;
        $retData = array();
        $gestPathHtml = \Controller::module_gestpath_resource($moduleName, "html");
@@ -325,7 +330,12 @@ class Ajax {
        $idModulo = $data["module_name"];
        $idModuloCC = ucfirst(\Utility\Str::camelCaseEncode($idModulo));
        $methodName = "_moduleDatasource";
-        include \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.class.php");
+        if (!class_exists($idModuloCC, false)) {
+            if (file_exists(\Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.php")))
+                include \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.php");
+            else
+                include \Controller::module_gestpath_classes($idModulo, "{$idModuloCC}.class.php");
+        }
        if (class_exists($idModuloCC)) {
            if (isset($data["profileDB"])) {
                $GLOBALS["profileDB"] = $data["profileDB"];
@@ -340,6 +350,22 @@ class Ajax {
        return $Ret;
    }

+    public static function get_moduleAuthorizations($data) {
+        $idModulo = $data["module_name"];
+
+        if (!isset($_SESSION["username"])) {
+            return \Ret::data(array());
+        }
+
+        $ems = new \IMSApi();
+        if (isset($data["profileDB"])) {
+            $ems->profileDB($data["profileDB"]);
+        }
+        return $ems
+            ->post("pvm/gestione/$idModulo/permessi")
+            ->send();
+    }
+
    public static function get_forecast($data) {
        $dayFrom = \Utility\Date::startOfDay($data["day_from"]);
        $dayTo = isset($data["day_to"]) ? \Utility\Date::startOfDay($data["day_to"]) : $dayFrom;
@@ -523,4 +549,6 @@ class Ajax {
        }
        return $Ret;
    }
+
+
 }
--- a/public_html/classes/PVM/CurrentModule.class.php
+++ b/public_html/classes/PVM/CurrentModule.class.php
@@ -2,7 +2,6 @@

 namespace PVM;

-use PVM\ModuloUtils;
 use Modulo;

 class CurrentModule {
@@ -43,4 +42,9 @@ class CurrentModule {
        $Modulo = self::getModulo();
        return !is_null($Modulo) ? $Modulo->getTitle() : null;
    }
+
+    public static function getShortTitle() {
+        $Modulo = self::getModulo();
+        return !is_null($Modulo) ? $Modulo->getShortTitle() : null;
+    }
 }
--- a/public_html/classes/PVM/Mailer.class.php
+++ b/public_html/classes/PVM/Mailer.class.php
@@ -198,7 +198,7 @@ class Mailer {
                if (is_null($emailItem[1])) {
                    $emails .= $emailItem[0] . ";";
                } else {
-                    $emails .= $emailItem[1] . " <" . $emailItem[0] . ">;";
+                    $emails .= str_replace(",", " ", $emailItem[1]) . " <" . $emailItem[0] . ">;";
                }
            } else {
                return $Ret->set_error("Indirizzo email non valido: " . $emailItem[0]);
@@ -327,4 +327,4 @@ class Mailer {
        $this->_sendDev = $sendDev;
        return $this;
    }
-}
+}
--- a/public_html/classes/Pagination.class.php
+++ b/public_html/classes/Pagination.class.php
@@ -219,7 +219,7 @@ class Pagination {
            ob_start();
            ?>
            <div>
-            <ul class="pagination pagination-<?= $this->size ?>"><?
+            <ul class="pagination pagination-<?= $this->size ?>"><?php
                if ($this->flagBtPrev) {
                    ?>
                    <li>
@@ -227,14 +227,14 @@ class Pagination {
                       aria-label="Precedente">
                        <span aria-hidden="true">&laquo;</span>
                    </a>
-                    </li><?
+                    </li><?php
                }

                $arr_pagesList = $this->getListNumPage();
                foreach ($arr_pagesList as $c => $number) {
                    if ($arr_pagesList[(($c == 0) ? 0 : $c - 1)] + 1 != $number && $c > 0) {
                        ?>
-                        <li class="disabled"><a href="#">...</a></li><?
+                        <li class="disabled"><a href="#">...</a></li><?php
                    }
                    if (!$this->isCurrentPage($number)) {
                        ?>
@@ -242,9 +242,9 @@ class Pagination {
                        <a href="<?= "{$_SERVER["PHP_SELF"]}?{$queryUri}&pag={$number}" ?>">
                            <?= number_format($number, 0, ".", "'") ?>
                        </a>
-                        </li><?
+                        </li><?php
                    } else { // corrente ?>
-                        <li class="active"><a href="#"><?= number_format($number, 0, ".", "'") ?></a></li><?
+                        <li class="active"><a href="#"><?= number_format($number, 0, ".", "'") ?></a></li><?php
                    }
                }

@@ -255,10 +255,10 @@ class Pagination {
                       aria-label="Successiva">
                        <span aria-hidden="true">&raquo;</span>
                    </a>
-                    </li><?
+                    </li><?php
                } ?>
            </ul>
-            </div><?
+            </div><?php

            $html = Utility\Str::remove_multiple_spaces(@ob_get_clean());
            echo $html;
--- a/public_html/classes/Query.class.php
+++ b/public_html/classes/Query.class.php
@@ -86,7 +86,7 @@ class Query {
    }

    public static function getDefaultDriver() {
-        return "mssql";
+        return null;
    }

    private function getDriver() {
@@ -95,10 +95,10 @@ class Query {
        if (!is_null($dbConfig)) {
            if (in_array($dbConfig["driver"], self::getAvailableDrivers())) {
                $driver = $dbConfig["driver"];
-
-            } else {
-                @Utility::send_debugMessage("missingDbDriver", $dbConfig, true, 24 * 60 * 60, true);
            }
+//            else {
+//                @Utility::send_debugMessage("missingDbDriver", $dbConfig, true, 24 * 60 * 60, true);
+//            }
        }
        return $driver;
    }
@@ -111,7 +111,7 @@ class Query {
    private function errorText($message){
        $this->errorText = "<b>Errore in Query.class</b>: ".$message;
    }
-    
+
    private function sqlStringNotNull(){
        if(is_null($this->sql)){
            $this->errorText("Valore SQL nullo o non valido");
@@ -185,17 +185,17 @@ class Query {
                }

                if (!is_null($this->groupBy)) {
-                    $this->sql .= " GROUP BY " . $this->groupBy;
+                    $this->sql .= "\nGROUP BY " . $this->groupBy;
                }

                if (!is_null($this->orderBy)) {
-                    $this->sql .= " ORDER BY " . $this->orderBy;
+                    $this->sql .= "\nORDER BY " . $this->orderBy;
                    $this->orderBy = null;
                }
            }
            /*
            if(!is_null($this->top)){
-                
+
            }*/
        }
        return $this->sql;
@@ -415,7 +415,7 @@ class Query {
    public function from($value) {/*
        if(self::is_selectSql($value)){
            $this->sql .= " FROM (".$value.") v1";
-            
+
        } else*/
        if (!is_null($this->sql)) { // NOME DELLA TABELLA
            $this->sql .= " FROM " . $value;
@@ -455,7 +455,7 @@ class Query {

    /*
    public function setDate($field, $value){
-        
+
    }*/

    public function set($field, $value) {// WARN va insieme a update()
@@ -519,12 +519,12 @@ class Query {
                } else {/*
                    if($type==\Format::strftimeYMD){
                        $value = strftime(\Format::strftimeYMD, $value);
-                        
+
                    } else if($type==\Format::strftimeYMDHMS){
                        $value = strftime(\Format::strftimeYMDHMS, $value);
-                        
+
                    } else if(!is_null($type) && $type==\Format::latLng1){
-            
+
                    }*/

                    $whereCond = " {$fieldname} = " . self::sqlValue($value, $type);
@@ -726,6 +726,20 @@ class Query {
                }
 //            } else if (!is_null($type) && !is_null($value) && $type == \Format::latLng1) {
            } else if (is_array($value)) {
+                if (\Report\Parameter::isCollection($type)) {
+                    if ($type === \Report\Parameter::TYPE_COLLECTION_STRING) {
+                        $value = array_map(function ($val) {
+                            return "'" . $val . "'";
+                        }, $value);
+                    }
+                    if (empty($value))
+                        $value = array("NULL");
+                    $inValue = implode(',', $value);
+                    $re = '/[$](?:(?:X)|(?:x)){[ ]*(?:(?:IN)|(?:in))[ ]*,[ ]*([^ ,]*)[ ]*,[ ]*' . $key . '[ ]*}/m';
+
+                    $this->sql = preg_replace($re, "$1 in (" . $inValue . ")", $this->sql);
+                }
+
                $value = implode("','", $value);
            } else if (is_bool($value)) {
                $value = $value ? "1" : "0";
@@ -733,10 +747,12 @@ class Query {

            $arr_pattern = array(
                "[{$key}]",// TRADIZIONALE
-                "\$p{{$key}}" // IREPORT /*'$p{'.$fieldname.'}'*/
+                "\$p{{$key}}", // IREPORT /*'$p{'.$fieldname.'}'*/
            );

+
            foreach ($arr_pattern as $i => $pattern) {
+
                if (stripos($this->sql, $pattern) !== false) {
                    if ($i == 0) { // TRADIZIONALE
                        //$value = str_replace("'", "''", $value);
@@ -1234,8 +1250,4 @@ class Query {
        $this->anonymousAuth = $value !== false;
        return $this;
    }
-}
-
-//include "Mssql.class.php";
-//include "Sqlsrv.class.php";
-//include "PDO.Sqlsrv.class.php";
+}
--- a/Show More
+++ b/Show More