mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 08:45:12 +02:00
Merge branch '1233-Macros-_date_-y-_time_-en-consola-visual' into 'develop'
Add _data_ _time_ macros for visual console - #1233 See merge request !749
This commit is contained in:
commit
fb88f44cff
@ -2645,6 +2645,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
|
|||||||
'proportion_width' => $proportion_width);
|
'proportion_width' => $proportion_width);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$layout_data['label'] = visual_map_macro($layout_data['label']);
|
||||||
|
|
||||||
switch ($layout_data['type']) {
|
switch ($layout_data['type']) {
|
||||||
case LINE_ITEM:
|
case LINE_ITEM:
|
||||||
visual_map_print_user_lines($layout_data, $proportion);
|
visual_map_print_user_lines($layout_data, $proportion);
|
||||||
@ -3008,4 +3010,10 @@ function visual_map_type_in_js($type) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function visual_map_macro($label){
|
||||||
|
$label = str_replace('_date_',strftime("%x"),$label);
|
||||||
|
$label = str_replace('_time_',strftime("%T"),$label);
|
||||||
|
return $label;
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user