Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5-Boxiang
Commits
21feb230
Commit
21feb230
authored
Feb 06, 2017
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense: display correctly table
parent
ebc9943d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_report_js.js
...mplateItem/web_page_module/gadget_hr_expense_report_js.js
+7
-7
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_report_js.xml
...plateItem/web_page_module/gadget_hr_expense_report_js.xml
+2
-2
No files found.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_report_js.js
View file @
21feb230
...
@@ -94,15 +94,11 @@
...
@@ -94,15 +94,11 @@
}
}
bar_data
.
push
(
value_list
);
bar_data
.
push
(
value_list
);
}
}
var
data
=
{
gadget
.
props
.
data
=
{
labels
:
label_list
,
labels
:
label_list
,
series
:
bar_data
,
series
:
bar_data
,
};
};
new
Chartist
.
Bar
(
gadget
.
props
.
element
.
querySelector
(
'
.ct-chart
'
),
data
,
{
seriesBarDistance
:
10
,
axisX
:
{
offset
:
60
},
});
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
title
:
"
Report
"
title
:
"
Report
"
});
});
...
@@ -119,7 +115,11 @@
...
@@ -119,7 +115,11 @@
/////////////////////////////////////////
/////////////////////////////////////////
.
declareService
(
function
()
{
.
declareService
(
function
()
{
var
gadget
=
this
;
var
gadget
=
this
;
new
Chartist
.
Bar
(
gadget
.
props
.
element
.
querySelector
(
'
.ct-chart
'
),
gadget
.
props
.
data
,
{
seriesBarDistance
:
10
,
axisX
:
{
offset
:
60
},
});
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
props
.
deferred
.
promise
;
return
gadget
.
props
.
deferred
.
promise
;
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_report_js.xml
View file @
21feb230
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
5822.38684.22630
</string>
</value>
<value>
<string>
956.5
8658.21925.32853
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
148
5251283.29
</float>
<float>
148
6391931.12
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</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