From a082d7a8eb4c3a829cf46aaa6c268d15d5a17af0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 7 May 2018 11:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/statistics/_form.html.erb           | 20 ++++++++++++++++++-
 .../statistics/_statistics_list.html.erb      |  1 -
 app/views/statistics/show.html.erb            | 11 +++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/views/statistics/_form.html.erb b/app/views/statistics/_form.html.erb
index f465be39e..6cf96f6e8 100644
--- a/app/views/statistics/_form.html.erb
+++ b/app/views/statistics/_form.html.erb
@@ -39,7 +39,25 @@
       <div class="field line_field">
         <label class="field_lab">数据描述：</label>
         <div id="statistics_description" class="new_li fl">
-          <%= f.text_area :description, :class => "wb85 h200 mb20", :style => "display: none;" %>
+          <textarea class="wb85 h200 mb20" id="statistic_description" name="statistic[description]" style="display: none;"><% if @statistic.description %><%= @statistic.description %><% else %>本数据集是国家重点研发计划“基于大数据的软件智能开发方法和环境”公布的软件工程研究数据集系列之一，其中包含了超过65万个开源软件项目的持续集成流水线描述文件（TravisCI配置文件）。
+
+#####数据背景
+
+[持续集成](https://docs.travis-ci.com/user/for-beginners/)方法及工具在软件开发中得到了广泛的应用.根据软件项目的需求，持续集包含自动化的代码合并、检查、编译、链接、测试、打包等诸多任务中的若干，他们通过一定的拓扑关系构成一条持续集成流水线。持续集成工具的配置文件描述了各个项目的流水线。持续集成可以大大提高软件开发迭代的速度，同时避免人力成本的上升。
+
+#####数据来源
+该数据集收集自[Github](http://example.com/ "Title")。作者选取了当时所有包含[TravisCI](https://www.travis-ci.org/ "Title")配置文件（.travis.yml）repository（非fork），从中下载了这些配置文件，共计65万8千余个（每个repository一个）。
+
+#####数据格式
+该数据集中的每个配置文件为[yaml](http://yaml.org/)格式，其中各个key的含义请参考TravisCI的[官方文档](https://docs.travis-ci.com/)。
+配置文件以repository的名称命名。这些文件统一记录在repo_list_travisci.txt中，通过一级索引文件夹进行组织，文件夹以repository名称的第一个字符命名。
+
+#####数据应用
+用户可以使用该数据集探索持续集成流水线的特征、模式，帮助提高持续集成的效率。
+
+#####数据下载
+数据下载地址：https://www.trustie.net/statistics
+<% end %></textarea>
         </div>
       </div>
       <div class="field cl">
diff --git a/app/views/statistics/_statistics_list.html.erb b/app/views/statistics/_statistics_list.html.erb
index 718d2096d..9cffe7670 100644
--- a/app/views/statistics/_statistics_list.html.erb
+++ b/app/views/statistics/_statistics_list.html.erb
@@ -15,7 +15,6 @@
       <% end %>
       <div class="fl data_itemMain">
         <span class="f16 mr10"> <%= link_to "#{statistic.name}", statistic ,:class => "color-grey3" %> </span>
-        <p class="f13 mt5 mb5 data_detail"><%= statistic.description.try(:html_safe) %></p>
         <div class="f13 mt7">
           <%= render :partial => 'attachments',:locals => {:attachments => statistic.try(:attachments)} %>
         </div>
diff --git a/app/views/statistics/show.html.erb b/app/views/statistics/show.html.erb
index a3c01c4d2..02f542222 100644
--- a/app/views/statistics/show.html.erb
+++ b/app/views/statistics/show.html.erb
@@ -6,7 +6,16 @@
     <%= image_tag(url_to_avatar(@statistic.creator), :width => "50", :height => "50", :class =>"fl" ,:style =>"border-radius: 50%")  %>
     <div class="fl color-grey8 ml15">
       <P class="color-grey3 f16 mb5"><%= @statistic.name %></P>
-      <p class="f14"><span class="mr20"><%= @statistic.creator.show_name %></span><span><%= format_time @statistic.created_at %></span></p>
+      <p class="f14">
+        <span class="mr20"><%= @statistic.creator.show_name %></span>
+        <span class="mr20"><%= @statistic.main_category.name %></span>
+        <% if @statistic.sub_category.present? %>
+          <span class="mr20"><%= @statistic.sub_category.try(:name) %></span>
+        <% end %>
+        <% if @statistic.file_size.present? %>
+          <span class="mr20"><%= @statistic.file_size %>&nbsp;MB</span>
+        <% end %>
+        <span><%= format_time @statistic.created_at %></span></p>
     </div>
     <%= link_to '返回', statistics_path ,:class=>"grey_btn fr mr45 ml15", :style=>"padding:4px 10px" %>
     <% if User.current.id == @statistic.user_id || User.current.admin? %>