lib/openstudio-standards/standards/necb/NECB2011/data/standards_data.rb in openstudio-standards-0.2.11 vs lib/openstudio-standards/standards/necb/NECB2011/data/standards_data.rb in openstudio-standards-0.2.12.rc1

@@ -56,30 +56,32 @@
       return return_objects
     end
   end
 
 
-  def json_to_excel(data_folder = File.dirname(__FILE__), xlsx_file = 'standards.xlsx')
+  def json_to_excel(data_folder = __dir__, xlsx_file = 'standards.xlsx')
     standards_data = self.load_standards_data(data_folder)
     workbook = RubyXL::Workbook.new
     workbook.worksheets.delete(workbook['Sheet1'])
     #Write Constants Sheet.
-    self.array_of_hashes_to_excel_sheet(workbook.add_worksheet('constants'), standards_data['constants'])
-    self.array_of_hashes_to_excel_sheet(workbook.add_worksheet('formulas'), standards_data['formulas'])
+    #self.array_of_hashes_to_excel_sheet(workbook.add_worksheet('constants'), standards_data['constants'])
+    #self.array_of_hashes_to_excel_sheet(workbook.add_worksheet('formulas'), standards_data['formulas'])
     standards_data['tables'].each do |table|
-      sheet = workbook.add_worksheet(table['name'])
+      #puts table
+      puts table[0]
+      sheet = workbook.add_worksheet(table[0])
       row = 0
-      table.each do |key, value|
+      table[1].each do |key, value|
         unless key == 'table'
           sheet.add_cell(row, 0, key).change_font_bold(true)
           sheet.add_cell(row, 1, value)
           row += 1
         end
       end
       row += 1
       sheet.add_cell(row, 0, 'Table').change_font_bold(true)
-      self.array_of_hashes_to_excel_sheet(sheet, table['table'], (row + 1))
+      self.array_of_hashes_to_excel_sheet(sheet, table[1]['table'], (row + 1))
     end
     workbook.write(xlsx_file)
     return xlsx_file
   end
 
@@ -483,10 +485,10 @@
           end
         end
         table_hash['table'] = table_array_of_hashes
         table_hash_array = {}
         table_hash_array['tables'] = [table_hash]
-        File.write("#{output_folder}/#{sheet.sheet_name}.json", JSON.pretty_generate(table_hash_array.sort_by_key(true)))
+        File.write("#{output_folder}/#{sheet.sheet_name}.json", JSON.pretty_generate({'tables':parent_hash.sort_by_key(true)}))
         output_hash = output_hash.merge(parent_hash)
       end
     end
   end
 
\ No newline at end of file