m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

admins: add school name and hidden phone to laboratory users add modal

Browse Source
dev_sync_trustie
p31729568 5 years ago
parent 097f20bebf
commit a547aebe0b
20 changed files with 3404 additions and 444 deletions
Show Stats Download Patch File Download Diff File

2
app/assets/javascripts/admins/laboratories/index.js
Unescape View File

@ -135,7 +135,7 @@ $(document).on('turbolinks:load', function() {
}, },
templateResult: function (item) { templateResult: function (item) {
if(!item.id || item.id === '') return item.text; if(!item.id || item.id === '') return item.text;
return item.real_name; return $("<span>" + item.real_name + " <span class='font-12'>" + item.school_name + ' ' + item.hidden_phone + "</span></span>");
}, },
templateSelection: function(item){ templateSelection: function(item){
if (item.id) { if (item.id) {

2
app/assets/javascripts/cooperative/laboratory_users/index.js
Unescape View File

@ -27,7 +27,7 @@ $(document).on('turbolinks:load', function() {
}, },
templateResult: function (item) { templateResult: function (item) {
if(!item.id || item.id === '') return item.text; if(!item.id || item.id === '') return item.text;
return item.real_name + "--" + item.identity; return $("<span>" + item.real_name + " <span class='font-12'>" + item.school_name + ' ' + item.hidden_phone + "</span></span>");
}, },
templateSelection: function(item){ templateSelection: function(item){
if (item.id) { if (item.id) {

9
app/controllers/cooperative/users_controller.rb
Unescape View File

@ -2,9 +2,14 @@ class Cooperative::UsersController < Cooperative::BaseController
def index def index
params[:sort_by] = params[:sort_by].presence || 'created_on' params[:sort_by] = params[:sort_by].presence || 'created_on'
params[:sort_direction] = params[:sort_direction].presence || 'desc' params[:sort_direction] = params[:sort_direction].presence || 'desc'
params[:school_id] = current_laboratory.school_id
users = Admins::UserQuery.call(params) users = Admins::UserQuery.call(search_params)
@users = paginate users.includes(user_extension: :school) @users = paginate users.includes(user_extension: :school)
end end
private
def search_params
params.permit(:name, :sort_by, :sort_direction)
end
end end

2
app/libs/util.rb
Unescape View File

@ -60,7 +60,7 @@ module Util
return if str.blank? return if str.blank?
case type case type
when :phone then "#{str[0..2]}***#{str[-3..-1]}" when :phone then "#{str[0..2]}****#{str[-4..-1]}"
when :email then "#{str[0]}***#{str[(str.rindex('@')-1)..-1]}" when :email then "#{str[0]}***#{str[(str.rindex('@')-1)..-1]}"
else "#{str[0..2]}***#{str[-3..-1]}" else "#{str[0..2]}***#{str[-3..-1]}"
end end

2
app/views/admins/users/index.json.jbuilder
Unescape View File

@ -1,6 +1,6 @@
json.count @users.total_count json.count @users.total_count
json.users do json.users do
json.array! @users.each do |user| json.array! @users.each do |user|
json.extract! user, :id, :login, :real_name, :identity, :school_name json.extract! user, :id, :login, :real_name, :identity, :school_name, :hidden_phone
end end
end end

2
app/views/cooperative/users/index.json.jbuilder
Unescape View File

@ -1,6 +1,6 @@
json.count @users.total_count json.count @users.total_count
json.users do json.users do
json.array! @users.each do |user| json.array! @users.each do |user|
json.extract! user, :id, :login, :real_name, :identity, :school_name json.extract! user, :id, :login, :real_name, :identity, :school_name, :hidden_phone
end end
end end

2
public/assets/.sprockets-manifest-4627fa5586ef7fed55ca286af7c028e9.json
View File

File diff suppressed because one or more lines are too long

90
public/assets/admin-60d200c1fcdf61a60537d29ccf4479c6b1e5e904208870a63b8ee677c96b347e.css → public/assets/admin-7ce3dd717f7d12fcbc64caf14200230a1e68db439be0ba1879077599ff2c32c6.css
Unescape View File

@ -24796,68 +24796,93 @@ input.form-control {
} }
/* line 37, app/assets/stylesheets/common.scss */ /* line 37, app/assets/stylesheets/common.scss */
.font-20 {
font-size: 20px !important;
}
/* line 38, app/assets/stylesheets/common.scss */
.font-24 {
font-size: 24px !important;
}
/* line 39, app/assets/stylesheets/common.scss */
.padding10-5 { .padding10-5 {
padding: 10px 5px; padding: 10px 5px;
} }
/* line 38, app/assets/stylesheets/common.scss */ /* line 40, app/assets/stylesheets/common.scss */
.width100 { .width100 {
width: 100%; width: 100%;
} }
/* line 39, app/assets/stylesheets/common.scss */ /* line 41, app/assets/stylesheets/common.scss */
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
/* line 40, app/assets/stylesheets/common.scss */ /* line 42, app/assets/stylesheets/common.scss */
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
/* line 41, app/assets/stylesheets/common.scss */ /* line 43, app/assets/stylesheets/common.scss */
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
/* line 42, app/assets/stylesheets/common.scss */ /* line 44, app/assets/stylesheets/common.scss */
.ml10 {
margin-left: 10px;
}
/* line 44, app/assets/stylesheets/common.scss */
.ml20 {
margin-left: 20px;
}
/* line 45, app/assets/stylesheets/common.scss */
.textarea-width-100 { .textarea-width-100 {
width: 100%; width: 100%;
resize: none; resize: none;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
/* line 43, app/assets/stylesheets/common.scss */ /* line 46, app/assets/stylesheets/common.scss */
.padding10 { .padding10 {
padding: 10px; padding: 10px;
} }
/* line 44, app/assets/stylesheets/common.scss */ /* line 47, app/assets/stylesheets/common.scss */
.padding5-10 { .padding5-10 {
padding: 5px 10px; padding: 5px 10px;
} }
/* line 45, app/assets/stylesheets/common.scss */ /* line 48, app/assets/stylesheets/common.scss */
.position-r { .position-r {
position: relative; position: relative;
} }
/* line 46, app/assets/stylesheets/common.scss */ /* line 49, app/assets/stylesheets/common.scss */
.color-grey-c { .color-grey-c {
color: #ccc; color: #ccc;
} }
/* line 47, app/assets/stylesheets/common.scss */ /* line 50, app/assets/stylesheets/common.scss */
.color-blue {
color: #4CACFF;
}
/* line 51, app/assets/stylesheets/common.scss */
.inline-block { .inline-block {
display: inline-block; display: inline-block;
} }
/* line 48, app/assets/stylesheets/common.scss */ /* line 52, app/assets/stylesheets/common.scss */
.hide { .hide {
display: none; display: none;
} }
/* line 49, app/assets/stylesheets/common.scss */ /* line 53, app/assets/stylesheets/common.scss */
.show { .show {
display: block; display: block;
} }
@ -25171,6 +25196,47 @@ input.form-control {
background: #fff; background: #fff;
} }
/* line 3, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .competition-mode-container .row {
height: 35px;
}
/* line 7, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .competition-mode-container .des-row {
height: auto;
}
/* line 11, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .competition-mode-container .form-control {
font-size: 14px;
}
/* line 22, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .col-md-label {
-webkit-box-flex: 0;
flex: 0 0 10%;
max-width: 10%;
min-width: 30px;
padding-right: 15px;
padding-left: 15px;
position: relative;
}
/* line 31, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .col-md-label-s {
-webkit-box-flex: 0;
flex: 0 0 30px;
padding-right: 15px;
padding-left: 15px;
position: relative;
}
/* line 38, app/assets/stylesheets/admins/competition_settings.scss */
.admins-competition-settings-index-page .setBtn_s {
height: 35px;
line-height: 5px;
}
/* line 4, app/assets/stylesheets/admins/cooperatives.scss */ /* line 4, app/assets/stylesheets/admins/cooperatives.scss */
.admins-cooperatives-index-page .coo-img-card .coo-img-item > .drag { .admins-cooperatives-index-page .coo-img-card .coo-img-item > .drag {
cursor: move; cursor: move;

BIN
public/assets/admin-60d200c1fcdf61a60537d29ccf4479c6b1e5e904208870a63b8ee677c96b347e.css.gz → public/assets/admin-7ce3dd717f7d12fcbc64caf14200230a1e68db439be0ba1879077599ff2c32c6.css.gz
View File

Binary file not shown.

3637
public/assets/admin-c8c127fefa5eca98bca19832c246619318164e8f242635c07033e2423cc18a6f.js → public/assets/admin-a11066081d60365ddf25d5867560d1ccdd3197dbe82a5b6e969cc940e3429ff1.js
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/admin-a11066081d60365ddf25d5867560d1ccdd3197dbe82a5b6e969cc940e3429ff1.js.gz
View File

Binary file not shown.

BIN
public/assets/admin-c8c127fefa5eca98bca19832c246619318164e8f242635c07033e2423cc18a6f.js.gz
View File

Binary file not shown.

BIN
public/assets/application-9cfbc3d792599a1d0de5c7b84209e1c2b2e60336f0f01e19f0581663918708fb.js.gz
View File

Binary file not shown.

BIN
public/assets/college-18f5e8400331634e898a35acc2187815c096c25e0ab74aba341ae916166cd287.js.gz
View File

Binary file not shown.

49
public/assets/college-38f953d6ba5b85d3fab63cb3c2bbf0d057ccc6454d07cfaafac3b06da37b8437.css → public/assets/college-93904c65d52c125aec0a463b9fd98bedda0018b78707f806be22685cca5d3747.css
Unescape View File

@ -15788,68 +15788,93 @@ input.form-control {
} }
/* line 37, app/assets/stylesheets/common.scss */ /* line 37, app/assets/stylesheets/common.scss */
.font-20 {
font-size: 20px !important;
}
/* line 38, app/assets/stylesheets/common.scss */
.font-24 {
font-size: 24px !important;
}
/* line 39, app/assets/stylesheets/common.scss */
.padding10-5 { .padding10-5 {
padding: 10px 5px; padding: 10px 5px;
} }
/* line 38, app/assets/stylesheets/common.scss */ /* line 40, app/assets/stylesheets/common.scss */
.width100 { .width100 {
width: 100%; width: 100%;
} }
/* line 39, app/assets/stylesheets/common.scss */ /* line 41, app/assets/stylesheets/common.scss */
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
/* line 40, app/assets/stylesheets/common.scss */ /* line 42, app/assets/stylesheets/common.scss */
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
/* line 41, app/assets/stylesheets/common.scss */ /* line 43, app/assets/stylesheets/common.scss */
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
/* line 42, app/assets/stylesheets/common.scss */ /* line 44, app/assets/stylesheets/common.scss */
.ml10 {
margin-left: 10px;
}
/* line 44, app/assets/stylesheets/common.scss */
.ml20 {
margin-left: 20px;
}
/* line 45, app/assets/stylesheets/common.scss */
.textarea-width-100 { .textarea-width-100 {
width: 100%; width: 100%;
resize: none; resize: none;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
/* line 43, app/assets/stylesheets/common.scss */ /* line 46, app/assets/stylesheets/common.scss */
.padding10 { .padding10 {
padding: 10px; padding: 10px;
} }
/* line 44, app/assets/stylesheets/common.scss */ /* line 47, app/assets/stylesheets/common.scss */
.padding5-10 { .padding5-10 {
padding: 5px 10px; padding: 5px 10px;
} }
/* line 45, app/assets/stylesheets/common.scss */ /* line 48, app/assets/stylesheets/common.scss */
.position-r { .position-r {
position: relative; position: relative;
} }
/* line 46, app/assets/stylesheets/common.scss */ /* line 49, app/assets/stylesheets/common.scss */
.color-grey-c { .color-grey-c {
color: #ccc; color: #ccc;
} }
/* line 47, app/assets/stylesheets/common.scss */ /* line 50, app/assets/stylesheets/common.scss */
.color-blue {
color: #4CACFF;
}
/* line 51, app/assets/stylesheets/common.scss */
.inline-block { .inline-block {
display: inline-block; display: inline-block;
} }
/* line 48, app/assets/stylesheets/common.scss */ /* line 52, app/assets/stylesheets/common.scss */
.hide { .hide {
display: none; display: none;
} }
/* line 49, app/assets/stylesheets/common.scss */ /* line 53, app/assets/stylesheets/common.scss */
.show { .show {
display: block; display: block;
} }

BIN
public/assets/college-38f953d6ba5b85d3fab63cb3c2bbf0d057ccc6454d07cfaafac3b06da37b8437.css.gz → public/assets/college-93904c65d52c125aec0a463b9fd98bedda0018b78707f806be22685cca5d3747.css.gz
View File

Binary file not shown.

49
public/assets/cooperative-6273b766d6ef11dd56174d868bab55e7f17af17546c888d2ba0dd0a6bcda76c8.css → public/assets/cooperative-10a9ee5177e196572573ccea460e133c748072e223fdb473d05ee72c991fbbe3.css
Unescape View File

@ -24796,68 +24796,93 @@ input.form-control {
} }
/* line 37, app/assets/stylesheets/common.scss */ /* line 37, app/assets/stylesheets/common.scss */
.font-20 {
font-size: 20px !important;
}
/* line 38, app/assets/stylesheets/common.scss */
.font-24 {
font-size: 24px !important;
}
/* line 39, app/assets/stylesheets/common.scss */
.padding10-5 { .padding10-5 {
padding: 10px 5px; padding: 10px 5px;
} }
/* line 38, app/assets/stylesheets/common.scss */ /* line 40, app/assets/stylesheets/common.scss */
.width100 { .width100 {
width: 100%; width: 100%;
} }
/* line 39, app/assets/stylesheets/common.scss */ /* line 41, app/assets/stylesheets/common.scss */
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
/* line 40, app/assets/stylesheets/common.scss */ /* line 42, app/assets/stylesheets/common.scss */
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
/* line 41, app/assets/stylesheets/common.scss */ /* line 43, app/assets/stylesheets/common.scss */
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
/* line 42, app/assets/stylesheets/common.scss */ /* line 44, app/assets/stylesheets/common.scss */
.ml10 {
margin-left: 10px;
}
/* line 44, app/assets/stylesheets/common.scss */
.ml20 {
margin-left: 20px;
}
/* line 45, app/assets/stylesheets/common.scss */
.textarea-width-100 { .textarea-width-100 {
width: 100%; width: 100%;
resize: none; resize: none;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
/* line 43, app/assets/stylesheets/common.scss */ /* line 46, app/assets/stylesheets/common.scss */
.padding10 { .padding10 {
padding: 10px; padding: 10px;
} }
/* line 44, app/assets/stylesheets/common.scss */ /* line 47, app/assets/stylesheets/common.scss */
.padding5-10 { .padding5-10 {
padding: 5px 10px; padding: 5px 10px;
} }
/* line 45, app/assets/stylesheets/common.scss */ /* line 48, app/assets/stylesheets/common.scss */
.position-r { .position-r {
position: relative; position: relative;
} }
/* line 46, app/assets/stylesheets/common.scss */ /* line 49, app/assets/stylesheets/common.scss */
.color-grey-c { .color-grey-c {
color: #ccc; color: #ccc;
} }
/* line 47, app/assets/stylesheets/common.scss */ /* line 50, app/assets/stylesheets/common.scss */
.color-blue {
color: #4CACFF;
}
/* line 51, app/assets/stylesheets/common.scss */
.inline-block { .inline-block {
display: inline-block; display: inline-block;
} }
/* line 48, app/assets/stylesheets/common.scss */ /* line 52, app/assets/stylesheets/common.scss */
.hide { .hide {
display: none; display: none;
} }
/* line 49, app/assets/stylesheets/common.scss */ /* line 53, app/assets/stylesheets/common.scss */
.show { .show {
display: block; display: block;
} }

BIN
public/assets/cooperative-6273b766d6ef11dd56174d868bab55e7f17af17546c888d2ba0dd0a6bcda76c8.css.gz → public/assets/cooperative-10a9ee5177e196572573ccea460e133c748072e223fdb473d05ee72c991fbbe3.css.gz
View File

Binary file not shown.

2
public/assets/cooperative-9fb7ac4ad44081fafd5ad2a3a1bfb7f4329ac96f28bc6446d1ff52b1e2e71286.js → public/assets/cooperative-84c79d26a36aff5b496551b6d21b1bfb726b1bbc4153435a366115e96c204e06.js
Unescape View File

@ -134069,7 +134069,7 @@ $(document).on('turbolinks:load', function() {
}, },
templateResult: function (item) { templateResult: function (item) {
if(!item.id || item.id === '') return item.text; if(!item.id || item.id === '') return item.text;
return item.real_name + "--" + item.identity; return $("<span>" + item.real_name + " <span class='font-12'>" + item.school_name + ' ' + item.hidden_phone + "</span></span>");
}, },
templateSelection: function(item){ templateSelection: function(item){
if (item.id) { if (item.id) {

BIN
public/assets/cooperative-9fb7ac4ad44081fafd5ad2a3a1bfb7f4329ac96f28bc6446d1ff52b1e2e71286.js.gz → public/assets/cooperative-84c79d26a36aff5b496551b6d21b1bfb726b1bbc4153435a366115e96c204e06.js.gz
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save