Feature#37 add private number

app/assets/stylesheets/application.scss

@@ -15,30 +15,26 @@
  */
 
 .alert-notice {
-    display: none;
+  display: none;
 }
 
-.alert-info {
-    display: none;
-}
-
-.alert-info {
-    display: none;
+.alert-alert {
+  display: none;
 }
 
 .notif {
-    position: absolute !important;
-    right: 1rem;
-    top: 1rem;
+  position: absolute !important;
+  right: 1rem;
+  top: 1rem;
 }
 
 #clock {
-    max-width: 256px;
-    max-height: 256px;
+  max-width: 256px;
+  max-height: 256px;
 }
 
 #error_explanation {
-    position: absolute;
-    top: 1rem;
-    right: 1rem;
+  position: absolute;
+  top: 1rem;
+  right: 1rem;
 }

app/controllers/employees_controller.rb

@@ -14,23 +14,22 @@ def new
   end
 
   def create
-      @employee = Employee.new(employee_params) 
-      respond_to do |format| 
-        if @employee.save
-          format.html { redirect_to employees_url, notice: 'Employee was successfully created.' }
-        else
-          format.html { render :new }
-        end
-      end
+    @employee = Employee.new(employee_params)
+    if @employee.valid? 
+      @employee.save!
+      redirect_to employees_path
+    else 
+      redirect_to new_employee_path, alert: 'Verify all the fields'
     end
+  end
 
   def edit
   end
 
   def update
     respond_to do |format| 
       if @employee.update(employee_params) 
-        format.html { redirect_to employees_url, info: 'Employee was successfully updated.' } 
+        format.html { redirect_to employees_url, notice: 'Employee was successfully updated.' } 
       else 
         format.html { render :edit } 
       end 

app/controllers/sessions_controller.rb

@@ -7,7 +7,7 @@ def new
 
   def create
     @admin = Admin.find_by(user: params[:user])
-    if @admin && @admin.authenticate(params[:password])
+    if @admin || @admin.authenticate(params[:password])
         session[:admin_id] = @admin.id
         redirect_to '/welcome', success: "You have singed in successfully!"
     else

app/javascript/packs/application.sass

@@ -0,0 +1,2 @@
+
+//@import "bootstrap";

app/models/employee.rb

@@ -1,7 +1,6 @@
 class Employee < ApplicationRecord
-  has_many :reports, dependent: :destroy
+  has_many :reports
   validates :name, presence: true 
   validates :position, presence: true
-  validates :private_number, presence: true
-  validates :email, presence: true
+  validates :private_number, presence: true, length: { is: 6 }, numericality: { only_integer: true }, uniqueness: true
 end

app/views/employees/new.html.erb

@@ -18,6 +18,9 @@
 <div class="container p-3 my-3 border">
     <%= form_with model: @employee do |form| %>
     <div class="form-group">
+      <div class="alert alert-primary" role="alert">
+        All fields are required
+      </div>
         <%= label_tag 'name', 'Name:'%>
         <%= form.text_field :name, class:'form-control'%>
     </div>
@@ -34,9 +37,16 @@
 
     <div class="form-group">
         <%= label_tag 'private_number', 'Private Number:'%>
+        <div class="alert alert-primary" role="alert">
+        Private Number should be:
+        <p class="mb-0">- Numeric</p>
+        <p class="mb-0">- 6 digits long</p>
+        <p class="mb-0">- Unique </div></p>
         <%= form.text_field :private_number, class:'form-control'%>
+
     </div>
 
     <%= submit_tag "Add Employee", class:"btn btn-outline-success"%>
+
     <% end %>
 </div>

db/migrate/20201105185421_add_active_to_branches.rb

@@ -3,3 +3,4 @@ def change
     add_column :branches, :active, :boolean
   end
 end
+

db/migrate/20201130195540_remove_private_number_employees.rb

@@ -0,0 +1,5 @@
+class RemovePrivateNumberEmployees < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :employees, :private_number
+   end
+end

db/migrate/20201130195654_add_private_number_to_employees.rb

@@ -0,0 +1,5 @@
+class AddPrivateNumberToEmployees < ActiveRecord::Migration[6.0]
+  def change
+    add_column :employees, :private_number, :int
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_11_12_180413) do
+ActiveRecord::Schema.define(version: 2020_11_30_195654) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -33,10 +33,14 @@
     t.string "name"
     t.string "email"
     t.string "position"
+<<<<<<< HEAD
+=======
     t.integer "private_number"
+>>>>>>> 7a0f3000b243c4f7c5373bb3968c353e105b09ca
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.boolean "status", default: true
+    t.integer "private_number"
   end
 
   create_table "reports", force: :cascade do |t|

db/seeds.rb

@@ -8,10 +8,6 @@
 
 # Employee.create(name: 'Karina Delgado', email: '[email protected]', position: 'QA', private_number: 123, status: 'active')
 # Employee.create(name: 'Daniela Sotomayor', email: '[email protected]', position: 'Developer', private_number: 321, status: 'active')
-admin = Admin.new(user: 'Karina')
-admin.password = "12345"
-admin.password_confirmation = "12345"
-admin.save
-
+ Admin.create(user: 'admin', password_digest: 'admin')
 # Branch.create(name: 'HR', address: '3rd Floor')
 # Report.create(check: 'check in', check_time: "2016-11-01 17:00:13", employee_id: "1")