educode_sales 0.1.0 → 0.1.4

data/app/views/educode_sales/teachers/show_follow.json.jbuilder

@@ -0,0 +1,20 @@
+json.data do
+  json.array!  @follow_ups do |d|
+    json.id d.id
+    json.created_at d.created_at.to_s
+    json.time d.created_at.to_s(:date)
+    json.teacher_attitude EducodeSales::Common.find_by(id: d.attitude_id).name
+    json.course_plan EducodeSales::Common.find_by(id: d.course_plan_id).name
+    json.course_build EducodeSales::Common.find_by(id: d.course_build_id).name
+    json.contact EducodeSales::Common.find_by(id: d.follow_id).name
+    json.staff d.staff.user.real_name
+    json.students_count d.students_count
+    json.courses_count d.courses_count
+    json.evaluates_count d.evaluates_count
+    json.course_shixuns_count d.course_shixuns_count
+    json.shixuns_count d.shixuns_count
+  end
+end
+
+json.code 0
+json.count @follow_ups.count

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

@@ -1,67 +1,36 @@
-<form class="layui-form " action="">
+<form class="layui-form form-value" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label">教师态度</label>
+      <label class="layui-form-label">教师态度：</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <span><%= EducodeSales::Common.find_by(id: @follow_up.attitude_id).name %></span>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">开课计划</label>
+      <label class="layui-form-label">开课计划：</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <span><%= EducodeSales::Common.find_by(id: @follow_up.course_plan_id).name %></span>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">课堂建设</label>
+      <label class="layui-form-label">课堂建设：</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <span><%= EducodeSales::Common.find_by(id: @follow_up.course_build_id).name %></span>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">跟进手段</label>
+      <label class="layui-form-label">跟进手段：</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <span><%= EducodeSales::Common.find_by(id: @follow_up.follow_id).name %></span>
       </div>
     </div>
     <br>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">跟进小结</label>
+      <label class="layui-form-label">跟进小结：</label>
       <div class="layui-input-block">
-        <textarea name="desc" placeholder="此处可以填写：
-1、教师关注的痛点问题；
-2、教师关注的教学项目、教学成果类型；
-3、其他个性化需求，以及应对情况说明；
-4、目前态度的产生原因等。
-" class="layui-textarea"></textarea>
+        <span><%= @follow_up.description%></span>
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 50px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
-      </button>
-    </div>
   </div>
 </form>

data/app/views/educode_sales/teachers/unfinish_plans.json.jbuilder

@@ -0,0 +1,14 @@
+json.data do
+  json.array! @plans do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.month d.month.strftime("%Y-%m")
+    json.weekly d.weekly
+    json.content d.content.truncate(30)
+    json.finish_rate "#{d.finish_rate}%"
+    json.updated_at d.updated_at.to_s
+  end
+end
+
+json.code 0
+json.count @plans.count

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

@@ -43,34 +43,54 @@
         <li class="layui-nav-item layui-nav-itemed">
           <a class="" href="javascript:;">销售活动</a>
           <dl class="layui-nav-child">
+            <% if can? :trends, EducodeSales::SaleTrend %>
             <dd>
               <a href="/educode_sales/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>">市场态势</a>
             </dd>
+            <% end %>
+            <% if can? :sales, EducodeSales::Staff %>
             <dd><a href="/educode_sales/sales" class="<%= current?('layui-this', sales_path) %>">销售分工</a>
             </dd>
+            <% end %>
+            <% if can? :read, EducodeSales::Business %>
             <dd><a href="/educode_sales/businesses" class="<%= current?('layui-this', businesses_path) %>">商机管理</a>
             </dd>
+            <% end %>
+            <% if can? :read, EducodeSales::Place %>
             <dd><a href="/educode_sales/places" class="<%= current?('layui-this', places_path) %>">渠道管理</a></dd>
+            <% end %>
+            <% if can? :read, EducodeSales::SalePlan %>
             <dd><a href="/educode_sales/plans" class="<%= current?('layui-this', plans_path) %>">销售计划</a></dd>
-            <!-- <dd><a href="/educode_sales/statistics">销售数据统计</a></dd> -->
+            <% end %>
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed">
           <a class="" href="javascript:;">运营活动</a>
           <dl class="layui-nav-child">
+             <% if can? :read, EducodeSales::OperationTrend %>
             <dd>
               <a href="/educode_sales/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>">运营态势</a>
             </dd>
+             <% end %>
+             <% if can? :operations, EducodeSales::Staff %>
             <dd>
-              <a href="/educode_sales/sales/operations" class="<%= current?('layui-this', sale_trends_sales_path) %>">运营分工</a>
+              <a href="/educode_sales/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>">运营分工</a>
             </dd>
+            <% end %>
+            <% if can? :read, EducodeSales::Teacher %>
             <dd><a href="/educode_sales/teachers" class="<%= current?('layui-this', teachers_path) %>">教师运营</a></dd>
+            <% end %>
+            <% if can? :read, EducodeSales::Activity %>
             <dd><a href="/educode_sales/activities" class="<%= current?('layui-this', activities_path) %>">活动运营</a></dd>
+            <% end %>
+            <% if can? :read, EducodeSales::OperationPlan %>
             <dd>
               <a href="/educode_sales/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>">运营计划</a>
             </dd>
+            <% end %>
           </dl>
         </li>
+        <% if @current_admin.is_admin %>
         <li class="layui-nav-item layui-nav-itemed">
           <a class="" href="javascript:;">系统设置</a>
           <dl class="layui-nav-child">
@@ -79,6 +99,7 @@
             <dd><a href="/educode_sales/commons" class="<%= current?('layui-this', commons_path) %>">字典列表</a></dd>
           </dl>
         </li>
+        <% end %>
       </ul>
     </div>
   </div>

data/config/routes.rb

@@ -13,7 +13,13 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
-  resources :operation_reports
+  resources :operation_reports do
+    member do
+      get :plans
+      get :audit
+      put :update_audit
+    end
+  end
 
   resources :sale_reports do
     member do
@@ -25,8 +31,6 @@ EducodeSales::Engine.routes.draw do
 
   resources :key_person
 
-  resources :operation_plans
-
   resources :follow_ups do
     member do
       get :teachers
@@ -69,7 +73,6 @@ EducodeSales::Engine.routes.draw do
 
   resources :plans do
     collection do
-      get :operation
       get :new_week
       get :new_weekly
       get :new_month
@@ -101,6 +104,8 @@ EducodeSales::Engine.routes.draw do
       get :edit_weekly
       get :edit_month
       get :edit_monthly
+      get :my_week
+      get :my_month
     end
   end
 
@@ -118,6 +123,16 @@ EducodeSales::Engine.routes.draw do
       get :course_list
       get :activities
     end
+
+    member do
+      post :create_course
+      put :update_course
+      delete :delete_course
+      post :add_follow_up
+      get :unfinish_plans
+      get :course_subject
+      put :update_follow_up
+    end
   end
 
   resources :activities do
@@ -156,7 +171,10 @@ EducodeSales::Engine.routes.draw do
   resources :roles do
     member do
       put :view
+      put :update_role
     end
   end
 
+  resources :teacher_follows
+
 end

data/db/migrate/20210915061738_add_students_count_teacher_follow_ups.rb

@@ -0,0 +1,9 @@
+class AddStudentsCountTeacherFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teacher_follows, :students_count, :integer, default: 0, comment: '学生数'
+    add_column :educode_sales_teacher_follows, :courses_count, :integer, default: 0, comment: '课堂数'
+    add_column :educode_sales_teacher_follows, :evaluates_count, :integer, default: 0, comment: '评测数'
+    add_column :educode_sales_teacher_follows, :course_shixuns_count, :integer, default: 0, comment: '使用实践项目数'
+    add_column :educode_sales_teacher_follows, :shixuns_count, :integer, default: 0, comment: '创建的实践项目数'
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.0'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - app/controllers/educode_sales/sales_controller.rb
 - app/controllers/educode_sales/sessions_controller.rb
 - app/controllers/educode_sales/staffs_controller.rb
+- app/controllers/educode_sales/teacher_follows_controller.rb
 - app/controllers/educode_sales/teachers_controller.rb
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
@@ -206,6 +207,9 @@ files:
 - app/views/educode_sales/operation_plans/edit_week.html.erb
 - app/views/educode_sales/operation_plans/edit_weekly.html.erb
 - app/views/educode_sales/operation_plans/index.html.erb
+- app/views/educode_sales/operation_plans/index.json.jbuilder
+- app/views/educode_sales/operation_plans/my_month.json.jbuilder
+- app/views/educode_sales/operation_plans/my_week.json.jbuilder
 - app/views/educode_sales/operation_plans/new_month.html.erb
 - app/views/educode_sales/operation_plans/new_monthly.html.erb
 - app/views/educode_sales/operation_plans/new_week.html.erb
@@ -215,6 +219,11 @@ files:
 - app/views/educode_sales/operation_plans/show_monthly.html.erb
 - app/views/educode_sales/operation_plans/show_week.html.erb
 - app/views/educode_sales/operation_plans/show_weekly.html.erb
+- app/views/educode_sales/operation_reports/audit.html.erb
+- app/views/educode_sales/operation_reports/edit.html.erb
+- app/views/educode_sales/operation_reports/index.json.jbuilder
+- app/views/educode_sales/operation_reports/plans.json.jbuilder
+- app/views/educode_sales/operation_reports/show.html.erb
 - app/views/educode_sales/operations/trends.html.erb
 - app/views/educode_sales/places/edit.html.erb
 - app/views/educode_sales/places/index.html.erb
@@ -272,6 +281,7 @@ files:
 - app/views/educode_sales/teachers/add_event.html.erb
 - app/views/educode_sales/teachers/add_keys.html.erb
 - app/views/educode_sales/teachers/course_list.json.jbuilder
+- app/views/educode_sales/teachers/course_subject.json.jbuilder
 - app/views/educode_sales/teachers/edit.html.erb
 - app/views/educode_sales/teachers/edit_follow_record.html.erb
 - app/views/educode_sales/teachers/index.html.erb
@@ -281,7 +291,9 @@ files:
 - app/views/educode_sales/teachers/search_new.html.erb
 - app/views/educode_sales/teachers/show_class.html.erb
 - app/views/educode_sales/teachers/show_follow.html.erb
+- app/views/educode_sales/teachers/show_follow.json.jbuilder
 - app/views/educode_sales/teachers/show_follow_record.html.erb
+- app/views/educode_sales/teachers/unfinish_plans.json.jbuilder
 - app/views/layouts/educode_sales/application.html.erb
 - app/views/layouts/educode_sales/login.html.erb
 - config/locales/sale.zh-CN.yml
@@ -311,6 +323,7 @@ files:
 - db/migrate/20210912061148_add_audit_user_id_to_sales_reports.rb
 - db/migrate/20210913070728_create_educode_sales_activity_teachers.rb
 - db/migrate/20210913071607_create_educode_sales_course_subjects.rb
+- db/migrate/20210915061738_add_students_count_teacher_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb