includes od in toggle_o/d json response

HartasCuerdas · Oct 8, 2014 · b54f142 · b54f142
1 parent 88c44fa
commit b54f142
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/ods_controller.rb b/app/controllers/ods_controller.rb
@@ -24,7 +24,7 @@ def toggle_od_response
     @day = @od.day
     @week = @day.week
     respond_to do |format|
-      format.json { render 'days/day_week', status: :ok }
+      format.json { render 'ods/od_day_week', status: :ok }
     end
   end
 

diff --git a/app/views/ods/od_day_week.json.jbuilder b/app/views/ods/od_day_week.json.jbuilder
@@ -0,0 +1,9 @@
+json.od do
+  json.extract! @od, :id, :instant, :o, :d, :timekey, :created_at, :updated_at
+end
+json.day do
+  json.extract! @day, :id, :date, :oTotal, :dTotal, :wr, :week_id
+end
+json.week do
+  json.extract! @week, :id, :firstDay, :oAVG, :dAVG, :oMAX, :oMIN, :dMAX, :dMIN, :comment
+end