@@ -452,6 +452,7 @@ end (0..last_index).each{|i|result << c[:proc].call(form,i)} return result else + return c[:proc].call(form,index) end end @@ -821,7 +822,12 @@ end field_list.each do |f| the_field = form.fields[f] value = the_field.calculated[:proc].call(form,index) - idx = the_field.calculated[:summary_calculation] ? 0 : index + if the_field.calculated[:summary_calculation] + idx = 0 + FieldInstance.destroy_all([condition_string,@form_instance.id,[f],0]) + else + idx = index + end fi = FieldInstance.new({:answer => value, :field_id=>f, :form_instance_id => @form_instance.id, :idx => idx, :state => 'calculated'}) fi.save end lib/metaform/record.rb @@ -805,6 +805,7 @@ describe Record do @record['name',2] = 'Jane' @record['name',3] = 'Bob' @record.total_bobs.should == 2 + @record['total_bobs',0].should == 2 @record['total_bobs',4].should == 2 @record.save('new_entry') r = Record.locate(@record.id,:fields => ['total_bobs'],:return_answers_hash =>true) @@ -818,6 +819,27 @@ describe Record do r = Record.locate(@record.id,:fields => ['reverse_name_and_job'],:return_answers_hash =>true) r['reverse_name_and_job'].value.should == "ssoBtrebreH" end + it "summary_calculation fields should be written to the database at the 0th index" do + @record['name',1] = 'Joe' + @record['name',2] = 'Jane' + @record['name',3] = 'Bob' + @record.save('new_entry') + f = FieldInstance.find(:all,:conditions => ['form_instance_id = ? and field_id = "total_bobs"',@record.id]) + f.size.should == 1 + f[0].answer.should == "2" + end + it "summary_calculation fields should be written to the database at the 0th index, even when there is a value saved there already" do + @record.save('new_entry') + record = Record.find(:first, :index => :any) + record['name',0].should == 'Bob Smith' + record['name',1] = 'Joe' + record['name',2] = 'Jane' + record['name',3] = 'Bob' + record.save('new_entry') + f = FieldInstance.find(:all,:conditions => ['form_instance_id = ? and field_id = "total_bobs"',@record.id]) + f.size.should == 1 + f[0].answer.should == "2" + end end describe "-- explanations" do spec/metaform/record_spec.rb @@ -45,7 +45,7 @@ def setup } f 'total_bobs', :label => 'total number of Bobs', :type => 'integer', :calculated => { :based_on_fields => ['name'], - :summary_calculate => true, + :summary_calculation => true, :proc => Proc.new { |form,index| answers = form.get_record.answers_hash('name');answers['name'].count("answer =~ /Bob/")} } f 'people_num', :label => '', :type => 'string' spec/resources/forms/sample_form.rb e8011e4c16be20c116853474b415ab903224b140 Lisa Sawin lsawin@optonline.net http://github.com/zippy/metaform/commit/8f0599481b05ab391c3816c191fc5fdc91999d00 8f0599481b05ab391c3816c191fc5fdc91999d00 2009-06-08T12:47:14-07:00 2009-06-08T12:47:14-07:00 summary_calculations now properly save their values in the database Before, if you updated the value of a field which was being used to calculated a calculated field with summary_calculation set to true, the database wouldn't save the value if there was already one written for this field at the 0th index. record#update_calculated_fields had to be updated to destroy the 0th indexed value first, so it could be saved in this case. 60bac579b5154b5913b7a15b71a7c51cb6ad8d36 Lisa Sawin lsawin@optonline.net