phcmembers 2.2.0 → 3.0.0

data/app/controllers/phcmembers/members/mains_controller.rb

@@ -2,11 +2,11 @@ require_dependency "phcmembers/application_controller"
 
 module Phcmembers
 	class Members::MainsController < ApplicationController
-	
+
 		# Filters
-		layout 'layouts/phcmembers/members/members_all.html.erb'
-		before_filter :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :set_paper_trail_whodunnit
 		before_action :set_members_main, only: [:show, :edit, :update, :destroy]
+		# layout :phcmemberspro_membersmain_layouts_resolver
 
 		# Member Profile List
 		def index
@@ -15,6 +15,9 @@ module Phcmembers
 
 		# Detailed Member Profile
 		def show
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Members::Main')
+			@members_listings = Directory::Listing.where(main_id: params[:id])
+			@members_main = Members::Main.find(params[:id])
 		end
 
 		# New Member Profile
@@ -30,7 +33,7 @@ module Phcmembers
 		def create
 			@members_main = Members::Main.new(members_main_params)
 			if @members_main.save
-				redirect_to members_mains_path, notice: 'Member profile was successfully created.'
+				redirect_to members_mains_path, notice: 'Member profile has been successfully created.'
 				else
 					render :new
 			end
@@ -39,7 +42,7 @@ module Phcmembers
 		# Update Member Profile Action
 		def update
 			if @members_main.update(members_main_params)
-				redirect_to members_mains_path, notice: 'Member profile was successfully updated.'
+				redirect_to members_mains_path, notice: 'Member profile has been successfully updated.'
 				else
 					render :edit
 			end
@@ -48,7 +51,7 @@ module Phcmembers
 		# Delete Member Profile Action
 		def destroy
 			@members_main.destroy
-			redirect_to members_mains_path, notice: 'Member profile was successfully destroyed.'
+			redirect_to members_mains_path, notice: 'Member profile and all businesses was successfully destroyed.'
 		end
 
 		private
@@ -60,7 +63,7 @@ module Phcmembers
 
 		# White List
 		def members_main_params
-			params.require(:members_main).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes)
+			params.require(:members_main).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :smfacebook, :smtwitter, :smlinkedin)
 		end
 
 	end

data/app/helpers/phcmembers/application_helper.rb

@@ -1,5 +1,4 @@
 module Phcmembers
 	module ApplicationHelper
-
 	end
 end

data/app/jobs/phcmembers/application_job.rb

@@ -0,0 +1,4 @@
+module Phcmembers
+	class ApplicationJob < ActiveJob::Base
+	end
+end

data/app/mailers/phcmembers/application_mailer.rb

@@ -0,0 +1,6 @@
+module Phcmembers
+	class ApplicationMailer < ActionMailer::Base
+		default from: 'info@phcnetworks.net'
+		layout 'mailer'
+	end
+end

data/app/models/phcmembers/api.rb

@@ -0,0 +1,7 @@
+module Phcmembers
+	module Api
+		def self.table_name_prefix
+			'phcmembers_api_'
+		end
+	end
+end

data/app/models/phcmembers/application_record.rb

@@ -0,0 +1,5 @@
+module Phcmembers
+	class ApplicationRecord < ActiveRecord::Base
+		self.abstract_class = true
+	end
+end

data/app/models/phcmembers/directory.rb

@@ -1,10 +1,7 @@
 module Phcmembers
 	module Directory
-
-		# Auto Prefix Directory Tables
 		def self.table_name_prefix
 			'phcmembers_directory_'
 		end
-
 	end
 end

data/app/models/phcmembers/directory/category.rb

@@ -1,13 +1,16 @@
 module Phcmembers
 	class Directory::Category < ActiveRecord::Base
 
+		# Add Paper Trail
+		has_paper_trail
+
 		# Model Relationship
-		has_many :catlists, class_name: 'Directory::Catlist'
+		has_many :listings, class_name: 'Directory::Listing', dependent: :destroy
+		has_many :businesses, class_name: 'Members::Business', :through => :listings
 
 		# Validation for Form Fields
-		validates :catname, 
+		validates :catname,
 			presence: true,
-			uniqueness: true,
 			length: { minimum: 3 }
 
 	end

data/app/models/phcmembers/directory/listing.rb

@@ -0,0 +1,20 @@
+module Phcmembers
+	class Directory::Listing < ActiveRecord::Base
+
+		# Add Paper Trail
+		has_paper_trail
+    
+		# Model Relationship
+		belongs_to :category, class_name: 'Directory::Category'
+		belongs_to :business, class_name: 'Members::Business'
+
+		# Validation for Form Fields
+		validates :business_id,
+			presence: true
+
+		# Validation for Form Fields
+		validates :category_id,
+			presence: true
+
+	end
+end

data/app/models/phcmembers/members.rb

@@ -1,10 +1,7 @@
 module Phcmembers
 	module Members
-
-		# Auto Prefix Tables for Members
 		def self.table_name_prefix
 			'phcmembers_members_'
 		end
-
 	end
 end

data/app/models/phcmembers/members/business.rb

@@ -0,0 +1,44 @@
+module Phcmembers
+	class Members::Business < ActiveRecord::Base
+
+		# Add Paper Trail
+		has_paper_trail
+
+		# Translate Country Code to Name
+		def country_name
+			country = ISO3166::Country[mccountry]
+			country.translations[I18n.locale.to_s] || country.name
+		end
+
+		# Model Relationship
+		has_many :listings, class_name: 'Directory::Listing'
+		has_many :categories, class_name: 'Directory::Category', :through => :listings
+		belongs_to :main, class_name: 'Members::Main'
+
+		# Validation for Form Fields
+		validates :mbcompanyname,
+			presence: true,
+			length: { minimum: 3 }
+
+		validates :mbcontactname,
+			presence: true,
+			length: { minimum: 2 }
+
+		validates :mbcity,
+			presence: true,
+			length: { minimum: 3 }
+
+		validates :mbprovince,
+			presence: true,
+			length: { minimum: 2 }
+
+		validates :mbcountry,
+			presence: true,
+			length: { minimum: 2 }
+
+		validates :mbpostalcode,
+			presence: true,
+			length: { minimum: 6 }
+ 
+	end
+end

data/app/models/phcmembers/members/contact.rb

@@ -1,18 +1,19 @@
 module Phcmembers
 	class Members::Contact < ActiveRecord::Base
 
+		# Add Paper Trail
+		has_paper_trail
+
+		# Translate Country Code to Name
+		def country_name
+			country = ISO3166::Country[mccountry]
+			country.translations[I18n.locale.to_s] || country.name
+		end
+
 		# Model Relationships
 		belongs_to :main, class_name: 'Members::Main'
 
 		# Validation for Form Fields
-		validates :mccontactname,
-			presence: true,
-			length: { minimum: 3 }
-
-		validates :mccompanyname,
-			presence: true,
-			length: { minimum: 2 }
-
 		validates :mccity,
 			presence: true,
 			length: { minimum: 3 }
@@ -20,7 +21,7 @@ module Phcmembers
 		validates :mcprovince,
 			presence: true,
 			length: { minimum: 2 }
-			
+
 		validates :mccountry,
 			presence: true,
 			length: { minimum: 2 }

data/app/models/phcmembers/members/main.rb

@@ -1,12 +1,15 @@
 module Phcmembers
 	class Members::Main < ActiveRecord::Base
 
+		# Add Paper Trail
+		has_paper_trail
+
 		# Gravatar
 		include Gravtastic
 		gravtastic :memail
 
 		# Model Relationship
-		has_many :listings, class_name: 'Members::Listing', dependent: :destroy
+		has_many :businesses, class_name: 'Members::Business', dependent: :destroy
 		has_many :contacts, class_name: 'Members::Contact', dependent: :destroy
 
 		# Validation for Form Fields
@@ -23,12 +26,10 @@ module Phcmembers
 
 		validates :memail,
 			presence: true,
-			uniqueness: true,
 			length: { minimum: 6 }
 
 		validates :mphone,
 			presence: true,
-			uniqueness: true,
 			format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: xxx-xxx-xxxx" }
 
 	end

data/app/views/layouts/phcmembers/application.html.erb

@@ -1,17 +1,21 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>PHCMembers - Member's Listing & Contacts Manager</title>
-			<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
-			<%= javascript_include_tag "phcmembers/application" %>
-			<%= csrf_meta_tags %>
+
+		<title>PHCMembers SSO - Members Manager</title>
+
+		<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
+		<%= javascript_include_tag "phcmembers/application" %>
+		<%= csrf_meta_tags %>
+
 	</head>
+
 	<body>
 		<div class="container">
-
-			<%= render 'phcnotifi/notifications' %>
-			<%= yield %>
-
+			<div class="row">
+				<%= yield %>
+			</div> 
 		</div>
 	</body>
+
 </html>

data/app/views/layouts/phcmembers/directory/directory_all.html.erb

@@ -1,17 +1,21 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>PHCMembers - Member's Listing & Contacts Manager</title>
-			<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
-			<%= javascript_include_tag "phcmembers/application" %>
-			<%= csrf_meta_tags %>
+
+		<title>PHCMembers SSO - Directories Manager</title>
+
+		<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
+		<%= javascript_include_tag "phcmembers/application" %>
+		<%= csrf_meta_tags %>
+
 	</head>
+
 	<body>
 		<div class="container">
-
-			<%= render 'phcnotifi/notifications' %>
-			<%= yield %>
-
+			<div class="row">
+				<%= yield %>
+			</div> 
 		</div>
 	</body>
+
 </html>

data/app/views/layouts/phcmembers/members/members_all.html.erb

@@ -1,17 +1,21 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>PHCMembers - Member's Listing & Contacts Manager</title>
-			<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
-			<%= javascript_include_tag "phcmembers/application" %>
-			<%= csrf_meta_tags %>
+
+		<title>PHCMembers SSO - Members Manager</title>
+
+		<%= stylesheet_link_tag    "phcmembers/application", media: "all" %>
+		<%= javascript_include_tag "phcmembers/application" %>
+		<%= csrf_meta_tags %>
+
 	</head>
+
 	<body>
 		<div class="container">
-
-			<%= render 'phcnotifi/notifications' %>
-			<%= yield %>
-
+			<div class="row">
+				<%= yield %>
+			</div> 
 		</div>
 	</body>
+
 </html>

data/app/views/phcmembers/directory/categories/_form.html.erb

@@ -7,8 +7,9 @@
 		<label><%= f.label :catname, "Category Name" %></label>
 		<%= f.text_field :catname, class: "form-control", placeholder: "Directory Category" %>
 	</div>
+
 	<div class="actions">
-		<%= f.submit "Submit", class: "btn btn-primary" %>
+		<%= f.submit "Submit", class: "btn blue-hoki" %>
 	</div>
 
 <% end %>

data/app/views/phcmembers/directory/categories/components/_category_audits.html.erb

@@ -0,0 +1,25 @@
+<div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
+	<ul class="feeds">
+		<% @versions.each do |version| %>
+			<li>
+				<div class="col1">
+					<div class="cont">
+						<div class="cont-col1">
+							<div class="label label-sm label-success">
+								<i class="fa fa-bell-o"></i>
+							</div>
+						</div>
+						<div class="cont-col2">
+							<div class="desc">
+								<strong>EVENT #<%= version.id %></strong> - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i>  - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> - <%= version.event.capitalize %> - <%= @directory_category.catname %> - Category
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="col2">
+					<div class="date"> <%= l(version.created_at, format: "%H:%M %Z") %> </div>
+				</div>
+			</li>
+		<% end %>
+	</ul>
+</div>

data/app/views/phcmembers/directory/categories/components/_category_list.html.erb

@@ -0,0 +1,7 @@
+<ul class="list-group">
+	<% @directory_category.listings.each do |directory_category_listings| %>
+		<li class="list-group-item">
+			<%= link_to directory_category_listings.business.mbcompanyname, directory_category_listings_path(@directory_category)  %>
+		</li>
+	<% end %>
+</ul>

data/app/views/phcmembers/directory/categories/components/_category_main.html.erb

@@ -0,0 +1,24 @@
+<div class="col-md-6">
+	<div class="card">
+		<div class="card-header">
+			Recent Listings for <%= @directory_category.catname %>
+		</div>
+		<div class="card-block">
+			<%= render 'phcmembers/directory/categories/components/category_list' %>
+			<%= link_to directory_category_listings_path(@directory_category), class: "btn blue-chambray" do %>
+				<i class="fa fa-list-alt"></i> All Listings for <%= @directory_category.catname %>
+			<% end %>
+		</div>
+	</div>
+</div>
+
+<div class="col-md-6">
+	<div class="card">
+		<div class="card-header">
+			Category Change Log
+		</div>
+		<div class="card-block">
+			<%= render 'phcmembers/directory/categories/components/category_audits' %>
+		</div>
+	</div>
+</div>

data/app/views/phcmembers/directory/categories/edit.html.erb

@@ -1,26 +1,45 @@
-<!-- Bread Crumbs -->
-<div class="row wrapper border-bottom white-bg page-heading">
+<!-- Title System -->
+<% phc_title  "PHCMembers - Directory Category Manager" %>
+<% phc_title_tagline "Edit " + @directory_category.catname + " Title" %>
+
+<!-- BreadCrumbs -->
+<div class="row">
 	<div class="col-lg-12">
-		<h2>Directory Category Information</h2>
+
+		<!-- Bread Crumb -->
 		<ol class="breadcrumb">
-			<li><%= link_to "Home", directory_root_path %></li>
+			<li><%= link_to "Directory Home", directory_root_path %></li>
 			<li><%= link_to "Directory Categories", directory_categories_path %></li>
-			<li class="active">Update Directory Category</li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
 		</ol>
+
+	</div>
+</div>
+
+<!-- Page Title -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
 	</div>
 </div>
 
 <!-- Main Content -->
 <div class="row">
 	<div class="col-lg-12">
-		<div class="panel panel-primary">
-			<div class="panel-heading">
-				Update Directory Category
+
+		<div class="card">
+			<div class="card-header">
+				<%= yield(:phc_title_tagline) %>
 			</div>
-			<div class="panel-body">
-				<%= render 'phcnotifi/notifications' %>
-				<%= render 'form' %>
+			<div class="card-block">
+				<%= render 'formpatch' %>
 			</div>
 		</div>
+
 	</div>
 </div>