dhatu 0.1.5 → 0.1.6

data/app/controllers/dhatu/team_members_controller.rb

@@ -4,7 +4,7 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/team_member").permit(:name, :designation, :status, :featured, :description, :linked_in_url, :google_plus_url, :facebook_url, :twitter_url)
+      params.require("dhatu/team_member").permit(:name, :designation, :status, :featured, :description, :linked_in_url, :google_plus_url, :facebook_url, :twitter_url, :priority)
     end
 
     def get_collections
@@ -19,9 +19,7 @@ module Dhatu
     def apply_filters
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @order_by = "created_at desc" unless @order_by
-      @relation = @relation.order(@order_by)
+      @relation = @relation.order("priority ASC, name ASC")
     end
 
     def configure_filter_settings
@@ -70,9 +68,9 @@ module Dhatu
       {
         heading: "Manage Team",
         icon: "fa-group",
-        description: "Listing all team_members",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
-                  {name: "Manage team_members", link: dhatu.team_members_path, icon: 'fa-group', active: true}]
+        description: "Listing all Team",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Team", link: dhatu.team_members_path, icon: 'fa-group', active: true}]
       }
     end
 

data/app/controllers/dhatu/testimonials_controller.rb

@@ -4,11 +4,11 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/testimonial").permit(:name, :designation, :organisation, :status, :featured, :statement)
+      params.require("dhatu/testimonial").permit(:name, :designation, :organisation, :status, :featured, :statement, :priority)
     end
 
     def get_collections
-      @relation = Testimonial.includes(:profile_image, :logo_image).where("")
+      @relation = Dhatu::Testimonial.includes(:profile_image, :logo_image).where("")
       params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
@@ -19,9 +19,7 @@ module Dhatu
     def apply_filters
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @order_by = "created_at desc" unless @order_by
-      @relation = @relation.order(@order_by)
+      @relation = @relation.order("priority ASC, name ASC")
     end
 
     def configure_filter_settings
@@ -43,9 +41,9 @@ module Dhatu
         status: {
           object_filter: false,
           select_label: "Select Status",
-          display_hash: Testimonial::STATUS,
+          display_hash: Dhatu::Testimonial::STATUS,
           current_value: @status,
-          values: Testimonial::STATUS_REVERSE,
+          values: Dhatu::Testimonial::STATUS_REVERSE,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -62,17 +60,17 @@ module Dhatu
         view_path: "dhatu/testimonials",
         collection_name: :testimonials,
         item_name: :testimonial,
-        class: Testimonial
+        class: Dhatu::Testimonial
       }
     end
 
     def breadcrumbs_configuration
       {
-        heading: "Manage testimonials",
+        heading: "Manage Testimonials",
         icon: "fa-comment",
-        description: "Listing all testimonials",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
-                  {name: "Manage testimonials", link: dhatu.testimonials_path, icon: 'fa-comment', active: true}]
+        description: "Listing all Testimonials",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Testimonials", link: dhatu.testimonials_path, icon: 'fa-comment', active: true}]
       }
     end
 

data/app/models/dhatu/booking.rb

@@ -0,0 +1,55 @@
+class Dhatu::Booking < Dhatu::ApplicationRecord
+
+  # Set Table Name
+  self.table_name = "bookings"
+
+  # Including the State Machine Methods
+  include Readable
+  include Featureable
+
+  # Validations
+  validates :name, presence: true, length: {minimum: 3, maximum: 256}, allow_blank: false
+  # validate_email :email, mandatory: false, allow_blank: true
+  validates :mobile, length: {maximum: 250}, allow_blank: true
+
+  # Associations
+  belongs_to :service
+  
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(email) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(mobile) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(message) LIKE LOWER('%#{query}%')")}
+  
+  scope :upcoming, lambda { where("created_at >= ?", Time.now) }
+  scope :past, lambda { where("created_at < ?", Time.now) }
+
+  # ------------------
+  # Instance variables
+  # ------------------
+
+  # Generic Methods
+  # ---------------
+  def to_param
+    "#{id}-#{name.parameterize[0..32]}"
+  end
+
+  def display_name
+    "#{name_was}"
+  end
+
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    false
+  end
+
+  def can_be_deleted?
+    status?(:removed)
+  end
+
+end

data/app/models/dhatu/category.rb

@@ -93,16 +93,6 @@ class Dhatu::Category < Dhatu::ApplicationRecord
   # Instance methods
   # ------------------
 
-  # Exclude some attributes info from json output.
-  def as_json(options={})
-    options[:except] ||= EXCLUDED_JSON_ATTRIBUTES
-    options[:include] ||= [:parent, :top_parent, :sub_categories]
-    #options[:methods] = []
-    #options[:methods] << :profile_image
-    json = super(options)
-    # Hash[*json.map{|k, v| [k, v || ""]}.flatten]
-  end
-
   # Other Methods
   # ------------------
 
@@ -110,6 +100,10 @@ class Dhatu::Category < Dhatu::ApplicationRecord
     self.name
   end
 
+  def display_category_type
+    self.category_type.try(:demodulize).try(:pluralize).try(:titleize)
+  end
+
   def default_image_url(size="medium")
     "/assets/defaults/category-#{size}.png"
   end
@@ -133,15 +127,19 @@ class Dhatu::Category < Dhatu::ApplicationRecord
   end
 
   def can_be_unpublished?
-    published? or archived?
+    return false if end_node == false or self.sub_categories.any?
+    published? or removed?
   end
 
   def can_be_archived?
-    unpublished?
+    return false if end_node == false or self.sub_categories.any?
+    unpublished? or removed?
   end
 
   def can_be_removed?
-    unpublished? or archived?
+    return false if parent.nil?
+    return false if end_node == false or self.sub_categories.any?
+    published? or unpublished?
   end
 
   # Callback methods

data/app/models/dhatu/event.rb

@@ -11,8 +11,9 @@ class Dhatu::Event < Dhatu::ApplicationRecord
   validates :title, presence: true, length: {minimum: 5, maximum: 500}, allow_blank: false
   validates :venue, length: {minimum: 3, maximum: 250}, allow_blank: true
   validates :description, presence: true
-  
+
   # Associations
+  belongs_to :category
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
   

data/app/models/dhatu/offer.rb

@@ -13,6 +13,7 @@ class Dhatu::Offer < Dhatu::ApplicationRecord
   validates :description, presence: true
   
   # Associations
+  belongs_to :category
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
   

data/app/models/dhatu/price.rb

@@ -0,0 +1,59 @@
+class Dhatu::Price < Dhatu::ApplicationRecord
+
+  # Set Table Name
+  self.table_name = "prices"
+
+  # Including the State Machine Methods
+  include Publishable
+  include Featureable
+  
+  # Validations
+  validate_string :title, mandatory: true, min_length: 2, format: /.*/i
+  validate_string :sub_title, mandatory: false, format: /.*/i
+  
+  validates :price, presence: true
+  validates :category, presence: true
+  
+  # Associations
+  belongs_to :category
+  has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
+  
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  scope :search, lambda {|query| where("LOWER(title) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(sub_title) LIKE LOWER('%#{query}%') OR")
+  }
+  
+  scope :filter_by_category, lambda { |c| where("category_id = ?", (c.is_a? Dhatu::Category ? c.id : c)) }
+
+  scope :upcoming, lambda { where("created_at >= ?", Time.now) }
+  scope :past, lambda { where("created_at < ?", Time.now) }
+
+  # ------------------
+  # Instance variables
+  # ------------------
+
+  # Generic Methods
+  # ---------------
+  def to_param
+    "#{id}-#{title.parameterize[0..32]}"
+  end
+
+  def display_name
+    "#{title_was}"
+  end
+
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    status?(:published) or status?(:unpublished)
+  end
+
+  def can_be_deleted?
+    status?(:removed)
+  end
+
+end

data/app/models/dhatu/section.rb

@@ -6,20 +6,6 @@ class Dhatu::Section < Dhatu::ApplicationRecord
   # Including the State Machine Methods
   include Publishable
 
-  # Constants
-  COVER_IMAGE_INSTRUCTIONS = [
-    "the file extension should be .jpg / .jpeg or .png format",
-    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
-    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
-  ]
-  
-  # Constants
-  GALLERY_IMAGE_INSTRUCTIONS = [
-    "the file extension should be .jpg / .jpeg or .png format",
-    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
-    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
-  ]
-  
   # Validations
   validates :title, presence: true, length: {minimum: 3, maximum: 256}, allow_blank: false
   validates :sub_title, length: {minimum: 3, maximum: 256}, allow_blank: true
@@ -31,6 +17,7 @@ class Dhatu::Section < Dhatu::ApplicationRecord
   validates :button_two_link, length: {maximum: 512}, allow_blank: true
 
   # Associations
+  belongs_to :category
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
 

data/app/models/dhatu/service.rb

@@ -5,21 +5,8 @@ class Dhatu::Service < Dhatu::ApplicationRecord
 
   # Including the State Machine Methods
   include Publishable
+  include Featureable
 
-  # Constants
-  COVER_IMAGE_INSTRUCTIONS = [
-    "the file extension should be .jpg / .jpeg or .png format",
-    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
-    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
-  ]
-  
-  # Constants
-  GALLERY_IMAGE_INSTRUCTIONS = [
-    "the file extension should be .jpg / .jpeg or .png format",
-    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
-    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
-  ]
-  
   # Validations
   validate_string :name, mandatory: true, min_length: 2, format: /.*/i
   validate_string :one_liner, mandatory: false, format: /.*/i

data/app/uploaders/category_image_uploader.rb

@@ -4,6 +4,14 @@ class CategoryImageUploader < ImageUploader
     "uploads/category_images/#{model.id}"
   end
 
+  version :large do
+    process :resize_to_fill => [400, 400]
+  end
+
+  version :medium do
+    process :resize_to_fill => [200, 200]
+  end
+
 	version :small do
     process :resize_to_fill => [100, 100]
   end

data/app/views/dhatu/blog_posts/_show.html.erb

@@ -35,8 +35,6 @@
             <tr>
               <th style="width:25%">Posted At</th>
               <td style="width:25%"><%= time_tag(@blog_post.posted_at) if @blog_post.posted_at %></td>
-              <th style="width:25%">Slug</th>
-              <td style="width:25%"><%= @blog_post.slug %></td>
             </tr>
 
             <tr>
@@ -79,9 +77,9 @@
   <div class="tab-content">
     <div class="tab-pane active" id="blog_post_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
       
-      <%= clear_tag(20) %>
-      <%= raw(@blog_post.description) %>
-      <%= clear_tag(20) %>
+      <div class="well">
+        <%= raw(@blog_post.description) %>
+      </div>
       
     </div>
 

data/app/views/dhatu/bookings/_index.html.erb

@@ -0,0 +1,48 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:8%">#</th> 
+				<th style="width:200px">Name</th>
+				<th style="width:50%;" >Message</th>
+				<!-- <th style="width:100px;" class="hidden-sm hidden-xs">Status</th> -->
+				<% if display_manage_links? %>
+				<th style="text-align: center;" class="" >Actions</th>
+				<% end %>
+			</tr> 
+		</thead>
+	  <tbody>
+	  	<tr id="tr_booking_0"></tr>
+	  	<% @bookings.each_with_index do |booking, i| %>
+	  		<tr id="tr_booking_<%= booking.id %>">
+
+					<th scope="row" style="text-align: center;">
+						<%= serial_number(i) %>
+					</th>
+
+					<td class="display-link">
+						<% if booking.new? || booking.unread? %>
+							<%= link_to booking.name, booking_path(booking), remote: true, style: "font-weight:800;" %><br>
+						<% else %>
+							<%= link_to booking.name, booking_path(booking), remote: true %>
+						<% end %>
+						&nbsp;<%= display_readable_status(booking) %><br>
+						<%= link_to time_ago_in_words(booking.created_at) + " ago", booking_path(booking), remote: true, style: "color:darkred;font-size:10px;" %>
+					</td>
+
+					<td class=""><%= truncate booking.message, length: 30 %></td>
+
+					<% if display_manage_links? %>
+			    	<td class="action-links" style="width:15%"><%= display_readable_links(booking) %></td>
+			    <% end %>
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@bookings) %>
+  </div>
+</div>

data/app/views/dhatu/bookings/_row.html.erb

@@ -0,0 +1,18 @@
+<tr id="tr_booking_<%= booking.id %>">
+  <th scope="row" style="text-align: center;">
+    <%= serial_number(i) %>
+  </th>
+
+  <td class="display-link">
+    <%= link_to booking.name, booking_path(booking), remote: true %><br>
+    <%#= link_to booking.category.try(:display_name), booking_path(booking), remote: true, style: "color:darkred" %>
+  </td>
+
+  <td class=""><%= truncate booking.message, length: 30 %></td>
+
+  <td class="hidden-sm hidden-xs"><%= display_readable_status(booking) %></td>
+
+  <% if display_manage_links? %>
+    <td class="action-links hidden-sm hidden-xs" style="width:15%"><%= display_readable_links(booking) %></td>
+  <% end %>
+</tr>

data/app/views/dhatu/bookings/_show.html.erb

@@ -0,0 +1,62 @@
+<div id="div_booking_show">
+
+  <div class="row">
+    
+    <div class="col-md-8 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@booking.name) %>
+      <%= display_readable_status(@booking) %>
+      <%= display_featured(@booking) %>
+      <%= clear_tag(10) %>
+      <div class="well">
+        <%= theme_panel_description(@booking.message) %>
+      </div>
+      <%= clear_tag(10) %>
+
+      <% if @current_user.super_admin? %>
+      <div class="table-responsive"> 
+        <table class="table table-striped table-condensed table-bordered mb-60"> 
+          <tbody>
+            
+            <tr>
+              <th>ID</th><td><%= @booking.id %></td>
+            </tr>
+
+            <tr>
+              <th>Featured</th><td><%= @booking.featured ? "Yes" : "No" %></td>
+            </tr>
+
+            <tr>
+              <th>Status</th><td><%= @booking.status %></td>
+            </tr>
+
+            <tr>
+              <th>Created At</th><td><%= @booking.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @booking.created_at %></td>
+            </tr>
+
+            <tr>
+              <th>Updated At</th><td><%= @booking.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @booking.updated_at %></td>
+            </tr>
+            
+          </tbody>
+        </table>
+      </div>
+      <% end %>
+
+      <%= clear_tag(20) %>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-4 col-sm-12 col-xs-12">
+      <%= display_readable_buttons(@booking) %>
+      <%= display_featurable_buttons(@booking) %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+
+  <%= clear_tag %>
+
+</div>