Commit 4b41177c authored by Bruno Freitas Tissei's avatar Bruno Freitas Tissei

Fix error message when scheduling for a citizen from an inactive city hall

Signed-off-by: Bruno Freitas Tissei's avatarBruno Freitas Tissei <bft15@inf.ufpr.br>
parent 3974fc29
......@@ -22,16 +22,6 @@ class SchedulesController < ApplicationController
# GET /schedules
# GET /schedules.json
def index
if !@citizen.nil?
if !CityHall.where(city_id: @citizen.city_id).first.active?
@form_error = "O cidadão pertence a uma cidade inativa! :("
end
end
if @citizen.nil? and params[:cpf]
@form_error = "O CPF digitado é inválido ou o cidadão não foi cadastrado!"
end
if params[:clear_cpf]
session[:cpf] = nil unless session[:cpf].nil?
end
......@@ -52,6 +42,14 @@ class SchedulesController < ApplicationController
else
@citizen = Citizen.where(:cpf => params[:cpf]).first
if @citizen
if !@citizen.nil? and !CityHall.where(city_id: @citizen.city_id).first.active?
return redirect_to :back, alert: "O cidadão pertence a uma cidade inativa!"
end
if @citizen.nil? and params[:cpf]
return redirect_to :back, alert: "O CPF digitado é inválido ou o cidadão não foi cadastrado!"
end
@dependants = Citizen.where(responsible_id: @citizen.id)
if @currentProfessionalServicePlace.role != "adm_c3sl"
if @citizen.city_id != @currentCityHall.city_id
......@@ -116,9 +114,9 @@ class SchedulesController < ApplicationController
if @currentProfessionalServicePlace.role == "adm_c3sl"
# As adm_c3sl
# Get all active sectors
if(@citizen != nil and CityHall.where(city_id: @citizen.city_id).first.active?)
@city_hall_id = CityHall.active.where(city_id: @citizen.city.id).first.id
@sectors = Sector.active.where(city_hall_id: @city_hall_id)
if @citizen != nil
@city_hall_id = CityHall.active.where(city_id: @citizen.city.id).first.id
@sectors = Sector.active.where(city_hall_id: @city_hall_id)
else
@sectors = Sector.active
end
......
......@@ -235,6 +235,7 @@ class Citizen < ActiveRecord::Base
##############################
validates_presence_of :name, :birth_date
validates_presence_of :rg, :cep, :phone1, :if => :cpf_required?
validates_presence_of :city
validates_with PhonesValidator, fields: [:phone1, :phone2]
validates_with EmailValidator
validates_length_of :name, maximum: 255
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment