[refs #442] Add statistics data to mass builds. Small refactor for report

This commit is contained in:
konstantin.grabar 2012-06-25 19:20:35 +04:00
parent 651dd57044
commit bdb97b8891
6 changed files with 40 additions and 8 deletions

View File

@ -1080,3 +1080,8 @@ form.mass_build section.left {
form.mass_build section.right { form.mass_build section.right {
margin-right: 50px; margin-right: 50px;
} }
.collapse {
overflow: hidden;
padding-top: 10px;
}

View File

@ -30,16 +30,39 @@
%tr %tr
%th.lpadding16= t('activerecord.attributes.mass_build.id') %th.lpadding16= t('activerecord.attributes.mass_build.id')
%th.lpadding16= t('activerecord.attributes.mass_build.name') %th.lpadding16= t('activerecord.attributes.mass_build.name')
%th.lpadding16= t('activerecord.attributes.mass_build.arch_names') %th.lpadding16= t("layout.build_lists.all").camelize
%th.lpadding16= t('activerecord.attributes.mass_build.user') %th.lpadding16= t("layout.build_lists.statuses.build_published").camelize
%th.lpadding16= t('activerecord.attributes.mass_build.auto_publish') %th.lpadding16= t("layout.build_lists.statuses.build_pending").camelize
%th.lpadding16= t('activerecord.attributes.mass_build.created_at') %th.lpadding16= t("layout.build_lists.statuses.build_started").camelize
%th.lpadding16= t("layout.build_lists.statuses.build_publish").camelize
%th.lpadding16= t("layout.mass_builds.extended_data")
- @mass_builds.each do |mass_build| - @mass_builds.each do |mass_build|
%tr %tr
%td= mass_build.id %td= mass_build.id
%td= link_to mass_build.name, build_lists_path(:filter => {:mass_build_id => mass_build.id}) %td= link_to mass_build.name, build_lists_path(:filter => {:mass_build_id => mass_build.id})
%td= mass_build.arch_names %td= mass_build.build_lists_count
%td= link_to mass_build.user.fullname, mass_build.user %td= mass_build.build_published_count
%td= mass_build.auto_publish %td= mass_build.build_pending_count
%td= mass_build.created_at %td= mass_build.build_started_count
%td= mass_build.build_publish_count
%td
%a{:href => '#', :'data-toggle' => "collapse", :'data-target' => "#collapse_#{ mass_build.id }"}= t("layout.mass_builds.extended_data")
.in.collapse{:id => "collapse_#{ mass_build.id }"}
= t('activerecord.attributes.mass_build.arch_names') + ": "
= mass_build.arch_names
.both
= t('activerecord.attributes.mass_build.user') + ": "
= link_to mass_build.user.fullname, mass_build.user
.both
= t('activerecord.attributes.mass_build.auto_publish') + ": "
= mass_build.auto_publish
.both
= t('activerecord.attributes.mass_build.created_at') + ": "
= mass_build.created_at
.both
= will_paginate @mass_builds = will_paginate @mass_builds
= javascript_include_tag "lib/bootstrap-collapse"
:javascript
$(".collapse").collapse();

View File

@ -45,6 +45,7 @@ en:
layout: layout:
build_lists: build_lists:
all: All
filter_header: Filter filter_header: Filter
current: Curent current: Curent
created_at_start: "Build to start on:" created_at_start: "Build to start on:"

View File

@ -44,6 +44,7 @@ ru:
layout: layout:
build_lists: build_lists:
all: Все
filter_header: Фильтр filter_header: Фильтр
current: Текущие current: Текущие
created_at_start: "Время постановки на сборку с:" created_at_start: "Время постановки на сборку с:"

View File

@ -2,6 +2,7 @@ en:
layout: layout:
mass_builds: mass_builds:
repositories: Repositories repositories: Repositories
extended_data: Extended data
activerecord: activerecord:
models: models:
mass_build: Mass Build mass_build: Mass Build

View File

@ -2,6 +2,7 @@ ru:
layout: layout:
mass_builds: mass_builds:
repositories: Репозитории repositories: Репозитории
extended_data: Дополнительные данные
activerecord: activerecord:
models: models:
mass_build: Массовая Сборка mass_build: Массовая Сборка