diff --git a/db/migrations/0002_add_result_type.rb b/db/migrations/0002_add_result_type.rb new file mode 100644 index 0000000..60665ab --- /dev/null +++ b/db/migrations/0002_add_result_type.rb @@ -0,0 +1,17 @@ +Sequel.migration do + + up do + alter_table(:results) do + add_column :type, String, null: false, default: 'fps' + add_column :minimum_score, String + add_column :maximum_score, String + end + end + + down do + drop_column :results, :type + drop_column :results, :minimum_score + drop_column :results, :maximum_score + end + +end diff --git a/src/routes/result.rb b/src/routes/result.rb index a9ff1d2..bdc2d3c 100644 --- a/src/routes/result.rb +++ b/src/routes/result.rb @@ -20,15 +20,19 @@ class GameData < Sinatra::Base end post '/result/add' do benchmark = Benchmark.where(:id => params[:result_benchmark]).first() - formatted_score = params[:result_average] if benchmark.scoring == 'fps' formatted_score = params[:result_average] + ':' + params[:result_minimum] + ':' + params[:result_maximum] end + result_minimum = params[:result_minimum] if params.has_key?(:result_minimum) + result_maximum = params[:result_maximum] if params.has_key?(:result_maximum) + result = Result.create( hardware_id: params[:result_hardware], benchmark_id: params[:result_benchmark], - score: formatted_score + score: params[:result_average], + minimum_score: result_minimum, + maximum_score: result_maximum ) redirect "/result" diff --git a/views/result/add.erb b/views/result/add.erb index 86cba45..21468ad 100644 --- a/views/result/add.erb +++ b/views/result/add.erb @@ -35,7 +35,7 @@