educode_sales 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae794ee6831f1fab6465eb9290de9f3155b4a32e13acafe865500e42decaff6
-  data.tar.gz: cb2e8ea7a97b6cd04942343417a7d427f18657dec46ddc2805d11a876a8672f1
+  metadata.gz: 87e480da43efa545f556407cb3aced122684a09ebba821cc1d5ba1b33013758c
+  data.tar.gz: f8a1d0d849c2f45fac61856394ebd61fa19c6993349393cf30c73061071e200b
 SHA512:
-  metadata.gz: 72e214c3bca3382997cc389f36eb92747a96323ef141f255154aff068b20c9e5488fe24de4a028bbcb67a6d4c8d457713d078c6c5a70d8be08c311e3402363f4
-  data.tar.gz: f570a34ca2014691e28f95c758a204a82f3953118deccc89b22650476fc32ca7f5cf7a003758023796f2deccb980fbb609cfd0f99a141cafd027c06f8293ef18
+  metadata.gz: 2b9b85218c9ab2ba92752aaac23ed8329bd130c48f27c00488d4e8a484cdb8791b29b9be8bb9ccafa6828ba9bc4500c4365718d5c080cfd789960c5125c2da33
+  data.tar.gz: 8ae91d1a4d9337886c87067b69728cd93831e8d7a85bf524c6acef57915561726a574d6a3c5a1c2eb4cead28ea6aea1450dd94949920d0113856b7390f418445

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -33,7 +33,7 @@ module EducodeSales
           x_business_ids << d.id
         end
       end
-      colors = ['#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)']
+      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)']
       @follow_count_range = params[:follow_count_range] || "day"
       @goal_count_range = params[:goal_count_range] || "day"
       # 商机跟进数图表
@@ -82,8 +82,8 @@ module EducodeSales
                          Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
                        end
                      },
-                     backgroundColor: colors[sale_names.index(name)+1],
-                     borderColor: colors[sale_names.index(name)+1],
+                     backgroundColor: colors[sale_names.index(name)],
+                     borderColor: colors[sale_names.index(name)],
                      borderWidth: 1
                    }
         end
@@ -108,8 +108,8 @@ module EducodeSales
                              else
                                Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
                              end                           },
-                           backgroundColor: colors[sale_names.index(name)+1],
-                           borderColor: colors[sale_names.index(name)+1],
+                           backgroundColor: colors[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
                            borderWidth: 1
                          }
               end
@@ -132,8 +132,8 @@ module EducodeSales
                              else
                                Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
                              end                           },
-                           backgroundColor: colors[sale_names.index(name)+1],
-                           borderColor: colors[sale_names.index(name)+1],
+                           backgroundColor: colors[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
                            borderWidth: 1
                          }
               end
@@ -172,8 +172,8 @@ module EducodeSales
             data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
             pointBorderColor: "#fff",
-            borderColor: colors[names.index(name)%10],
-            pointBackgroundColor: colors[names.index(name)%10],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
             borderWidth: 1
           }
         end
@@ -189,8 +189,8 @@ module EducodeSales
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
             pointBorderColor: "#fff",
-            borderColor: colors[names.index(name)%10],
-            pointBackgroundColor: colors[names.index(name)%10],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
             borderWidth: 1
           }
         end
@@ -206,8 +206,8 @@ module EducodeSales
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
             pointBorderColor: "#fff",
-            borderColor: colors[names.index(name)%10],
-            pointBackgroundColor: colors[names.index(name)%10],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
             borderWidth: 1
           }
         end

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -20,46 +20,46 @@ module EducodeSales
     end
 
     def create
-      folder = edu_setting('attachment_folder')
-        upload_file = params["file"]
-        raise "未上传文件" unless upload_file
-        save_path = File.join(folder)
-        ext = file_ext(upload_file.original_filename)
-        local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
-        content_type = upload_file.content_type.presence || 'application/octet-stream'
-        disk_filename = local_path[save_path.size + 1, local_path.size]
-        @attachment = Attachment.where(disk_filename: disk_filename,
-                                       author_id: @current_admin.id).first
-        if @attachment.blank?
-          @attachment = Attachment.new
-          @attachment.filename = upload_file.original_filename
-          @attachment.description = "business"
-          @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
-          @attachment.filesize = upload_file.tempfile.size
-          @attachment.content_type = content_type
-          @attachment.digest = digest
-          @attachment.author_id = @current_admin.id
-          @attachment.container_id = params[:business_id]
-          @attachment.save!
-        else
-          logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
-        end
-        render_success
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      upload_file = params["file"]
+      raise "未上传文件" unless upload_file
+      save_path = File.join(folder)
+      ext = file_ext(upload_file.original_filename)
+      local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+      content_type = upload_file.content_type.presence || 'application/octet-stream'
+      disk_filename = local_path[save_path.size + 1, local_path.size]
+      @attachment = Attachment.where(disk_filename: disk_filename,
+                                     author_id: @current_admin.user_id).first
+      if @attachment.blank?
+        @attachment = Attachment.new
+        @attachment.filename = upload_file.original_filename
+        @attachment.description = "business"
+        @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
+        @attachment.filesize = upload_file.tempfile.size
+        @attachment.content_type = content_type
+        @attachment.digest = digest
+        @attachment.author_id = @current_admin.user_id
+        @attachment.container_id = params[:business_id]
+        @attachment.save!
+      else
+        logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
+      end
+      render_success
     end
 
     def destroy
-      folder = edu_setting('attachment_folder')
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
       file = Attachment.find(params[:id])
       file.destroy
-      File.delete(folder.to_s + '/' + file.disk_filename) if FileTest::exist?(folder.to_s + '/' + file.disk_filename)
+      File.delete(folder +  "/" +file.disk_filename) if FileTest::exist?(folder +  "/" +file.disk_filename)
       render_success
     end
 
     def download
-      folder = edu_setting('attachment_folder')
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
       file = Attachment.find_by_id(params[:id])
       raise "未找到文件" unless file
-      send_file(folder.to_s + '/' + file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')
+      send_file(folder +  "/" +file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')
     end
 
     def edu_setting name

data/app/views/educode_sales/businesses/file.html.erb

@@ -122,11 +122,11 @@
             if (obj.event === 'preview') {
                 if (data.content_type.split("/")[0] === "image"){
                     layer.photos({
-                        photos: { "data": [{"src": '/business_file/' + name}] }
+                        photos: { "data": [{"src": '/images/educode_sales/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/business_file/' + name;
+                    var pdf = '/images/business_file/' + name;
                     console.log(pdf);
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({

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

@@ -203,6 +203,8 @@
     </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>
@@ -327,7 +329,7 @@
         laydate.render({
             elem: '#date',
             min: -15
-            ,max: 15,
+            ,max: 0,
             range: true
         });
         laydate.render({
@@ -348,14 +350,14 @@
             type: 'year',
             elem: '#date_year',
             min: -3660
-            ,max: 366,
+            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'year',
             elem: '#goal_date_year',
             min: -3660
-            ,max: 366,
+            ,max: 0,
             range: true
         });
         laydate.render({
@@ -424,19 +426,41 @@
             }
         });
 
+
+        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: {
-                scales: {
-                    yAxes: [{
-                        ticks: {
-                            beginAtZero:true
-                        }
-                    }]
-                }
-            }
+            options: opt
         });
     })
   </script>

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

@@ -66,42 +66,42 @@
             templet: "#business_a",
             totalRow:true,
             sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_c',
             title: 'C类商机',
             templet: "#business_c",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_d',
             title: 'D类商机',
             templet: "#business_d",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_e',
             title: 'E类商机',
             templet: "#business_e",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_o',
             title: 'O类商机',
             templet: "#business_o",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'goal',
@@ -110,7 +110,7 @@
             width: 120
           }, {
             field: 'return_money',
-            title: '回款',
+            title: '回款金额',
             totalRow:true,sort:true,
             width: 120
           }

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/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - anke1460