#WIP Improvements to offspring_controller

Gemfile

@@ -89,7 +89,7 @@ end
 # Add rack specific version to fix deployment error
 # in OpenShift online
 
-gem 'rack', '1.5.2'
+gem 'rack'
 
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'

Gemfile.lock

@@ -151,7 +151,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.16)
@@ -277,7 +277,7 @@ DEPENDENCIES
   minitest-reporters
   patternfly-sass (~> 3.8.0)
   pg
-  rack (= 1.5.2)
+  rack
   rails (~> 4.1)
   rake
   rspec-rails (~> 3.4)
@@ -291,6 +291,3 @@ DEPENDENCIES
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
-
-BUNDLED WITH
-   1.12.5

app/controllers/admin_controller.rb

@@ -19,6 +19,11 @@ def rooms
     @rooms = Room.all
   end
 
+  def switch_lock_admin
+    ApplicationHelper.switch_lock
+    render nothing: true
+  end
+
   private
 
   def admin_user?

app/controllers/assignments_controller.rb

@@ -1,16 +1,13 @@
 class AssignmentsController < ApplicationController
+  SCOPE = "activerecord.errors.controllers.assignment".freeze # Necessary to acces locales file
   def new
     @offspring = Offspring.find_by_id(params[:format])
     @rooms = Room.all
   end
 
   def create
-    Offspring.transaction do
-      of = Offspring.lock.find_by_id(params["format"])
-      of.shift = Shift.find_by_id(params["shift"])
-      of.save
-      redirect_to root_url
-    end
+    access_control? ? create_assignment : flash[:alert] = I18n.t("admin_locked_create", scope: SCOPE)
+    redirect_to root_url
   end
 
   def destroy
@@ -19,4 +16,23 @@ def destroy
     of.save
     redirect_to new_assignment_path(of)
   end
+
+  private
+
+  def access_control?
+    if current_user.admin?
+      true
+    else
+      !ApplicationHelper.status_lock?
+    end
+  end
+
+  def create_assignment
+    Offspring.transaction do
+      of = Offspring.lock.find_by_id(params["format"])
+      of.shift = Shift.find_by_id(params["shift"])
+      of.save
+      flash[:success] = I18n.t("assignment_create_success", scope: SCOPE)
+    end
+  end
 end

app/controllers/offsprings_controller.rb

@@ -1,31 +1,35 @@
 # Offsprings are dependent on users and are the ones that get assigned to shifts
 # They can't be assigned themselves, and need the process to be done by the user
 class OffspringsController < ApplicationController
+  SCOPE = "activerecord.errors.controllers.offspring".freeze # Necessary to acces locales file
   def show
   end
 
+  def index
+  end
+
   def new
     @offspring = current_user.offsprings.build
   end
 
   def create
-    @offspring = current_user.offsprings.build(offsprings_params)
-    if [email protected]_first?
-      flash[:warning] = "Sólo puede añadir a niños de 1º de Primaria"
-      redirect_to static_pages_intructions_path
-      return
-    elsif @offspring.save
-      flash[:success] = "Niño añadido"
+    if access_control?
+      @offspring = current_user.offsprings.build(offsprings_params)
+      return unless validate_create_offspring? @offspring
     else
-      flash[:danger] = "No se pudo añadir al niño"
+      flash[:alert] = I18n.t("admin_locked_create", scope: SCOPE)
     end
     redirect_to root_path
   end
 
   def destroy
-    offspring = Offspring.find_by_id(params[:id])
-    offspring.destroy
-    flash[:success] = "Niño borrado"
+    if access_control?
+      offspring = Offspring.find_by_id(params[:id])
+      offspring.destroy
+      flash[:success] = I18n.t("offspring_deleted", scope: SCOPE)
+    else
+      flash[:alert] = I18n.t("admin_locked_destroy", scope: SCOPE)
+    end
     redirect_to request.referer || root_url
   end
 
@@ -34,4 +38,26 @@ def destroy
   def offsprings_params
     params.require(:offspring).permit(:first_name, :last_name, :grade)
   end
+
+  def save_offspring(off)
+    if off.save
+      flash[:success] = I18n.t("add_offspring_success", scope: SCOPE)
+    else
+      flash[:danger] = I18n.t("add_offspring_failure", scope: SCOPE)
+    end
+  end
+
+  def access_control?
+    !ApplicationHelper.status_lock?
+  end
+
+  def validate_create_offspring?(off)
+    unless off.primary_first?
+      flash[:warning] = I18n.t("condition_primary_grade", scope: SCOPE)
+      redirect_to static_pages_intructions_path
+      return false
+    end
+    save_offspring(off)
+    true
+  end
 end

app/controllers/users_controller.rb

@@ -25,12 +25,14 @@ def destroy
   private
 
   def delete_possible?(user)
-    if user.nil?
-      return false
-    elsif user == current_user
+    if current_user.admin?
+      return true
+    elsif user.nil?
       return false
-    elsif !current_user.admin?
+    elsif user != current_user
       return false
+    elsif current_user.admin?
+      return true
     else
       return true
     end

app/helpers/application_helper.rb

@@ -31,4 +31,12 @@ def week_day_convert(day)
     week = {1 => 'Lunes', 2 => 'Martes', 3 => 'Miércoles', 4 => 'Jueves', 5 => 'Viernes', 6 => 'Sábado', 7 => 'Domingo'}
     week[day] || 'Ninguno'
   end
+
+  def self.status_lock?
+    Rails.application.config.lock.status
+  end
+
+  def self.switch_lock
+    Rails.application.config.lock.status = !Rails.application.config.lock.status
+  end
 end

app/views/admin/_system_admin_view.html.erb

@@ -1,9 +1,50 @@
 <div class="panel panel-default">
+<<<<<<< HEAD
+
+
+<div style="float:left; width: 50%;">
+  <div class="panel-heading">
+    <h3 id= "blocker_panel_title" class="panel-title"><%="Bloqueo de cambios"%></h3>
+  </div>
+  <div class="panel-body">
+    <div class="container-fluid">
+      <p>
+        <ul class="list-group">
+          <li> Ésta acción permite al administrador bloquear cambios que puedan hacer los usuarios.
+            <ol>
+              <li> No se podrán añadir usuarios nuevos. </li>
+              <li> No se podrán agregar hijos. </li>
+              <li> No podrán cambiar o reasignar aulas/turnos a no ser que seas administrador. </li>
+              <li> Cada usuario <b>SÍ</b> podrá borrar su cuenta. </li>
+            </ol>
+          </li>
+          <div>
+          <%if ApplicationHelper.status_lock?%>    
+            <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" checked>
+          <%else%>
+            <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" unchecked>
+          <%end%>
+          <script>
+            jQuery(".bootstrap-switch").bootstrapSwitch().on('switchChange.bootstrapSwitch', function () {
+                $.ajax({
+                  url: "/switch_lock_admin%22",
+                  type: 'POST'
+                });
+            });
+          </script>
+
+          </div>
+        </p>
+      </div>
+    </div>
+  </div> 
+
+=======
+>>>>>>> b2aac19f380a5af8fe393e0b2108ca56601ea8dc
   <div style="float:left; width: 50%;">
     <div class="panel-heading">
       <h3 id= "blocker_panel_title" class="panel-title"><%="Bloqueo de cambios"%></h3>
     </div>
-
     <div class="panel-body">
       <div class="container-fluid">
         <p>
@@ -16,17 +57,25 @@
                 <li> Cada usuario <b>SÍ</b> podrá borrar su cuenta. </li>
               </ol>
             </li>
-          </ul>
-          <div>
-            <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" checked>
-            <script>
-              jQuery(".bootstrap-switch").bootstrapSwitch();
-            </script>
-          </div>
-        </p>
+            <div>
+              <%if ApplicationHelper.status_lock?%>    
+                <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" checked>
+              <%else%>
+                <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" unchecked>
+              <%end%>
+              <script>
+                jQuery(".bootstrap-switch").bootstrapSwitch().on('switchChange.bootstrapSwitch', function () {
+                  $.ajax({
+                    url: "/switch_lock_admin%22",
+                    type: 'POST'
+                  });
+                });
+              </script>
+            </div>
+          </p>
+        </div>
       </div>
-    </div>
-  </div>
+    </div> 
 
     <div style="float:left; width: 50%;">
       <div class="panel-heading">
@@ -42,4 +91,4 @@
           </div>
         </div>
       </div>
-</div>
+    </div>

config/initializers/lock.rb

@@ -0,0 +1,7 @@
+
+# lock_config = Rails.application.config_for(:lock)
+
+Rails.application.configure do
+  config.lock = ActiveSupport::OrderedOptions.new
+  config.lock.status = false
+end

config/locales/es.yml

@@ -109,6 +109,18 @@ es:
 
       messages:
         record_invalid: "no es válido"
+
+      controllers:
+        offspring:
+          admin_locked_create: "No se puedo añadir al niño en este momento, espere."
+          admin_locked_destroy: "No se puedo destruir al niño en este momento, espere."
+          offspring_deleted: "El niño ha sido elimidado con éxito."
+          condition_primary_grade: "Sólo puede añadir a niños de 1º de Primaria"
+          add_offspring_success: "El niño ha sido añadido con éxito"
+          add_offspring_failure: "No ha sido posible añadir al niño."
+        assignment:
+          admin_locked_create: "No se puedo añadir al niño en este momento, espere."
+          assignment_create_success: "Niño asignado correctamente"
     attributes:
       user:
         first_name: "Nombre"
@@ -123,3 +135,6 @@ es:
         first_name: "Nombre"
         last_name: "Apellidos"
         grade: "Curso"
+    controllers:
+      assignment:
+        admin_locked_create: "No se puedo añadir al niño en este momento, espere."

config/routes.rb

@@ -15,6 +15,7 @@
     resources :assignments, only: [:new, :create, :destroy]
     resources :shifts, only: [:show]
     get 'admin' => 'admin#dashboard'
+    post 'switch_lock_admin"' => 'admin#switch_lock_admin'
     get 'offsprings' => 'admin#offsprings'
     get 'users' => 'admin#users'
   end

db/migrate/20160404181436_add_admin_to_user.rb

@@ -2,4 +2,4 @@ class AddAdminToUser < ActiveRecord::Migration
   def change
     add_column :users, :admin, :boolean, default: false
   end
-end
+end