Changeset 454

Show
Ignore:
Timestamp:
01/22/07 18:51:39 (2 years ago)
Author:
timo
Message:
  • The rest of the migrations are renamed.
  • More renaming in the rest of the files.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/workorder_report_rename/app/helpers/application_helper.rb

    r373 r454  
    411411  end 
    412412 
    413   # Function: link_to_report 
     413  # Function: link_to_form 
    414414  # ======================== 
    415415  # 
    416   # Returns a link to report 
    417   # 
    418   # Parameters: 
    419   # ----------- 
    420   # report    - Report to link to 
    421   # link_only - If true, the 'Report' text is not displayed. 
    422   def link_to_report(report, link_only = false) 
    423     return '' unless report 
    424  
    425     link = link_to(h("#{report.to_s} (#{report.report_type.name})"), {:controller => 'report', :action => 'view', :id => report.id}, :class => 'report') 
    426  
    427     #link_title = h("#{report.to_s} (#{report.report_type.name})") 
    428     #link = "<a href=\"/report/view/#{report.id}\" class=\"report\">#{link_title}</a>" 
     416  # Returns a link to form 
     417  # 
     418  # Parameters: 
     419  # ----------- 
     420  # form    - Form to link to 
     421  # link_only - If true, the 'Form' text is not displayed. 
     422  def link_to_form(form, link_only = false) 
     423    return '' unless form 
     424 
     425    link = link_to(h("#{form.to_s} (#{form.form_type.name})"), {:controller => 'form', :action => 'view', :id => form.id}, :class => 'form') 
     426 
     427    #link_title = h("#{form.to_s} (#{form.form_type.name})") 
     428    #link = "<a href=\"/form/view/#{form.id}\" class=\"form\">#{link_title}</a>" 
    429429    return link if link_only 
    430     return _('Report') + ' ' + link 
     430    return _('Form') + ' ' + link 
    431431  end 
    432432 
    …… 
    544544    asset_url_prefix = url_for(:controller=>'/asset', :action=>'view', :full_code=>'') 
    545545    work_order_url_prefix = url_for(:controller=>'work_order', :action=>'view', :id=>'') 
    546     report_url_prefix = url_for(:controller=>'report', :action=>'view', :id=>'') 
     546    form_url_prefix = url_for(:controller=>'form', :action=>'view', :id=>'') 
    547547    attachment_url_prefix = url_for(:controller=>'attachment', :action=>'view', :id=>'') 
    548548    type_attachment_url_prefix = url_for(:controller=>'type_attachment', :action=>'view', :id=>'') 
    549     return CMMSMarkup.new(src, asset_url_prefix, work_order_url_prefix, report_url_prefix, attachment_url_prefix, type_attachment_url_prefix).to_html 
     549    return CMMSMarkup.new(src, asset_url_prefix, work_order_url_prefix, form_url_prefix, attachment_url_prefix, type_attachment_url_prefix).to_html 
    550550  end 
    551551 

  • branches/workorder_report_rename/app/helpers/asset_helper.rb

    r238 r454  
    6262        result += '&nbsp;' + 
    6363          case item.class.to_s 
    64           when 'Report' 
    65             link_to_report(item, true) 
     64          when 'Form' 
     65            link_to_form(item, true) 
    6666          when 'WorkOrder' 
    6767            link_to_work_order(item, true) 
    …… 
    7777    results = asset.analyse_service_request_chain 
    7878    result_items = '' 
    79     result_items += condition_list_item(:red, sprintf(n_('%d unprocessed %s report:', '%d unprocessed %s reports:', results[:unprocessed_requests].last.size), results[:unprocessed_requests].last.size, results[:unprocessed_requests].first), results[:unprocessed_requests].last) if results.has_key?(:unprocessed_requests) 
     79    result_items += condition_list_item(:red, sprintf(n_('%d unprocessed %s form:', '%d unprocessed %s forms:', results[:unprocessed_requests].last.size), results[:unprocessed_requests].last.size, results[:unprocessed_requests].first), results[:unprocessed_requests].last) if results.has_key?(:unprocessed_requests) 
    8080 
    8181    result_items += condition_list_item(:orange, sprintf(n_('%d new %s work order:', '%d new %s work orders:', results[:new_works].last.size), results[:new_works].last.size, results[:new_works].first), results[:new_works].last) if results.has_key?(:new_works) 
    …… 
    8383    result_items += condition_list_item(:green, sprintf(n_('%d assigned or accepted %s work order:', '%d assigned or accepted %s work orders:', results[:assigned_works].last.size), results[:assigned_works].last.size, results[:assigned_works].first), results[:assigned_works].last) if results.has_key?(:assigned_works) 
    8484 
    85     result_items += condition_list_item(:orange, sprintf(n_('%d unfinished %s work order. No %s report has been filed:', '%d unfinished %s work orders. No %s report has been filed:', results[:unknown_condition].last.size), results[:unknown_condition].last.size, *results[:unknown_condition].first), results[:unknown_condition].last) if results.has_key?(:unknown_condition) 
     85    result_items += condition_list_item(:orange, sprintf(n_('%d unfinished %s work order. No %s form has been filed:', '%d unfinished %s work orders. No %s form has been filed:', results[:unknown_condition].last.size), results[:unknown_condition].last.size, *results[:unknown_condition].first), results[:unknown_condition].last) if results.has_key?(:unknown_condition) 
    8686 
    87     result_items += condition_list_item(:green, sprintf(n_('%d recent %s report:', '%d recent %s reports:', results[:recent_condition].last.size), results[:recent_condition].last.size, results[:recent_condition].first), results[:recent_condition].last) if results.has_key?(:recent_condition) 
     87    result_items += condition_list_item(:green, sprintf(n_('%d recent %s form:', '%d recent %s forms:', results[:recent_condition].last.size), results[:recent_condition].last.size, results[:recent_condition].first), results[:recent_condition].last) if results.has_key?(:recent_condition) 
    8888 
    8989    result_items 
    …… 
    9696    result_items += condition_list_item(:green, sprintf(n_('%d assigned or accepted %s work order:', '%d assigned or accepted %s work orders:', results[:assigned_works].last.size), results[:assigned_works].last.size, results[:assigned_works].first), results[:assigned_works].last) if results.has_key?(:assigned_works) 
    9797 
    98     result_items += condition_list_item(:orange, sprintf(n_('%d unfinished %s work order. No %s report has been filed:', '%d unfinished %s work orders. No %s report has been filed:', results[:unknown_condition].last.size), results[:unknown_condition].last.size, *results[:unknown_condition].first), results[:unknown_condition].last) if results.has_key?(:unknown_condition) 
     98    result_items += condition_list_item(:orange, sprintf(n_('%d unfinished %s work order. No %s form has been filed:', '%d unfinished %s work orders. No %s form has been filed:', results[:unknown_condition].last.size), results[:unknown_condition].last.size, *results[:unknown_condition].first), results[:unknown_condition].last) if results.has_key?(:unknown_condition) 
    9999 
    100     result_items += condition_list_item(:green, sprintf(n_('%d recent %s report:', '%d recent %s reports:', results[:recent_maintenance].last.size), results[:recent_maintenance].last.size, results[:recent_maintenance].first), results[:recent_maintenance].last) if results.has_key?(:recent_maintenance) 
     100    result_items += condition_list_item(:green, sprintf(n_('%d recent %s form:', '%d recent %s forms:', results[:recent_maintenance].last.size), results[:recent_maintenance].last.size, results[:recent_maintenance].first), results[:recent_maintenance].last) if results.has_key?(:recent_maintenance) 
    101101 
    102102    result_items 

  • branches/workorder_report_rename/app/models/asset_condition_analysis.rb

    r238 r454  
    99  def analyse_service_request_chain 
    1010    result = {} 
    11     cause_report_tag, work_order_tag, effect_report_tag = DataTypeTag.find DataTypeTag::CHAIN['Service request'] 
    12     cause_report_type_ids = cause_report_tag.report_types.map {|t| t.id } 
     11    cause_form_tag, work_order_tag, effect_form_tag = DataTypeTag.find DataTypeTag::CHAIN['Service request'] 
     12    cause_form_type_ids = cause_form_tag.form_types.map {|t| t.id } 
    1313    work_order_type_ids = work_order_tag.work_order_types.map {|t| t.id } 
    14     effect_report_type_ids = effect_report_tag.report_types.map {|t| t.id } 
     14    effect_form_type_ids = effect_form_tag.form_types.map {|t| t.id } 
    1515 
    1616    unless work_order_type_ids.empty? 
    17       # Find "Service request" reports which haven't led to work orders. 
    18       unless cause_report_type_ids.empty? 
    19         # First find ids of reports which have led to work orders. 
    20         cause_report_ids = WorkOrder.find(:all, :select => 'cause_report_id,' + WorkOrder.minimal_select, :conditions => ['asset_id = ? AND work_order_type_id IN (?) AND cause_report_id IS NOT NULL', self.id, work_order_type_ids]).map {|w| w.cause_report_id } 
    21         conditions = ['asset_id = ? AND report_type_id IN (?)', self.id, cause_report_type_ids] 
    22         unless cause_report_ids.empty? 
    23           conditions[0] += ' AND reports.id NOT IN (?)' 
    24           conditions.push cause_report_ids 
    25         end 
    26         found = Report.find_authorized_to_read(:all, :conditions => conditions, :readonly => true) 
    27         result[:unprocessed_requests] = [cause_report_tag.name, found] unless found.empty? 
     17      # Find "Service request" forms which haven't led to work orders. 
     18      unless cause_form_type_ids.empty? 
     19        # First find ids of forms which have led to work orders. 
     20        cause_form_ids = WorkOrder.find(:all, :select => 'cause_form_id,' + WorkOrder.minimal_select, :conditions => ['asset_id = ? AND work_order_type_id IN (?) AND cause_form_id IS NOT NULL', self.id, work_order_type_ids]).map {|w| w.cause_form_id } 
     21        conditions = ['asset_id = ? AND form_type_id IN (?)', self.id, cause_form_type_ids] 
     22        unless cause_form_ids.empty? 
     23          conditions[0] += ' AND forms.id NOT IN (?)' 
     24          conditions.push cause_form_ids 
     25        end 
     26        found = Form.find_authorized_to_read(:all, :conditions => conditions, :readonly => true) 
     27        result[:unprocessed_requests] = [cause_form_tag.name, found] unless found.empty? 
    2828      end 
    2929 
    …… 
    3636      result[:assigned_works] = [work_order_tag.name, found] unless found.empty? 
    3737 
    38       # Find closed "Service" work orders, which haven't led to "Condition" reports. 
    39       unless effect_report_type_ids.empty? 
    40         # First find ids of work orders which have led to reports. 
    41         cause_work_order_ids = Report.find(:all, :select => 'cause_work_order_id,' + Report.minimal_select, :conditions => ['asset_id = ? AND report_type_id IN (?) AND cause_work_order_id IS NOT NULL', self.id, effect_report_type_ids]).map {|w| w.cause_work_order_id } 
     38      # Find closed "Service" work orders, which haven't led to "Condition" forms. 
     39      unless effect_form_type_ids.empty? 
     40        # First find ids of work orders which have led to forms. 
     41        cause_work_order_ids = Form.find(:all, :select => 'cause_work_order_id,' + Form.minimal_select, :conditions => ['asset_id = ? AND form_type_id IN (?) AND cause_work_order_id IS NOT NULL', self.id, effect_form_type_ids]).map {|w| w.cause_work_order_id } 
    4242        conditions = ['asset_id = ? AND work_order_type_id IN (?) AND work_orders.state = ?', self.id, work_order_type_ids, WorkOrder.CLOSED] 
    4343        unless cause_work_order_ids.empty? 
    …… 
    4646        end 
    4747        found = WorkOrder.find_authorized_to_read(:all, :conditions => conditions, :readonly => true) 
    48         result[:unknown_condition] = [[work_order_tag.name, effect_report_tag.name], found] unless found.empty? 
    49       end 
    50     end 
    51  
    52     # Find recent "Condition" reports, created during the last typical_maintenance_time_interval. 
    53     unless self.asset_type.nil? or  effect_report_type_ids.empty? 
    54       found = Report.find_authorized_to_read(:all, :conditions => ['asset_id = ? AND report_type_id IN (?) AND created_at > ?', self.id, effect_report_type_ids, Time.now - self.asset_type.typical_maintenance_time_interval]) 
    55       result[:recent_condition] = [effect_report_tag.name, found] unless found.empty? 
     48        result[:unknown_condition] = [[work_order_tag.name, effect_form_tag.name], found] unless found.empty? 
     49      end 
     50    end 
     51 
     52    # Find recent "Condition" forms, created during the last typical_maintenance_time_interval. 
     53    unless self.asset_type.nil? or  effect_form_type_ids.empty? 
     54      found = Form.find_authorized_to_read(:all, :conditions => ['asset_id = ? AND form_type_id IN (?) AND created_at > ?', self.id, effect_form_type_ids, Time.now - self.asset_type.typical_maintenance_time_interval]) 
     55      result[:recent_condition] = [effect_form_tag.name, found] unless found.empty? 
    5656    end 
    5757 
    …… 
    6363  def analyse_maintenance_chain 
    6464    result = {} 
    65     cause_work_order_tag, effect_report_tag = DataTypeTag.find DataTypeTag::CHAIN['Maintenance'] 
     65    cause_work_order_tag, effect_form_tag = DataTypeTag.find DataTypeTag::CHAIN['Maintenance'] 
    6666    cause_work_order_type_ids = cause_work_order_tag.work_order_types.map {|t| t.id } 
    67     effect_report_type_ids = effect_report_tag.report_types.map {|t| t.id } 
     67    effect_form_type_ids = effect_form_tag.form_types.map {|t| t.id } 
    6868 
    6969    unless cause_work_order_type_ids.empty? 
    …… 
    7676      result[:assigned_works] = [cause_work_order_tag.name, found] unless found.empty? 
    7777 
    78       # Find closed "Maintenance" work orders, which haven't led to "Maintenance" reports. 
    79       unless effect_report_type_ids.empty? 
    80         # First find ids of work orders which have led to reports. 
    81         cause_work_order_ids = Report.find(:all, :select => 'cause_work_order_id,' + Report.minimal_select, :conditions => ['asset_id = ? AND report_type_id IN (?) AND cause_work_order_id IS NOT NULL', self.id, effect_report_type_ids]).map {|w| w.cause_work_order_id } 
     78      # Find closed "Maintenance" work orders, which haven't led to "Maintenance" forms. 
     79      unless effect_form_type_ids.empty? 
     80        # First find ids of work orders which have led to forms. 
     81        cause_work_order_ids = Form.find(:all, :select => 'cause_work_order_id,' + Form.minimal_select, :conditions => ['asset_id = ? AND form_type_id IN (?) AND cause_work_order_id IS NOT NULL', self.id, effect_form_type_ids]).map {|w| w.cause_work_order_id } 
    8282        conditions = ['asset_id = ? AND work_order_type_id IN (?) AND work_orders.state = ?', self.id, cause_work_order_type_ids, WorkOrder.CLOSED] 
    8383        unless cause_work_order_ids.empty? 
    …… 
    8686        end 
    8787        found = WorkOrder.find_authorized_to_read(:all, :conditions => conditions, :readonly => true) 
    88         result[:unknown_condition] = [[cause_work_order_tag.name, effect_report_tag.name], found] unless found.empty? 
    89       end 
    90     end 
    91  
    92     # Find recent "Maintenance" reports, created during the last typical_maintenance_time_interval. 
    93     unless self.asset_type.nil? or effect_report_type_ids.empty? 
    94       found = Report.find_authorized_to_read(:all, :conditions => ['asset_id = ? AND report_type_id IN (?) AND created_at > ?', self.id, effect_report_type_ids, Time.now - self.asset_type.typical_maintenance_time_interval]) 
    95       result[:recent_maintenance] = [effect_report_tag.name, found] unless found.empty? 
     88        result[:unknown_condition] = [[cause_work_order_tag.name, effect_form_tag.name], found] unless found.empty? 
     89      end 
     90    end 
     91 
     92    # Find recent "Maintenance" forms, created during the last typical_maintenance_time_interval. 
     93    unless self.asset_type.nil? or effect_form_type_ids.empty? 
     94      found = Form.find_authorized_to_read(:all, :conditions => ['asset_id = ? AND form_type_id IN (?) AND created_at > ?', self.id, effect_form_type_ids, Time.now - self.asset_type.typical_maintenance_time_interval]) 
     95      result[:recent_maintenance] = [effect_form_tag.name, found] unless found.empty? 
    9696    end 
    9797 
    …… 
    9999  end 
    100100 
    101   # Analyses assets maintenance need by investigating "Maintenance" reports. 
     101  # Analyses assets maintenance need by investigating "Maintenance" forms. 
    102102  def analyse_maintenance_need 
    103103    # If asset is typeless, we don't have reference value for maintenance 
    …… 
    110110    result = { :new_asset? => (self.created_at > (Time.now - typical_interval)) } 
    111111 
    112     # Find the "Maintenance" tag and ids of its report types. 
    113     report_tag = ReportTag.find ReportTag::TAG_ID['Maintenance'] 
    114     report_type_ids = report_tag.report_types.map {|t| t.id } 
    115     return result if report_type_ids.empty? 
    116  
    117     # Find creation times of "Maintenance" reports created during 
     112    # Find the "Maintenance" tag and ids of its form types. 
     113    form_tag = FormTag.find FormTag::TAG_ID['Maintenance'] 
     114    form_type_ids = form_tag.form_types.map {|t| t.id } 
     115    return result if form_type_ids.empty? 
     116 
     117    # Find creation times of "Maintenance" forms created during 
    118118    # the last ten typical_maintenance_time_intervals. 
    119119    # 
    120     # TODO: Consider analysing reports in different report types separately, 
     120    # TODO: Consider analysing forms in different form types separately, 
    121121    # since maintenance operations of different types can have different 
    122     # maintenance time intervals. Therefore analysing all reports together 
     122    # maintenance time intervals. Therefore analysing all forms together 
    123123    # can lead to the result that maintenance is irregular, although it is not. 
    124     creation_times = Report.find(:all, :select => Report.minimal_select, :conditions => ['asset_id = ? AND report_type_id IN (?) AND created_at >= ?', self.id, report_type_ids, Time.now - 10*typical_interval], :order => 'created_at DESC').map {|r| r.created_at } 
     124    creation_times = Form.find(:all, :select => Form.minimal_select, :conditions => ['asset_id = ? AND form_type_id IN (?) AND created_at >= ?', self.id, form_type_ids, Time.now - 10*typical_interval], :order => 'created_at DESC').map {|r| r.created_at } 
    125125 
    126126    case creation_times.size 

  • branches/workorder_report_rename/app/models/work_order_tag.rb

    r228 r454  
    77  # Callbacks 
    88  # Associations 
    9   belongs_to :cause_report_tag, :class_name => 'ReportTag', :foreign_key => 'cause_tag_id' 
    10   has_one :effect_report_tag, :class_name => 'ReportTag', :foreign_key => 'cause_tag_id' 
     9  belongs_to :cause_form_tag, :class_name => 'FormTag', :foreign_key => 'cause_tag_id' 
     10  has_one :effect_form_tag, :class_name => 'FormTag', :foreign_key => 'cause_tag_id' 
    1111  has_many :work_order_types, :order => 'name' 
    1212 

  • branches/workorder_report_rename/app/models/work_order_template.rb

    r369 r454  
    5555  end 
    5656 
    57   def create_section_links_for_reports(report_ids) 
     57  def create_section_links_for_forms(form_ids) 
    5858    # FIXME: Could this be implemented using the same method that charts are included in the documents? 
    5959    content = get_xml_document('content.xml') 
    …… 
    7676    text_element = REXML::XPath.first(content, '/office:document-content/office:body/office:text') 
    7777 
    78     for report_id in report_ids 
     78    for form_id in form_ids 
    7979      # Page break 
    8080      page_break_element = REXML::Element.new('text:p', text_element) 
    …… 
    8383      # Section element 
    8484      section_element = REXML::Element.new('text:section', text_element) 
    85       section_element.attributes['text:name'] = "Report#{report_id}" 
     85      section_element.attributes['text:name'] = "Form#{form_id}" 
    8686      section_element.attributes['text:protected'] = 'true' 
    8787 
    8888      # Source element 
    8989      source_element = REXML::Element.new('text:section-source', section_element) 
    90       source_element.attributes['xlink:href'] = "../report_#{report_id}.odt" 
     90      source_element.attributes['xlink:href'] = "../form_#{form_id}.odt" 
    9191      source_element.attributes['text:filter-name'] = 'writer8' # Something OpenOffice specific 
    9292    end 

  • branches/workorder_report_rename/db/migrate/021_version_one_dot_two_tables.rb

    r453 r454  
    11class VersionOneDotTwoTables < ActiveRecord::Migration 
     2  @@report_columns = [ 
     3    ['report_types', 'report_category_id'], 
     4    ['open_document_files', 'report_type_id'], 
     5    ['report_field_groups', 'report_type_id'], 
     6    ['report_fields', 'report_type_id'], 
     7    ['report_fields', 'report_field_group_id'], 
     8    ['reports', 'report_type_id'], 
     9    ['report_field_values', 'report_id'], 
     10    ['report_field_values', 'report_field_id'], 
     11    # reports_work_orders is dropped later in this migration! 
     12    ['timeline_events', 'report_id'], 
     13    ['assets_user_groups', 'create_report'], 
     14    ['data_permissions', 'report_id'], 
     15  ] 
     16 
    217  @@report_tables = [ 
    318    'reports', 
    …… 
    1126 
    1227  def self.up 
     28    rename_columns('report', 'form', @@report_columns) 
    1329    rename_tables('report', 'form', @@report_tables) 
    1430 
    …… 
    116132     
    117133    rename_tables('report', 'form', @@report_tables, true) 
     134    rename_columns('report', 'form', @@report_columns, true) 
    118135  end 
    119136 
    …… 
    127144  def self.rename_tables(from, to, names, revert=false) 
    128145    for name in names 
    129       rename_table(name, new_name(from, to, revert)) 
     146      rename_table(name, new_name(from, to, name, revert)) 
    130147    end 
    131148  end 
    132149 
    133   def self.new_name(from, to, revert=false) 
     150  # Function: rename_columns 
     151  # ------------------------ 
     152  # Renames the columns listed in `tables_and_cols` as `[table/col]` 
     153  # pairs by replacing `from` in the column name with `to`. 
     154  # 
     155  # If `revert` is set to `true`, the process is reverted, and the tables are 
     156  # renamed by replacing `to` with `from`. 
     157  def self.rename_columns(from, to, tables_and_cols, revert=false) 
     158    for table, col in tables_and_cols 
     159      rename_column(table, col, new_name(from, to, col, revert)) 
     160    end 
     161  end 
     162 
     163  def self.new_name(from, to, name, revert=false) 
    134164    if revert 
    135       new_name = name.sub(to, from) 
     165      return name.sub(to, from) 
    136166    else 
    137       new_name = name.sub(from, to) 
     167      return name.sub(from, to) 
    138168    end 
    139169  end 

  • branches/workorder_report_rename/db/migrate/023_version_one_dot_two_data_type_tags.rb

    r250 r454  
    1616    TempDataTypeTag.connection.reset_pk_sequence!('data_type_tags') if ['PostgreSQL'].include?(TempDataTypeTag.connection.adapter_name) 
    1717    # 
    18     # "Service request report -> Service work order -> Condition report" chains 
    19     TempDataTypeTag.create_chain(['ReportTag', _('Service request')], 
     18    # "Service request form -> Service work order -> Condition form" chains 
     19    TempDataTypeTag.create_chain(['FormTag', _('Service request')], 
    2020                                 ['WorkOrderTag', _('Service')], 
    21                                  ['ReportTag', _('Condition')]) 
    22     # "Maintenance work order -> Maintenance report" chains 
     21                                 ['FormTag', _('Condition')]) 
     22    # "Maintenance work order -> Maintenance form" chains 
    2323    TempDataTypeTag.create_chain(['WorkOrderTag', _('Maintenance')], 
    24                                  ['ReportTag', _('Maintenance')]) 
     24                                 ['FormTag', _('Maintenance')]) 
    2525  end 
    2626 

  • branches/workorder_report_rename/test/test_helper.rb

    r369 r454  
    5353  end 
    5454 
    55   # Saves a report before an action is called and filters in ApplicationController are applied. 
    56   def save_report(report) 
     55  # Saves a form before an action is called and filters in ApplicationController are applied. 
     56  def save_form(form) 
    5757    User.current_user = @request.session[:user] 
    58     assert report.save 
     58    assert form.save 
    5959    User.current_user = nil 
    6060  end 
    …… 
    108108 
    109109  # Gives +user_group+ permission to read +asset+ and optionally also permissions to 
    110   # +edit+, +create_report+, +create_work_order+, +attach_file+, +create_subasset+, 
     110  # +edit+, +create_form+, +create_work_order+, +attach_file+, +create_subasset+, 
    111111  # +edit_permissions+ and +remove+ for the asset. 
    112112  # Returns the created association. 
    113   def add_user_group_to_asset(user_group, asset, edit = false, create_report = false, create_work_order = false, attach_file = false, create_subasset = false, edit_permissions = false, remove = false) 
     113  def add_user_group_to_asset(user_group, asset, edit = false, create_form = false, create_work_order = false, attach_file = false, create_subasset = false, edit_permissions = false, remove = false) 
    114114    tmp = TempAssetsUserGroup.create!(:user_group_id => user_group.id, 
    115115                                      :asset_id => asset.id, 
    116116                                      :edit => edit, 
    117                                       :create_report => create_report, 
     117                                      :create_form => create_form, 
    118118                                      :create_work_order => create_work_order, 
    119119                                      :attach_file => attach_file, 
    …… 
    139139  end 
    140140 
    141   # Creates a new report to asset+ 
    142   def create_report(asset, ready = false, other_read = false, other_edit = false) 
    143     r = Report.new(:other_read => other_read, :other_edit => other_edit) 
     141  # Creates a new form to asset+ 
     142  def create_form(asset, ready = false, other_read = false, other_edit = false) 
     143    r = Form.new(:other_read => other_read, :other_edit => other_edit) 
    144144    r.asset = asset 
    145145    r.ready = ready 
    …… 
    148148  end 
    149149 
    150   # Creates a report without validations and callbacks 
    151   def create_raw_report(asset, ready = false, other_read = false, other_edit = false) 
    152     tmp = TempReport.create!(:asset_id => asset.id, :ready => ready, :other_read => other_read, :other_edit => other_edit) 
    153     Report.find(tmp.id) 
     150  # Creates a form without validations and callbacks 
     151  def create_raw_form(asset, ready = false, other_read = false, other_edit = false) 
     152    tmp = TempForm.create!(:asset_id => asset.id, :ready => ready, :other_read => other_read, :other_edit => other_edit) 
     153    Form.find(tmp.id) 
    154154  end 
    155155 
    …… 
    281281    end 
    282282 
    283     [:edit, :create_report, :create_work_order, :attach_file, :create_subasset, :edit_permissions, :remove].each { |attr| 
     283    [:edit, :create_form, :create_work_order, :attach_file, :create_subasset, :edit_permissions, :remove].each { |attr| 
    284284      assert_equal reference_assets_group.send(attr), assets_group.send(attr) 
    285285    } 

© 2004-2007 Norfello Oy All Rights Reserved