usman 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8545e2e5dc538e357611ef4599c6516144efe87
-  data.tar.gz: 350db031459f0ac0625965a192cf1d2354048f57
+  metadata.gz: 305e0b1f3fcbaf48dfa3ef61edcc5fc8f1f735c7
+  data.tar.gz: 0f29c10f24fe0a2a18fe7c30b3f48b3f37d57ae8
 SHA512:
-  metadata.gz: 057c92a4cc8580cf368bf03d3ce396b44b70e9cdd1e83caeb61c6e35964f04b1baf42cf70d12533ef1f2bfff1d9061cae908140cd1fa00ade3c6f9896ff9836b
-  data.tar.gz: 50ea37f84bd1e935adc41381b79eccec7aa6be570f938292aefd17b68cb35b99f95fe5cb99ff08851bc2ca0166018b4b012295e108429a96de9445e51bc08831
+  metadata.gz: edca824f4e840bd5fd8786455cdd5f598d2543caa35060aca8f221270c0ee3b16800526620f0976d6b600e2f1c3b456a5bb7e4d555a988fcd0b3c264ed2cf730
+  data.tar.gz: 929e61aa9eddab89d2658005482b6abbf1e00c28302286f49dafe4adae2dbe534ea4b9e4f20df18456a39d70e58361f0aaa09897f3d75f184fdc89366e0551cc

data/app/controllers/usman/api/v1/base_controller.rb

@@ -8,6 +8,7 @@ module Usman
         include Usman::ApiHelper
         
         before_action :require_api_token
+        after_action :store_last_accessed_api
 
       end
     end

data/app/controllers/usman/registrations_controller.rb

@@ -3,6 +3,20 @@ module Usman
 
     before_action :require_site_admin
     
+    def update_status
+      @registration = @r_object = Registration.find(params[:id])
+      case params[:status]
+      when "pending"
+        @registration.pending!
+      when "verified"
+        @registration.verify!
+      when "suspended"
+        @registration.suspend!
+      end
+      set_notification(true, I18n.t('status.success'), I18n.t('state.changed', item: default_item_name.titleize, new_state: @r_object.status))
+      render_row
+    end
+
     private
 
     def get_collections

data/app/helpers/usman/api_helper.rb

@@ -39,6 +39,29 @@ module Usman
       else
         @current_user = @current_device.try(:registration).try(:user)
       end
+      if @current_user
+        if @current_user.pending?
+          proc_code = Proc.new do
+            @success = false
+            @errors = {
+              heading: I18n.translate("api.general.user_is_pending.heading"),
+              message: I18n.translate("api.general.user_is_pending.message")
+            }
+          end
+          render_json_response(proc_code)
+          return
+        elsif @current_user.suspended?
+          proc_code = Proc.new do
+            @success = false
+            @errors = {
+              heading: I18n.translate("api.general.user_is_suspended.heading"),
+              message: I18n.translate("api.general.user_is_suspended.message")
+            }
+          end
+          render_json_response(proc_code)
+          return
+        end
+      end
     end
 
     def require_super_admin_auth_token
@@ -64,5 +87,16 @@ module Usman
         return
       end
     end
+
+    def store_last_accessed_api
+      if @current_device
+        # Know what was the last API accessed and when
+        # This is to catch the users who are inactive
+        @current_device.last_accessed_api = request.original_url
+        @current_device.last_accessed_at = Time.now
+        @current_device.save
+      end
+    end
+
   end
 end

data/app/models/device.rb

@@ -169,6 +169,7 @@ class Device < ApplicationRecord
 
     self.verify!
     self.registration.verify!
+    self.registration.user.approve! if self.registration.user
 
     # Clearing the OTP so that next time if he uses the same, it shows error
     self.otp = nil

data/app/models/registration.rb

@@ -5,15 +5,18 @@ class Registration < ApplicationRecord
 
   PENDING = "pending"
   VERIFIED = "verified"
+  SUSPENDED = "suspended"
   
   STATUS = { 
     PENDING => "Pending", 
-    VERIFIED => "Verified"
+    VERIFIED => "Verified",
+    SUSPENDED => "Suspended"
   }
 
   STATUS_REVERSE = { 
     "Pending" => PENDING,
-    "Verified" => VERIFIED
+    "Verified" => VERIFIED,
+    "Suspended" => SUSPENDED
   }
   
 	# Associations
@@ -37,12 +40,15 @@ class Registration < ApplicationRecord
   #   >>> registration.search(query)
   #   => ActiveRecord::Relation object
   scope :search, lambda {|query| joins("LEFT JOIN users on users.id = registrations.user_id").
-                                where("LOWER(registrations.mobile_number) LIKE LOWER('%#{query}%') OR 
-                                       LOWER(users.name) LIKE LOWER('%#{query}%')")}
+                                where("LOWER(registrations.mobile_number) LIKE LOWER('%#{query}%') OR
+                                       LOWER(users.name) LIKE LOWER('%#{query}%') OR 
+                                       LOWER(users.email) LIKE LOWER('%#{query}%') OR 
+                                       LOWER(users.username) LIKE LOWER('%#{query}%')")}
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
 
   scope :pending, -> { where(status: PENDING) }
   scope :verified, -> { where(status: VERIFIED) }
+  scope :suspended, -> { where(status: SUSPENDED) }
 
   # ------------------
   # Instance Methods
@@ -77,6 +83,14 @@ class Registration < ApplicationRecord
     (status == VERIFIED)
   end
 
+  # * Return true if the user is suspended, else false.
+  # == Examples
+  #   >>> registration.suspended?
+  #   => true
+  def suspended?
+    (status == SUSPENDED)
+  end
+
   # change the status to :verified
   # Return the status
   # == Examples
@@ -84,6 +98,7 @@ class Registration < ApplicationRecord
   #   => "pending"
   def pending!
     self.update_attribute(:status, PENDING)
+    self.user.update_attribute(:status, PENDING) if self.user
   end
 
   # change the status to :verified
@@ -93,6 +108,17 @@ class Registration < ApplicationRecord
   #   => "verified"
   def verify!
     self.update_attribute(:status, VERIFIED)
+    self.user.update_attribute(:status, VERIFIED) if self.user
+  end
+
+  # change the status to :suspended
+  # Return the status
+  # == Examples
+  #   >>> registration.suspend!
+  #   => "suspended"
+  def suspend!
+    self.update_attribute(:status, SUSPENDED)
+    self.user.update_attribute(:status, SUSPENDED) if self.user
   end
 
   # Permission Methods

data/app/models/user.rb

@@ -173,6 +173,7 @@ class User < Usman::ApplicationRecord
   #   => "pending"
   def pending!
     self.update_attribute(:status, PENDING)
+    self.registration.update_attribute(:status, PENDING) if self.registration
   end
 
   # change the status to :approved
@@ -182,6 +183,7 @@ class User < Usman::ApplicationRecord
   #   => "approved"
   def approve!
     self.update_attribute(:status, APPROVED)
+    self.registration.update_attribute(:status, Registration::VERIFIED) if self.registration
   end
 
   # change the status to :suspended
@@ -191,6 +193,7 @@ class User < Usman::ApplicationRecord
   #   => "suspended"
   def suspend!
     self.update_attribute(:status, SUSPENDED)
+    self.registration.update_attribute(:status, SUSPENDED) if self.registration
   end
 
   # Gender Methods

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -52,7 +52,10 @@
 
 					<ul>
 						<li class="<%= nav_class("admin/users") %>">
-					    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.users_url %>
+					    <%= link_to raw("<i class=\"fa-user\"></i> <span class='title'>Manage Users</span>"), usman.users_url %>
+					  </li>
+					  <li class="<%= nav_class("admin/registrations") %>">
+					    <%= link_to raw("<i class=\"fa-mobile\"></i> <span class='title'>Manage Registrations</span>"), usman.registrations_url %>
 					  </li>
 					</ul>
 				</li>
@@ -88,6 +91,10 @@
 						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.features_url %>
 					</li>
 
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-graduation-cap\"></i> <span class='title'>Manage Roles</span>"), usman.roles_url %>
+					</li>
+
 					<li class="<%= nav_class("admin/users") %>">
 						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.permissions_url %>
 					</li>

data/app/views/usman/api/v1/docs/get_profile_info/_neg_case_1.html.erb

@@ -6,7 +6,7 @@ api_input = <<-eos
 Example:
 
 Authorization: nil
-GET #{request.base_url}/api/v1/profile/profile_picture
+GET #{request.base_url}/api/v1/profile_info
 eos
 
 api_output = <<-eos

data/app/views/usman/api/v1/docs/get_profile_info/_neg_case_2.html.erb

@@ -6,7 +6,7 @@ api_input = <<-eos
 Example:
 
 Authorization: Token token="87b01adbba90824b57add8cc06ad8738"
-GET #{request.base_url}/api/v1/profile/profile_picture
+GET #{request.base_url}/api/v1/profile_info
 eos
 
 api_output = <<-eos

data/app/views/usman/api/v1/docs/get_profile_info/_pos_case_1.html.erb

@@ -6,7 +6,7 @@ api_input = <<-eos
 Example:
 
 Authorization: Token token="87b01adbba90824b57add8cc06ad8738"
-GET #{request.base_url}/api/v1/profile/profile_picture
+GET #{request.base_url}/api/v1/profile_info
 eos
 
 api_output = <<-eos

data/app/views/usman/dashboard/index.html.erb

@@ -10,6 +10,16 @@
 			text: "Users",
 			icon_class: "fa-user",
 			url: usman.users_url
+		},
+		registrations: {
+			counts: {
+				total: Registration.count,
+				pending: Registration.pending.count,
+				verified: Registration.verified.count
+			},
+			text: "Registrations",
+			icon_class: "fa-mobile",
+			url: usman.registrations_url
 		}
 	}
 %>
@@ -116,3 +126,12 @@
 		
 	</div>
 <% end %>
+
+
+<div class="dx-warning">
+	<div>
+		<h2>Usman - API Documentation</h2>
+		<p>All APIs are documented with all cases and examples.</p>
+		<a class="btn btn-success" href="/docs/api/v1/register" target="_blank">Go to the API Documentation</a>
+	</div>
+</div>

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

@@ -2,11 +2,12 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:50px;">#</th> 
+				<th style="text-align: center;width:5%;">#</th> 
 				<th style="text-align: left;">User</th>
-				<th style="text-align: left;width:200px;">Mobile</th>
-				<th style="text-align: left;width:200px;">Location</th>
-				<th style="text-align: left;width:200px;">Status</th>
+				<th style="text-align: left;width:15%;">Mobile</th>
+				<th style="text-align: left;width:15%;">Location</th>
+				<th>Status</th>
+				<th style="text-align: center;width:15%;">Actions</th>
 			</tr> 
 		</thead>
 		
@@ -41,8 +42,23 @@
 							<span class="ml-5 mt-5 label label-default">Pending</span>
 						<% elsif registration.verified? %>
 							<span class="ml-5 mt-5 label label-success">Verified</span>
+						<% elsif registration.suspended? %>
+    				  <span class="ml-5 mt-5 label label-danger">Suspended</span>
 						<% end %>
 					</td>
+
+					<td class="action-links" style="width:15%">
+
+						<!-- 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, role: "menuitem", tabindex: "-1" unless registration.pending? %>
+
+		      	<!-- Verify -->
+				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Verify"), update_status_registration_path(:id =>registration.id, :status =>'verified'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" 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, role: "menuitem", tabindex: "-1" unless registration.suspended? %>
+
+		      </td>
 		      
 					<!-- <td class="action-links" style="width:10%">
 		      	<%#= link_to raw("<i class=\"linecons-pencil\"></i> Edit Registration"), edit_link, :remote=>true, class: "edit" if @current_user.super_admin? and registration.can_be_edited? %>

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

@@ -1,8 +1,5 @@
-<% edit_link = edit_registration_path(id: registration.id) %>
-<% delete_link = registration_path(id: registration.id) %>
-
 <tr id="tr_registration_<%= registration.id %>">
-
+          
   <th scope="row" style="text-align: center;">
     <% if i < 0 %>
       <i class="fa fa-check text-success"></i>
@@ -11,14 +8,43 @@
     <% end %>
   </th>
 
-  <td class="registration-name"><%= link_to registration.name, registration_path(registration), remote: true %></td>
+  <% if registration.user %>
+    <td class="registration-name"><%= link_to registration.user.display_name, registration_path(registration), remote: true %></td>
+  <% else %>
+    <td class="registration-name"><%= link_to registration.display_name, registration_path(registration), remote: true %></td>
+  <% end %>
+
+  <td class="registration-name"><%= link_to registration.display_name, registration_path(registration), remote: true %></td>
+  
+  <td class="registration-name"><%= link_to registration.display_location, registration_path(registration), remote: true %></td>
+  
+  <td>
+    <% if registration.pending? %>
+      <span class="ml-5 mt-5 label label-default">Pending</span>
+    <% elsif registration.verified? %>
+      <span class="ml-5 mt-5 label label-success">Verified</span>
+    <% elsif registration.suspended? %>
+      <span class="ml-5 mt-5 label label-danger">Suspended</span>
+    <% end %>
+  </td>
 
-  <td class="action-links" style="width:10%">
+  <td class="action-links" style="width:15%">
 
-    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Registration"), edit_link, :remote=>true, class: "edit" if @current_user.super_admin? and registration.can_be_edited? %>
+    <!-- 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, role: "menuitem", tabindex: "-1" unless registration.pending? %>
+    
+    <!-- Verify -->
+    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Verify"), update_status_registration_path(:id =>registration.id, :status =>'verified'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" unless registration.verified? %>
 
-    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, registration: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if @current_user.super_admin? and registration.can_be_deleted? %>
+    <!-- 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, role: "menuitem", tabindex: "-1" unless registration.suspended? %>
 
   </td>
+  
+  <!-- <td class="action-links" style="width:10%">
+    <%#= link_to raw("<i class=\"linecons-pencil\"></i> Edit Registration"), edit_link, :remote=>true, class: "edit" if @current_user.super_admin? and registration.can_be_edited? %>
+
+    <%#= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, registration: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if @current_user.super_admin? and registration.can_be_deleted? %>
+  </td> -->
 
 </tr>

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

@@ -5,7 +5,17 @@
 	
 	<div class="row">
 
-	  <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+		<% if @user %>
+		<div class="col-md-3 col-sm-6 col-xs-6" 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 }) %>
+	  </div>
+	  <% end %>
+	  
+	  <div class="col-md-9 col-sm-6 col-xs-6" style="border-right:1px solid #f1f1f1;">
 
 	  	<div class="visible-sm visible-xs mt-50"></div>
 

data/config/locales/usman/authentication.en.yml

@@ -11,7 +11,7 @@ en:
       message: "Invalid Username/Email or password."
     user_is_pending:
       heading: "Account Pending"
-      message: "Your account is not yet approved, please contact administrator to activate your account"
+      message: "Your account is not yet to be approved, please contact administrator to activate your account"
     user_is_suspended:
       heading: "Account Suspended"
       message: "Your account is suspended, please contact administrator"
@@ -21,5 +21,8 @@ en:
     logged_out:
       heading: "Signed Out"
       message: "You have successfully signed out"
+    login_required:
+      heading: "Login Required"
+      message: "You need to login to access this page."
     masquerade: "لقد سجلت الدخول بنجاح - %{user}"
     sign_in_back: "You have successfully signed in back as %{user}"

data/config/routes.rb

@@ -18,6 +18,9 @@ Usman::Engine.routes.draw do
 
     resources :registrations, only: [:index, :show] do
       resources :devices, :controller => "registration_devices", only: [:index, :show]
+      member do
+        put :update_status, as:  :update_status
+      end
     end
 
     resources :users do

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails