pattana 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 428e36ae17b95c74125c6ecb1790a310679ab872
-  data.tar.gz: 429218025bd8c3d5954f52dc03f81156bb6da829
+  metadata.gz: 759605f6662a7551093ef0a53623c7e6c4dd58ea
+  data.tar.gz: 57236bd2235c8279a2cbb13a13dd73fa7c3dc553
 SHA512:
-  metadata.gz: fd8d09d949f1016541ba0e9a8f55c0aac309e303eb0618ca47196ba8d5fefe31e3d4c0e50a97222ddd20fb021e83ed2fbd5c0fe5a2161a421d09978e1226c20f
-  data.tar.gz: 5c8b51045f779b3265ac86f3233ffda2ec5f5ebedcf7d857d62d0ab8fc610394e93224ffb0ecfd02ef37882e013e92df8c551299d5f974c0ad75949c09639cc2
+  metadata.gz: 0527e845479cd559de18d78baf7045f75f48ef76a5d9810337d9d4f9ca4fe6553df5635916dee5930a98a95e6a288c88ebd89af555a2a9945b6840950d79290d
+  data.tar.gz: 55fc7ceee1a7196084326f29ec11b93381ae8456a3ff6bbb631a43c576ffaaaefd368722212859bca4b74abf46dd74c949961129a30f81c0951334f89432506e

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/controllers/pattana/cities_controller.rb

@@ -1,10 +1,74 @@
 module Pattana
   class CitiesController < ResourceController
 
+    def show_in_api
+      @city = @r_object = City.find(params[:id])
+      if @city
+        @city.show_in_api = true
+        if @city.valid?
+          @city.save
+          set_notification(true, I18n.t('cities.show_in_api.heading'), I18n.t('cities.show_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @city.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def hide_in_api
+      @city = @r_object = City.find(params[:id])
+      if @city
+        @city.show_in_api = false
+        if @city.valid?
+          @city.save
+          set_notification(true, I18n.t('cities.hide_in_api.heading'), I18n.t('cities.hide_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @city.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def mark_as_operational
+      @city = @r_object = City.find(params[:id])
+      if @city
+        @city.operational = true
+        if @city.valid?
+          @city.save
+          set_notification(true, I18n.t('cities.marked_as_operational.heading'), I18n.t('cities.marked_as_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @city.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def remove_operational
+      @city = @r_object = City.find(params[:id])
+      if @city
+        @city.operational = false
+        if @city.valid?
+          @city.save
+          set_notification(true, I18n.t('cities.removed_operational.heading'), I18n.t('cities.removed_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @city.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
     private
 
     def get_collections
-      @relation = City.where("")
+      @relation = City.includes(:country, :region).where("")
 
       parse_filters
       apply_filters
@@ -57,7 +121,7 @@ module Pattana
     end
 
     def permitted_params
-      params.require(:city).permit(:name)
+      params.require(:city).permit(:name, :alternative_names, :iso_code, :population, :latitude, :longitude, :country_id, :region_id)
     end
 
     def set_navs

data/app/controllers/pattana/countries_controller.rb

@@ -11,6 +11,80 @@ module Pattana
       @regions = @relation.page(@current_page).per(@per_page)
     end
 
+    def cities
+      @country = Country.find_by_id(params[:id])
+      @relation = @country.cities.limit(50)
+
+      parse_filters
+      apply_filters
+
+      @cities = @relation.page(@current_page).per(@per_page)
+    end
+
+    def show_in_api
+      @country = @r_object = Country.find(params[:id])
+      if @country
+        @country.show_in_api = true
+        if @country.valid?
+          @country.save
+          set_notification(true, I18n.t('countries.show_in_api.heading'), I18n.t('countries.show_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @country.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def hide_in_api
+      @country = @r_object = Country.find(params[:id])
+      if @country
+        @country.show_in_api = false
+        if @country.valid?
+          @country.save
+          set_notification(true, I18n.t('countries.hide_in_api.heading'), I18n.t('countries.hide_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @country.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def mark_as_operational
+      @country = @r_object = Country.find(params[:id])
+      if @country
+        @country.operational = true
+        if @country.valid?
+          @country.save
+          set_notification(true, I18n.t('countries.marked_as_operational.heading'), I18n.t('countries.marked_as_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @country.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def remove_operational
+      @country = @r_object = Country.find(params[:id])
+      if @country
+        @country.operational = false
+        if @country.valid?
+          @country.save
+          set_notification(true, I18n.t('countries.removed_operational.heading'), I18n.t('countries.removed_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @country.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
     private
 
     def get_collections
@@ -65,7 +139,11 @@ module Pattana
     end
 
     def permitted_params
-      params.require(:country).permit(:name)
+      params.require(:country).permit(:name, :official_name, :iso_name, 
+                                      :fips, :iso_alpha_2, :iso_alpha_3,
+                                      :itu_code, :dialing_prefix, :tld,
+                                      :latitude, :longitude, :capital,
+                                      :priority, :languages)
     end
 
     def set_navs

data/app/controllers/pattana/regions_controller.rb

@@ -1,10 +1,84 @@
 module Pattana
   class RegionsController < ResourceController
 
+    def cities
+      @region = Region.find_by_id(params[:id])
+      @relation = @region.cities.limit(50)
+
+      parse_filters
+      apply_filters
+
+      @cities = @relation.page(@current_page).per(@per_page)
+    end
+
+    def show_in_api
+      @region = @r_object = Region.find(params[:id])
+      if @region
+        @region.show_in_api = true
+        if @region.valid?
+          @region.save
+          set_notification(true, I18n.t('regions.show_in_api.heading'), I18n.t('regions.show_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @region.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def hide_in_api
+      @region = @r_object = Region.find(params[:id])
+      if @region
+        @region.show_in_api = false
+        if @region.valid?
+          @region.save
+          set_notification(true, I18n.t('regions.hide_in_api.heading'), I18n.t('regions.hide_in_api.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @region.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def mark_as_operational
+      @region = @r_object = Region.find(params[:id])
+      if @region
+        @region.operational = true
+        if @region.valid?
+          @region.save
+          set_notification(true, I18n.t('regions.marked_as_operational.heading'), I18n.t('regions.marked_as_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @region.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
+    def remove_operational
+      @region = @r_object = Region.find(params[:id])
+      if @region
+        @region.operational = false
+        if @region.valid?
+          @region.save
+          set_notification(true, I18n.t('regions.removed_operational.heading'), I18n.t('regions.removed_operational.message'))
+        else
+          set_notification(false, I18n.t('status.error'), I18n.translate("error"), @region.errors.full_messages.join("<br>"))
+        end
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.error', item: default_item_name.titleize))
+      end
+      render_row
+    end
+
     private
 
     def get_collections
-      @relation = Region.where("")
+      @relation = Region.includes(:country).where("")
 
       parse_filters
       apply_filters
@@ -55,7 +129,7 @@ module Pattana
     end
 
     def permitted_params
-      params.require(:region).permit(:name)
+      params.require(:region).permit(:name, :iso_code, :latitude, :longitude, :country_id)
     end
 
     def set_navs

data/app/models/city.rb

@@ -10,6 +10,9 @@ class City < Pattana::ApplicationRecord
 	# Validations
 	validates :name, presence: true, length: {minimum: 3, maximum: 128}
 	
+  # Callbacks
+  before_validation :set_country, on: :create
+
   # ------------------
   # Class Methods
   # ------------------
@@ -124,15 +127,23 @@ class City < Pattana::ApplicationRecord
   # Instance Methods
   # ------------------
 
+  # Callback Methods
+  # ------------------
+
+  def set_country
+    self.country = self.region.country if self.region && self.region.country
+  end
+
   # Permission Methods
   # ------------------
 
   def can_be_edited?
-    false
+    true
   end
 
   def can_be_deleted?
-    false
+    return false if operational?
+    true
   end
 
   # Other Methods
@@ -153,5 +164,13 @@ class City < Pattana::ApplicationRecord
   def display_show_in_api
     self.show_in_api ? "Yes" : "No"
   end
+
+  # * Return Yes or No
+  # == Examples
+  #   >>> city.display_operational
+  #   => "Yes"
+  def display_operational
+    self.operational ? "Yes" : "No"
+  end
 	
 end

data/app/models/country.rb

@@ -99,11 +99,13 @@ class Country < Pattana::ApplicationRecord
   # ------------------
 
   def can_be_edited?
-    false
+    true
   end
 
   def can_be_deleted?
-    false
+    return false if self.regions.any? || self.cities.any?
+    return false if operational?
+    true
   end
 
   # Other Methods
@@ -120,9 +122,17 @@ class Country < Pattana::ApplicationRecord
   # * Return Yes or No
   # == Examples
   #   >>> country.display_show_in_api
-  #   => "India"
+  #   => "No"
   def display_show_in_api
     self.show_in_api ? "Yes" : "No"
   end
+
+  # * Return Yes or No
+  # == Examples
+  #   >>> country.display_operational
+  #   => "Yes"
+  def display_operational
+    self.operational ? "Yes" : "No"
+  end
 	
 end

data/app/models/region.rb

@@ -86,11 +86,13 @@ class Region < Pattana::ApplicationRecord
   # ------------------
 
   def can_be_edited?
-    false
+    true
   end
 
   def can_be_deleted?
-    false
+    return false if self.cities.any?
+    return false if operational?
+    true
   end
 
   # Other Methods
@@ -107,9 +109,17 @@ class Region < Pattana::ApplicationRecord
   # * Return Yes or No
   # == Examples
   #   >>> region.display_show_in_api
-  #   => "India"
+  #   => "No"
   def display_show_in_api
     self.show_in_api ? "Yes" : "No"
   end
+
+  # * Return Yes or No
+  # == Examples
+  #   >>> region.display_operational
+  #   => "Yes"
+  def display_operational
+    self.operational ? "Yes" : "No"
+  end
 	
 end

data/app/views/pattana/cities/_form.html.erb

@@ -0,0 +1,33 @@
+<%= form_for(@city, :html => {:id=>"form_city", :class=>"mb-0 form-horizontal", :role => "form", :method => (@city.new_record? ? :post : :put), :remote=>true}) do |f| %>
+
+      <div id="city_form_error">
+        <%= @city.errors[:base].to_sentence %>
+      </div>
+
+      <div class="row">
+        <div class="col-md-12 col-sm-12">
+          <div class="form-inputs mb-30 mt-30">
+            
+            <%= theme_form_field(@city, :name) %>
+            <%= theme_form_field(@city, :alternative_names) %>
+
+            <%= theme_form_field(@city, :iso_code, required: false) %>
+            <%= theme_form_field(@city, :population, required: false) %>
+
+            <%= theme_form_field(@city, :latitude, required: false) %>
+            <%= theme_form_field(@city, :longitude, required: false) %>
+            
+          </div>
+        </div>
+      <div>
+        
+        <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
+        
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeLargeModal();", class: "pull-right ml-10 btn btn-white" %>
+
+      </div>
+      <%= clear_tag(10) %>
+  </div>
+
+<% end %>
+

data/app/views/pattana/cities/_index.html.erb

@@ -2,22 +2,20 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align:center;width:5%;">#</th> 
+				<th style="text-align:center;width:15%;">#</th> 
 				<th style="text-align:left;width:30%;">Name</th>
 				<th style="text-align:center;width:15%;">Region</th>
 				<th style="text-align:center;width:15%;">Country</th>
 				<th style="text-align:center;width:10%;">Priority</th>
 				<th style="text-align:center;width:15%;">Show in API</th>
-				<th style="text-align:center;width:10%;">Actions</th>
+				<th style="text-align:center;width:10%;" colspan="2">Actions</th>
 			</tr> 
 		</thead>
 	  <tbody>
 	  	<% @cities.each_with_index do |city, i| %>
 	  		
-	  		<%# edit_link = edit_city_path(id: city.id) %>
-				<%# delete_link = city_path(id: city.id) %>
-				<% edit_link = "#" %>
-				<% delete_link = "#" %>
+	  		<% edit_link = edit_city_path(id: city.id) %>
+				<% delete_link = city_path(id: city.id) %>
 				
 		    <tr id="tr_city_<%= city.id %>">
 		      
@@ -29,14 +27,24 @@
 		      <td  class="text-align-center"><%= city.priority %></td>
 		      <td  class="text-align-center"><%= city.display_show_in_api %></td>
 		      
-					<td class="action-links" style="width:10%">
+					<td class="action-links text-align-center" style="width:10%">
+						<% if city.show_in_api? %>
+		      		<%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Hide in API"), hide_in_api_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "delete" %>
+		      	<% else %>
+		      		<%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Show in API"), show_in_api_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
+		      	<% end %>
 
+		      	<% if city.operational? %>
+		      		<%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Remove Operational"), remove_operational_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "delete" %>
+		      	<% else %>
+		      		<%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Mark as Operational"), mark_as_operational_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
+		      	<% end %>
+		      </td>
+
+		      <td class="action-links text-align-center" style="width:10%">
 		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit City"), edit_link, :remote=>true, class: "edit" %>
 
 		        <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
-
-		      </td>
-
 		    </tr>
 		  <% end %>
 	  </tbody>

data/app/views/pattana/cities/_row.html.erb

@@ -1,55 +1,32 @@
-<% edit_link = edit_admin_city_path(id: city.id) %>
-<% delete_link = admin_city_path(id: city.id) %>
+<% edit_link = edit_city_path(id: city.id) %>
+<% delete_link = city_path(id: city.id) %>
 
 <tr id="tr_city_<%= city.id %>">
-
-  <td class="city-image">
-    <%= link_to(admin_city_path(city), remote: true) do %>
-      <%= display_image(city, "city_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: city.display_name) %>
-    <% end %>
-  </td>
-
-  <td class="city-name"><%= link_to city.name, admin_city_path(city), remote: true %></td>
-
-  <td>
-    <% if city.unpublished? %>
-      <span class="ml-5 mt-5 label label-default">Un-Published</span>
-    <% elsif city.published? %>
-      <span class="ml-5 mt-5 label label-success">Published</span>
-    <% elsif city.disabled? %>
-      <span class="ml-5 mt-5 label label-danger">Disabled</span>
+  
+  <td class="text-align-center"><%= city.id %></td>
+  <td class="text-align-left"><%= link_to city.name, pattana.city_path(city), remote: true %></td>
+
+  <td class="text-align-center"><%= city.region.name if city.region %></td>
+  <td class="text-align-center"><%= city.country.name if city.country %></td>
+  <td  class="text-align-center"><%= city.priority %></td>
+  <td  class="text-align-center"><%= city.display_show_in_api %></td>
+  
+  <td class="action-links text-align-center" style="width:10%">
+    <% if city.show_in_api? %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Hide in API"), hide_in_api_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "delete" %>
+    <% else %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Show in API"), show_in_api_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
     <% end %>
-  </td>
 
-  <td class="action-links" style="width:10%">
-
-    <% case city.status %>
-    <% when "published" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_city_path(:id =>city.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"city_status" %>
-      
-      <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_city_path(:id =>city.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"city_status" %>
-    <% when "unpublished" %>
-      <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_city_path(:id =>city.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"city_status" %>
-      <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_city_path(:id =>city.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"city_status" %>
-    <% when "disabled" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_city_path(:id =>city.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"city_status" %>
-      <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_city_path(:id =>city.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"city_status" %>
+    <% if city.operational? %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Remove Operational"), remove_operational_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "delete" %>
+    <% else %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Mark as Operational"), mark_as_operational_city_path(:id =>city.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
     <% end %>
-
   </td>
 
-  <td class="action-links" style="width:10%">
-
+  <td class="action-links text-align-center" style="width:10%">
     <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit City"), edit_link, :remote=>true, class: "edit" %>
 
     <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
-
-  </td>
-
 </tr>

data/app/views/pattana/cities/_show.html.erb

@@ -9,6 +9,18 @@
       <%= theme_panel_heading(@city.name) %>
 
       <%= theme_panel_sub_heading(@city.country.name, "#") if @city.country %><br>
+
+      <% if @city.show_in_api? %>
+        <div class="label label-success">Show In API</div>
+      <% else %>
+        <div class="label label-danger">Hide In API</div>
+      <% end %>
+
+      <% if @city.operational? %>
+        <div class="label label-success">Operational</div>
+      <% else %>
+        <div class="label label-danger">Non Operational</div>
+      <% end %>
       
       <%= clear_tag(10) %>
       
@@ -26,13 +38,6 @@
         <span class="hidden-xs">City Details</span>
       </a>
     </li>
-
-    <li class="">
-      <a href="#technical_details" data-toggle="tab" aria-expanded="false">
-        <span class="visible-xs"><i class="fa-database"></i></span>
-        <span class="hidden-xs">Technical Details</span>
-      </a>
-    </li>
   </ul>
 
   <div class="tab-content">
@@ -49,10 +54,22 @@
               <th>ID</th><td><%= @city.id %></td>
               <th>Name</th><td><%= @city.name %></td>
             </tr>
+
             <tr>
-              <th>Country</th><td><%= @city.country.name if @city.country %></td>
-              <th></th><td></td>
+              <th>Region</th><td><%= @city.region.name if @city.region %> (<%= @city.region.try(:id) %>)</td>
+              <th>Country</th><td><%= @city.country.name if @city.country %> (<%= @city.country.try(:id) %>)</td>
             </tr>
+
+            <tr>
+              <th>Latitude</th><td><%= @city.latitude %></td>
+              <th>Longitude</th><td><%= @city.longitude %></td>
+            </tr>
+
+            <tr>
+              <th>Created At</th><td><%= @city.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @city.created_at %></td>
+              <th>Updated At</th><td><%= @city.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @city.updated_at %></td>
+            </tr>
+
           </tbody>
         </table>
       </div>
@@ -72,10 +89,7 @@
               <th></th><td></td>
             </tr>
 
-            <tr>
-              <th>Created At</th><td><%= @city.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @city.created_at %></td>
-              <th>Updated At</th><td><%= @city.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @city.updated_at %></td>
-            </tr>
+            
 
           </tbody>
         </table>