educode_sales 0.7.0 → 0.7.3

data/app/views/layouts/educode_sales/application.html.erb

@@ -84,13 +84,19 @@
             <% if can? :read, EducodeSales::SalePlan %>
               <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
+<!--            <dd>-->
+<!--              <a href="/missions/results" class="<%#= current?('layui-this', results_path) %>"><i style="padding-right: 35px"></i><%#= image_tag "educode_sales/6.销售计划.png", size: "15" %>-->
+<!--                <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>-->
             <% if @current_admin.is_admin %>
-            <dd><a href="/missions/recycles" class="<%= current?('layui-this', recycles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回收站</a></dd>
-              <%end %>
+              <dd>
+                <a href="/missions/recycles" class="<%= current?('layui-this', recycles_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 15px"></i>回收站</a></dd>
+            <% end %>
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed menu-li">
-          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
+            <i style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :read, EducodeSales::OperationTrend %>
               <dd>

data/config/routes.rb

@@ -162,7 +162,6 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
-
   resources :import_teachers
 
   resources :upload_files do
@@ -173,6 +172,13 @@ EducodeSales::Engine.routes.draw do
     member do
     end
   end
+  resources :results do
+    collection do
+    end
+
+    member do
+    end
+  end
 
   resources :teachers do
     collection do

data/db/migrate/20220314053856_add_service_start_time_to_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddServiceStartTimeToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :service_start_time, :date
+    add_column :educode_sales_follow_ups, :service_end_time, :date
+  end
+end

data/db/migrate/20220314074354_add_service_time_long_to_follow_ups.rb

@@ -0,0 +1,5 @@
+class AddServiceTimeLongToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :service_time_long, :integer
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.0'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/controllers/educode_sales/places_controller.rb
 - app/controllers/educode_sales/plans_controller.rb
 - app/controllers/educode_sales/recycles_controller.rb
+- app/controllers/educode_sales/results_controller.rb
 - app/controllers/educode_sales/roles_controller.rb
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
@@ -165,6 +166,7 @@ files:
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/business_helper.rb
+- app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
 - app/helpers/educode_sales/sessions_helper.rb
 - app/helpers/educode_sales/teachers_helper.rb
@@ -195,6 +197,7 @@ files:
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
 - app/models/educode_sales/recycle.rb
+- app/models/educode_sales/result.rb
 - app/models/educode_sales/role.rb
 - app/models/educode_sales/role_area.rb
 - app/models/educode_sales/role_permission.rb
@@ -328,6 +331,11 @@ files:
 - app/views/educode_sales/recycles/monthly.json.jbuilder
 - app/views/educode_sales/recycles/weekPlan.json.jbuilder
 - app/views/educode_sales/recycles/weekly.json.jbuilder
+- app/views/educode_sales/results/edit.html.erb
+- app/views/educode_sales/results/index.html.erb
+- app/views/educode_sales/results/index.json.jbuilder
+- app/views/educode_sales/results/new.html.erb
+- app/views/educode_sales/results/show.json.jbuilder
 - app/views/educode_sales/roles/edit.html.erb
 - app/views/educode_sales/roles/index.html.erb
 - app/views/educode_sales/roles/index.json.jbuilder
@@ -421,6 +429,8 @@ files:
 - db/migrate/20220121060006_create_educode_sales_business_export_records.rb
 - db/migrate/20220125013811_create_educode_sales_staff_schools.rb
 - db/migrate/20220125033552_create_educode_sales_customer_adds.rb
+- db/migrate/20220314053856_add_service_start_time_to_follow_ups.rb
+- db/migrate/20220314074354_add_service_time_long_to_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb