jobshop 0.0.167 → 0.0.179

data/app/views/jobshop/employees/_form.html.haml

@@ -0,0 +1,46 @@
+- if employee.errors.present?
+  %ul
+    - employee.errors.full_messages.each do |message|
+      %li= message
+
+= form_with(model: employee) do |employee_f|
+  %ul
+    %li= employee_f.text_field :forename, placeholder: "First Name"
+    %li= employee_f.text_field :surname, placeholder: "Last Name"
+    %li= employee_f.text_field :email, placeholder: "Email Address"
+    %li
+      Departments
+      %ul
+        = employee_f.collection_check_boxes(:department_ids,
+          current_organization.departments.all, :id, :name) do |department|
+          %li
+            = department.label do
+              = department.check_box
+              = department.object.name
+
+  %table
+    = employee_f.fields_for :employments do |employment_f|
+      %tr
+        %td
+          = employment_f.label :started_on
+          %br
+          = employment_f.date_select :started_on, include_blank: true
+        %td
+          = employment_f.label :ended_on
+          %br
+          = employment_f.date_select :ended_on, include_blank: true
+
+  -if employee.employments.empty? || employee.employments.last.ended_on != nil
+    %table
+      = employee_f.fields_for :employments, employee.employments.build do |employment_f|
+        %tr
+          %td
+            = employment_f.label :started_on
+            %br
+            = employment_f.date_select :started_on, include_blank: true
+          %td
+            = employment_f.label :ended_on
+            %br
+            = employment_f.date_select :ended_on, include_blank: true
+
+  = employee_f.submit

data/app/views/jobshop/employees/edit.html.haml

@@ -0,0 +1 @@
+= render("form", employee: employee)

data/app/views/jobshop/employees/index.html.haml

@@ -0,0 +1,12 @@
+#active-employees
+  %nav
+    %ul
+      %li= link_to "Add Employee", new_employee_path
+
+  %h3 Active Employees
+
+  %table
+    - @active_employees.each do |employee|
+      %tr
+        %td= link_to employee.name, employee
+        %td= employee.departments.map(&:name).join(", ")

data/app/views/jobshop/employees/new.html.haml

@@ -0,0 +1 @@
+= render("form", employee: employee)

data/app/views/jobshop/employees/show.html.haml

@@ -0,0 +1,16 @@
+%h3
+  = employee.name
+  %small (#{link_to "edit", edit_employee_path})
+
+#employment-history
+  %h4 Employment History
+  %table
+    %thead
+      %tr
+        %th Start Date
+        %th End Date
+    %tbody
+      - employee.employments.each do |employment|
+        %tr
+          %td= employment.started_on
+          %td= employment.ended_on || "Present"

data/app/views/jobshop/organizations/_form.html.haml

@@ -0,0 +1,10 @@
+= form_for @organization do |f|
+  - if @organization.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@organization.errors.count, "error")} prohibited this organization from being saved:"
+      %ul
+        - @organization.errors.full_messages.each do |message|
+          %li= message
+
+  .actions
+    = f.submit

data/app/views/jobshop/organizations/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing organization
+
+= render 'form'
+
+= link_to 'Show', @organization
+\|
+= link_to 'Back', organization_path

data/app/views/jobshop/organizations/index.html.haml

@@ -0,0 +1,19 @@
+%h1 Listing organizations
+
+%table
+  %thead
+    %tr
+      %th
+      %th
+      %th
+
+  %tbody
+    - @organizations.each do |organization|
+      %tr
+        %td= link_to 'Show', organization
+        %td= link_to 'Edit', edit_organization_path(organization)
+        %td= link_to 'Destroy', organization, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New Organization', new_organization_path

data/app/views/jobshop/organizations/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New organization
+
+= render 'form'
+
+= link_to 'Back', organizations_path

data/app/views/jobshop/organizations/show.html.haml

@@ -0,0 +1,16 @@
+%h2= current_organization.name
+
+%table
+  %tr
+    %td Employees:
+    %td= current_organization.employees.count
+  %tr
+    %td Departments:
+    %td= current_organization.departments.count
+  %tr
+    %td RFQs:
+    %td= current_organization.rfqs.count
+
+= link_to "Edit", edit_organization_path
+\|
+= link_to "Back", organization_path

data/app/views/jobshop/rfqs/_form.html.haml

@@ -0,0 +1,60 @@
+:css
+  thead, tbody, tfoot, tr {
+    display: block;
+    border-top: 1px solid grey;
+    border-bottom: 1px solid grey;
+  }
+
+  td {
+    vertical-align: top;
+  }
+
+- if rfq.errors.present?
+  %ul
+    %li Unable to save RFQ
+    - rfq.errors.full_messages.each do |message|
+      %li= message
+
+= form_with(model: rfq) do |rfq_f|
+  %table
+    %thead
+      %tr
+        %th Quantities
+        %th Identifier
+        %th Description
+        %th Assigned To
+        %th
+    %tbody
+      = rfq_f.fields_for :lines do |line_f|
+        %tr{ id: line_f.object.cache_key_with_version }
+          %td
+            = line_f.fields_for :quantities do |quantity_f|
+              = quantity_f.text_field :quantity, placeholder: "Quantity"
+              %br
+            - if line_f.object.persisted?
+              = line_f.fields_for :quantities, line_f.object.quantities.build do |quantity_f|
+                = quantity_f.text_field :quantity, placeholder: "Quantity",
+                  data: { new_quantity_for: line_f.object.id }
+          %td= line_f.text_field :identifier, placeholder: "Identifier"
+          %td= line_f.text_area :description, placeholder: "Description"
+          %td= line_f.collection_select :assignee_ids,
+            current_organization.employees, :id, :name, {},
+            { multiple: true, include_blank: true }
+          %td
+            = line_f.check_box :_destroy
+            = line_f.label "Delete"
+    %tfoot#new-rfq-line-item
+      = rfq_f.fields_for :lines, rfq.lines.build do |line_f|
+        %tr
+          %td
+            = line_f.fields_for :quantities, line_f.object.quantities.build do |quantity_f|
+              = quantity_f.text_field :quantity, placeholder: "Quantity",
+                data: { new_line_quantity: DateTime.now.strftime("%Q") }
+          %td= line_f.text_field :identifier, placeholder: "Identifier",
+            data: { new_line_identifier: DateTime.now.strftime("%Q") }
+          %td= line_f.text_area :description, placeholder: "Description"
+          %td= line_f.collection_select :assignee_ids,
+            current_organization.employees, :id, :name, { },
+            { multiple: true, include_blank: true }
+          %td
+  = rfq_f.submit

data/app/views/jobshop/rfqs/edit.html.haml

@@ -0,0 +1,4 @@
+= render("form", rfq: rfq)
+%h1= rfq.subject
+%p From: #{rfq.from}
+%p Content: #{rfq.content}

data/app/views/jobshop/rfqs/index.html.haml

@@ -0,0 +1,2 @@
+%h1 RFQs#index
+%p Find me in app/views/jobshop/rfqs/index.html.haml

data/app/views/jobshop/roles/_form.html.haml

@@ -0,0 +1,11 @@
+= form_for @role do |f|
+  - if @role.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@role.errors.count, "error")} prohibited this role from being saved:"
+      %ul
+        - @role.errors.full_messages.each do |message|
+          %li= message
+
+  = f.text_field :name, placeholder: "Name"
+  .actions
+    = f.submit

data/app/views/jobshop/roles/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing role
+
+= render 'form'
+
+= link_to 'Show', @role
+\|
+= link_to 'Back', roles_path

data/app/views/jobshop/roles/index.html.haml

@@ -0,0 +1,21 @@
+%h1 Listing roles
+
+%table
+  %thead
+    %tr
+      %th Name
+      %th
+      %th
+      %th
+
+  %tbody
+    - @roles.each do |role|
+      %tr
+        %td= role.name
+        %td= link_to 'Show', role
+        %td= link_to 'Edit', edit_role_path(role)
+        %td= link_to 'Destroy', role, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New Role', new_role_path

data/app/views/jobshop/roles/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New role
+
+= render 'form'
+
+= link_to 'Back', roles_path

data/app/views/jobshop/roles/show.html.haml

@@ -0,0 +1,3 @@
+= link_to 'Edit', edit_role_path(@role)
+\|
+= link_to 'Back', roles_path

data/app/views/layouts/jobshop/application.html.haml

@@ -7,9 +7,57 @@
 
     %title Jobshop
 
-    =# stylesheet_link_tag "jobshop/application", media: "all", "data-turbolinks-track": "reload"
-    =# javascript_include_tag "jobshop/application", "data-turbolinks-track": "reload"
+    //= stylesheet_link_tag "jobshop/application", media: "all", "data-turbolinks-track": "reload"
+    //= javascript_include_tag webpack_asset_url("application.js"), "data-turbolinks-track": "reload"
     = csrf_meta_tags
 
   %body{ class: :body_class }
+    :scss
+      nav {
+        ul {
+          margin: 0;
+          padding: 0;
+          list-style: none;
+        }
+
+        li {
+          display: inline-block;
+        }
+
+        a {
+          display: block;
+          padding: 6px 12px;
+          text-decoration: none;
+        }
+      }
+
+      thead, tbody, tfoot, tr {
+        display: block;
+        border-top: 1px solid grey;
+        border-bottom: 1px solid grey;
+      }
+
+      td {
+        vertical-align: top;
+      }
+
+    - if user_signed_in?
+      %p
+        #{current_organization.name} - Hello, #{current_user.name} (#{current_user.email})
+        %span= link_to("Sign Out", destroy_user_session_path)
+      %nav
+        %ul
+          %li= link_to "Home", root_path
+          %li= link_to "HR", employees_path
+          %li
+            %ul
+              %li Administration
+              %li= link_to "Organization", organization_path
+              %li= link_to "Departments", departments_path
+              %li= link_to "Roles", roles_path
+      %hr
+      - flash.each do |key, value|
+        = content_tag :div, value, class: "flash #{key}"
+      %hr
+
     = content_for?(:body) ? yield(:body) : yield

data/config/initializers/devise.rb

@@ -8,7 +8,7 @@ Devise.setup do |config|
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
-  config.secret_key = SecureRandom.hex(64)
+  config.secret_key = Rails.application.credentials.secret_key_base
 
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
@@ -251,7 +251,7 @@ Devise.setup do |config|
   # config.navigational_formats = ['*/*', :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting

data/config/routes.rb

@@ -1,3 +1,21 @@
 Jobshop::Engine.routes.draw do
+  default_url_options = { protocol: :https, host: "jobshop.test" }
+
   devise_for :users, class_name: "Jobshop::User", module: :devise
+
+  scope "/sales" do
+    resources :rfqs
+  end
+
+  scope "/hr" do
+    resources :employees
+  end
+
+  scope "/admin" do
+    resources :departments
+    resources :roles
+    resource :organization
+  end
+
+  root to: "dashboards#show"
 end

data/db/migrate/20170311194758_initialize_jobshop.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 class InitializeJobshop < ActiveRecord::Migration[5.2]
   def change
@@ -6,43 +6,8 @@ class InitializeJobshop < ActiveRecord::Migration[5.2]
     enable_extension "citext"     unless extension_enabled? "citext"
     enable_extension "btree_gist" unless extension_enabled? "btree_gist"
 
-    execute <<~SQL
-      -- prepare_auditable()
-      CREATE OR REPLACE FUNCTION prepare_auditable() RETURNS TRIGGER AS $$
-        BEGIN
-          IF (TG_OP = 'UPDATE') THEN
-            NEW.version = OLD.version + 1;
-            RETURN NEW;
-          ELSIF (TG_OP = 'INSERT') THEN
-            NEW.version = 0;
-            RETURN NEW;
-          END IF;
-        END;
-      $$ LANGUAGE plpgsql;
-
-      -- process_auditable(audit_table_name)
-      CREATE OR REPLACE FUNCTION process_auditable() RETURNS TRIGGER AS $$
-        DECLARE
-          audit_table_name text := TG_ARGV[0];
-
-        BEGIN
-          IF (TG_OP = 'UPDATE') THEN
-            EXECUTE
-              FORMAT(
-                'INSERT INTO %1$I SELECT gen_random_uuid(), now(), ($1).*',
-                audit_table_name)
-              USING OLD;
-            RETURN NEW;
-          ELSIF (TG_OP = 'INSERT') THEN
-            EXECUTE
-              FORMAT(
-                'INSERT INTO %1$I SELECT gen_random_uuid(), now(), ($1).*',
-                audit_table_name)
-              USING NEW;
-            RETURN NEW;
-          END IF;
-        END;
-      $$ LANGUAGE plpgsql;
-    SQL
+    execute File.read(
+      File.join(Jobshop::Engine.config.paths["db/migrate"].first,
+                "support/temporal_tables.sql"))
   end
 end

data/db/migrate/20171216021339_create_organizations.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
@@ -6,14 +6,9 @@ class CreateOrganizations < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
-    create_table :jobshop_organizations, id: false do |t|
-      t.uuid :organization_id, null: false, default: "gen_random_uuid()"
-      t.index :organization_id, unique: true,
-        name: :idx_jobshop_organizations_pkey
-
+    create_table_with_auditing :jobshop_organizations, primary_key: :id do |t|
+      t.citext :name, null: false, index: true
       t.timestamps
     end
-
-    idx_table_name_pkey :jobshop_organizations
   end
 end