pattana 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d191b186ccf58e2094dad4b6c5c3087596acd7b
-  data.tar.gz: ca76b41cafef4b27c4dfb5bf73ef268819d46ed0
+  metadata.gz: 94df381248e180d50b4e9680aaf0ad49ed10b301
+  data.tar.gz: ea14b07819c6a74035d2fd7176265c9086367306
 SHA512:
-  metadata.gz: 5a783ee301a8750c1b42981245cb5ce6c34cc9af45223400ddef74da56b02496603602be5ff3e7777642988a53476a1acb3d9c6e04b72f6d7dbdf740acfe29e8
-  data.tar.gz: 6332ae96eca914d63055208eec7d56a828d7ced81ddb5288ca8aa99759eb85b8d1cf7a0c827a84686ca8dc1fab9eac1e8ae4c9460d4f3e4f011e90ade9748a0f
+  metadata.gz: 387fd3a4a1cd53b462d748e5d3898539215de8c1e0a2e0864dc277325b9edfa9e4afbc9f89efb2494841e79e9599e45ef5b9ca74b371530119fae374f014f742
+  data.tar.gz: 5d63f5ede54abf683093cccb20616e2ff893ec977f28b66ed21cf37595ad14dc8890be5d90ed755d345a5dd60764bf3019125423b11422fa3b918a025875c42d

data/app/controllers/pattana/api/v1/cities_controller.rb

@@ -7,9 +7,9 @@ module Pattana
           proc_code = Proc.new do
             @country = Country.find_by_id(params[:country_id])
             if @country
-              @relation = @country.cities.includes(:region, :country).where("cities.show_in_api is true").order("cities.name ASC")
+              @relation = @country.cities.includes(:region, :country).show_in_api(true).order("cities.name ASC")
               @relation = @relation.search(params[:q]) if params[:q]
-              @relation = @relation.operational if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
+              @relation = @relation.operational(true) if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
               @cities = @relation.all
               @data = ActiveModelSerializers::SerializableResource.new(@cities, each_serializer: CityPreviewSerializer)
               @success = true
@@ -28,9 +28,9 @@ module Pattana
           proc_code = Proc.new do
             @region = Region.find_by_id(params[:region_id])
             if @region
-              @relation = @region.cities.includes(:region, :country).where("cities.show_in_api is true").order("cities.name ASC")
+              @relation = @region.cities.includes(:region, :country).show_in_api(true).order("cities.name ASC")
               @relation = @relation.search(params[:q]) if params[:q]
-              @relation = @relation.operational if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
+              @relation = @relation.operational(true) if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
               @cities = @relation.all
               @data = ActiveModelSerializers::SerializableResource.new(@cities, each_serializer: CityPreviewSerializer)
               @success = true

data/app/controllers/pattana/api/v1/countries_controller.rb

@@ -5,15 +5,18 @@ module Pattana
 
         def index
           proc_code = Proc.new do
-            @relation = Country.show_in_api.order("countries.name ASC")
+            @relation = Country.show_in_api(true).order("countries.name ASC")
             @relation = @relation.search(params[:q]) if params[:q]
-            @relation = @relation.operational if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
+            @relation = @relation.operational(true) if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
             @countries = @relation.all
             @data = ActiveModelSerializers::SerializableResource.new(@countries, each_serializer: CountryPreviewSerializer)
             @success = true
           end
           render_json_response(proc_code)
         end
+
+        
+        
       end
     end
   end

data/app/controllers/pattana/api/v1/regions_controller.rb

@@ -7,9 +7,9 @@ module Pattana
           proc_code = Proc.new do
             @country = Country.find_by_id(params[:country_id])
             if @country
-              @relation = @country.regions.includes(:country).where("regions.show_in_api is true").order("regions.name ASC")
+              @relation = @country.regions.includes(:country).show_in_api(true).order("regions.name ASC")
               @relation = @relation.search(params[:q]) if params[:q]
-              @relation = @relation.operational if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
+              @relation = @relation.operational(true) if params[:operational] && ["y","t","yes","true",1].include?(params[:operational].downcase)
               @regions = @relation.all
               @data = ActiveModelSerializers::SerializableResource.new(@regions, each_serializer: RegionPreviewSerializer)
               @success = true

data/app/controllers/pattana/application_controller.rb

@@ -8,6 +8,16 @@ module Pattana
     def set_default_title
       set_title("Pattana Admin - Database of Countries, Regions and Cities")
     end
+
+    def configure_filter_param_mapping
+      @filter_param_mapping = default_filter_param_mapping
+      @filter_param_mapping[:show_in_api] = :show_in_api
+      @filter_param_mapping[:operational] = :operational
+    end
+
+    def breadcrumb_home_path
+      pattana.dashboard_path
+    end
     
   end
 end

data/app/controllers/pattana/cities_controller.rb

@@ -115,7 +115,7 @@ module Pattana
         heading: "Manage Cities",
         icon: "fa-map-marker",
         description: "Listing all Cities",
-        links: [{name: "Dashboard", link: pattana.dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Cities", link: pattana.cities_path, icon: 'fa-map-marker', active: true}]
       }
     end

data/app/controllers/pattana/countries_controller.rb

@@ -8,6 +8,11 @@ module Pattana
       parse_filters
       apply_filters
 
+      @filter_ui_settings[:operational][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:operational][:url_method_name] = "regions_country_url"
+      @filter_ui_settings[:show_in_api][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:show_in_api][:url_method_name] = "regions_country_url"
+
       @regions = @relation.page(@current_page).per(@per_page)
     end
 
@@ -17,6 +22,11 @@ module Pattana
 
       parse_filters
       apply_filters
+      
+      @filter_ui_settings[:operational][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:operational][:url_method_name] = "cities_country_url"
+      @filter_ui_settings[:show_in_api][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:show_in_api][:url_method_name] = "cities_country_url"
 
       @cities = @relation.page(@current_page).per(@per_page)
     end
@@ -100,6 +110,10 @@ module Pattana
 
     def apply_filters
       @relation = @relation.search(@query) if @query
+
+      @relation = @relation.operational(@operational) unless @operational.nil?
+      @relation = @relation.show_in_api(@show_in_api) unless @show_in_api.nil?
+
       @order_by = "priority, name ASC" unless @order_by
       @relation = @relation.order(@order_by)
     end
@@ -110,14 +124,56 @@ module Pattana
           { filter_name: :query },
           { filter_name: :status }
         ],
-        boolean_filters: [],
+        boolean_filters: [
+          { filter_name: :show_in_api },
+          { filter_name: :operational }
+        ],
         reference_filters: [],
         variable_filters: [],
       }
     end
 
     def configure_filter_ui_settings
-      @filter_ui_settings = {}
+      @filter_ui_settings = {
+        operational: {
+          object_filter: false,
+          select_label: "Operation Filter",
+          display_hash: { 
+            true => "Operational", 
+            false => "Non Operational"
+          },
+          current_value: @operational,
+          values: {
+            "Operational" => true,
+            "Non Operational" => false
+          },
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: { query: @query, show_in_api: @show_in_api },
+          url_method_name: 'countries_url',
+          show_all_filter_on_top: true,
+          show_null_filter_on_top: false
+        },
+        show_in_api: {
+          object_filter: false,
+          select_label: "Show in API Filter",
+          display_hash: { 
+            true => "Show in API", 
+            false => "Hide in API"
+          },
+          current_value: @show_in_api,
+          values: {
+            "Show in API" => true,
+            "Hide in API" => false
+          },
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: { query: @query, operational: @operational },
+          url_method_name: 'countries_url',
+          show_all_filter_on_top: true,
+          show_null_filter_on_top: false
+        }
+      }
     end
 
     def resource_controller_configuration
@@ -133,7 +189,7 @@ module Pattana
         heading: "Manage Countries",
         icon: "fa-flag-checkered",
         description: "Listing all Countries",
-        links: [{name: "Dashboard", link: pattana.dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Countries", link: pattana.countries_path, icon: 'fa-flag-checkered', active: true}]
       }
     end

data/app/controllers/pattana/dashboard_controller.rb

@@ -11,7 +11,7 @@ module Pattana
       {
         heading: "Dashboard - Pattana",
         description: "A Quick view of Countries, Regions & Cities",
-        links: [{name: "Dashboard - Pattana", link: pattana.dashboard_path, icon: 'fa-dashboard'}]
+        links: [{name: "Dashboard - Pattana", link: breadcrumb_home_path, icon: 'fa-dashboard'}]
       }
     end
 

data/app/controllers/pattana/regions_controller.rb

@@ -8,6 +8,11 @@ module Pattana
       parse_filters
       apply_filters
 
+      @filter_ui_settings[:operational][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:operational][:url_method_name] = "cities_region_url"
+      @filter_ui_settings[:show_in_api][:drop_down_options] = {remote: true}
+      @filter_ui_settings[:show_in_api][:url_method_name] = "cities_region_url"
+
       @cities = @relation.page(@current_page).per(@per_page)
     end
 
@@ -89,7 +94,12 @@ module Pattana
     end
 
     def apply_filters
+
       @relation = @relation.search(@query) if @query
+
+      @relation = @relation.operational(@operational) unless @operational.nil?
+      @relation = @relation.show_in_api(@show_in_api) unless @show_in_api.nil?
+
       @order_by = "name ASC" unless @order_by
       @relation = @relation.order(@order_by)
     end
@@ -100,14 +110,56 @@ module Pattana
           { filter_name: :query },
           { filter_name: :status }
         ],
-        boolean_filters: [],
+        boolean_filters: [
+          { filter_name: :show_in_api },
+          { filter_name: :operational }
+        ],
         reference_filters: [],
         variable_filters: [],
       }
     end
 
     def configure_filter_ui_settings
-      @filter_ui_settings = {}
+      @filter_ui_settings = {
+        operational: {
+          object_filter: false,
+          select_label: "Operation Filter",
+          display_hash: { 
+            true => "Operational", 
+            false => "Non Operational"
+          },
+          current_value: @operational,
+          values: {
+            "Operational" => true,
+            "Non Operational" => false
+          },
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: { query: @query, show_in_api: @show_in_api },
+          url_method_name: 'regions_url',
+          show_all_filter_on_top: true,
+          show_null_filter_on_top: false
+        },
+        show_in_api: {
+          object_filter: false,
+          select_label: "Show in API Filter",
+          display_hash: { 
+            true => "Show in API", 
+            false => "Hide in API"
+          },
+          current_value: @show_in_api,
+          values: {
+            "Show in API" => true,
+            "Hide in API" => false
+          },
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: { query: @query, operational: @operational },
+          url_method_name: 'regions_url',
+          show_all_filter_on_top: true,
+          show_null_filter_on_top: false
+        }
+      }
     end
 
     def resource_controller_configuration
@@ -123,7 +175,7 @@ module Pattana
         heading: "Manage Regions",
         icon: "fa-globe",
         description: "Listing all Regions",
-        links: [{name: "Dashboard", link: pattana.dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Regions", link: pattana.regions_path, icon: 'fa-globe', active: true}]
       }
     end

data/app/models/city.rb

@@ -45,8 +45,8 @@ class City < Pattana::ApplicationRecord
                                          LOWER(cities.alternative_names) LIKE LOWER('%#{query}%') OR
                                          LOWER(cities.iso_code) LIKE LOWER('%#{query}%')")}
 
-  scope :show_in_api, -> { where(show_in_api: true) }
-  scope :operational, -> { where(operational: true) }
+  scope :show_in_api, lambda {|val| where("cities.show_in_api is #{val.to_s.upcase}")}
+  scope :operational, lambda {|val| where("cities.operational is #{val.to_s.upcase}")}
 
   # Import Methods
   

data/app/models/country.rb

@@ -39,8 +39,8 @@ class Country < Pattana::ApplicationRecord
                                         LOWER(iso_alpha_2) LIKE LOWER('%#{query}%') OR 
                                         LOWER(iso_alpha_3) LIKE LOWER('%#{query}%')")}
 
-  scope :show_in_api, -> { where(show_in_api: true) }
-  scope :operational, -> { where(operational: true) }
+  scope :show_in_api, lambda {|val| where("countries.show_in_api is #{val.to_s.upcase}")}
+  scope :operational, lambda {|val| where("countries.operational is #{val.to_s.upcase}")}
 
   # Import Methods
 

data/app/models/region.rb

@@ -33,8 +33,8 @@ class Region < Pattana::ApplicationRecord
   #   => ActiveRecord::Relation object
   scope :search, lambda {|query| joins("INNER JOIN countries co on co.id = regions.country_id").where("LOWER(regions.name) LIKE LOWER('%#{query}%') || LOWER(regions.iso_code) LIKE LOWER('%#{query}%') || LOWER(co.name) LIKE LOWER('%#{query}%')")}
 
-  scope :show_in_api, -> { where(show_in_api: true) }
-  scope :operational, -> { where(operational: true) }
+  scope :show_in_api, lambda {|val| where("regions.show_in_api is #{val.to_s.upcase}")}
+  scope :operational, lambda {|val| where("regions.operational is #{val.to_s.upcase}")}
 
   # Import Methods
 

data/app/serializers/city_preview_serializer.rb

@@ -1,7 +1,7 @@
 class CityPreviewSerializer < ActiveModel::Serializer
   include NullAttributeReplacer
   
-  attributes :id, :name, :priority
+  attributes :id, :name, :priority, :operational
   
   belongs_to :country, serializer: CountryPreviewSerializer
   belongs_to :region, serializer: RegionPreviewSerializer

data/app/serializers/country_preview_serializer.rb

@@ -1,4 +1,4 @@
 class CountryPreviewSerializer < ActiveModel::Serializer
   include NullAttributeReplacer
-  attributes :id, :name, :iso_name, :dialing_prefix, :priority
+  attributes :id, :name, :iso_name, :iso_alpha_2, :dialing_prefix, :priority, :operational
 end

data/app/serializers/region_preview_serializer.rb

@@ -1,6 +1,6 @@
 class RegionPreviewSerializer < ActiveModel::Serializer
   include NullAttributeReplacer
-  attributes :id, :name, :priority
+  attributes :id, :name, :priority, :operational
   
   belongs_to :country, serializer: CountryPreviewSerializer
 end

data/app/views/pattana/api/v1/docs/cities_in_a_country/_pos_case_1.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }

data/app/views/pattana/api/v1/docs/cities_in_a_country/_pos_case_2.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }

data/app/views/pattana/api/v1/docs/cities_in_a_country/_pos_case_3.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }

data/app/views/pattana/api/v1/docs/cities_in_a_country/_pos_case_4.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }

data/app/views/pattana/api/v1/docs/cities_in_a_region/_pos_case_1.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true,
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true,
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }

data/app/views/pattana/api/v1/docs/cities_in_a_region/_pos_case_2.html.erb

@@ -17,17 +17,21 @@ api_output = <<-eos
       "id": 21,
       "name": "Abu Dhabi",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 14,
           "name": "Abu Dhabi",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     },
     .
@@ -37,17 +41,21 @@ api_output = <<-eos
       "id": 8,
       "name": "Umm al Qaywayn",
       "priority": 1000,
+      "operational": true,
       "country": {
           "id": 235,
           "name": "United Arab Emirates",
           "iso_name": "UNITED ARAB EMIRATES",
+          "iso_alpha_2": "AE",
           "dialing_prefix": "971",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       },
       "region": {
           "id": 8,
           "name": "Umm Al Quwain",
-          "priority": 1000
+          "priority": 1000,
+          "operational": true
       }
     }]
 }