usman 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80f17bd4fd7f791c314b69f53db8d81e8170bb6
-  data.tar.gz: 453011e1f47a69b26225bb571eaae8bcb81d9e3c
+  metadata.gz: 2fcb08b50e5aac2d8a62c1a061964395c71374ac
+  data.tar.gz: 0cebc15bf191aa323cd08a521b1c4562f2b60c3b
 SHA512:
-  metadata.gz: a2671eadf4f58e47489246ea20ce127a1c0513db468f8d6a8e1b27df92057086dc88b5180c57f32b46323357d8847bf711db32b5567c507b30bc13d5c439214d
-  data.tar.gz: 7d73126487782bc3e770562e6da062336bd6cfd4b84dd4820bdcb23a671fab907f6897538b9643e7b2969e7559a8615a0707663a2168e3ce9c2c72aec098d04a
+  metadata.gz: e5f8bcf10af040d0eed3f78fe66e68d827147ff6f4e82ec08bef2f5c0bc02afffa3fd275973835c332d340691aca060dc121b943f94053b1db1091415ae111f4
+  data.tar.gz: 0aa4637f4fba44a2b238b4286d26dca60f0d1c78d7f5c5f823a7337ce357f187625a75b8f945e88d0528b081caafa060113b0be0dbd399f28d1d7d8bab5a7258

data/app/controllers/usman/features_controller.rb

@@ -74,7 +74,7 @@ module Usman
     end
 
     def permitted_params
-      params.require(:feature).permit(:name)
+      params.require(:feature).permit(:name, :categorisable)
     end
 
     def set_navs

data/app/models/feature.rb

@@ -40,6 +40,8 @@ class Feature < Usman::ApplicationRecord
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
 
+  scope :categorisable, -> { where(categorisable: true) }
+
   scope :unpublished, -> { where(status: UNPUBLISHED) }
   scope :published, -> { where(status: PUBLISHED) }
   scope :disabled, -> { where(status: DISABLED) }
@@ -163,6 +165,10 @@ class Feature < Usman::ApplicationRecord
     "#{name.to_s.demodulize.pluralize.titleize}"
   end
 
+  def display_categorisable
+    self.categorisable ? "Yes" : "No"
+  end
+
   # Image Configuration
   # -------------------
   def image_configuration

data/app/views/usman/features/_form.html.erb

@@ -6,14 +6,12 @@
 
       <div class="form-inputs mb-30 mt-30">
         <%= theme_form_field(@feature, :name, label: "Class Name") %>
+        <%= theme_form_field(@feature, :categorisable, required: false, html_options: {type: :checkbox}) %>
       </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: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
-
       </div>
       <%= clear_tag(10) %>
   </div>

data/app/views/usman/features/_index.html.erb

@@ -3,9 +3,10 @@
 	  <thead> 
 			<tr> 
 				<th style="text-align: center;width:60px">#</th> 
-				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
+				<!-- <th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th>  -->
 				<th>Name</th>
 				<th>Class Name</th>
+				<th>Categorisable</th>
 				<th style="width:100px;">Status</th>
 				<% if display_manage_links? %>
 				<th style="text-align: center;" colspan="2">Actions</th>
@@ -25,15 +26,18 @@
 				    <% end %>
 				  </th>
 		      
-		      <td class="feature-image" style="text-align: center;">
-		        <%= link_to(feature_path(feature), remote: true) do %>
-		        	<%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
-		        <% end %>
-		      </td>
+		      <!-- <td class="feature-image" style="text-align: center;">
+		        <%#= link_to(feature_path(feature), remote: true) do %>
+		        	<%#= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
+		        <% #end %>
+		      </td> -->
 
 					<td class="feature-name"><%= link_to feature.display_name, feature_path(feature), remote: true %></td>
+
 					<td class="feature-name"><%= link_to feature.name, feature_path(feature), remote: true %></td>
 
+					<td><%= feature.display_categorisable %></td>
+
 					<td>
 						<% if feature.unpublished? %>
 							<span class="ml-5 mt-5 label label-default">Un-Published</span>

data/app/views/usman/features/_row.html.erb

@@ -8,15 +8,18 @@
     <% end %>
   </th>
   
-  <td class="feature-image" style="text-align: center;">
-    <%= link_to(feature_path(feature), remote: true) do %>
-      <%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
-    <% end %>
-  </td>
+  <!-- <td class="feature-image" style="text-align: center;">
+    <%#= link_to(feature_path(feature), remote: true) do %>
+      <%#= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
+    <%# end %>
+  </td> -->
 
   <td class="feature-name"><%= link_to feature.display_name, feature_path(feature), remote: true %></td>
+  
   <td class="feature-name"><%= link_to feature.name, feature_path(feature), remote: true %></td>
 
+  <td><%= feature.display_categorisable %></td>
+
   <td>
     <% if feature.unpublished? %>
       <span class="ml-5 mt-5 label label-default">Un-Published</span>

data/db/migrate/20170929083234_add_categorisable_to_features.rb

@@ -0,0 +1,5 @@
+class AddCategorisableToFeatures < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :features, :categorisable, :boolean, default: false
+  end
+end

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.21
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.21
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -546,6 +546,7 @@ files:
 - db/migrate/20170904080436_add_tac_accepted_at_to_devices.rb
 - db/migrate/20170905041104_add_gender_to_users.rb
 - db/migrate/20170929083233_add_dummy_to_users.rb
+- db/migrate/20170929083234_add_categorisable_to_features.rb
 - lib/tasks/usman/data.rake
 - lib/tasks/usman/master_data.rake
 - lib/temp/features.rake