usman 0.1.4 → 0.1.5dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603c14d27aa8016f2b9c6b141b268aba78f2bc1a
-  data.tar.gz: 7ddfdfed5beae3b998be632647d7636367e8d2c2
+  metadata.gz: c65c43b24f186560b1f39335dbea222f3ea9b22a
+  data.tar.gz: f527e47ba03c22de8fe1bdb6bc3b569c77f3b6f2
 SHA512:
-  metadata.gz: 5e9aea7072f19c0e92d10ba2480bd322ac32c05fccf2ea5b410509353e4bba3734c4bfc5667caeee1bb65e12b3416c128c853e9efc4f5967c23d359e185d1c93
-  data.tar.gz: 94712419531933914e1a80f7de6fd76afd6ad21e0ac3ca01fba0c5212ad25c019ebf1bd4ecbba35f6cb719b864e25f7209f344c6881b8987521679a34078f079
+  metadata.gz: 4fb1ef097e0a139368176c48695857aae00e8fe8087e3d2b47793cc34848485306d9d41fed93a927d1ff14e937b086a32885b6b13c64c01c394e4401a12899cd
+  data.tar.gz: 65cbc70c65a69ac79a26c76c172a53bcb6004a0399d01a4990487c366d7db5369dd64ac4f53b88ef0b95694793bfd2fd22235d63cde824fefeee048924aa1b5c

data/app/controllers/usman/admin/dashboard_controller.rb

@@ -10,7 +10,7 @@ module Usman
 
 	    def breadcrumbs_configuration
 	      {
-	        heading: "Usman Dashboard",
+	        heading: "User Dashboard",
 	        description: "A Quick view of users and roles",
 	        links: [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-dashboard'}]
 	      }

data/app/controllers/usman/admin/features_controller.rb

@@ -54,6 +54,8 @@ module Usman
 
       def resource_controller_configuration
         {
+          page_title: "Features",
+          js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/usman/admin/features"
         }
       end

data/app/controllers/usman/admin/permissions_controller.rb

@@ -2,29 +2,20 @@ module Usman
   module Admin
     class PermissionsController < ResourceController
 
-      def index
-        @heading = "Manage Permissions"
-        @description = "Listing all permissions"
-        @links = [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-home'}, 
-                  {name: "Manage Permissions", link: admin_permissions_path, icon: 'fa-user', active: true}]
-        super
-      end
-
       def create
-        @permission = Permission.where(" user_id = ? AND feature_id = ? ", permitted_params[:user_id], permitted_params[:feature_id]).first || Permission.new
+        @permission = @r_object = Permission.where(" user_id = ? AND feature_id = ? ", permitted_params[:user_id], permitted_params[:feature_id]).first || Permission.new
         @permission.assign_attributes(permitted_params)
-        save_resource(@permission)
-
+        save_resource
         get_collections
       end
 
       def update
-        @permission = Permission.find_by_id(params[:id])
+        @permission = @r_object = Permission.find_by_id(params[:id])
         # The form will not submit can_create 0 if it is not selected
         # hence making it false by default and letting it update by itself.
         @permission.assign_attributes({"can_create": "0", "can_read": "0", "can_update": "0", "can_delete": "0"})
         @permission.assign_attributes(permitted_params)
-        save_resource(@permission)
+        save_resource
         get_collections
       end
 
@@ -36,7 +27,7 @@ module Usman
         parse_filters
         apply_filters
         
-        @permissions = @relation.includes(:user, :feature).page(@current_page).per(@per_page)
+        @permissions = @r_objects = @relation.includes(:user, :feature).page(@current_page).per(@per_page)
 
         return true
       end
@@ -65,7 +56,9 @@ module Usman
 
       def resource_controller_configuration
         {
-          view_path: "/demo/permissions"
+          page_title: "Permissions",
+          js_view_path: "/kuppayam/workflows/parrot",
+          view_path: "/usman/admin/permissions"
         }
       end
 

data/app/controllers/usman/admin/roles_controller.rb

@@ -18,7 +18,7 @@ module Usman
       def apply_filters
         @relation = @relation.search(@query) if @query
         
-        @order_by = "created_at desc" unless @order_by
+        @order_by = "name ASC" unless @order_by
         @relation = @relation.order(@order_by)
       end
 
@@ -39,7 +39,8 @@ module Usman
 
       def resource_controller_configuration
         {
-          js_view_path: "/kuppayam/workflows/parrot",
+          page_title: "Roles",
+          js_view_path: "/kuppayam/workflows/peacock",
           view_path: "/usman/admin/roles"
         }
       end

data/app/controllers/usman/admin/user_roles_controller.rb

@@ -0,0 +1,142 @@
+module Usman
+  module Admin
+    class UserRolesController < ResourceController
+
+      before_action :get_role
+      
+      def index
+        get_collections
+        respond_to do |format|
+          format.html {}
+          format.js  { 
+            js_view_path = @resource_options && @resource_options[:js_view_path] ? "#{@resource_options[:js_view_path]}/index" : :index 
+            render js_view_path
+          }
+        end
+      end
+
+      def show
+        @user = @r_object = @resource_options[:class].find_by_id(params[:id])
+        set_notification(false, I18n.t('status.error'), I18n.t('status.not_found', item: default_item_name.titleize)) unless @r_object
+        render_accordingly
+      end
+
+      def new
+        @user = User.new
+        render_accordingly
+      end
+
+      def create
+        @user = @r_object = User.find_by_id(permitted_params[:id])
+        if @user.add_role(@role)
+          set_notification(true, I18n.t('status.success'), "Role '#{@role.name}' has been assigned to the user '#{@user.name}'")
+        else
+          set_notification(false, I18n.t('status.success'), "Failed to assign the Role '#{@role.name}'")
+        end
+        action_name = params[:action].to_s == "create" ? "new" : "edit"
+        render_or_redirect(false, resource_url(@r_object), action_name)
+      end
+
+      def destroy
+        @user = @r_object = User.find_by_id(params[:id])
+        if @user
+          if @user.remove_role(@role)
+            get_collections
+            set_flash_message(I18n.t('success.deleted'), :success)
+            set_notification(true, I18n.t('status.success'), "Role '#{@role.name}' has been removed for the user '#{@user.name}'")
+            @destroyed = true
+          else
+            message = I18n.t('errors.failed_to_delete', item: default_item_name.titleize)
+            set_flash_message(message, :failure)
+            set_notification(false, I18n.t('status.success'), "Failed to remove the Role '#{@role.name}'")
+            @destroyed = false
+          end
+        else
+          set_notification(false, I18n.t('status.error'), I18n.t('status.not_found', item: default_item_name.titleize))
+        end
+
+        respond_to do |format|
+          format.html {}
+          format.js  { 
+            js_view_path = @resource_options && @resource_options[:js_view_path] ? "#{@resource_options[:js_view_path]}/destroy" : :destroy 
+            render js_view_path
+          }
+        end
+
+      end
+
+      private
+
+      def get_role
+        @role = Role.find_by_id(params[:role_id])
+      end
+
+      def get_collections
+        @relation = @role.users.where("")
+
+        parse_filters
+        apply_filters
+        
+        @users = @r_objects = @relation.page(@current_page).per(@per_page)
+        
+        return true
+      end
+
+      def apply_filters
+        @relation = @relation.search(@query) if @query
+        
+        @order_by = "name ASC" unless @order_by
+        @relation = @relation.order(@order_by)
+      end
+
+      def configure_filter_settings
+        @filter_settings = {
+          string_filters: [
+            { filter_name: :query }
+          ],
+          boolean_filters: [],
+          reference_filters: [],
+          variable_filters: [],
+        }
+      end
+
+      def configure_filter_ui_settings
+        @filter_ui_settings = {}
+      end
+
+      def resource_url(obj)
+        url_for([:admin, @role, obj])
+      end
+
+      def resource_controller_configuration
+        {
+          collection_name: :users,
+          item_name: :user,
+          class: User,
+          show_modal_after_update: false,
+          show_modal_after_update: false,
+          page_title: "Manage User Roles",
+          js_view_path: "/kuppayam/workflows/parrot",
+          view_path: "/usman/admin/user_roles"
+        }
+      end
+
+      def breadcrumbs_configuration
+        {
+          heading: "Manage User Roles",
+          description: "Listing all User Roles",
+          links: [{name: "Home", link: admin_dashboard_path, icon: 'fa-home'}]
+        }
+      end
+
+      def permitted_params
+        params.require(:user).permit(:id)
+      end
+
+      def set_navs
+        set_nav("admin/roles/user_roles")
+      end
+
+    end
+  end
+end

data/app/controllers/usman/admin/users_controller.rb

@@ -104,7 +104,9 @@ module Usman
 
       def resource_controller_configuration
         {
-          view_path: "usman/admin/users"
+          page_title: "Users",
+          js_view_path: "/kuppayam/workflows/peacock",
+          view_path: "/usman/admin/users"
         }
       end
 

data/app/helpers/usman/authentication_helper.rb

@@ -10,7 +10,14 @@ module Usman
     
     # Returns the default URL to which the system should redirect the user after successful authentication
     def default_redirect_url_after_sign_in
-      usman.admin_dashboard_url    
+      main_app.user_landing_url
+      # if @current_user.has_role?("Admin")
+      #   main_app.admin_dashboard_url
+      # elsif @current_user.has_role?("Admin")
+      #   main_app.store_dashboard_url
+      # else
+      #   main_app.admin_dashboard_url
+      # end
     end
 
     # Returns the default URL to which the system should redirect the user after an unsuccessful attempt to authorise a resource/page
@@ -22,11 +29,11 @@ module Usman
     # This method should also handle the redirection if it has come through a client appliction for authentication
     # In that case, it should persist the params passed by the client application
     def redirect_after_unsuccessful_authentication
-      params_hsh = {}
-      params_hsh[:client_app] = params[:client_app] if params[:client_app]
-      params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
-      params_hsh[:requested_url] = request.original_url if request.get?
-      redirect_to add_query_params(default_sign_in_url, params_hsh)
+      @params_hsh = {}
+      @params_hsh[:client_app] = params[:client_app] if params[:client_app]
+      @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
+      @params_hsh[:requested_url] = request.original_url if request.get?
+      redirect_to add_query_params(default_sign_in_url, @params_hsh)
       return
     end
 
@@ -49,6 +56,11 @@ module Usman
           redirect_after_unsuccessful_authentication
         }
         format.js {
+          @params_hsh = {}
+          @params_hsh[:client_app] = params[:client_app] if params[:client_app]
+          @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
+          @params_hsh[:requested_url] = request.original_url if request.get?
+          
           render(:partial => 'usman/sessions/sign_in.js.erb', :handlers => [:erb], :formats => [:js])
         }
       end
@@ -118,7 +130,6 @@ module Usman
       session[:last_user_id] = current_user.id if current_user
       user.start_session
       session[:id] = user.id
-      default_redirect_url_after_sign_in
       redirect_to default_redirect_url_after_sign_in
     end
 

data/app/models/feature.rb

@@ -1,8 +1,5 @@
 class Feature < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  
   # Constants
   UNPUBLISHED = "unpublished"
   PUBLISHED = "published"
@@ -47,9 +44,7 @@ class Feature < Usman::ApplicationRecord
   scope :published, -> { where(status: PUBLISHED) }
   scope :disabled, -> { where(status: DISABLED) }
 
-  def self.save_row_data(row, base_path)
-
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -60,33 +55,13 @@ class Feature < Usman::ApplicationRecord
     feature.status = Feature::UNPUBLISHED
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
-
-    ## Adding a profile picture
-    begin
-      image_path = image_base_path + "features/#{feature.name.parameterize}.png"
-      image_path = image_base_path + "features/#{feature.name.parameterize}}.jpg" unless File.exists?(image_path)
-      if File.exists?(image_path)
-        feature.build_feature_image
-        feature.feature_image.image = File.open(image_path)
-      else
-        summary = "Feature Image not found for feature: #{feature.name}"
-        details = "#{image_path}/png doesn't exists"
-        error_object.warnings << { summary: summary, details: details }
-      end
-    rescue => e
-      summary = "Error during processing: #{$!}"
-      details = "Feature: #{feature.name}, Image Path: #{image_path}"
-      stack_trace = "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      error_object.errors << { summary: summary, details: details, stack_trace: stack_trace }
-    end if feature.feature_image.blank?
-
-    if feature.valid? && (feature.feature_image.blank? || feature.feature_image.valid?)
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    if feature.valid?
       feature.save!
     else
       summary = "Error while saving feature: #{feature.name}"
       details = "Error! #{feature.errors.full_messages.to_sentence}"
-      details << ", #{feature.feature_image.errors.full_messages.to_sentence}" if feature.feature_image
       error_object.errors << { summary: summary, details: details }
     end
     return error_object
@@ -154,5 +129,17 @@ class Feature < Usman::ApplicationRecord
   def can_be_destroyed?
     return true
   end
+
+  def can_be_published?
+    unpublished? or disabled?
+  end
+
+  def can_be_unpublished?
+    published? or disabled?
+  end
+
+  def can_be_removed?
+    published? or unpublished? or disabled?
+  end
 	
 end

data/app/models/permission.rb

@@ -1,9 +1,6 @@
 class Permission < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-
-	# Associations
+  # Associations
   belongs_to :user
   belongs_to :feature
 
@@ -30,16 +27,14 @@ class Permission < Usman::ApplicationRecord
                                         LOWER(f.name) LIKE LOWER('%#{query}%')")}
 
 
-  def self.save_row_data(row, base_path)
-
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
     return if row[:user].blank? || row[:feature].blank?
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     user = User.find_by_username(row[:user])
     unless user

data/app/models/role.rb

@@ -1,8 +1,5 @@
 class Role < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  
   # Associations
   has_and_belongs_to_many :users
 
@@ -18,10 +15,10 @@ class Role < Usman::ApplicationRecord
   # == Examples
   #   >>> role.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(roles.name) LIKE LOWER('%#{query}%')")
                         }
 
-  def self.save_row_data(row, base_path)
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -31,7 +28,7 @@ class Role < Usman::ApplicationRecord
     role.name = row[:name]
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     if role.valid?
       role.save!

data/app/models/user.rb

@@ -1,9 +1,5 @@
 class User < Usman::ApplicationRecord
 
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  extend KuppayamValidators
-  
   # including Password Methods
   has_secure_password
 
@@ -26,7 +22,7 @@ class User < Usman::ApplicationRecord
 
   EXCLUDED_JSON_ATTRIBUTES = [:confirmation_token, :password_digest, :reset_password_token, :unlock_token, :status, :reset_password_sent_at, :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :confirmed_at, :confirmation_sent_at, :unconfirmed_email, :failed_attempts, :locked_at, :created_at, :updated_at]
   DEFAULT_PASSWORD = "Password@1"
-  SESSION_TIME_OUT = 30.minutes
+  SESSION_TIME_OUT = 120.minutes
 
   # Validations
   validates :name, presence: true
@@ -43,7 +39,7 @@ class User < Usman::ApplicationRecord
   has_one :profile_picture, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProfilePicture"
   has_many :permissions
   has_many :features, through: :permissions
-  has_and_belongs_to_many :users
+  has_and_belongs_to_many :roles
 
   
   # ------------------
@@ -59,10 +55,10 @@ class User < Usman::ApplicationRecord
   # == Examples
   #   >>> user.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(username) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(email) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(designation) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(users.name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.username) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.email) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.designation) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -70,10 +66,11 @@ class User < Usman::ApplicationRecord
   scope :pending, -> { where(status: PENDING) }
   scope :approved, -> { where(status: APPROVED) }
   scope :suspended, -> { where(status: SUSPENDED) }
+  
+  scope :super_admins, -> { where(super_admin: TRUE) }
+  scope :normal_users, -> { where(super_admin: FALSE) }
 
-  def self.save_row_data(row, base_path)
-
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -92,7 +89,7 @@ class User < Usman::ApplicationRecord
     user.assign_default_password
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     if user.valid?
       user.save!
@@ -102,33 +99,6 @@ class User < Usman::ApplicationRecord
       error_object.errors << { summary: summary, details: details }
     end
 
-    ## Adding a profile picture
-    begin
-      image_path = image_base_path + "users/#{user.username}.png"
-      image_path = image_base_path + "users/#{user.username}.jpg" unless File.exists?(image_path)
-      if File.exists?(image_path)
-        user.build_profile_picture
-        user.profile_picture.image = File.open(image_path)
-        if user.profile_picture.valid?
-          user.profile_picture.save
-        else
-          summary = "Error while saving user: #{user.name}"
-          details = "Error! #{user.errors.full_messages.to_sentence}"
-          details << ", #{user.profile_picture.errors.full_messages.to_sentence}" if user.profile_picture
-          error_object.errors << { summary: summary, details: details }
-        end
-      else
-        summary = "Profile Picture not found for user: #{user.name}"
-        details = "#{image_path}/png doesn't exists"
-        error_object.warnings << { summary: summary, details: details }
-      end
-    rescue => e
-      summary = "Error during processing: #{$!}"
-      details = "User: #{user.name}, Image Path: #{image_path}"
-      stack_trace = "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      error_object.errors << { summary: summary, details: details, stack_trace: stack_trace }
-    end if user.profile_picture.blank?
-
     return error_object
   end
 
@@ -223,6 +193,10 @@ class User < Usman::ApplicationRecord
     self.update_attribute(:token_created_at, Time.now)
   end
 
+  def expire_token!
+    self.update_attribute(:token_created_at, (Time.now - (SESSION_TIME_OUT + 1.minute)))
+  end
+
   def token_about_to_expire?
     return self.token_created_at.nil? || (Time.now > self.token_created_at + (SESSION_TIME_OUT - 1.minute))
   end
@@ -301,13 +275,40 @@ class User < Usman::ApplicationRecord
   end
 
   def can_be_deleted?
-    return true
+    suspended?
   end
 
   def can_be_edited?
     !suspended?
   end
 
+  def add_role(role)
+    return false unless self.approved?
+    role = Role.find_by_name(role) if role.is_a?(String)
+    if role
+      self.roles << role unless self.has_role?(role)
+      return true
+    else
+      return false
+    end
+  end
+
+  def remove_role(role)
+    role = Role.find_by_name(role) if role.is_a?(String)
+    self.roles.delete(role) if role
+  end
+
+  def has_role?(role)
+    role = Role.find_by_name(role) if role.is_a?(String)
+    if role && role.persisted?
+      return true if self.super_admin
+      self.roles.exists?(:id => [role.id])
+    else
+      return false
+    end
+    
+  end
+
   private
 
   def should_validate_password?
@@ -332,25 +333,4 @@ class User < Usman::ApplicationRecord
     return feature
   end
 
-  def get_role(role_name)
-    self.roles.find_by_id(role_name) || self.roles.find_by_name(role_name)
-  end
-
-  def add_role(role_name)
-    role = self.get_role(role_name)
-    self.roles << role if role && role.persists?
-  end
-
-  def remove_role(role_name)
-    role = self.get_role(role_name)
-    if role
-      self.roles.delete(role)
-    end
-  end
-
-  def has_role?(role_name)
-    role = self.get_role(role_name)
-    role && role.persists?
-  end
-
 end

data/app/models/usman/application_record.rb

@@ -1,5 +1,9 @@
 module Usman
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
+
+	  require 'kuppayam/importer.rb'
+	  extend Kuppayam::Importer
+	  extend KuppayamValidators
 	end
 end

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

@@ -37,6 +37,7 @@
 			
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
+			<!-- Admin Dashboard -->
 			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
 				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.admin_dashboard_url %>
 			</li>
@@ -52,29 +53,29 @@
 					<li class="<%= nav_class("admin/users") %>">
 				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
 				  </li>
-					
-					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
-					</li>
 				</ul>
-
 			</li>
 
+			<% if @current_user.super_admin? %>
 			<li class="">
 				<a href="/xenon/xenon-files/html/dashboard-1.html">
 					<i class="linecons-database"></i>
 					<span class="title">Master Data</span>
 				</a>
+
 				<ul>
 					<li class="">
 						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.admin_features_url %>
 					</li>
 
-					<li class="">
-						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Roles</span>"), usman.admin_roles_url %>
+					<li class="<%= nav_class("admin/users") %>">
+						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
 					</li>
 				</ul>
+
 			</li>
+			<% end %>
+
 		</ul>
 		
 	</div>