RubyGems - educode_sales - Versions diffs - 0.1.1 → 0.1.2 - Mend

educode_sales 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

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

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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/config/routes.rb CHANGED Viewed

@@ -123,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

data/db/migrate/20210915061738_add_students_count_teacher_follow_ups.rb ADDED Viewed

@@ -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 CHANGED Viewed

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -281,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
@@ -290,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
@@ -320,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