educode_sales 0.5.1 → 0.5.5

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -101,7 +101,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已中标<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <h5>已中标（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @goal_amount %>万</h1>
@@ -114,7 +114,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已签单<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <h5>已签单（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @service_amount %>万</h1>
@@ -148,6 +148,32 @@
                 </div>
               </div>
             </div>
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <h5>已中标（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                  </div>
+                  <div class="panel-content y-t-10">
+                    <h1 class="no-margins"><%= @actual_goal_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <h5>已签单（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                  </div>
+                  <div class="panel-content y-t-10">
+                    <h1 class="no-margins"><%= @actual_service_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <div class="layui-row layui-col-space30" >
             <div class="layui-col-xs3">
               <div class="panel layui-bg-number">
@@ -168,12 +194,146 @@
     </div>
   </div>
 </form>
+<br>
+<div class="layui-tab layui-tab-card" id="商机跟进数">
+  <ul class="layui-tab-title">
+    <li class="layui-this">商机跟进数</li>
+  </ul>
+  <div class="layui-tab-content" style="padding-right: 50px">
+    <div class="layui-tab-item layui-show " style="padding-left: 20px">
+      <div style="margin: 10px 10px 10px 10px">
+        <form class="layui-form layui-form-pane" lay-filter="search_form">
+          <div class="layui-form-item">
+            <div class="layui-inline m-t-10">
+              <label class="layui-form-label">视图</label>
+              <div class="layui-input-inline">
+                <%= select_tag "follow_count_range", options_for_select([['按周','week'],['按天','day'],['按月','month'],['按年','year']],params[:follow_count_range]), {'lay-filter': 'follow_count'}%>
+              </div>
+            </div>
+            <div class="layui-inline">
+              <label class="layui-form-label">时间范围</label>
+              <div class="layui-input-inline">
+                  <input type="text"  class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" >
+                  <input type="text"  class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>">
+                  <input type="text"  class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).to_s(:date) + ' - ' + Time.now.to_s(:date)   %>">
+                  <input type="text"  class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
+                  </div>
+            </div>
+            <div class="layui-inline">
+              <button type="submit" id="search_bt" class=" follow_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+      <canvas id="myChart" width="960" height="200"></canvas>
+    </div>
+  </div>
+</div>
+<br>
+<br>
+<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+  <ul class="layui-tab-title">
+    <li class="layui-this">销售额分析</li>
+  </ul>
+  <div class="layui-tab-content" style="padding-right: 50px">
+    <div class="layui-tab-item layui-show" style="padding-left: 20px">
+      <div style="margin: 10px 10px 10px 10px">
+      <form class="layui-form layui-form-pane" lay-filter="search_form">
+        <div class="layui-form-item">
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">维度</label>
+            <div class="layui-input-inline">
+              <%= select_tag "count_type", options_for_select([['按合同额统计','actual_amount'],['按总额统计','total_amount']],params[:count_type]), {'lay-filter': 'count_type'}%>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">视图</label>
+            <div class="layui-input-inline">
+              <%= select_tag "goal_count_range", options_for_select([['按月','month'],['按年','year']],params[:goal_count_range]), {'lay-filter': 'goal_count'}%>
+            </div>
+          </div>
+          <div class="layui-inline">
+            <label class="layui-form-label">时间范围</label>
+            <div class="layui-input-inline">
+              <input type="text"  class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month].present? ? params[:goal_date_month] : Time.now.year.to_s + "-01"  + " - " + Time.now.strftime("%Y-%m")  %>">
+              <input type="text"  class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>">
+            </div>
+          </div>
+          <div class="layui-inline">
+            <button type="submit" id="search_bt" class="follow_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
+            </button>
+          </div>
+        </div>
+      </form>
+      </div>
+      <canvas id="myChart2" width="960" height="200"></canvas>
+    </div>
+
+  </div>
+</div>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
+<script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
   <script>
+      follow_type = "<%=@follow_count_range %>"
+      goal_type = "<%=@goal_count_range %>"
+      follow_flag = <%=params[:follow_count_range].present? %>
+    if(follow_flag){
+        window.location.href = "#商机跟进数"
+    }
+
+      goal_flag = <%=params[:goal_count_range].present? %>
+    if(goal_flag){
+        window.location.href = "#销售额分析"
+    }
     layui.use(['form', 'jquery', 'request'], function () {
       var $ = layui.jquery,
         form = layui.form,
         request = layui.request;
         var year = "<%= @year %>";
+        var element = layui.element;
+        laydate = layui.laydate;
+
+        $(document).ready(function () {
+            $(".follow_count_bt").click(function () {
+                layer.msg("图表绘制中...", {
+                    offset:['40%','46%']
+                })
+                layer.load(0, {});
+                setTimeout(function () {
+                    layer.closeAll('loading');
+                }, 3000);
+            });
+        });
+        if(follow_type == "day"){
+            $(".year").addClass('layui-hide')
+            $(".month").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
+            $(".day").removeClass('layui-hide')
+        }else if(follow_type == "month"){
+            $(".year").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
+            $(".month").removeClass('layui-hide')
+            $(".day").addClass('layui-hide')
+        }else if(follow_type == "week"){
+            $(".year").addClass('layui-hide')
+            $(".day").addClass('layui-hide')
+            $(".week").removeClass('layui-hide')
+            $(".month").addClass('layui-hide')
+        }else {
+            $(".year").removeClass('layui-hide')
+            $(".month").addClass('layui-hide')
+            $(".day").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
+        }
+
+        if(goal_type == "year"){
+            $(".goal_year").removeClass('layui-hide')
+            $(".goal_month").addClass('layui-hide')
+        }else{
+            $(".goal_year").addClass('layui-hide')
+            $(".goal_month").removeClass('layui-hide')
+        }
 
         function editForm(el) {
           $("#" + el + "_edit").click(function() {
@@ -205,18 +365,138 @@
           })
         }
 
+        // 时间选择器
+        laydate.render({
+            elem: '#date',
+            range: true
+        });
+        laydate.render({
+            elem: '#date_week',
+            range: true
+        });
+        laydate.render({
+            type: 'month',
+            elem: '#date_month',
+            range: true
+        });
+        laydate.render({
+            type: 'year',
+            elem: '#date_year',
+            range: true
+        });
+        laydate.render({
+            type: 'year',
+            elem: '#goal_date_year',
+            range: true
+        });
+        laydate.render({
+            type: 'month',
+            elem: '#goal_date_month',
+            range: true
+        });
+
+
         form.on('select(year)', function(data){
           console.log(data, )
           year = data.value
           window.location.href = "/missions/sale_trends/trends?year=" + data.value
         })
-    
+        form.on('select(follow_count)', function(data){
+          console.log(data, )
+            const value = data.value;
+          if(value == "month"){
+              $(".year").addClass('layui-hide')
+              $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
+              $(".month").removeClass('layui-hide')
+          }else if(value == "year"){
+              $(".month").addClass('layui-hide')
+              $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
+              $(".year").removeClass('layui-hide')
+          }else if(value == "week"){
+              $(".month").addClass('layui-hide')
+              $(".day").addClass('layui-hide')
+              $(".week").removeClass('layui-hide')
+              $(".year").addClass('layui-hide')
+          }else {
+              $(".month").addClass('layui-hide')
+              $(".year").addClass('layui-hide')
+              $(".day").removeClass('layui-hide')
+              $(".week").addClass('layui-hide')
+
+          }
+        })
+
+        form.on('select(goal_count)', function(data){
+          console.log(data, )
+            const value = data.value;
+          if(value == "month"){
+              $(".goal_year").addClass('layui-hide')
+              $(".goal_month").removeClass('layui-hide')
+          }else {
+              $(".goal_month").addClass('layui-hide')
+              $(".goal_year").removeClass('layui-hide')
+          }
+        })
+
         editForm("chance_money");
         editForm("ballot_money");
         editForm("sign_money");
         editForm("returned_money");
 
-       
+        element.on('tab(test1)', function(){
+            window.location.href = "#销售额分析"
+        });
+
+        var ctx = document.getElementById('myChart');
+        var myChart = new Chart(ctx, {
+            type: 'line',
+            data: <%=raw @follow_count_data.to_json %>,
+            options: {
+                elements: {
+                    line: {
+                        tension: 0
+                    }
+                }
+            }
+        });
+
+
+        var opt = {
+            events: false,
+            tooltips: {
+                enabled: false
+            },
+            hover: {
+                animationDuration: 0
+            },
+            animation: {
+                duration: 1,
+                onComplete: function () {
+                    var chartInstance = this.chart,
+                        ctx = chartInstance.ctx;
+                    ctx.font = Chart.helpers.fontString(Chart.defaults.global.defaultFontSize, Chart.defaults.global.defaultFontStyle, Chart.defaults.global.defaultFontFamily);
+                    ctx.textAlign = 'center';
+                    ctx.textBaseline = 'bottom';
+
+                    this.data.datasets.forEach(function (dataset, i) {
+                        var meta = chartInstance.controller.getDatasetMeta(i);
+                        meta.data.forEach(function (bar, index) {
+                            var data = dataset.data[index];
+                            ctx.fillText(data, bar._model.x, bar._model.y - 5);
+                        });
+                    });
+                }
+            }
+        };
+
 
+        var ctx = document.getElementById('myChart2');
+        var myChart2 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @goal_count_data.to_json %>,
+            options: opt
+        });
     })
   </script>

data/app/views/educode_sales/sale_trends/trends.json.jbuilder

@@ -0,0 +1,14 @@
+my_array = [1,2,3,4,5]
+json.data do
+  json.labels my_array
+  json.datasets do
+  json.array! [1,2] do |d|
+    json.label '人名'
+    json.backgroundColor "#fff"
+    json.borderColor "#36A2EB"
+    json.pointBackgroundColor "#36A2EB"
+    json.pointBorderColor "#fff"
+    json.data my_array
+  end
+  end
+end

data/app/views/educode_sales/sales/index.html.erb

@@ -1,7 +1,7 @@
 <div class="section">
   <h4><span>销售人员列表</span></h4>
   <hr>
-  <table class="layui-hide" id="table"></table>
+  <table class="layui-hide" id="table" lay-filter="table" ></table>
 </div>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
@@ -18,6 +18,26 @@
     <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
   </div>
 </script>
+<script type="text/html" id="business_c">
+  <div class="layui-text">
+    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}">{{d.business_c}}</a>
+  </div>
+</script>
+<script type="text/html" id="business_d">
+  <div class="layui-text">
+    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}">{{d.business_d}}</a>
+  </div>
+</script>
+<script type="text/html" id="business_e">
+  <div class="layui-text">
+    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}">{{d.business_e}}</a>
+  </div>
+</script>
+<script type="text/html" id="business_o">
+  <div class="layui-text">
+    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
+  </div>
+</script>
 <script>
   layui.use('table', function () {
     var table = layui.table;
@@ -45,22 +65,53 @@
             title: 'A类商机',
             templet: "#business_a",
             totalRow:true,
-            width: 120
-          }, {
+            sort:true,
+            width: 100
+          },
+            {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
-            totalRow:true,
-            width: 120
-          }, {
+            totalRow:true,sort:true,
+            width: 100
+          },
+            {
+            field: 'business_c',
+            title: 'C类商机',
+            templet: "#business_c",
+            totalRow:true,sort:true,
+            width: 100
+          },
+            {
+            field: 'business_d',
+            title: 'D类商机',
+            templet: "#business_d",
+            totalRow:true,sort:true,
+            width: 100
+          },
+            {
+            field: 'business_e',
+            title: 'E类商机',
+            templet: "#business_e",
+            totalRow:true,sort:true,
+            width: 100
+          },
+            {
+            field: 'business_o',
+            title: 'O类商机',
+            templet: "#business_o",
+            totalRow:true,sort:true,
+            width: 100
+          },
+            {
             field: 'goal',
             title: '中标金额',
-            totalRow:true,
+            totalRow:true,sort:true,
             width: 120
           }, {
             field: 'return_money',
-            title: '回款',
-            totalRow:true,
+            title: '回款金额',
+            totalRow:true,sort:true,
             width: 120
           }
         ]
@@ -69,5 +120,20 @@
           limits: [10,15,20,30,40,50,60,70,80,90],
       page: true
     });
+
+      // var sort = {}, search = {};
+      // table.on('sort(table)', function (obj) {
+      //     sort.field = obj.field;
+      //     sort.order = obj.type;
+      //     table.reload('table', {
+      //         initSort: obj,
+      //         where: {
+      //             sort: sort,
+      //             q: search
+      //         }
+      //     });
+      // })
+
+
   });
 </script>

data/app/views/educode_sales/sales/index.json.jbuilder

@@ -1,5 +1,10 @@
 businesses_a_count = 0
 businesses_b_count = 0
+businesses_c_count = 0
+businesses_d_count = 0
+businesses_e_count = 0
+businesses_o_count = 0
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     part_a_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",d.id).ids
@@ -11,23 +16,52 @@ json.data do
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
     business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
     businesses_a_count += business_a
     json.business_a business_a
     business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
     businesses_b_count += business_b
     json.business_b business_b
+    business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
+    businesses_c_count += business_c
+    json.business_c business_c
+    business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
+    businesses_d_count += business_d
+    json.business_d business_b
+    business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
+    businesses_e_count += business_e
+    json.business_e business_b
+    business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
+    businesses_o_count += business_o
+    json.business_o business_o
     json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
     json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
+    json.c_clazz_id @c_clazz&.id
+    json.d_clazz_id @d_clazz&.id
+    json.e_clazz_id @e_clazz&.id
+    json.o_clazz_id @o_clazz&.id
   end
 end
 
 json.totalRow do
   json.business_a businesses_a_count.to_s
   json.business_b businesses_b_count.to_s
+  json.business_c businesses_c_count.to_s
+  json.business_d businesses_d_count.to_s
+  json.business_e businesses_e_count.to_s
+  json.business_o businesses_o_count.to_s
 end
 json.code 0
 json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -1,12 +1,22 @@
 departments_count = 0
 schools_count = 0
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
     departments = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
     json.departments departments
     schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']

data/app/views/educode_sales/staffs/index.html.erb

@@ -137,4 +137,9 @@
     });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+</style>

data/app/views/educode_sales/staffs/index.json.jbuilder

@@ -1,15 +1,25 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.month d.month
     json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''
     json.expired_at d.enabled_at ? "#{d.enabled_at.to_s(:date)}-#{d.expired_at.to_s(:date)}" : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
   end
 end
 
+
 json.code 0
 json.count @staffs.total_count

data/app/views/educode_sales/teachers/add_keys.html.erb

@@ -144,7 +144,7 @@
       $(document).on('click','#new_teacher1',function(){
           var content = miniPage.getHrefContent('/missions/teachers/new');
           var openWH = miniPage.getOpenWidthHeight();
-          sindex = layer.open({
+          teacher_uni_index = layer.open({
               id:"a",
               title: '添加老师',
               type: 1,

data/app/views/educode_sales/teachers/index.html.erb

@@ -588,4 +588,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

data/app/views/educode_sales/teachers/new.html.erb

@@ -156,6 +156,7 @@
               table.reload('teachers_table');
               layer.close(parent.index)
               layer.close(parent.sindex)
+              layer.close(parent.teacher_uni_index)
             }
           })
           return false;

data/app/views/educode_sales/upload_files/index.json.jbuilder

@@ -4,7 +4,7 @@ json.data do
     json.name d.filename
     json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
     json.created_on d.created_on.to_s
-    json.upload_person EducodeSales::Staff.find(d.author_id).user.real_name
+    json.upload_person d.author.real_name
     json.disk_filename d.disk_filename
     json.content_type d.content_type
   end

data/config/routes.rb

@@ -203,6 +203,9 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :roles do
+    collection do
+      get :rename
+    end
     member do
       put :view
       put :update_role

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.1'
+  VERSION = '0.5.5'
 end