Merge pull request #1755 from FreeUKGen/t3_freereg_211218

T3 freereg 211218

.gitignore

@@ -138,5 +138,5 @@ config/mongoid.yml
 config/secrets.yml
 config/initializers/setup_mail.rb
 data/*
-
+.robocop.yml
 app/assets/copy_of_assets_freecen/

.rubocop.yml

@@ -0,0 +1,23 @@
+Rails:
+  Enabled: true
+
+# Commonly used screens these days easily fit more than 80 characters.
+Metrics/LineLength:
+  Max: 120
+
+# Too short methods lead to extraction of single-use methods, which can make
+# the code easier to read (by naming things), but can also clutter the class
+Metrics/MethodLength:
+  Max: 20
+
+# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
+Metrics/ClassLength:
+  Max: 1500
+
+# Mixing the styles looks just silly.
+Style/HashSyntax:
+  EnforcedStyle: ruby19_no_mixed_keys
+
+# has_key? and has_value? are far more readable than key? and value?
+Style/PreferredHashMethods:
+  Enabled: false

app/controllers/contacts_controller.rb

@@ -132,6 +132,8 @@ def get_contacts
 
   def index
     session[:archived_contacts] = false
+    session[:message_base] = 'contact'
+    params[:source] = 'original'
     get_user_info_from_userid
     order = "contact_time DESC"
     @contacts = get_contacts.result(session[:archived_contacts],order)
@@ -149,6 +151,8 @@ def keep
 
   def list_archived
     session[:archived_contacts] = true
+    session[:message_base] = 'contact'
+    params[:source] = 'original'
     get_user_info_from_userid
     order = "contact_time  DESC"
     @contacts = get_contacts.result(session[:archived_contacts],order)
@@ -241,12 +245,17 @@ def  set_nil_session_parameters
   end
 
   def set_session_parameters_for_record(file)
+    return false if file.blank?
+
     register = file.register
     return false if register.blank?
+
     church = register.church
     return false if church.blank?
+
     place = church.place
     return false if place.blank?
+
     session[:freereg1_csv_file_id] = file._id
     session[:freereg1_csv_file_name] = file.file_name
     session[:place_name] = place.place_name
@@ -285,6 +294,7 @@ def reply_contact
   end
 
   def return_after_archive(source, id)
+
     if source == 'show'
       redirect_to action: 'show', id: id
     else

app/controllers/feedbacks_controller.rb

@@ -111,6 +111,8 @@ def force_destroy
 
   def index
     session[:archived_contacts] = false
+    session[:message_base] = 'feedback'
+    params[:source] = 'original'
     get_user_info_from_userid
     order = "feedback_time DESC"
     @feedbacks = Feedback.archived(session[:archived_contacts]).order_by(order)
@@ -128,6 +130,8 @@ def keep
 
   def list_archived
     session[:archived_contacts] = true
+    session[:message_base] = 'feedback'
+    params[:source] = 'original'
     get_user_info_from_userid
     order = "feedback_time DESC"
     @feedbacks = Feedback.archived(session[:archived_contacts]).order_by(order)

app/controllers/freereg1_csv_entries_controller.rb

@@ -12,49 +12,54 @@ def calculate_software_version
 
   def create
     get_user_info_from_userid
-    @freereg1_csv_file = Freereg1CsvFile.find(session[:freereg1_csv_file_id])
-    @freereg1_csv_entry = Freereg1CsvEntry.new(freereg1_csv_entry_params)
-    @freereg1_csv_file.check_and_augment_def(params[:freereg1_csv_entry])
-    params[:freereg1_csv_entry][:record_type] = @freereg1_csv_file.record_type
-    year = @freereg1_csv_entry.get_year(params[:freereg1_csv_entry])
-    if session[:error_id].nil?
-      file_line_number, line_id = @freereg1_csv_file.augment_record_number_on_creation
+    if session[:freereg1_csv_file_id].blank?
+      flash[:notice] = 'Somehow we are missing a vital piece of information. Please have you coordinator contact System Administration with this message'
+      redirect_to new_manage_resource_path and return
     else
-      file_line_number, line_id = @freereg1_csv_file.determine_line_information(session[:error_id])
-    end
-    @freereg1_csv_entry.update_attributes(:register_type => @freereg1_csv_file.register_type, :year => year, :line_id => line_id,:record_type  => @freereg1_csv_file.record_type, :file_line_number => file_line_number)
-    # need to deal with change in place
-    place, church, register = @freereg1_csv_entry.add_additional_location_fields(@freereg1_csv_file)
-    @freereg1_csv_file.freereg1_csv_entries << @freereg1_csv_entry
-    @freereg1_csv_entry.save
-    if @freereg1_csv_entry.errors.any?
-      flash[:notice] = 'The creation of the record was unsuccessful'
-      display_info
-      render action: 'error' and return
-    else
-      @freereg1_csv_file.calculate_distribution
-      search_version = calculate_software_version
-      SearchRecord.update_create_search_record(@freereg1_csv_entry, search_version, place)
-      @freereg1_csv_file.backup_file
-      @freereg1_csv_file.lock_all(session[:my_own])
-      @freereg1_csv_file.modification_date = Time.now.strftime("%d %b %Y")
-      if session[:error_id].present?
-        @freereg1_csv_file.error = @freereg1_csv_file.error - 1
-        error = @freereg1_csv_file.batch_errors.find(session[:error_id])
-        @freereg1_csv_file.batch_errors.delete(error) if error.present?
+      @freereg1_csv_file = Freereg1CsvFile.find(session[:freereg1_csv_file_id])
+      @freereg1_csv_entry = Freereg1CsvEntry.new(freereg1_csv_entry_params)
+      @freereg1_csv_file.check_and_augment_def(params[:freereg1_csv_entry])
+      params[:freereg1_csv_entry][:record_type] = @freereg1_csv_file.record_type
+      year = @freereg1_csv_entry.get_year(params[:freereg1_csv_entry])
+      if session[:error_id].nil?
+        file_line_number, line_id = @freereg1_csv_file.augment_record_number_on_creation
+      else
+        file_line_number, line_id = @freereg1_csv_file.determine_line_information(session[:error_id])
       end
-      display_info
-      @freereg1_csv_file.save
-      register.calculate_register_numbers
-      church.calculate_church_numbers
-      place.calculate_place_numbers
-      if @freereg1_csv_file.errors.any?
-        flash[:notice] = 'The update in entry data distribution contents was unsuccessful'
-        redirect_to :action => 'error' and return
+      @freereg1_csv_entry.update_attributes(:register_type => @freereg1_csv_file.register_type, :year => year, :line_id => line_id,:record_type  => @freereg1_csv_file.record_type, :file_line_number => file_line_number)
+      # need to deal with change in place
+      place, church, register = @freereg1_csv_entry.add_additional_location_fields(@freereg1_csv_file)
+      @freereg1_csv_file.freereg1_csv_entries << @freereg1_csv_entry
+      @freereg1_csv_entry.save
+      if @freereg1_csv_entry.errors.any?
+        flash[:notice] = 'The creation of the record was unsuccessful'
+        display_info
+        render action: 'error' and return
       else
-        session[:error_id] = nil
-        flash[:notice] = 'The creation/update in entry contents was successful, a backup of file made and locked'
-        redirect_to freereg1_csv_entry_path(@freereg1_csv_entry) and return
+        @freereg1_csv_file.calculate_distribution
+        search_version = calculate_software_version
+        SearchRecord.update_create_search_record(@freereg1_csv_entry, search_version, place)
+        @freereg1_csv_file.backup_file
+        @freereg1_csv_file.lock_all(session[:my_own])
+        @freereg1_csv_file.modification_date = Time.now.strftime("%d %b %Y")
+        if session[:error_id].present?
+          @freereg1_csv_file.error = @freereg1_csv_file.error - 1
+          error = @freereg1_csv_file.batch_errors.find(session[:error_id])
+          @freereg1_csv_file.batch_errors.delete(error) if error.present?
+        end
+        display_info
+        @freereg1_csv_file.save
+        register.calculate_register_numbers
+        church.calculate_church_numbers
+        place.calculate_place_numbers
+        if @freereg1_csv_file.errors.any?
+          flash[:notice] = 'The update in entry data distribution contents was unsuccessful'
+          redirect_to :action => 'error' and return
+        else
+          session[:error_id] = nil
+          flash[:notice] = 'The creation/update in entry contents was successful, a backup of file made and locked'
+          redirect_to freereg1_csv_entry_path(@freereg1_csv_entry) and return
+        end
       end
     end
   end

app/controllers/freereg1_csv_files_controller.rb

@@ -381,7 +381,7 @@ def set_controls(file)
     @physical_file = PhysicalFile.userid(file.userid).file_name(file.file_name).first
     @role = session[:role]
     @freereg1_csv_file_name = file.file_name
-    session[:freereg1_csv_file_id] =  file._id
+    session[:freereg1_csv_file_id] = file._id
     @return_location  = file.register.id unless file.register.nil?
   end