Merge pull request #36 from Noelryn/department_sidebar

 Department view in hospitals page

app/assets/javascripts/application.js

@@ -16,11 +16,11 @@
 //= require_tree .
 
 const sharedDeviseLinkHandler = (event) => {
-    if (event.target.classList.contains('shared_devise_link')){
+    if (event.target.classList.contains('shared_devise_link')) {
         var modalElement = document.getElementById('modal')
         modalElement.remove()
     }
-} 
+}
 
 const closeModal = (modalElement) => {
     modalElement.remove()
@@ -46,22 +46,39 @@ const hideMainContent = () => {
 }
 
 const displayTemplate = html => {
+    hideRightBar();
     hideMainContent();
     App.tempContent.innerHTML = html
 }
 
+const rightTemplate = html => {
+    App.rightContent.innerHTML = html
+}
+
 const displayModal = html => {
     hideMainContent();
     App.tempContent.innerHTML = html
+    hideRightBar()
     closeModalListener('cancel_modal')
 }
 
+const hideRightBar = () => {
+    App.rightContent.innerHTML = ""
+}
+
 document.addEventListener('turbolinks:load', () => {
     App.mainContent = document.getElementById('main_content')
     App.tempContent = document.getElementById('temp_content')
+    App.rightContent = document.getElementById('rightbar')
 
     let flashElement = document.getElementById('messages')
-    setTimeout(()=>{ 
-        flashElement.style.display = 'none' 
-    }, 2000);
+    if (flashElement) {
+        setTimeout(() => {
+            flashElement.style.display = 'none'
+        }, 2000);
+    }
+
 })
+
+
+

app/controllers/departments_controller.rb

@@ -0,0 +1,24 @@
+class DepartmentsController < ApplicationController
+  def create
+    department = Department.create(department_params)
+    if department.persisted?
+      hospital = Hospital.find(params[:department][:hospital_id])
+      html = render_to_string('hospitals/_list', formats: :html, layout: false, locals: { hospital: hospital })
+      render json: { message: 'Department has been added', html: html }
+    else
+      redirect_to hospitals_path, notice: 'Department already exists. Your department could not be saved'
+    end
+  end
+
+  def get_departments
+    hospital = Hospital.find_by_name(params['hospital'])
+    html = render_to_string('hospitals/_department_select', formats: :html, layout: false, locals: { hospital: hospital })
+    render json: { html: html }
+  end
+
+  private
+
+  def department_params
+    params.require(:department).permit(:name, :hospital_id)
+  end
+end

app/controllers/hospitals_controller.rb

@@ -13,6 +13,10 @@ def create
     end
   end 
 
+ def show
+   @hospital = Hospital.find(params[:id])
+ end
+
   def destroy
     if Hospital.find(params[:id]).destroy
       redirect_to hospitals_path, notice: 'Hospital was successfully removed.'

app/models/department.rb

@@ -1,3 +1,4 @@
 class Department < ApplicationRecord
+    belongs_to :hospital
     validates_presence_of :name
 end

app/models/hospital.rb

@@ -1,5 +1,6 @@
 class Hospital < ApplicationRecord
-    has_many :jobs 
+    has_many :jobs
     belongs_to :region
+    has_many :departments 
     validates :name, uniqueness: true
 end

app/views/hospitals/_department_select.html.haml

@@ -0,0 +1,5 @@
+.to-field-wrapper
+    .to-field-full-width
+        = label_tag 'job[department]', 'Department', class: "form-label"
+        = select_tag 'job[department]', options_for_select(hospital.departments.collect {|c| [ c.name ] }, { include_blank: true }), id: "select_department", class: "form-input-field"
+

app/views/hospitals/_index.html.haml

@@ -5,7 +5,8 @@
     .list-grid
       .list-name= hospital.name
       .list-button-area
-        = link_to "Remove", hospital_path(hospital, locale: I18n.locale), method: :delete, data: {confirm: 'Are you sure?'}, remote: true, class: "button"
+        = link_to "Show", hospital_path(hospital, locale: I18n.locale), class: "button text-center", remote: true
+        = link_to "Remove", hospital_path(hospital, locale: I18n.locale), method: :delete, data: {confirm: 'Are you sure?'}, remote: true, class: "button text-center"
   = form_with url: hospitals_path, scope: :hospital  do |f|
     .list-grid
       .list-name

app/views/hospitals/_list.html.haml

@@ -0,0 +1,5 @@
+%ul
+    - hospital.departments.each do |department|
+        .list-grid
+            %li.list-name
+                = department.name

app/views/hospitals/_show.html.haml

@@ -0,0 +1,13 @@
+#rightbar
+  #error_messages
+  .list-card
+    .form-header Departments 
+    .list-item.flex#list
+      = render partial: 'list', locals: {hospital: @hospital}
+    = form_with url: departments_path, scope: :department, id: :create_department  do |f|
+      = f.hidden_field :hospital_id, value: @hospital.id
+      .list-grid
+        .list-name
+          = f.text_field :name, class: "form-input-field"
+        .list-button-area
+          = f.submit value: "Add Department", class: "button text-center"

app/views/hospitals/show.js.erb

@@ -0,0 +1,22 @@
+
+var templateContent = '<%= escape_javascript(render partial: 'show') %>'
+rightTemplate(templateContent)
+
+var departmentForm = document.getElementById('create_department')
+    console.log('show panel')
+
+departmentForm.addEventListener('ajax:success', (event) => {
+    templateContent = event.detail[0].html
+    document.getElementById('list').innerHTML = templateContent;
+    var errorMessageDisplayElement = document.getElementById('messages')
+    var message = event.detail[0].message
+    errorMessageDisplayElement.innerHTML =  message
+})
+
+departmentForm.addEventListener('ajax:error', (event) => {
+    console.log('added listener for error...')
+
+    var errorMessageDisplayElement = document.getElementById('error_messages')
+    var message = event.detail[0].message
+    errorMessageDisplayElement.innerHTML =  message
+})

app/views/jobs/_new.html.haml

@@ -13,11 +13,8 @@
             .to-field-wrapper
                 .to-field-full-width
                     = form.label :hospital, class: "form-label"
-                    = form.select :hospital, Hospital.all.collect {|c| [ c.name ] }, { include_blank: true }, id: "Hospital", class: "form-input-field"
-            .to-field-wrapper
-                .to-field-full-width
-                    = form.label :department, class: "form-label"
-                    = form.select :department, Department.all.collect {|c| [ c.name ] }, { include_blank: true }, class: "form-input-field"
+                    = form.select :hospital, Hospital.all.collect {|c| [ c.name ] }, { include_blank: true }, id: "select_hospital", class: "form-input-field"
+            #select_department
             .to-field-wrapper
                 .to-field-full-width
                     = form.label :license, class: "form-label"

app/views/jobs/new.js.erb

@@ -5,10 +5,24 @@ App.tempContent.innerHTML = modalContent
 closeModalListener('cancel_modal')
 
 var form = document.getElementById('create_job')
+var hospitalSelect = document.getElementById('select_hospital')
+var departmentSelect = document.getElementById('select_department')
 
 form.addEventListener('ajax:error', (event) => {
     let errorMessageDisplayElement = document.getElementById('error_messages')
     let message = event.detail[0].message
     errorMessageDisplayElement.innerHTML =  message
 })
 
+hospitalSelect.addEventListener('change', () => {
+    var params = `hospital=${hospitalSelect.options[hospitalSelect.selectedIndex].value}`
+    Rails.ajax({
+        type: 'GET',
+        url: '<%= get_departments_path %>',
+        data: params,
+        success: (response) => {
+            departmentSelect.innerHTML = response.html;
+        }
+
+    })
+})

app/views/layouts/application.html.haml

@@ -15,13 +15,14 @@
     = render partial: 'partials/header'
     .grid-container.bg-grey-darker
       = render partial: 'partials/sidebar'
+      = render partial: 'partials/rightbar'
       #content
+        - if notice || alert
+          #messages
+            = notice 
+            = alert 
         #temp_content
         #main_content
-          - if notice || alert
-            #messages
-              = notice 
-              = alert 
           = yield
       
     

app/views/partials/_rightbar.html.haml

@@ -0,0 +1,2 @@
+#rightbar
+    = content_for :rightbar

config/routes.rb

@@ -8,9 +8,11 @@
     }
     root controller: :jobs, action: :index
     resources :jobs, only: [:new, :create, :destroy]
+    resources :departments, only: [:create]
     resources :invitations, only: [:create, :new]
     resources :staffcos, only: [:create, :index, :new, :destroy]
-    resources :hospitals, only: [:index, :create, :new, :destroy]
+    resources :hospitals, only: [:index, :create, :new, :show, :destroy]
     resources :regions, only: [:create, :new]
+    get :get_departments, controller: :departments, action: :get_departments
   end
 end

db/migrate/20181116141742_association_between_hospitals_and_departments.rb

@@ -0,0 +1,5 @@
+class AssociationBetweenHospitalsAndDepartments < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :departments, :hospital, foreign_key: true
+  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: 2018_11_13_150059) do
+ActiveRecord::Schema.define(version: 2018_11_16_141742) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -25,6 +25,8 @@
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "hospital_id"
+    t.index ["hospital_id"], name: "index_departments_on_hospital_id"
   end
 
   create_table "hospitals", force: :cascade do |t|
@@ -46,6 +48,7 @@
     t.string "department"
     t.string "license"
     t.string "care_type"
+    t.bigint "hospital_id"
     t.text "requirements"
     t.string "other_requirements"
     t.text "description"
@@ -61,7 +64,6 @@
     t.string "other_budget"
     t.text "other_comment"
     t.string "reference_number"
-    t.bigint "hospital_id"
     t.bigint "region_id"
     t.index ["hospital_id"], name: "index_jobs_on_hospital_id"
     t.index ["region_id"], name: "index_jobs_on_region_id"
@@ -129,6 +131,7 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "departments", "hospitals"
   add_foreign_key "hospitals", "regions"
   add_foreign_key "jobs", "hospitals"
   add_foreign_key "jobs", "regions"

features/rsc_can_create_new_job.feature

@@ -6,41 +6,47 @@ Feature: Rsc can add new job
 
     Background: Landing page, clicking new and directed to the form page
         Given the following licenses exists
-            | name    | 
+            | name    |
             | Kirurgi |
 
         Given the following hospitals exists
             | name                |
             | stockholm sjukhuset |
 
         Given the following profession exists
-            | name       |
-            | Doctor     |
+            | name   |
+            | Doctor |
 
         Given the following department exists
-            | name       |
-            | Surgery    |
+            | name    | hospital            |
+            | Surgery | stockholm sjukhuset |
 
         Given the following caretype exists
-            | name       |
-            | Homecare   |
+            | name     |
+            | Homecare |
 
         Given the following other requirement exists
             | name            |
             | Drivers License |
-
+
+
         Given I am on the landing page
         And I click on "Add New Job"
 
     Scenario: RSC creates a new job
         Then I should see "Create New Job"
-        And I fill in the job form with "valid" information     
+        And I fill in the job form with "valid" information
+        And I select "stockholm sjukhuset" from "select_hospital"
+        And I wait 3 seconds
+        And I select "Surgery" from "select_department"
         And I click on "Submit"
         Then I should see "The job was successfully created"
         And I should see "Doctor"
 
     Scenario: RSC fills out form incorrectly
         And I fill in the job form with "invalid" information
+        And I select "stockholm sjukhuset" from "select_hospital"
+        And I select "Surgery" from "select_department"
         And I click on "Submit"
         Then I should see "Profession can't be blank,License can't be blank,Scope can't be blank"
 

features/rsc_can_post_new_job_to_staffing_companies_using_a_webhook.feature

@@ -23,8 +23,8 @@ Feature: Posting a job to staffing companies with a webhook
             | Doctor |
 
         And the following department exists
-            | name    |
-            | Surgery |
+            | name    | hospital            |
+            | Surgery | stockholm sjukhuset |
 
         And the following caretype exists
             | name     |
@@ -47,6 +47,8 @@ Feature: Posting a job to staffing companies with a webhook
     Scenario: RSC posts a job to staffing companies using a webhook
         Then I should see "Create New Job"
         And I fill in the job form with "valid" information
+        And I select "stockholm sjukhuset" from "select_hospital"
+        And I select "Surgery" from "select_department"
         And I click on "Submit"
         And I should see "The job was successfully created"
         And I wait 2 seconds