Bug-fix-patch4
# handling exception in while adding language # Implemented Yajra in users list table # custom filter and veiw option in users list table
This commit is contained in:
@@ -1148,5 +1148,12 @@ return [
|
||||
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
|
||||
];
|
||||
|
@@ -1585,5 +1585,11 @@ return [
|
||||
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
];
|
||||
|
@@ -1556,5 +1556,12 @@ return [
|
||||
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
|
||||
];
|
||||
|
@@ -1108,4 +1108,11 @@ return [
|
||||
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
];
|
||||
|
@@ -1602,4 +1602,11 @@ return [
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
];
|
||||
|
@@ -1547,4 +1547,12 @@ return [
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
|
||||
];
|
||||
|
@@ -1055,4 +1055,12 @@ return [
|
||||
|
||||
//update 18-12-2016
|
||||
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
|
||||
|
||||
//update 19-12-2016
|
||||
'only-agents' => 'Agent users',
|
||||
'only-users' => 'Clients users',
|
||||
'banned-users' => 'Banned users',
|
||||
'inactive-users' => 'Inactive users',
|
||||
'all-users' => 'All users',
|
||||
'search' => 'Search...',
|
||||
];
|
||||
|
@@ -34,20 +34,32 @@ class="active"
|
||||
|
||||
<div class="box-header with-border">
|
||||
<div class="row">
|
||||
<div>
|
||||
<div class="col-md-6">
|
||||
<h3 class="box-title ">{{Lang::get('lang.user')}}</h3>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-5">
|
||||
<div class="box-tools" style="width: 235px">
|
||||
<div class="has-feedback">
|
||||
<input type="text" class="form-control input-sm" id="search-text" name="search" placeholder="{{Lang::get('lang.search')}}">
|
||||
<span class="fa fa-search form-control-feedback"></span>
|
||||
</div>
|
||||
</div><!-- /.box-tools -->
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-7">
|
||||
<div class="pull-right">
|
||||
<div id="labels-div" class="btn-group">
|
||||
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" id="labels-button"><i class="fa fa-eye" style="color:teal;"> </i>{{Lang::get('lang.view-option')}}<span class="caret"></span>
|
||||
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" id="labels-button"><i class="fa fa-eye" style="color:teal;"> </i>{{Lang::get('lang.view-option')}}<span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu pull-right" role="menu">
|
||||
<li><a href="#" class="active">{{Lang::get('lang.active-users')}}</a></li>
|
||||
<li><a href="#" class="inactive">{{Lang::get('lang.deleted-users')}}</a></li>
|
||||
<ul class="dropdown-menu role="menu">
|
||||
<li class="active"><a href="#" class="all">{{Lang::get('lang.all-users')}}</a></li>
|
||||
<li><a href="#" class="agents">{{Lang::get('lang.only-agents')}}</a></li>
|
||||
<li><a href="#" class="users">{{Lang::get('lang.only-users')}}</a></li>
|
||||
<li><a href="#" class="active-users">{{Lang::get('lang.active-users')}}</a></li>
|
||||
<li><a href="#" class="inactive">{{Lang::get('lang.inactive-users')}}</a></li>
|
||||
<li><a href="#" class="deleted">{{Lang::get('lang.deleted-users')}}</a></li>
|
||||
<li><a href="#" class="banned">{{Lang::get('lang.banned-users')}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<a href="{{url('user-export')}}" class="btn btn-default btn-sm ">Export</a>
|
||||
|
@@ -7,8 +7,9 @@ foreach($segments as $seg){
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
jQuery(document).ready(function () {
|
||||
var show = 'active';
|
||||
oTable = myFunction(show);
|
||||
var show = 'all';
|
||||
var searchTerm = '';
|
||||
oTable = myFunction(show, searchTerm);
|
||||
|
||||
$("select[name=type_of_profile]").change(function () {
|
||||
//alert($('select[name=type_of_profile]').val());
|
||||
@@ -19,29 +20,73 @@ foreach($segments as $seg){
|
||||
function myFunction(show)
|
||||
{
|
||||
return jQuery('#chumper').dataTable({
|
||||
"sDom": "<'row'<'col-xs-6'l><'col-xs-6'>r>"+
|
||||
"t"+
|
||||
"<'row'<'col-xs-6'i><'col-xs-6'p>>",
|
||||
"sPaginationType": "full_numbers",
|
||||
"bProcessing": true,
|
||||
"bServerSide": true,
|
||||
"ajax": {
|
||||
url: "{{url('user-list')}}",
|
||||
data: function (d) {
|
||||
d.profiletype = show;
|
||||
d.searchTerm = searchTerm;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
$('.active').on('click', function(){
|
||||
$('.all').on('click', function(){
|
||||
show = 'all';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
$('.active-users').on('click', function(){
|
||||
show = 'active';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show);
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
$('.inactive').on('click', function(){
|
||||
show = 'inactive';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show);
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
});
|
||||
|
||||
$('.agents').on('click', function(){
|
||||
show = 'agents';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
$('.users').on('click', function(){
|
||||
show = 'users';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
$('.banned').on('click', function(){
|
||||
show = 'banned';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
$('.deleted').on('click', function(){
|
||||
show = 'deleted';
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
});
|
||||
|
||||
document.getElementById('search-text').onkeypress = function(e){
|
||||
if (!e) e = window.event;
|
||||
var keyCode = e.keyCode || e.which;
|
||||
if (keyCode == '13'){
|
||||
searchTerm = $('input[name=search]').val();
|
||||
$("#chumper").dataTable().fnDestroy();
|
||||
myFunction(show, searchTerm);
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
Reference in New Issue
Block a user