Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Merged measurement and readout views

Browse Source
This commit is contained in:
cryptogopher 2019-12-26 19:51:32 +01:00
parent c1f26e9bf0
commit 79c30be601
5 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/measurements_controller.rb
View File

@ -22,12 +22,7 @@ class MeasurementsController < ApplicationController
@measurement = @project.measurements.new(measurement_params) @measurement = @project.measurements.new(measurement_params)
if @measurement.save if @measurement.save
flash[:notice] = 'Created new measurement' flash[:notice] = 'Created new measurement'
if session[:m_filters][:scope].empty? readouts_view? ? prepare_readouts : prepare_measurements
prepare_measurements
else
prepare_readouts
render :create_readouts
end
else else
@measurement.readouts.new if @measurement.readouts.empty? @measurement.readouts.new if @measurement.readouts.empty?
render :new render :new
@ -40,13 +35,8 @@ class MeasurementsController < ApplicationController
def update def update
if @measurement.update(measurement_params) if @measurement.update(measurement_params)
flash[:notice] = 'Updated measurement' flash[:notice] = 'Updated measurement'
if session[:m_filters][:scope].empty? readouts_view? ? prepare_readouts : prepare_measurements
prepare_measurements
render :index render :index
else
prepare_readouts
render :readouts
end
else else
render :edit render :edit
end end
@ -75,7 +65,7 @@ class MeasurementsController < ApplicationController
def toggle_column def toggle_column
@measurement.column_view.toggle_column!(@quantity) @measurement.column_view.toggle_column!(@quantity)
prepare_readouts prepare_readouts
render :readouts render :index
end end
private private
@ -120,4 +110,8 @@ class MeasurementsController < ApplicationController
.includes(:source) .includes(:source)
.filter(session[:m_filters], @quantities) .filter(session[:m_filters], @quantities)
end end
def readouts_view?
session[:m_filters][:scope].present?
end
end end

4
app/views/measurements/create.js.erb
View File

@ -1,4 +1,8 @@
$('div[id^=flash_]').remove(); $('div[id^=flash_]').remove();
$('#content').prepend('<%= j render_flash_messages %>'); $('#content').prepend('<%= j render_flash_messages %>');
$('#new-measurement').empty(); $('#new-measurement').empty();
<% if defined? @quantities %>
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
<% else %>
$('#measurements').html('<%= j render partial: 'measurements/index' %>'); $('#measurements').html('<%= j render partial: 'measurements/index' %>');
<% end %>

4
app/views/measurements/create_readouts.js.erb
View File

@ -1,4 +0,0 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= j render_flash_messages %>');
$('#new-measurement').empty();
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');

4
app/views/measurements/index.js.erb
View File

@ -1,3 +1,7 @@
$('div[id^=flash_]').remove(); $('div[id^=flash_]').remove();
$('#content').prepend('<%= j render_flash_messages %>'); $('#content').prepend('<%= j render_flash_messages %>');
<% if defined? @quantities %>
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
<% else %>
$('#measurements').html('<%= j render partial: 'measurements/index' %>'); $('#measurements').html('<%= j render partial: 'measurements/index' %>');
<% end %>

3
app/views/measurements/readouts.js.erb
View File

@ -1,3 +0,0 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= j render_flash_messages %>');
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');