Skip to content

Commit

Permalink
数据统计中数据在进入时动态显示.(存储上次计算数据部分功能遗漏,补充)
Browse files Browse the repository at this point in the history
  • Loading branch information
gilbert-yuan committed Jun 26, 2017
1 parent a7629ea commit 7ad4db7
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
7 changes: 5 additions & 2 deletions home_page/models/home_page.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models
from odoo.tools.safe_eval import safe_eval as eval

from datetime import datetime
class home_report_type(models.Model):
_name = "home.report.type"
_description = u"用来分类报表,让相似的报表显示在一起"
Expand Down Expand Up @@ -84,7 +84,10 @@ def construction_action_url_list(self, action, action_url_list):
field_compute = action.compute_field_one.name
# 本次只计算有变更的记录的值
compute_value = sum([res_model_obj[field_compute] for res_model_obj in res_model_objs])
action_vals[0] = "%s %s" % (action_vals[0], compute_value+action.last_compute_result)
new_compute_value = compute_value + action.last_compute_result
action_vals[0] = "%s %s" % (action_vals[0], )
action.last_compute_result = new_compute_value
action.last_compute_date = datetime.now()
action_url_list['top'].append(action_vals)
else:
action_vals[0] = "%s " % action_vals[0]
Expand Down
4 changes: 3 additions & 1 deletion home_page/static/src/js/home_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ odoo.define('home_page', function (require) {
<button class='btn btn-primary button-circle oe_top_link_" + i +
"' oe_top_link='" + i + "' id='" + i + "' style='width: 160px;height: 160px'>\
<h4>" + top_data[0] + "</h4>\
<h3>" + self.commafy(top_data[1]) + "</h3>\
<h3><span class='counter'>\
" + self.commafy(top_data[1]) + "</span></h3>\
</button><p class='m-t-sm'></p></div>");
self.$el.find('.top_div').append(left_html_str);
}
Expand Down Expand Up @@ -213,6 +214,7 @@ odoo.define('home_page', function (require) {
self.third_part()
}
});
$('.counter').countUp({delay: 50, time: 2000});
},
});
core.action_registry.add('home_page.homepage', HomePage);
Expand Down
1 change: 1 addition & 0 deletions home_page/static/src/lib/jquery.countup.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions home_page/static/src/lib/jquery.waypoints.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions home_page/views/home_page_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<xpath expr="." position="inside">
<link rel="stylesheet" href="/home_page/static/src/css/home_page.css"/>
<script type="text/javascript" src="/home_page/static/src/js/home_page.js"/>
<script type="text/javascript" src="/home_page/static/src/lib/jquery.countup.min.js"/>
<script type="text/javascript" src="/home_page/static/src/lib/jquery.waypoints.min.js"/>
</xpath>
</template>

Expand Down

0 comments on commit 7ad4db7

Please sign in to comment.