Merge pull request #522 from scott/dev/add-users-priority

Adds a priority to the users, Closes #499
helpyio · Jan 21, 2017 · 33204ed · 33204ed
2 parents b451d2b + ee0adbd
commit 33204ed
Show file tree

Hide file tree

Showing 25 changed files with 351 additions and 90 deletions.
diff --git a/app/controllers/api/v1/users.rb b/app/controllers/api/v1/users.rb
@@ -79,6 +79,7 @@ class Users < Grape::API
           optional :linkedin, type: String, desc: "Users Linkedin username"
           optional :language, type: String, desc: "Users prefered language"
           optional :active, type: Boolean, desc: "User active or deactivated", default: true
+          optional :priority, type: String, desc: "Users Priority", values: ['low', 'normal', 'high', 'vip'], default: 'normal'
         end
         post "", root: :users do
           user = User.create!(
@@ -103,7 +104,8 @@ class Users < Grape::API
             twitter: permitted_params[:twitter],
             linkedin: permitted_params[:linkedin],
             language: permitted_params[:language],
-            active: permitted_params[:active]
+            active: permitted_params[:active],
+            priority: permitted_params[:priority]
             )
           present user, with: Entity::User
         end
@@ -137,6 +139,7 @@ class Users < Grape::API
           optional :linkedin, type: String, desc: "Users Linkedin username"
           optional :language, type: String, desc: "Users prefered language"
           optional :active, type: Boolean, desc: "User active or deactivated"
+          optional :priority, type: String, desc: "Users Priority- low, normal, high or vip", default: 'normal'
         end
         patch ":id", root: :users do
           user = User.where(id: permitted_params[:id]).first
@@ -162,7 +165,8 @@ class Users < Grape::API
             twitter: permitted_params[:twitter],
             linkedin: permitted_params[:linkedin],
             language: permitted_params[:language],
-            active: permitted_params[:active]
+            active: permitted_params[:active],
+            priority: permitted_params[:priority]
             )
           present user, with: Entity::User
         end

diff --git a/app/models/entity/user.rb b/app/models/entity/user.rb
@@ -31,5 +31,6 @@ class User < Base
     expose :sign_in_count, documentation: { type: "Integer" }
     expose :team_list
     expose :account_number
+    expose :priority
   end
 end
diff --git a/app/views/admin/users/_edit.html.erb b/app/views/admin/users/_edit.html.erb
@@ -10,6 +10,7 @@
       <%#= @topic.user.country.titleize unless @topic.user.country.nil? %>
       <%= f.select(:role, [[t('select_role'),''],[t('admin_role'),'admin'],[t('agent_role'),'agent'],[t('editor_role'),'editor'],[t('user_role'),'user']]) if current_user.is_admin? %>
       <%= f.text_field :team_list, value: @user.team_list.to_s, class: 'selectize form-control', label: "Group Membership" if AppSettings['settings.teams'] && current_user.is_admin? && @user.is_agent? %>
+      <%= f.select(:priority, [[t('select_priority'),'Select Priority'],[t('low_priority'),'low'],[t('normal_priority'),'normal'],[t('high_priority'),'high'],[t('vip_priority'),'vip']]) if current_user.is_admin? %>
       <%= f.check_box :active %> <%#= f.check_box :admin, inline: true %>
     </div>
     <div class="user-section">

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -83,10 +83,10 @@ ca:
   # version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Iniciar sessió
@@ -161,6 +161,13 @@ ca:
   work_phone: feina
   cell_phone: mòbil
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 usuari trobat amb nom %{query}"
@@ -329,4 +336,4 @@ ca:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -83,10 +83,10 @@ de:
   version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Anmelden
@@ -161,6 +161,13 @@ de:
   work_phone: Arbeit
   cell_phone: Handy
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 Benutzer mit dem Namen %{query} wurde gefunden"

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -164,6 +164,13 @@ en:
   work_phone: work
   cell_phone: cell
 
+  # Priorities
+  select_priority: Select Priority
+  vip_priority: VIP
+  high_priority: High
+  normal_priority: Normal
+  low_priority: Low
+
   # Roles
   select_role: Select Role
   admin_role: Admin

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -83,10 +83,10 @@ es:
   version: "Versión:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Iniciar sesión
@@ -161,6 +161,13 @@ es:
   work_phone: trabajo
   cell_phone: móvil
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 usuario encontrado con nombre %{query}"
@@ -330,4 +337,4 @@ es:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/et.yml b/config/locales/et.yml
@@ -80,10 +80,10 @@ et:
   # version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # Profile
   my_profile: 'Minu profiil'
@@ -161,6 +161,13 @@ et:
   work_phone: töö
   cell_phone: telefon
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 kasutaja leitud %{query}"
@@ -323,4 +330,4 @@ et:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -83,10 +83,10 @@ fa:
   version: "نسخه:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: ورود
@@ -161,6 +161,13 @@ fa:
   work_phone: تلفن دفتر
   cell_phone: موبایل
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "۱ کاربر با اسم %{query} پیدا شد"
@@ -375,4 +382,4 @@ fa:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -83,10 +83,10 @@ fr:
   # version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Connexion
@@ -161,6 +161,13 @@ fr:
   work_phone: téléphone professionnel
   cell_phone: portable
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 utilisateur nommé %{query} a été trouvé"

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
@@ -83,10 +83,10 @@ hi:
   # version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: लॉगिन
@@ -161,6 +161,13 @@ hi:
   work_phone: काम
   cell_phone: मोबाइल
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 यूजर नामित %{query} मिला था"
@@ -331,4 +338,4 @@ hi:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
@@ -83,10 +83,10 @@ hu:
   version: "Verzió:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Bejelentkezés
@@ -164,6 +164,13 @@ hu:
   work_phone: munka
   cell_phone: mobil
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 felhasználó található ez alapján: %{query}"
@@ -379,4 +386,4 @@ hu:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -83,10 +83,10 @@ it:
   version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: Accedi
@@ -161,6 +161,13 @@ it:
   work_phone: Telefono (Business)
   cell_phone: telefonine
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 utente col nome %{query}"
@@ -376,4 +383,4 @@ it:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -83,10 +83,10 @@ ja:
   # version: "Version:"
 
   # flag
-  #flag_for_review: 
-  #flag_post_for_review: 
+  #flag_for_review:
+  #flag_post_for_review:
   #flag_post_placeholder:
-  #flag: 
+  #flag:
 
   # devise/sessions/new
   login: ログイン
@@ -161,6 +161,13 @@ ja:
   work_phone: "職場の電話番号"
   cell_phone: "携帯電話番号"
 
+  # Priorities
+  # select_priority: Select Priority
+  # vip_priority: VIP
+  # high_priority: High
+  # normal_priority: Normal
+  # low_priority: Low
+
   # User search results
   users_found:
     one: "1 ユーザーを見つけました"
@@ -331,4 +338,4 @@ ja:
           million: M
           billion: B
           trillion: T
-          quadrillion: Q      
+          quadrillion: Q