dhatu 0.1.19 → 0.1.20

data/app/controllers/dhatu/prices_controller.rb

@@ -7,21 +7,39 @@ module Dhatu
       params.require("dhatu/price").permit(:title, :sub_title, :price, :category_id, :priority)
     end
 
+    def load_nested_categories
+      # Checkout the method get_category_filters before using this method
+      category_ids = Dhatu::Price.distinct.pluck(:category_id)
+      @categories = Dhatu::Category.where(id: category_ids).to_a
+      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+    end
+
     def get_collections
+      # Checkout the method get_category_filters before using this method
+      # load_nested_categories
+
       get_category_filters("Dhatu::Price")
       @relation = Dhatu::Price.where("")
+
       parse_filters
       apply_filters
+
       @prices = @r_objects = @relation.page(@current_page).per(@per_page)
       return true
     end
 
     def apply_filters
-      if @category
-        if @category.id == -1
-          @relation = @relation.where("category_id is NULL")
-        else
+      if @category.is_a?(String)
+        @category = Dhatu::Category.new(id: -2, name: "IS NOT SET")
+      elsif @category.blank?
+        @category = Dhatu::Category.new(id: -1, name: "All")
+      end
+
+      if @category 
+        if @category.persisted?
           @relation = @relation.where("category_id = ?", @category.id)
+        elsif @category.id == -2
+          @relation = @relation.where("category_id IS NULL")
         end
       end
       
@@ -39,7 +57,9 @@ module Dhatu
         ],
 
         boolean_filters: [],
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :category, filter_class: Dhatu::Category },
+        ],
         variable_filters: [],
       }
     end
@@ -48,27 +68,73 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::Price::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Price::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::Price::STATUS_REVERSE,
+          values: Dhatu::Price::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
           url_method_name: 'prices_url',
           show_all_filter_on_top: true
+        },
+        category: {
+          object_filter: true,
+          select_label: 'Select Category Type',
+          current_value: @category,
+          values: Dhatu::Category.filter_by_category_type("Dhatu::Price").published.order("priority ASC, name ASC").all,
+          current_filters: @filters,
+          url_method_name: 'prices_url',
+          filters_to_remove: [],
+          filters_to_add: {},
+          show_null_filter_on_top: true,
+          show_all_filter_on_top: true
         }
       }
     end
 
     def resource_controller_configuration
       {
-        page_title: "Prices",
-        js_view_path: "/kuppayam/workflows/parrot",
-        view_path: "dhatu/prices",
+        page_title: "Manage Prices",
+        current_nav: "dhatu/prices",
+
+        # Resource Names
+        class: Dhatu::Price,
         collection_name: :prices,
         item_name: :price,
-        class: Dhatu::Price
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :generic,
+        show_model_size: :generic,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/prices",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/projects_controller.rb

@@ -4,17 +4,21 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/project").permit(:name, :meta_description, :permalink, :description, :client, :category_id, :priority)
+      params.require("dhatu/project").permit(:name, :short_description, :permalink, :description, :client, :category_id, :priority)
     end
 
-    def get_collections
+    def load_nested_categories
+      # Checkout the method get_category_filters before using this method
       category_ids = Dhatu::Project.distinct.pluck(:category_id)
       @categories = Dhatu::Category.where(id: category_ids).to_a
       @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+    end
 
-      @relation = Dhatu::Project.includes(:cover_image).where("")
-      # params[:st] = "published" if params[:st].nil?
-
+    def get_collections
+      # Checkout the method get_category_filters before using this method
+      # load_nested_categories
+      @relation = Dhatu::Project.includes(:cover_image, :category).where("")
+      
       parse_filters
       apply_filters
 
@@ -23,10 +27,18 @@ module Dhatu
     end
 
     def apply_filters
-      @category = Dhatu::Category.find_by_id(params[:ct]) || Dhatu::Category.new(id: -1, name: "All")
-      
-      if @category && @category.id != -1
-        @relation = @relation.where("category_id = ?", @category.id)
+      if @category.is_a?(String)
+        @category = Dhatu::Category.new(id: -2, name: "IS NOT SET")
+      elsif @category.blank?
+        @category = Dhatu::Category.new(id: -1, name: "All")
+      end
+
+      if @category 
+        if @category.persisted?
+          @relation = @relation.where("category_id = ?", @category.id)
+        elsif @category.id == -2
+          @relation = @relation.where("category_id IS NULL")
+        end
       end
 
       @relation = @relation.search(@query) if @query
@@ -42,8 +54,9 @@ module Dhatu
         ],
 
         boolean_filters: [],
-
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :category, filter_class: Dhatu::Category },
+        ],
         variable_filters: [],
       }
     end
@@ -52,27 +65,73 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::Project::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Project::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::Project::STATUS_REVERSE,
+          values: Dhatu::Project::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
           url_method_name: 'projects_url',
           show_all_filter_on_top: true
+        },
+        category: {
+          object_filter: true,
+          select_label: 'Select Category Type',
+          current_value: @category,
+          values: Dhatu::Category.filter_by_category_type("Dhatu::Project").published.order("priority ASC, name ASC").all,
+          current_filters: @filters,
+          url_method_name: 'projects_url',
+          filters_to_remove: [],
+          filters_to_add: {},
+          show_null_filter_on_top: true,
+          show_all_filter_on_top: true
         }
       }
     end
 
     def resource_controller_configuration
       {
-        page_title: "Projects",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/projects",
+        page_title: "Manage Projects",
+        current_nav: "dhatu/projects",
+
+        # Resource Names
+        class: Dhatu::Project,
         collection_name: :projects,
         item_name: :project,
-        class: Dhatu::Project
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/projects",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 
@@ -85,9 +144,6 @@ module Dhatu
                   {name: "Manage Projects", link: dhatu.projects_path, icon: 'fa-rocket', active: true}]
       }
     end
-
-    def set_navs
-      set_nav("project")
-    end
+    
   end
 end

data/app/controllers/dhatu/promotion_enquiries_controller.rb

@@ -25,6 +25,9 @@ module Dhatu
     end
 
     def apply_filters
+      if @promotion 
+        @relation = @relation.where("promotion_id = ?", @promotion.id)
+      end
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
       @relation = @relation.order("created_at DESC")
@@ -36,26 +39,85 @@ module Dhatu
           { filter_name: :query },
           { filter_name: :status }
         ],
-
         boolean_filters: [],
-
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :promotion, filter_class: Dhatu::Promotion },
+        ],
         variable_filters: [],
       }
     end
 
     def configure_filter_ui_settings
-      @filter_ui_settings = {}
+      @filter_ui_settings = {
+        status: {
+          object_filter: false,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::PromotionEnquiry::STATUS_REVERSE,
+          current_value: @status,
+          values: Dhatu::PromotionEnquiry::STATUS,
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: {},
+          url_method_name: 'promotion_enquiries_url',
+          show_all_filter_on_top: false
+        },
+        promotion: {
+          object_filter: true,
+          select_label: 'Filter by Promotion',
+          current_value: @promotion,
+          values: Dhatu::Promotion.order("priority ASC, title ASC").all,
+          current_filters: @filters,
+          url_method_name: 'promotion_enquiries_url',
+          filters_to_remove: [],
+          filters_to_add: {},
+          show_null_filter_on_top: false,
+          show_all_filter_on_top: true
+        }
+      }
     end
 
     def resource_controller_configuration
       {
         page_title: "Promotional Enquiries",
-        js_view_path: "/kuppayam/workflows/parrot",
-        view_path: "dhatu/promotion_enquiries",
+        current_nav: "dhatu/promotion_enquiries",
+
+        # Resource Names
+        class: Dhatu::PromotionEnquiry,
         collection_name: :promotion_enquiries,
         item_name: :promotion_enquiry,
-        class: Dhatu::PromotionEnquiry
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: false,
+        show_modal_after_update: false,
+
+        # Model Size can be large or generic
+        form_model_size: :generic,
+        show_model_size: :generic,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/promotion_enquiries",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: false,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/promotions_controller.rb

@@ -45,7 +45,7 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
+          select_label: "Filter by Status",
           display_hash: Dhatu::Promotion::STATUS,
           current_value: @status,
           values: Dhatu::Promotion::STATUS_REVERSE,
@@ -65,9 +65,53 @@ module Dhatu
         view_path: "dhatu/promotions",
         collection_name: :promotions,
         item_name: :promotion,
-        checkbox_fields: [:name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage],
         class: Dhatu::Promotion,
       }
+      {
+        page_title: "Manage Promotions",
+        current_nav: "dhatu/promotions",
+
+        # Resource Names
+        class: Dhatu::Promotion,
+        collection_name: :promotions,
+        item_name: :promotion,
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        #
+        checkbox_fields: [:name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage],
+
+        # Rendering Paths
+        view_path: "dhatu/promotions",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
+      }
     end
 
     def breadcrumbs_configuration