educode_sales 0.9.53 → 0.9.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67243841093d2b85c0eefb02d4fc8bb4f7acaafc2870f68d4ec03975dcfd56ba
-  data.tar.gz: 4e7361e3aea55d0e979ee3d876a0674d9f397007e8eab83414971f0e93f67f9b
+  metadata.gz: d84bb1c7e9e34758e91acc40d652ddd0d5349078f7415634e9b543354e801f7a
+  data.tar.gz: e27fd016f131694941d502c8e9111fc3eb530f8f95484af1518754966602ca80
 SHA512:
-  metadata.gz: e82bd4139fc5341ced74482ec6bf79c08c750f9e74cda9d762062f112c60d13579c541bec2c696f38690d5c2e24281dec271f09e0357f6ec579d5ea8519af128
-  data.tar.gz: c7d052d54a7d3270e02a64f8fec5325bef6a39f5608f164b1ffe067f3ea3451b5dc50f0903f798efb975d94f4b826e9e5fd8c808400405c16440ac353ef9df7e
+  metadata.gz: be84a8610f48ec6db17c36264699f12e4de5adf8d3452b4a7ef07940c85d5003ad4f1667ae90c93f5434fbc781ada0fc08e8a2005c96267c4a74435a143bb06d
+  data.tar.gz: 78f9a6bdff957b4459d3792992c86a9bc7b53507e2f4acd51626535d9be53e474072f766196b71f6b626e896c235f90d2c18eb83ee4ec4ff540c2af82a10caf0

data/app/controllers/educode_sales/idea_recycles_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
 
           if params[:q] && params[:q][:created_at].present?
             date = params[:q][:created_at].split(" - ")
-            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
             @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")

data/app/controllers/educode_sales/ideas_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
 
           if params[:q] && params[:q][:created_at].present?
             date = params[:q][:created_at].split(" - ")
-            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
             @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")

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

@@ -9,7 +9,7 @@ json.data do
     json.end_time d.end_time.to_s
     json.creator d.creator&.user&.real_name
     json.deleter d.deleter&.user&.real_name
-    json.created_at d.created_at.to_s
+    json.created_at d.created_at.to_s(:date)
     json.history_type EducodeSales::Idea.where(school_id: d.school_id).size.to_i >= 2 ? "有" : "无"
   end
 end

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

@@ -84,7 +84,7 @@
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
-  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">删除</a>
+  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

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

@@ -9,7 +9,7 @@ json.data do
     json.end_time d.end_time.to_s
     json.creator d.creator&.user&.real_name
     json.deleter d.deleter&.user&.real_name
-    json.created_at d.created_at.to_s
+    json.created_at d.created_at.to_s(:date)
     json.history_type EducodeSales::Idea.where(school_id: d.school_id).size.to_i >= 2 ? "有" : "无"
   end
 end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.53'
+  VERSION = '0.9.55'
 end

metadata

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