we_bridge_rails_engine_orgs 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396170864840366ac5d88174dd8e707d8cc4dfc5
-  data.tar.gz: 9ae9fb53ab02f0802743dde23b3def46360aee9e
+  metadata.gz: 14b9016374ad865cee705818e1fedcc60a6aecf7
+  data.tar.gz: 1fe2962883d1053edd554e5a4cf714ba72d1dd8e
 SHA512:
-  metadata.gz: d52bb9f1571cf006e27342a59c01e7d82055a9e4dc37a1b0e247cca66fe1c1bd0e0eba4ce9321fae893099351fa9adf70d2c8cf803282f290c02279d9ffd70c4
-  data.tar.gz: efe37d5be28e6f00cf6ae38b84948274bd5b510d59f3eb3a9ce78b153e6dd65bc7fd04bf30158216193c559352993503947fe53bd35e02ad24660c0e24ebfa22
+  metadata.gz: 04cbf683c96391ab51fbcdc1b1461cc52d2d427eea06bccac18d67f3580e8fd76a47cc941394daefe037031a1dd6119e76308eda10be10d66f8e7811fc12fd8e
+  data.tar.gz: 3fbe31cbe763da133302f89c64de3bd28fb8f2e1c8a50b4d4b2bbc698b0bf43d140c2085a4d34842cb80adf2b786a6491ac2f62749456c662640c76d9356b7d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    we_bridge_rails_engine_orgs (0.1.6)
+    we_bridge_rails_engine_orgs (0.1.7)
       actionview-helpers-auto_tag_helper
       activerecord-mlang
       we_bridge-auto_view_helper

data/app/assets/javascripts/org_department_positions.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/org_departments.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/org_department_positions.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/org_departments.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/org_department_positions_controller.rb

@@ -0,0 +1,58 @@
+class OrgDepartmentPositionsController < ApplicationController
+  before_action :set_org_department_position, only: [:show, :edit, :update, :destroy]
+
+  # GET /org_department_positions
+  def index
+    @org_department_positions = OrgDepartmentPosition.all
+  end
+
+  # GET /org_department_positions/1
+  def show
+  end
+
+  # GET /org_department_positions/new
+  def new
+    @org_department_position = OrgDepartmentPosition.new
+  end
+
+  # GET /org_department_positions/1/edit
+  def edit
+  end
+
+  # POST /org_department_positions
+  def create
+    @org_department_position = OrgDepartmentPosition.new(org_department_position_params)
+
+    if @org_department_position.save
+      redirect_to @org_department_position, notice: 'Org department position was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /org_department_positions/1
+  def update
+    if @org_department_position.update(org_department_position_params)
+      redirect_to @org_department_position, notice: 'Org department position was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /org_department_positions/1
+  def destroy
+    @org_department_position.destroy
+    redirect_to org_department_positions_url, notice: 'Org department position was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_org_department_position
+      @org_department_position = OrgDepartmentPosition.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def org_department_position_params
+      params[:org_department_position]
+    end
+end

data/app/controllers/org_departments_controller.rb

@@ -0,0 +1,58 @@
+class OrgDepartmentsController < ApplicationController
+  before_action :set_org_department, only: [:show, :edit, :update, :destroy]
+
+  # GET /org_departments
+  def index
+    @org_departments = OrgDepartment.all
+  end
+
+  # GET /org_departments/1
+  def show
+  end
+
+  # GET /org_departments/new
+  def new
+    @org_department = OrgDepartment.new
+  end
+
+  # GET /org_departments/1/edit
+  def edit
+  end
+
+  # POST /org_departments
+  def create
+    @org_department = OrgDepartment.new(org_department_params)
+
+    if @org_department.save
+      redirect_to @org_department, notice: 'Org department was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /org_departments/1
+  def update
+    if @org_department.update(org_department_params)
+      redirect_to @org_department, notice: 'Org department was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /org_departments/1
+  def destroy
+    @org_department.destroy
+    redirect_to org_departments_url, notice: 'Org department was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_org_department
+      @org_department = OrgDepartment.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def org_department_params
+      params[:org_department]
+    end
+end

data/app/helpers/org_department_positions_helper.rb

@@ -0,0 +1,2 @@
+module OrgDepartmentPositionsHelper
+end

data/app/helpers/org_departments_helper.rb

@@ -0,0 +1,2 @@
+module OrgDepartmentsHelper
+end

data/app/models/org.rb

@@ -3,13 +3,21 @@ require 'activerecord/mlang'
 class Org < ActiveRecord::Base
   belongs_to :lang
   has_many :director_types, class_name: "OrgDirectorType"
-  has_many :directors, through: :director_types
-  has_many :members, class_name: "OrgMember"
-  has_many :member_tags, class_name: "OrgMemberTag"
+  has_many :directors,      through: :director_types
+  has_many :members,        class_name: "OrgMember"
+  has_many :member_types,   class_name: "OrgMemberType"
+  has_many :member_tags,    class_name: "OrgMemberTag"
+  has_many :activities,     class_name: "OrgActivity"
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
   set_accessible_attrs :lang_id, :email,:url,:domain,:started_on,:post_number,:tel
   set_input_options :email, type: :email
   set_input_options :url, type: :url
   set_input_options :tel, type: :phone
+
+  def representative
+    tname = OrgDirectorType.table_name
+    self.directors.joins(:org_director_type).where("#{tname}.position" => OrgDirectorType.where(org_id: self.id).minimum(:position)).order(id: :asc).uniq.first
+  end
+
 end

data/app/models/org_branch.rb

@@ -3,6 +3,11 @@ require 'activerecord/mlang'
 class OrgBranch < ActiveRecord::Base
   belongs_to :org
   belongs_to :org_branch_type
+  has_many :branch_member_mappings, class_name: "OrgBranchMemberMapping"
+  has_many :members, through: :branch_member_mappings, source: :org_member
+
+  scope :has_member, ->(){ all.joins(branch_member_mappings: :org_member).uniq }
+
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
   set_accessible_attrs :org_branch_type_id, :position
@@ -11,4 +16,14 @@ class OrgBranch < ActiveRecord::Base
   def __display__
     self.text.name + self.org_branch_type.__display__
   end
+
+  # @member : OrgMember
+  def add(member)
+    member_id = case member
+                when Integer   then member
+                when OrgMember then member.id
+                else                member.to_i
+                end
+    OrgBranchMemberMapping.find_or_create_by(org_member_id: member_id, org_branch_id: self.id)
+  end
 end

data/app/models/org_department.rb

@@ -0,0 +1,19 @@
+require 'action_view/helpers/auto_tag_helper/form_info'
+require 'activerecord/mlang'
+class OrgDepartment < ActiveRecord::Base
+  belongs_to :org
+  belongs_to :manager, class_name: "OrgMember"
+  has_many :positions, class_name: "OrgDepartmentPosition"
+  has_many :position_member_mappings, through: :positions               , source: :member_mappings
+  has_many :members, ->(){ uniq },    through: :position_member_mappings, source: :org_member
+
+  include ActiveRecord::Mlang
+  include ActionView::Helpers::AutoTagHelper::FormInfo
+
+#  def self.editable_columns(); [] ;  end
+
+  def __display__
+    self.text.label
+  end
+
+end

data/app/models/org_department_position.rb

@@ -0,0 +1,26 @@
+require 'action_view/helpers/auto_tag_helper/form_info'
+require 'activerecord/mlang'
+class OrgDepartmentPosition < ActiveRecord::Base
+  belongs_to :org_department
+  has_many :member_mappings, class_name: "OrgDepartmentPositionMemberMapping"
+  has_many :members, through: :member_mappings, source: :org_member
+
+  include ActiveRecord::Mlang
+  include ActionView::Helpers::AutoTagHelper::FormInfo
+
+#  def self.editable_columns(); [] ;  end
+
+  def __display__
+    self.text.label
+  end
+
+  def add(member)
+    member_id = case member
+                when OrgMember then member.id
+                when Integer   then member
+                else                member.to_i
+                end
+    OrgDepartmentPositionMemberMapping.find_or_create_by(org_department_position_id: self.id, org_member_id: member_id)
+  end
+
+end

data/app/models/org_department_position_member_mapping.rb

@@ -0,0 +1,7 @@
+class OrgDepartmentPositionMemberMapping < ActiveRecord::Base
+  belongs_to :org_department_position
+  def position() self.org_department_position; end
+  belongs_to :org_member
+  def member() self.org_member; end
+end
+

data/app/models/org_department_position_text.rb

@@ -0,0 +1,10 @@
+require 'action_view/helpers/auto_tag_helper/form_info'
+require 'activerecord/mlang'
+class OrgDepartmentPositionText < ActiveRecord::Base
+  include ActiveRecord::Mlang::Text
+  include ActionView::Helpers::AutoTagHelper::FormInfo
+  set_accessible_attrs :name, :desc
+  def __display__
+    self.name
+  end
+end

data/app/models/org_department_text.rb

@@ -0,0 +1,11 @@
+require 'action_view/helpers/auto_tag_helper/form_info'
+require 'activerecord/mlang'
+class OrgDepartmentText < ActiveRecord::Base
+  include ActiveRecord::Mlang::Text
+  include ActionView::Helpers::AutoTagHelper::FormInfo
+  set_accessible_attrs :name,:desc
+  def __display__
+    self.name
+  end
+end
+

data/app/models/org_member.rb

@@ -10,6 +10,9 @@ class OrgMember < ActiveRecord::Base
   has_many :member_tag_mappings, class_name: "OrgMemberTagMapping"
   has_many :tags, through: :member_tag_mappings, source: :org_member_tag
 
+  has_many :branch_member_mappings, class_name: "OrgBranchMemberMapping"
+  has_many :branches, through: :branch_member_mappings, source: :org_branch
+
   enum sex: [:male,:female, :unknown]
 
   include ActiveRecord::Mlang
@@ -20,6 +23,8 @@ class OrgMember < ActiveRecord::Base
   set_input_options :bday, min: 1, max: 31
   set_input_options :sex, min: -1, max: 1
 
+  default_scope ->(){ where(retired_on: nil) }
+
   def others
     self.class.where(org_id: self.org_id).where.not(id: self.id)
   end

data/app/views/org_department_positions/_form.html.builder

@@ -0,0 +1,14 @@
+form_for @org_department_position do |f|
+  markup{|m|
+    if @org_department_position.errors.any?
+      #error_explanation
+      m.h2 "#{pluralize(@org_department_position.errors.count, "error")} prohibited this org_department_position from being saved:"
+      m.ul do
+        @org_department_position.errors.full_messages.each do |message|
+          m.li message
+        end
+      end
+    end
+    m << f.submit
+  }.html_safe
+end

data/app/views/org_department_positions/edit.html.builder

@@ -0,0 +1,7 @@
+markup do |m|
+  m.h1 "Editing org_department_position"
+  m << render('form')
+  m << link_to('Show', @org_department_position)
+  m << link_to('Back', org_department_positions_path)
+end
+

data/app/views/org_department_positions/index.html.builder

@@ -0,0 +1,25 @@
+markup do |m|
+  m.h1 'Listing org_department_positions'
+  m.table do
+    m.thead do
+      m.tr do
+        m.th
+        m.th
+        m.th
+      end
+    end
+    m.tbody do
+    @org_department_positions.each do |org_department_position|
+      m.tr do
+        m.td { m << link_to('Show', 'org_department_position') }
+        m.td { m << link_to('Edit', edit_org_department_position_path(org_department_position)) }
+        m.td { m << link_to('Destroy', org_department_position, data: { confirm: 'Are you sure?' }, method: :delete) }
+      end
+    end
+    end
+  end
+
+  m.br
+  m << link_to('New Org department position', new_org_department_position_path)
+
+end

data/app/views/org_department_positions/new.html.builder

@@ -0,0 +1,5 @@
+markup do |m|
+  m.h1 'New org_department_position'
+  m << render('form')
+  m << link_to('Back', org_department_positions_path)
+end

data/app/views/org_department_positions/show.html.builder

@@ -0,0 +1,8 @@
+markup do |m|
+  m.p id: 'notice'
+  m.dl do
+  end
+
+  m << link_to('Edit', edit_org_department_position_path(@org_department_position))
+  m << link_to('Back', org_department_positions_path)
+end

data/app/views/org_departments/_form.html.builder

@@ -0,0 +1,14 @@
+form_for @org_department do |f|
+  markup{|m|
+    if @org_department.errors.any?
+      #error_explanation
+      m.h2 "#{pluralize(@org_department.errors.count, "error")} prohibited this org_department from being saved:"
+      m.ul do
+        @org_department.errors.full_messages.each do |message|
+          m.li message
+        end
+      end
+    end
+    m << f.submit
+  }.html_safe
+end

data/app/views/org_departments/edit.html.builder

@@ -0,0 +1,7 @@
+markup do |m|
+  m.h1 "Editing org_department"
+  m << render('form')
+  m << link_to('Show', @org_department)
+  m << link_to('Back', org_departments_path)
+end
+

data/app/views/org_departments/index.html.builder

@@ -0,0 +1,25 @@
+markup do |m|
+  m.h1 'Listing org_departments'
+  m.table do
+    m.thead do
+      m.tr do
+        m.th
+        m.th
+        m.th
+      end
+    end
+    m.tbody do
+    @org_departments.each do |org_department|
+      m.tr do
+        m.td { m << link_to('Show', 'org_department') }
+        m.td { m << link_to('Edit', edit_org_department_path(org_department)) }
+        m.td { m << link_to('Destroy', org_department, data: { confirm: 'Are you sure?' }, method: :delete) }
+      end
+    end
+    end
+  end
+
+  m.br
+  m << link_to('New Org department', new_org_department_path)
+
+end