Skip to content

erp5
erp5
Commit d3f681f0 authored by Roque's avatar Roque
Browse files
Options

erp5_web_project_ui: refactoring

parent 61d79156
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 32 deletions
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_html.xml
View file @ d3f681f0
......@@ -238,7 +238,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.9358.61153.38468</string> </value>
<value> <string>982.9625.31554.51268</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -256,7 +256,7 @@
</tuple>
<state>
<tuple>
<float>1582883460.93</float>
<float>1582900646.3</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
View file @ d3f681f0
......@@ -53,8 +53,9 @@
return segments.slice(0, -1).join("/");
}
function getProjectSpanId(project_id, portal_type, span_title) {
return [project_id, portal_type, span_title].join("-").replace("/", "-").replace(" ", "-");
function getProjectSpanId(project_id, portal_type, span_title, hash_selector) {
hash_selector = (hash_selector) ? '#' : '';
return hash_selector + [project_id, portal_type, span_title].join("-").replace("/", "-").replace(" ", "-");
}
function getComplexQuery(query_dict, operator, extra_query) {
......@@ -133,10 +134,10 @@
}
function renderProjectLine(project_id, portal_type, total_count, outdated_count) {
var total_span = document.getElementById(getProjectSpanId(project_id, portal_type, TOTAL_SPAN)),
outdated_span = document.getElementById(getProjectSpanId(project_id, portal_type, OUTDATED_SPAN)),
status_span = document.getElementById(getProjectSpanId(project_id, portal_type, STATUS_SPAN)),
number_span = document.getElementById(getProjectSpanId(project_id, portal_type, NUMBER_SPAN));
var total_span = document.querySelector(getProjectSpanId(project_id, portal_type, TOTAL_SPAN, true)),
outdated_span = document.querySelector(getProjectSpanId(project_id, portal_type, OUTDATED_SPAN, true)),
status_span = document.querySelector(getProjectSpanId(project_id, portal_type, STATUS_SPAN, true)),
number_span = document.querySelector(getProjectSpanId(project_id, portal_type, NUMBER_SPAN, true));
total_span.textContent = parseInt(total_span.textContent, RADIX) + total_count;
outdated_span.textContent = parseInt(outdated_span.textContent, RADIX) + outdated_count;
if (outdated_count > 0) {
......@@ -155,8 +156,8 @@
left_div_html,
project_html_element_list,
left_line_html,
ul_list = document.getElementById("js-project-list"),
spinner = document.getElementById("js-spinner"),
ul_list = document.querySelector("#js-project-list"),
spinner = document.querySelector("#js-spinner"),
url_parameter_list = [],
project_id,
project_dict,
......
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
View file @ d3f681f0
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.9608.57814.23773</string> </value>
<value> <string>982.9699.11287.34560</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1582898723.9</float>
<float>1582903885.75</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_html.xml
View file @ d3f681f0
......@@ -238,7 +238,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.9355.51260.25156</string> </value>
<value> <string>982.9625.35905.39850</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -256,7 +256,7 @@
</tuple>
<state>
<tuple>
<float>1582883421.69</float>
<float>1582900651.88</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.js
View file @ d3f681f0
......@@ -76,20 +76,20 @@
switch (state) {
case 'started':
svg_element.classList.add("running");
document.getElementById("test_result_running").classList.remove("ui-hidden");
document.querySelector("test_result_running").classList.remove("ui-hidden");
break;
case 'failed':
svg_element.classList.add("fail");
document.getElementById("test_result_fail").classList.remove("ui-hidden");
document.querySelector("test_result_fail").classList.remove("ui-hidden");
break;
case 'cancelled':
svg_element.classList.add("cancelled");
document.getElementById("test_result_running").classList.remove("ui-hidden");
document.querySelector("test_result_running").classList.remove("ui-hidden");
break;
case 'stopped':
case 'public_stopped':
svg_element.classList.add("pass");
document.getElementById("test_result_pass").classList.remove("ui-hidden");
document.querySelector("test_result_pass").classList.remove("ui-hidden");
break;
default:
svg_element.classList.add("ui-hidden");
......@@ -176,7 +176,8 @@
redirector_ulr = url;
return gadget.jio_allDocs({
query: Query.objectToSearchText(query),
select_list: ['text_content']
select_list: ['text_content'],
limit: 2
});
})
.push(function (result_list) {
......@@ -292,20 +293,20 @@
return gadget.getUrlForList(url_parameter_list);
})
.push(function (url_list) {
enableLink(document.getElementById("milestone_link"), url_list[0]);
enableLink(document.getElementById("task_link"), url_list[1]);
enableLink(document.getElementById("support_request_link"), url_list[2]);
enableLink(document.getElementById("bug_link"), url_list[3]);
enableLink(document.getElementById("report_link"), url_list[4]);
enableLink(document.getElementById("test_result_link"), url_list[5]);
enableLink(document.getElementById("test_suite_link"), url_list[6]);
enableLink(document.getElementById("document_link"), url_list[7]);
enableLink(document.getElementById("activity_link"), url_list[8]);
enableLink(document.querySelector("milestone_link"), url_list[0]);
enableLink(document.querySelector("task_link"), url_list[1]);
enableLink(document.querySelector("support_request_link"), url_list[2]);
enableLink(document.querySelector("bug_link"), url_list[3]);
enableLink(document.querySelector("report_link"), url_list[4]);
enableLink(document.querySelector("test_result_link"), url_list[5]);
enableLink(document.querySelector("test_suite_link"), url_list[6]);
enableLink(document.querySelector("document_link"), url_list[7]);
enableLink(document.querySelector("activity_link"), url_list[8]);
if (web_page_info) {
enableLink(document.getElementById("web_page_link"), url_list[9]);
enableLink(document.querySelector("web_page_link"), url_list[9]);
}
//TODO move into a job to call it async
setLatestTestResult(gadget, document.getElementById("test_result_svg"), modification_dict.jio_key);
setLatestTestResult(gadget, document.querySelector("test_result_svg"), modification_dict.jio_key);
});
})
......
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_page_js.xml
View file @ d3f681f0
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.9606.8399.22101</string> </value>
<value> <string>982.9671.43908.33962</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1582898299.44</float>
<float>1582903924.09</float>
<string>UTC</string>
</tuple>
</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