Skip to content

erp5-Boxiang
erp5-Boxiang
Commit bf46d0a5 authored by Xiaowu Zhang's avatar Xiaowu Zhang
Browse files
Options

erp5_travel_expense: don't create and insert dom manually

parent 2b79140a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 30 deletions
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_html.html
View file @ bf46d0a5
...@@ -9,11 +9,17 @@ ...@@ -9,11 +9,17 @@
<script src="rsvp.js"></script> <script src="rsvp.js"></script>
<script src="renderjs.js"></script> <script src="renderjs.js"></script>
<script src="handlebars.js" type="text/javascript"></script>
<script src="gadget_officejs_page_leave_request_record_list.js"></script> <script src="gadget_officejs_page_leave_request_record_list.js"></script>
</head> <script class="page-template" type="text/x-handlebars-template">
{{#if day_left}}
<p data-i18n="Leaves days left: ">Leaves days left: <span>{{day_left}}</span></p>
{{/if}}
<div class="leave_request_listbox"></div>
</script>
</head>
<body> <body>
<div data-gadget-url="gadget_officejs_widget_listbox.html" data-gadget-scope="listbox"></div>
</body> </body>
</html> </html>
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_html.xml
View file @ bf46d0a5
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>supercedriclen</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>955.40831.35926.40840</string> </value> <value> <string>957.11901.58686.802</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1480528773.62</float> <float>1486546513.23</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.js
View file @ bf46d0a5
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
/*jslint indent: 2, nomen: true, maxlen: 80*/ /*jslint indent: 2, nomen: true, maxlen: 80*/
(function (window, RSVP, rJS, document) { (function (window, RSVP, rJS, document) {
"use strict"; "use strict";
var gadget_klass = rJS(window),
rJS(window) source = gadget_klass.__template_element
.querySelector(".page-template")
.innerHTML,
template = Handlebars.compile(source);
gadget_klass
.ready(function (g) { .ready(function (g) {
g.props = {}; g.props = {};
return g.getElement() return g.getElement()
...@@ -31,6 +35,7 @@ ...@@ -31,6 +35,7 @@
}); });
}) })
.declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("translate", "translate")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("updateHeader", "updateHeader") .declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod('getSetting', 'getSetting') .declareAcquiredMethod('getSetting', 'getSetting')
...@@ -70,7 +75,21 @@ ...@@ -70,7 +75,21 @@
}); });
}) })
.push(function () { .push(function () {
return gadget.getDeclaredGadget("listbox"); return gadget.jio_allDocs({
query: 'portal_type: "Leave Report Record"',
select_list: ["confirmed_leaves_days_left"],
});
})
.push(function (result) {
var options = {};
if (result.data.total_rows > 0) {
options.day_left = result.data.rows[0].value.confirmed_leaves_days_left;
}
return gadget.translateHtml(template(options));
})
.push(function (html) {
gadget.props.element.innerHTML = html;
return gadget.declareGadget("gadget_officejs_widget_listbox.html", {element: gadget.props.element.querySelector('.leave_request_listbox')});
}) })
.push(function (listbox) { .push(function (listbox) {
return listbox.render({ return listbox.render({
...@@ -96,25 +115,6 @@ ...@@ -96,25 +115,6 @@
sort_on: [["start_date", "descending"]] sort_on: [["start_date", "descending"]]
} }
}); });
})
.push(function () {
return gadget.jio_allDocs({
query: 'portal_type: "Leave Report Record"',
select_list: ["confirmed_leaves_days_left"],
});
})
.push(function (result) {
var p;
if (result.data.total_rows != 1) {
return;
}
p = document.createElement("p");
p.textContent = "Leaves days left: "
+ result.data.rows[0].value.confirmed_leaves_days_left;
gadget.props.element.insertBefore(
p,
gadget.props.element.querySelector("div")
);
}); });
}); });
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.xml
View file @ bf46d0a5
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>supercedriclen</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.57347.13686.32631</string> </value> <value> <string>957.11870.44460.28228</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485341013.1</float> <float>1486546441.25</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7