pattana 0.1.6 → 0.1.7

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

@@ -1,55 +1,38 @@
-<% edit_link = edit_admin_region_path(id: region.id) %>
-<% delete_link = admin_region_path(id: region.id) %>
+<% edit_link = edit_region_path(id: region.id) %>
+<% delete_link = region_path(id: region.id) %>
 
 <tr id="tr_region_<%= region.id %>">
-
-  <td class="region-image">
-    <%= link_to(admin_region_path(region), remote: true) do %>
-      <%= display_image(region, "region_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: region.display_name) %>
+  
+  <td class="region-id text-align-center"><%= region.id %></td>
+  
+  <td class="region-name text-align-left"><%= link_to region.name, pattana.region_path(region), remote: true %></td>
+  
+  <td class="region-name text-align-left"><%= link_to region.country.name, "#" %></td>
+
+  <td class="region-name text-align-center"><%= region.priority %></td>
+  
+  <td class="region-name text-align-center"><%= region.display_show_in_api %></td>
+
+  <td class="region-name text-align-center"><%= region.display_operational %></td>
+
+  <td class="action-links text-align-center" style="width:10%">
+    <% if region.show_in_api? %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Hide in API"), hide_in_api_region_path(:id =>region.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_region_path(:id =>region.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
     <% end %>
-  </td>
-
-  <td class="region-name"><%= link_to region.name, admin_region_path(region), remote: true %></td>
 
-  <td>
-    <% if region.unpublished? %>
-      <span class="ml-5 mt-5 label label-default">Un-Published</span>
-    <% elsif region.published? %>
-      <span class="ml-5 mt-5 label label-success">Published</span>
-    <% elsif region.disabled? %>
-      <span class="ml-5 mt-5 label label-danger">Disabled</span>
+    <% if region.operational? %>
+      <%= link_to raw("<i class=\"fa fa-square mr-5\"></i> Remove Operational"), remove_operational_region_path(:id =>region.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_region_path(:id =>region.id), :remote=>true, role: "menuitem", tabindex: "-1", style: "text-align:left;", class: "edit" %>
     <% end %>
   </td>
 
-  <td class="action-links" style="width:10%">
-
-    <% case region.status %>
-    <% when "published" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_region_path(:id =>region.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"region_status" %>
-      
-      <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_region_path(:id =>region.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"region_status" %>
-    <% when "unpublished" %>
-      <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_region_path(:id =>region.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"region_status" %>
-      <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_region_path(:id =>region.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"region_status" %>
-    <% when "disabled" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_region_path(:id =>region.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"region_status" %>
-      <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_region_path(:id =>region.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"region_status" %>
-    <% end %>
-
-  </td>
-
-  <td class="action-links" style="width:10%">
-
-    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Region"), 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 class="action-links text-align-center" style="width:10%">
+    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit"), edit_link, :remote=>true, style: "text-align:left;", 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 mt-10", style: "text-align:left;" %>
   </td>
 
 </tr>

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

@@ -12,6 +12,18 @@
 
       <%= theme_panel_sub_heading(@region.country.name, "#") if @region.country %><br>
 
+      <% if @region.show_in_api? %>
+        <div class="label label-success">Show In API</div>
+      <% else %>
+        <div class="label label-danger">Hide In API</div>
+      <% end %>
+
+      <% if @region.operational? %>
+        <div class="label label-success">Operational</div>
+      <% else %>
+        <div class="label label-danger">Non Operational</div>
+      <% end %>
+
       <%= clear_tag(10) %>
       
     </div>
@@ -30,11 +42,12 @@
     </li>
 
     <li class="">
-      <a href="#technical_details" data-toggle="tab" aria-expanded="false">
+      <a href="#cities" data-toggle="tab" aria-expanded="false">
         <span class="visible-xs"><i class="fa-database"></i></span>
-        <span class="hidden-xs">Technical Details</span>
+        <span class="hidden-xs">Cities</span>
       </a>
     </li>
+    
   </ul>
 
   <div class="tab-content">
@@ -51,39 +64,109 @@
               <th>ID</th><td><%= @region.id %></td>
               <th>Name</th><td><%= @region.name %></td>
             </tr>
+
             <tr>
               <th>ISO Code</th><td><%= @region.iso_code if @region.iso_code %></td>
-              <th>Country</th><td><%= @region.country.name if @region.country %></td>
+              <th>Country</th><td><%= @region.country.name if @region.country %> (<%= @region.country.try(:id) %>)</td>
             </tr>
-          </tbody>
-        </table>
-      </div>
-      
-    </div>
 
-    <div class="tab-pane" id="technical_details">
-      
-      <%= clear_tag(20) %>
-
-      <div class="table-responsive"> 
-        <table class="table table-striped table-condensed table-bordered mb-30"> 
-          <tbody>
-            
             <tr>
-              <th>ID</th><td><%= @region.id %></td>
-              <th></th><td></td>
+              <th>Latitude</th><td><%= @region.latitude %></td>
+              <th>Longitude</th><td><%= @region.longitude %></td>
             </tr>
 
             <tr>
               <th>Created At</th><td><%= @region.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @region.created_at %></td>
               <th>Updated At</th><td><%= @region.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @region.updated_at %></td>
             </tr>
-
           </tbody>
         </table>
       </div>
     </div>
 
+    <div class="tab-pane" id="cities" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      <%= clear_tag(20) %>
+
+      <div id="div_city_action_buttons">
+        <div class="row">
+          <div class="col-md-6">
+
+            <%= theme_button('Refresh', 'refresh', cities_region_path(@region), classes: "pull-left", btn_type: "white") %>
+            
+          </div>
+          <div class="col-md-6">
+            <%= search_form_kuppayam(City, cities_region_path(@region), text: "") %>
+          </div>
+        </div>
+      </div>
+      <%= clear_tag(10) %>
+
+      <div id="div_city_counts">
+        <div class="row">
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+          
+            <div style="border: 1px solid #ddd; margin-bottom: 20px;">
+            
+              <div class="xe-widget xe-counter xe-counter-info" 
+                  data-count=".num" 
+                  data-from="0" 
+                  data-to="99.9" 
+                  data-suffix="%" 
+                  data-duration="2"
+                  style="margin-bottom: 0px; 
+                  padding: 0px; 
+                  width: 15%;
+                  margin: 0px auto;">
+                <div class="xe-icon">
+                  <i class="linecons-database"></i>
+                </div>
+                <div class="xe-label">
+                  <strong class="num"><%= @region.cities.count %></strong>
+                  <span>Total</span>
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+          
+            <div style="border: 1px solid #ddd; margin-bottom: 20px;">
+            
+              <div class="xe-widget xe-counter" 
+                  data-count=".num" 
+                  data-from="0" 
+                  data-to="99.9" 
+                  data-suffix="%" 
+                  data-duration="2"
+                  style="margin-bottom: 0px; 
+                  padding: 0px; 
+                  width: 15%;
+                  margin: 0px auto;">
+                <div class="xe-icon">
+                  <i class="linecons-cloud"></i>
+                </div>
+                <div class="xe-label">
+                  <strong class="num"><%= @region.cities.show_in_api.count %></strong>
+                  <span>Show in API</span>
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+          
+          
+        </div>
+      </div>
+      <div id="div_city_index">
+        <%= link_to 'Refresh', cities_region_path(@region), remote: true %>
+        <%#= render :partial=>"master_data/admin_cities/index" %>
+      </div>
+    </div>
+
   </div>
 
   <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>

data/app/views/pattana/regions/cities.js.erb

@@ -0,0 +1,11 @@
+<% if @cities.any? %>
+  
+  // Refresh the list
+  $('#div_city_index').html("<%= escape_javascript(render(:partial=>"pattana/region_cities/index")) %>");
+
+<% else %>
+
+  var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
+  $('#div_city_index').html(noResultsText);
+
+<% end %>

data/config/locales/pattana/general.ar.yml

@@ -0,0 +1,40 @@
+ar:
+  countries:
+    show_in_api:
+      heading: "Show in API"
+      message: "Country will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "Country will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "Country was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "Country was removed from operation successfully"
+  regions:
+    show_in_api:
+      heading: "Show in API"
+      message: "Region will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "Region will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "Region was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "Region was removed from operation successfully"
+  cities:
+    show_in_api:
+      heading: "Show in API"
+      message: "City will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "City will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "City was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "City was removed from operation successfully"

data/config/locales/pattana/general.en.yml

@@ -0,0 +1,40 @@
+en:
+  countries:
+    show_in_api:
+      heading: "Show in API"
+      message: "Country will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "Country will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "Country was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "Country was removed from operation successfully"
+  regions:
+    show_in_api:
+      heading: "Show in API"
+      message: "Region will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "Region will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "Region was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "Region was removed from operation successfully"
+  cities:
+    show_in_api:
+      heading: "Show in API"
+      message: "City will now show in API from now"
+    hide_in_api:
+      heading: "Hide in API"
+      message: "City will now not show in API from now"
+    marked_as_operational:
+      heading: "Marked as Operational"
+      message: "City was marked as operational successfully"
+    removed_operational:
+      heading: "Removed Operational"
+      message: "City was removed from operation successfully"

data/config/routes.rb

@@ -6,11 +6,32 @@ Pattana::Engine.routes.draw do
     resources :countries,  as: :countries do
       member do
         get :regions
+        get :cities
+        get :show_in_api
+        get :hide_in_api
+        get :mark_as_operational
+        get :remove_operational
       end
     end
 
-    resources :regions,  as: :regions
-    resources :cities,  as: :cities
+    resources :regions,  as: :regions do
+      member do
+        get :cities
+        get :show_in_api
+        get :hide_in_api
+        get :mark_as_operational
+        get :remove_operational
+      end
+    end
+
+    resources :cities,  as: :cities do
+      member do
+        get :show_in_api
+        get :hide_in_api
+        get :mark_as_operational
+        get :remove_operational
+      end
+    end
   end
 
   namespace :api do

data/lib/pattana/factories.rb

@@ -4,4 +4,4 @@
 # Read More: https://stackoverflow.com/questions/31700345/how-can-i-share-the-factories-that-i-have-in-a-gem-and-use-it-in-other-project
 
 GEM_PATTANA_ROOT = File.dirname(File.dirname(File.dirname(__FILE__)))
-Dir[File.join(GEM_PATTANA_ROOT, 'spec', 'dummy', 'spec', 'factories', '*.rb')].each { |file| require(file) }
+Dir[File.join(GEM_PATTANA_ROOT, 'spec', 'dummy', 'spec', 'factories', '**','*.rb')].each { |file| require(file) }

data/lib/pattana/version.rb

@@ -1,3 +1,3 @@
 module Pattana
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/spec/dummy/spec/factories/city.rb

@@ -16,6 +16,7 @@ FactoryGirl.define do
 
     priority 1000
     show_in_api false
+    operational false
   end
   
 end

data/spec/dummy/spec/factories/country.rb

@@ -35,6 +35,7 @@ FactoryGirl.define do
 
     priority 1000
     show_in_api false
+    operational false
   end
 
   

data/spec/dummy/spec/factories/region.rb

@@ -13,6 +13,7 @@ FactoryGirl.define do
 
     priority 1000
     show_in_api false
+    operational false
   end
 
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattana
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -368,25 +368,36 @@ files:
 - app/views/pattana/api/v1/docs/countries/_pos_case_1.html.erb
 - app/views/pattana/api/v1/docs/regions/_neg_case_1.html.erb
 - app/views/pattana/api/v1/docs/regions/_pos_case_1.html.erb
+- app/views/pattana/cities/_form.html.erb
 - app/views/pattana/cities/_index.html.erb
 - app/views/pattana/cities/_row.html.erb
 - app/views/pattana/cities/_show.html.erb
 - app/views/pattana/cities/index.html.erb
+- app/views/pattana/countries/_form.html.erb
 - app/views/pattana/countries/_index.html.erb
 - app/views/pattana/countries/_row.html.erb
 - app/views/pattana/countries/_show.html.erb
+- app/views/pattana/countries/cities.js.erb
 - app/views/pattana/countries/index.html.erb
 - app/views/pattana/countries/regions.js.erb
+- app/views/pattana/country_cities/_index.html.erb
+- app/views/pattana/country_cities/_row.html.erb
 - app/views/pattana/country_regions/_form.html.erb
 - app/views/pattana/country_regions/_index.html.erb
 - app/views/pattana/country_regions/_row.html.erb
 - app/views/pattana/dashboard/index.html.erb
+- app/views/pattana/region_cities/_index.html.erb
+- app/views/pattana/region_cities/_row.html.erb
+- app/views/pattana/regions/_form.html.erb
 - app/views/pattana/regions/_index.html.erb
 - app/views/pattana/regions/_row.html.erb
 - app/views/pattana/regions/_show.html.erb
+- app/views/pattana/regions/cities.js.erb
 - app/views/pattana/regions/index.html.erb
 - config/locales/pattana/api.ar.yml
 - config/locales/pattana/api.en.yml
+- config/locales/pattana/general.ar.yml
+- config/locales/pattana/general.en.yml
 - config/routes.rb
 - db/master_data/cities.sql
 - db/master_data/countries.sql