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
144
Merge Requests
144
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
5b9c15de
Commit
5b9c15de
authored
Mar 10, 2020
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_project_ui: new ui for project info lines on front page
parent
a3609e95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
12 deletions
+20
-12
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
..._page_module/project_gadget_page_project_front_page_js.js
+18
-10
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
...page_module/project_gadget_page_project_front_page_js.xml
+2
-2
No files found.
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
View file @
5b9c15de
...
...
@@ -14,6 +14,9 @@
NAME_SPAN
=
"
name
"
,
FORUM_LINK_ID_SUFFIX
=
"
forum
"
,
FORUM_LINK_TYPE
=
"
link
"
,
OUTDATED_LABEL
=
"
out of date
"
,
FAILED_LABEL
=
"
failed
"
,
TEST_RESULT_PORTAL_TYPE
=
"
Test Result
"
,
QUERY_LIMIT
=
100000
,
SUPERVISOR_FIELD_TITLE
=
"
Supervisor
"
,
//XXX hardcoded one year old date to define outdated elements
...
...
@@ -118,8 +121,10 @@
}
}
if
(
number_span
)
{
number_span
.
classList
.
remove
(
"
ui-hidden
"
);
number_span
.
classList
.
add
(
"
ui-visible
"
);
if
(
outdated_count
>
0
)
{
number_span
.
classList
.
remove
(
"
ui-hidden
"
);
number_span
.
classList
.
add
(
"
ui-visible
"
);
}
}
}
...
...
@@ -289,35 +294,38 @@
outdated_span
=
document
.
createElement
(
'
span
'
),
total_span
=
document
.
createElement
(
'
span
'
),
open_bracket_span
=
document
.
createElement
(
'
span
'
),
close_bracket_span
=
document
.
createElement
(
'
span
'
);
close_bracket_span
=
document
.
createElement
(
'
span
'
),
outdated_label_span
=
document
.
createElement
(
'
span
'
);
line_div
.
classList
.
add
(
"
project-line
"
);
status_span
.
classList
.
add
(
STATUS_SPAN
);
status_span
.
classList
.
add
(
status_color
);
status_span
.
classList
.
add
(
"
margined
"
);
status_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
STATUS_SPAN
));
total_span
.
classList
.
add
(
"
margined
"
);
total_span
.
innerHTML
=
total_count
;
total_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
TOTAL_SPAN
));
name_span
.
classList
.
add
(
"
name
"
);
name_span
.
classList
.
add
(
"
margined
"
);
name_span
.
innerHTML
=
title
;
name_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
NAME_SPAN
));
total_span
.
classList
.
add
(
"
margined
"
);
total_span
.
innerHTML
=
total_count
;
total_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
TOTAL_SPAN
));
outdated_span
.
innerHTML
=
out_count
;
outdated_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
OUTDATED_SPAN
));
open_bracket_span
.
innerHTML
=
"
(
"
;
outdated_label_span
.
innerHTML
=
(
portal_type
===
TEST_RESULT_PORTAL_TYPE
)
?
FAILED_LABEL
:
OUTDATED_LABEL
;
close_bracket_span
.
innerHTML
=
"
)
"
;
number_span
.
appendChild
(
total_span
);
number_span
.
appendChild
(
open_bracket_span
);
number_span
.
appendChild
(
outdated_span
);
number_span
.
appendChild
(
outdated_label_span
);
number_span
.
appendChild
(
close_bracket_span
);
number_span
.
setAttribute
(
"
id
"
,
getProjectHtlmElementId
(
project_id
,
portal_type
,
NUMBER_SPAN
));
number_span
.
classList
.
add
(
"
ui-hidden
"
);
line_div
.
appendChild
(
status_span
);
line_div
.
appendChild
(
total_span
);
line_div
.
appendChild
(
name_span
);
line_div
.
appendChild
(
number_span
);
return
line_div
;
...
...
@@ -413,7 +421,7 @@
.
declareJob
(
"
renderOtdatedMilestoneInfo
"
,
function
()
{
//XXX For testing -> use NOW_DATE
//
return renderMilestoneLines(this, NOW_DATE);
return
renderMilestoneLines
(
this
,
NOW_DATE
);
return
renderMilestoneLines
(
this
,
LIMIT_DATE
);
})
...
...
@@ -442,7 +450,7 @@
for
(
project_id
in
project_test_status_dict
)
{
if
(
project_test_status_dict
.
hasOwnProperty
(
project_id
))
{
renderProjectLine
(
project_id
,
"
Test Result
"
,
TEST_RESULT_PORTAL_TYPE
,
parseInt
(
project_test_status_dict
[
project_id
].
all_tests
,
RADIX
),
parseInt
(
project_test_status_dict
[
project_id
].
failures
,
RADIX
));
}
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
View file @
5b9c15de
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.284
35.61677.45243
</string>
</value>
<value>
<string>
982.284
56.11875.61474
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
158385
5321.73
</float>
<float>
158385
6506.94
</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