Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
139
Merge Requests
139
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
fc9ca479
Commit
fc9ca479
authored
May 29, 2024
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: minor graph refactoring
parent
b1dcfe05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_field_graph_dygraph_js.js
...lateItem/web_page_module/gadget_field_graph_dygraph_js.js
+5
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_field_graph_dygraph_js.xml
...ateItem/web_page_module/gadget_field_graph_dygraph_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_field_graph_dygraph_js.js
View file @
fc9ca479
...
...
@@ -72,7 +72,6 @@
serie
.
drawPoints
=
true
;
serie
.
strokeWidth
=
0
;
}
console
.
log
(
"
serie
"
,
serie
);
graph_data_and_parameter
.
series
[
trace
.
title
||
''
]
=
serie
;
}
for
(
i
=
0
;
i
<
data
.
length
;
i
=
i
+
1
)
{
...
...
@@ -195,7 +194,11 @@
graph_data_and_parameter
;
container
=
gadget
.
element
.
querySelector
(
"
.graph-content
"
);
graph_data_and_parameter
=
formatGraphDict
(
modification_dict
.
value
);
if
(
modification_dict
.
value
.
new_format
)
{
graph_data_and_parameter
=
formatGraphDict
(
modification_dict
.
value
);
}
else
{
graph_data_and_parameter
=
getGraphDataAndParameterFromConfiguration
(
modification_dict
.
value
);
}
gadget
.
property_dict
.
graph
=
new
Dygraph
(
container
,
graph_data_and_parameter
.
dygraph_data
,
graph_data_and_parameter
.
dygraph_parameter_dict
);
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_field_graph_dygraph_js.xml
View file @
fc9ca479
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1016.
32471.45294.12919
</string>
</value>
<value>
<string>
1016.
58116.20617.24900
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
171
5371703.99
</float>
<float>
171
6991783.66
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment