abiao 2 rokov pred
rodič
commit
9c804862e8
2 zmenil súbory, kde vykonal 13 pridanie a 15 odobranie
  1. 5 2
      app/models/employ_static_food.rb
  2. 8 13
      app/models/static_food.rb

+ 5 - 2
app/models/employ_static_food.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 class EmployStaticFood < ActiveRecord::Base
-  self.table_name = "static_foods"
+  self.table_name = "employ_static_foods"
   validates :source,presence: true
 
   TYPE_ENUM = [["早餐",1],["中餐",2],["晚餐",3]]
@@ -8,10 +8,11 @@ class EmployStaticFood < ActiveRecord::Base
 
   rails_admin do
     navigation_label '食堂管理'
-    weight -500
+    weight -501
     list do
       filters [:source]
       field :id
+      field :employ_id
       field :food_date
       field :source, :enum do
         filterable true
@@ -25,6 +26,7 @@ class EmployStaticFood < ActiveRecord::Base
     end
     show do
       field :id
+      field :employ_id
       field :food_date
       field :source, :enum do
         filterable true
@@ -37,6 +39,7 @@ class EmployStaticFood < ActiveRecord::Base
       field :updated_at
     end
     edit do
+      field :employ_id
       field :food_date
       field :source, :enum do
         filterable true

+ 8 - 13
app/models/static_food.rb

@@ -1,49 +1,44 @@
 # encoding: utf-8
 class StaticFood < ActiveRecord::Base
-  self.table_name = "food_forbid_date"
-  validates :forbid_date,:source,presence: true
+  self.table_name = "static_foods"
+  validates :source,presence: true
 
   TYPE_ENUM = [["早餐",1],["中餐",2],["晚餐",3]]
 
-  after_update :sync_forbid_date
-  after_create :sync_forbid_date
 
-  def sync_forbid_date
-    #发放未发放赠品
-    url = "#{CONFIG_FILE["xj_host"]}/base/synchronize-forbid-food/?id=#{self.id}"
-    open(url)
-  end
 
   rails_admin do
     navigation_label '食堂管理'
-    weight -500
+    weight -502
     list do
       filters [:source]
       field :id
-      field :forbid_date
+      field :food_date
       field :source, :enum do
         filterable true
         enum do
           TYPE_ENUM
         end
       end
+      field :nums
       field :created_at
       # field :updated_at
     end
     show do
       field :id
-      field :forbid_date
+      field :food_date
       field :source, :enum do
         filterable true
         enum do
           TYPE_ENUM
         end
       end
+      field :nums
       field :created_at
       field :updated_at
     end
     edit do
-      field :forbid_date
+      field :food_date
       field :source, :enum do
         filterable true
         enum do