1
0

Merged measurement and readout views

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

View File

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

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' %>');

View File

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

View File

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