usman 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479e1edd33576baf3784bcecc8165178e3c1da93
-  data.tar.gz: 34e9499b5fcf9ce47220b6eb8fc007b13860029d
+  metadata.gz: 7c9994e5cbd0656c7e474abba0af96316e2026ff
+  data.tar.gz: fe09a804f3dd1eededff04c8d8e023303ac79c52
 SHA512:
-  metadata.gz: f146961b5e325920447f76b33fb9bb1b00cc1791db67e02106ebe90b2dceb4d14e7a5649d0378e6230655567f49d94efbe55d8709aed06db21909f230fbd97fe
-  data.tar.gz: f1b73771b7cf1493af891b1928e88bd5aedae0c56e7d389f5da7795e46762ba896f36768bbc280461e9c22d1c7fb62857c9478977a4e1b465465bdcec8712cfd
+  metadata.gz: 184a2ddb395120ca4c1a9c24034211e4260f8650935c771f3d30e56c0119cd2be5cf3c30460744b56748d083b44599c8f12bb844d91e1fe03d255076e10bfdf5
+  data.tar.gz: 4b237890aab134dd28f5f5fcb0323ff3b94d447f2a62605a13e2c40705ceaa034005ca4aca179c5333b97d7afebc2a4e339abb34603eb4454b1178b49951bec1

data/app/controllers/usman/application_controller.rb

@@ -21,5 +21,9 @@ module Usman
       @filter_param_mapping[:feature] = :ft
     end
 
+    def breadcrumb_home_path
+      usman.dashboard_path
+    end
+
   end
 end

data/app/controllers/usman/features_controller.rb

@@ -66,7 +66,7 @@ module Usman
         heading: "Manage Features",
         icon: "lincons-diamond",
         description: "Listing all Features",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Features", link: features_path, icon: 'fa-calendar', active: true}]
       }
     end

data/app/controllers/usman/my_account_controller.rb

@@ -11,7 +11,7 @@ module Usman
       {
         heading: "My Account",
         description: "Manage Account, Profile & Settings",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'},
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'},
                 {name: "My Account", link: "#", icon: 'fa-user'}]
       }
     end

data/app/controllers/usman/permissions_controller.rb

@@ -68,7 +68,7 @@ module Usman
         heading: "Manage Permissions",
         icon: "fa-lock",
         description: "Listing all Permissions",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Permissions", link: permissions_path, icon: 'fa-calendar', active: true}]
       }
     end

data/app/controllers/usman/registration_devices_controller.rb

@@ -81,7 +81,7 @@ module Usman
       {
         heading: "Manage Device Registrations",
         description: "Listing all Device Registrations",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}]
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}]
       }
     end
 

data/app/controllers/usman/registrations_controller.rb

@@ -65,7 +65,7 @@ module Usman
         heading: "Manage Registrations",
         icon: "linecons-mobile",
         description: "Listing all Registrations",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Registrations", link: registrations_path, icon: 'linecons-mobile', active: true}]
       }
     end

data/app/controllers/usman/resource_controller.rb

@@ -16,6 +16,5 @@ module Usman
       @filter_param_mapping[:user] = :us
       @filter_param_mapping[:feature] = :ft
     end
-
   end
 end

data/app/controllers/usman/roles_controller.rb

@@ -51,7 +51,7 @@ module Usman
         heading: "Manage Roles",
         icon: "fa-lock",
         description: "Listing all Roles",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Roles", link: roles_path, icon: 'fa-calendar', active: true}]
       }
     end

data/app/controllers/usman/user_roles_controller.rb

@@ -125,7 +125,7 @@ module Usman
       {
         heading: "Manage User Roles",
         description: "Listing all User Roles",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}]
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}]
       }
     end
 

data/app/controllers/usman/users_controller.rb

@@ -130,7 +130,7 @@ module Usman
         heading: "Manage Users",
         icon: "fa-user",
         description: "Listing all Users",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Users", link: users_path, icon: 'fa-user', active: true}]
       }
     end

data/app/serializers/profile_serializer.rb

@@ -2,5 +2,11 @@ class ProfileSerializer < ActiveModel::Serializer
 	include NullAttributeReplacer
   attributes :id, :name, :gender, :date_of_birth, :username, :email, :phone, :dummy
 
-  has_one :profile_picture, class_name: "Image::ProfilePicture", serializer: ProfilePictureSerializer
+  has_one :profile_picture, class_name: "Image::ProfilePicture", serializer: ProfilePictureSerializer do
+    if object.profile_picture
+      object.profile_picture
+    else
+      object.build_profile_picture
+    end
+  end
 end

data/app/views/usman/registration_devices/_show.html.erb

@@ -22,21 +22,21 @@
       <tr><th>Operating System</th><td><%= @device.operating_system %></td></tr>
       <tr><th>Software Version</th><td><%= @device.software_version %></td></tr>
 
-      <tr><th>Last Accesssed API</th><td><%= @device.last_accessed_api %></td></tr>
-      <tr><th>Last Accessed At</th><td><%= @device.last_accessed_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.last_accessed_at %></td></tr>
+      <tr><th>Device Name</th><td><%= @device.device_name %></td></tr>
+      <tr><th>Device Type</th><td><%= @device.device_type %></td></tr>
+      <tr><th>Device Token</th><td><%= @device.device_token %></td></tr>
 
       <% if @current_user.super_admin? %>
         <tr><th>OTP</th><td><%= @device.otp %></td></tr>
-      <% else %>
-        <tr><th>Device Token</th><td><%= @device.device_token %></td></tr>
-      <% end %>
-      <tr><th>OTP Sent At</th><td><%= @device.otp_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.otp_sent_at %></td></tr>
-
-      <% if @current_user.super_admin? %>
+        <tr><th>OTP Sent At</th><td><%= @device.otp_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.otp_sent_at %></td></tr>
         <tr><th>API Token</th><td><%= @device.api_token %></td></tr>
       <% end %>
+
       <tr><th>Token Created At</th><td><%= @device.token_created_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.token_created_at %></td></tr>
 
+      <tr><th>Last Accesssed API</th><td><%= @device.last_accessed_api %></td></tr>
+      <tr><th>Last Accessed At</th><td><%= @device.last_accessed_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.last_accessed_at %></td></tr>
+
 			<tr><th>Created At</th><td><%= @device.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.created_at %></td></tr>
 			<tr><th>Updated At</th><td><%= @device.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @device.updated_at %></td></tr>
 			

data/app/views/usman/registrations/_show.html.erb

@@ -5,17 +5,19 @@
 	
 	<div class="row">
 
-		<% if @user %>
 		<div class="col-md-3 col-sm-6 col-xs-6" style="border-right:1px solid #f1f1f1;">
-	  	<%= edit_image(@user, 
+	  	<% if @current_user.super_admin? %>
+	  		<%= edit_image(@user, 
             "profile_picture.image.large.url",
             upload_image_link(@user, :profile_picture, nil ),
             remove_image_link(@user, :profile_picture, nil ),
             image_options: {assoc_name: :profile_picture }) %>
+      <% else %>
+      	<%= display_image(@user, "profile_picture.image.large.url", class: "img-circle img-inline userpic-32", alt: @user.display_name) %>
+      <% end %>
 	  </div>
-	  <% end %>
 	  
-	  <div class="col-md-9 col-sm-6 col-xs-6" style="border-right:1px solid #f1f1f1;">
+	  <div class="col-md-6 col-sm-6 col-xs-6" style="border-right:1px solid #f1f1f1;">
 
 	  	<div class="visible-sm visible-xs mt-50"></div>
 
@@ -41,6 +43,15 @@
 
 	  <div class="col-md-3 col-sm-12 col-xs-12">
 
+	  	<!-- Mark as Pending -->
+	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_registration_path(:id =>@registration.id, :status =>'pending'), :method =>'PUT', :remote=>true, class: "btn btn-block btn-white btn-only-hover" unless @registration.pending? %>
+	    
+	    <!-- Verify -->
+	    <%= link_to raw("<i class=\"fa fa-check mr-5\"></i> Verify"), update_status_registration_path(:id =>@registration.id, :status =>'verified'), :method =>'PUT', :remote=>true, class: "btn btn-block btn-success" unless @registration.verified? %>
+
+	    <!-- Suspend -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_registration_path(:id =>@registration.id, :status =>'suspended'), :method =>'PUT', :remote=>true, class: "btn btn-block btn-danger btn-only-hover" unless @registration.suspended? %>
+
 	  	<%# edit_link = edit_registration_path(id: @registration.id) %>
 			<%# delete_link = registration_path(id: @registration.id) %>
 
@@ -94,7 +105,20 @@
 						
 						<tr>
 							<th>ID</th><td><%= @registration.id %></td>
-							<th>Status</th><td><%= @registration.status %></td>
+							<th>User / Profile ID</th><td><%= @registration.user_id %></td>
+						</tr>
+
+						<tr>
+							<th>Status</th><td>
+								<% if @registration.pending? %>
+									<span class="label label-default">Pending</span>
+								<% elsif @registration.verified? %>
+									<span class="label label-success">Verified</span>
+								<% elsif @registration.suspended? %>
+		    				  <span class="label label-danger">Suspended</span>
+								<% end %>
+							</td>
+							<th></th><td></td>
 						</tr>
 
 						<tr>
@@ -135,10 +159,30 @@
 							<th>Phone</th><td><%= @user.try(:phone) %></td>
 						</tr>
 
+						<tr>
+							<th>Gender</th><td><%= @user.gender %></td>
+							<th>Date of Birth</th><td><%= @user.date_of_birth.strftime("%m/%d/%Y") if @user.date_of_birth %></td>
+						</tr>
+
 						<tr>
 							<th>Designation</th><td><%= @user.try(:designation) %></td>
-							<th>Status</th><td><%= @user.try(:status).try(:titleize) %></td>
+							<th>Status</th><td>
+								<% if @user.pending? %>
+									<span class="label label-default">Pending</span>
+								<% elsif @user.approved? %>
+									<span class="label label-success">Approved</span>
+								<% elsif @user.suspended? %>
+									<span class="label label-danger">Suspended</span>
+								<% end %>
+							</td>
+						</tr>
+
+						<% if @current_user.super_admin? %>
+						<tr>
+							<th>Dummy?</th><td><%= @user.dummy.to_s.titleize %></td>
+							<th>Super Admin</th><td><%= @user.super_admin?.to_s.titleize %></td>
 						</tr>
+						<% end %>
 						
 					</tbody>
 				</table>

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

@@ -28,13 +28,21 @@
   <td class="hidden-xs hidden-sm"><%= link_to user.email, user_path(user), remote: true, class: "email" %></td>
 
   <% if @current_user.super_admin? %>
-  <td class="hidden-xs hidden-sm">
-  	<% if user.super_admin %>
-      <span class="mr-10 mt-5 label label-warning">Super Admin</span>
-    <% else %>
-    	<span class="mr-10 mt-5 label label-default">Normal</span>
-    <% end %>
-  </td>
+    <td class="hidden-xs hidden-sm">
+      <% if user.super_admin? %>
+        <span class="mr-10 mt-5 label label-warning">Super Admin</span>
+      <% else %>
+        <% user.roles.collect(&:name).each do |r| %>
+          <span class="ml-5 label label-primary"><%= r %></span>
+        <% end %>
+      <% end %>
+    </td>
+  <% else %>
+    <td class="user-name">
+      <% user.roles.collect(&:name).each do |r| %>
+        <span class="ml-5 label label-primary"><%= r %></span>
+      <% end %>
+    </td>
   <% end %>
 
   <td>

data/app/views/usman/users/_show.html.erb

@@ -6,11 +6,16 @@
 
 	  <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
 
-	  	<%= edit_image(@user, 
-	                  "profile_picture.image.large.url",
-	                  upload_image_link(@user, :profile_picture, nil ),
-	                  remove_image_link(@user, :profile_picture, nil ),
-	                  image_options: {assoc_name: :profile_picture }) %>
+	  	<% if @current_user.super_admin? %>
+	  		<%= edit_image(@user, 
+            "profile_picture.image.large.url",
+            upload_image_link(@user, :profile_picture, nil ),
+            remove_image_link(@user, :profile_picture, nil ),
+            image_options: {assoc_name: :profile_picture }) %>
+      <% else %>
+      	<%= display_image(@user, "profile_picture.image.large.url", class: "img-circle img-inline userpic-32", alt: @user.display_name) %>
+      <% end %>
+	  	
 	  </div>
 
 	  <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
@@ -62,7 +67,7 @@
 	    <% end %>
 
 	    <!-- Approve -->
-	    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>@user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? && (@current_user != @user) %>
+	    <%= link_to raw("<i class=\"fa fa-check mr-5\"></i> Approve"), update_status_user_path(:id =>@user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? && (@current_user != @user) %>
 
 	    <!-- Mark as Pending -->
 	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_user_path(:id =>@user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" if @user.can_be_marked_as_pending? && (@current_user != @user) %>
@@ -104,10 +109,9 @@
 	</ul>
 
 	<div class="tab-content">
-	  <div class="tab-pane active" id="profile_info">
+	  <div class="tab-pane active" id="profile_info" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
 	      
 	    <%= clear_tag(20) %>
-
 	    <div class="table-responsive mt-30"> 
 		    <table class="table table-striped table-condensed table-bordered"> 
 					<tbody>
@@ -122,46 +126,90 @@
 							<th>Phone</th><td><%= @user.phone %></td>
 						</tr>
 
+						<tr>
+							<th>Gender</th><td><%= @user.gender %></td>
+							<th>Date of Birth</th><td><%= @user.date_of_birth.strftime("%m/%d/%Y") if @user.date_of_birth %></td>
+						</tr>
+
 						<tr>
 							<th>Designation</th><td><%= @user.designation %></td>
-							<th>Status</th><td><%= @user.status.titleize %></td>
+							<th>Status</th><td>
+								<% if @user.pending? %>
+									<span class="label label-default">Pending</span>
+								<% elsif @user.approved? %>
+									<span class="label label-success">Approved</span>
+								<% elsif @user.suspended? %>
+									<span class="label label-danger">Suspended</span>
+								<% end %>
+							</td>
 						</tr>
+
+						<% if @current_user.super_admin? %>
+						<tr>
+							<th>Dummy?</th><td><%= @user.dummy.to_s.titleize %></td>
+							<th>Super Admin</th><td><%= @user.super_admin?.to_s.titleize %></td>
+						</tr>
+						<% end %>
 						
 					</tbody>
 				</table>
 			</div>
+
 		</div>
 
-		<div class="tab-pane active" id="registration_info">
+		<div class="tab-pane" id="registration_info" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
 	      
 	    <%= clear_tag(20) %>
 
+	    <% if @registration %>
+
 	    <div class="table-responsive mt-30"> 
 		    <table class="table table-striped table-condensed table-bordered"> 
 					<tbody>
 						
 						<tr>
-							<th>Country</th><td><%= @registration.try(:country).try(:display_name) %></td>
-							<th>City</th><td><%= @registration.try(:city).try(:display_name) %></td>
+							<th>ID</th><td><%= @registration.id %></td>
+							<th>User / Profile ID</th><td><%= @registration.user_id %></td>
 						</tr>
 
 						<tr>
-							<th>Dialing Prefix</th><td><%= @registration.try(:dialing_prefix) %></td>
-							<th>Mobile Number</th><td><%= @registration.try(:mobile_number) %></td>
+							<th>Status</th><td>
+								<% if @registration.pending? %>
+									<span class="label label-default">Pending</span>
+								<% elsif @registration.verified? %>
+									<span class="label label-success">Verified</span>
+								<% elsif @registration.suspended? %>
+		    				  <span class="label label-danger">Suspended</span>
+								<% end %>
+							</td>
+							<th></th><td></td>
 						</tr>
 
 						<tr>
-							<th>Status</th><td><%= @registration.try(:status).try(:titleize) %></td>
-							<th></th><td></td>
+							<th>Country</th><td><%= @registration.country.try(:display_name) %></td>
+							<th>City</th><td><%= @registration.city.try(:display_name) %></td>
+						</tr>
+
+						<tr>
+							<th>Dialing Prefix</th><td><%= @registration.dialing_prefix %></td>
+							<th>Mobile Number</th><td><%= @registration.mobile_number %></td>
+						</tr>
+						
+						<tr>
+							<th>Created At</th><td><%= @registration.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.created_at %></td>
+							<th>Updated At</th><td><%= @registration.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.updated_at %></td>
 						</tr>
 						
 					</tbody>
 				</table>
 			</div>
+
+			<% end %>
+
 		</div>
 
 		<% if @current_user.super_admin? %>
-		<div class="tab-pane" id="technical_details">
+		<div class="tab-pane" id="technical_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
 	    
 	    <%= clear_tag(20) %>
 

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-04 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.14
+        version: 0.1.15
   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.14
+        version: 0.1.15
 - !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.11
+        version: 0.1.12
   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.11
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement