added sender ID to the clients Tab in Show view plus bug fixes

This commit is contained in:
Kwesi Banson
2024-08-26 10:23:49 +00:00
parent 4a0248e40d
commit 6cede6d980
54 changed files with 1948 additions and 120 deletions

View File

@@ -0,0 +1,100 @@
@extends('layouts.master')
@section('page_title')
@if(isset($page_title))
{{ $page_title }}
@endif
@endsection
@section('content')
<div class="">
<div class="page-title">
<div class="title_left" style="width:800px !important;">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li><a href="{!! url('infrastructure/server-list') !!}">Server List</a></li>
<li class="active">Add Server</li>
</ol>
</div>
</div>
<div class="clearfix"></div>
<div class="row">
@include('commons.notifications')
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
Add Server
<div class="clearfix"></div>
</div>
{{-- start of content --}}
<div class="x_content">
<br>
{!! Form::open(['url' => 'infrastructure/storeserver', 'class' => 'form-horizontal form-label-left']) !!}
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="serverNumber">DS Number *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('server_number') ? 'has-error' : ''}}">
{!! Form::text('server_number', old('server_id'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter DS number' , 'id' => 'serverNumber']) !!}
{!! $errors->first('server_number', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="friendlyName">Friendly Name *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('friendly_name') ? 'has-error' : ''}}">
{!! Form::text('friendly_name', old('friendly_name'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter partner name' , 'id' => 'friendlyName']) !!}
{!! $errors->first('friendly_name', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="publicIpAddress">Public IP Address </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('public_ip_address') ? 'has-error' : ''}}">
{!! Form::text('public_ip_address', old('public_ip_address'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Public IP Address' , 'id' => 'publicIpAddress']) !!}
{!! $errors->first('public_ip_address', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="privateIpAddress">Private IP Address </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('private_ip_address') ? 'has-error' : ''}}">
{!! Form::text('private_ip_address', old('private_ip_address'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter private ip address' , 'id' => 'privateIpAddress']) !!}
{!! $errors->first('private_ip_address', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="mainUse">Main Use</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('main_use') ? 'has-error' : ''}}">
{!! Form::text('main_use', old('main_use'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter main use' , 'id' => 'mainUse']) !!}
{!! $errors->first('main_use', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="remarks">Remarks </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('remarks') ? 'has-error' : ''}}">
{!! Form::text('remarks', old('remarks'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter remarks' , 'id' => 'remarks']) !!}
{!! $errors->first('remarks', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="ln_solid"></div>
<div class="form-group">
<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
<button type="submit" class="btn btn-success btn-block"><i class="fa fa-save"></i> Update</button>
</div>
</div>
{!! Form::close() !!}
</div>
{{-- end of x_content --}}
</div>
{{-- end of x_panel --}}
</div>
</div>
</div>
@endsection
@section('javascript')
<script type="text/javascript">
$(function(){
$('select').select2();
});
</script>
@endsection

View File

@@ -0,0 +1,111 @@
@extends('layouts.master')
@section('page_title')
@if(isset($page_title))
{{ $page_title }}
@endif
@endsection
@section('content')
<div class="">
<div class="page-title">
<div class="title_left" style="width:800px !important;">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li><a href="{!! url('systemcreds') !!}">Credentials List</a></li>
<li class="active">Add Credentials</li>
</ol>
</div>
</div>
<div class="clearfix"></div>
<div class="row">
@include('commons.notifications')
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
Add Credentials
<div class="clearfix"></div>
</div>
{{-- start of content --}}
<div class="x_content">
<br>
{!! Form::open(['url' => 'systemcreds', 'class' => 'form-horizontal form-label-left']) !!}
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="serviceName">Service *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('service') ? 'has-error' : ''}}">
{!! Form::select('service', $services, old('service'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Select Service Type' , 'id' => 'serviceName']) !!}
{!! $errors->first('service', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="clientID">Client Name *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('client') ? 'has-error' : ''}}">
{!! Form::select('client_id', $clients, old('client_id'), ['class' => 'form-control', 'placeholder'=>'Select Client' , 'id' => 'clientID', 'required' => 'true']) !!}
{!! $errors->first('client_id', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="networkOpsID">Network Operator *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('network_operator_id') ? 'has-error' : ''}}">
{!! Form::select('network_operator_id', $network_arr, old('network_operator_id'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Select Network ' , 'id' => 'networkOpsID', 'required' => 'true']) !!}
{!! $errors->first('network_operator_id', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="UrlEndpoint">URL/Endpoint *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('url_endpoint') ? 'has-error' : ''}}">
{!! Form::text('url_endpoint', old('url_endpoint'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter url/endpoint' , 'id' => 'UrlEndpoint']) !!}
{!! $errors->first('url_endpoint', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="credentials">Credentials *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('main_use') ? 'has-error' : ''}}">
{!! Form::textarea('credentials', old('credentials'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter main credentials' , 'rows' => '4', 'id' => 'credentials']) !!}
{!! $errors->first('credentials', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="expiryDate">Expiry Date *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('main_use') ? 'has-error' : ''}}">
{!! Form::text('expiry_date', old('expiry_date'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Select date' , 'id' => 'expiryDate']) !!}
{!! $errors->first('expiry_date', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="remarks">Remarks</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('remarks') ? 'has-error' : ''}}">
{!! Form::textarea('remarks', old('remarks'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter remarks' , 'rows' => '3', 'id' => 'remarks']) !!}
{!! $errors->first('remarks', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="ln_solid"></div>
<div class="form-group">
<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
<button type="submit" class="btn btn-success btn-block"><i class="fa fa-save"></i> Update</button>
</div>
</div>
{!! Form::close() !!}
</div>
{{-- end of x_content --}}
</div>
{{-- end of x_panel --}}
</div>
</div>
</div>
@endsection
@section('javascript')
<script type="text/javascript">
$(function(){
$('select').select2();
$('#expiryDate').datetimepicker({
format: 'YYYY-MM-DD'
});
});
</script>
@endsection

View File

@@ -0,0 +1,107 @@
@extends('layouts.master')
@section('page_title')
@if(isset($page_title))
{{ $page_title }}
@endif
@endsection
@section('content')
<div class="">
<div class="page-title">
<div class="title_left" style="width:800px !important;">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li><a href="{!! url('infrastructure/server-list') !!}">Server List</a></li>
<li class="active">Update Server</li>
</ol>
</div>
</div>
<div class="clearfix"></div>
<div class="row">
@include('commons.notifications')
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
Updating Server Details for <b><em>{{ $server->friendly_name }} | {{ $server->public_ip_address}} ({{ $server->private_ip_address}} )</em></b>
<div class="clearfix"></div>
</div>
{{-- start of content --}}
<div class="x_content">
<br>
{!! Form::open(['url' => 'infrastructure/updateserver', 'class' => 'form-horizontal form-label-left']) !!}
<input type="hidden" name="server_id" value="{{ $server->id }}">
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="serverNumber">DS Number *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('server_number') ? 'has-error' : ''}}">
{!! Form::text('server_number', $server->server_id, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter DS number' , 'id' => 'serverNumber']) !!}
{!! $errors->first('server_number', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="friendlyName">Friendly Name *</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('friendly_name') ? 'has-error' : ''}}">
{!! Form::text('friendly_name', $server->friendly_name, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter partner name' , 'id' => 'friendlyName']) !!}
{!! $errors->first('friendly_name', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="publicIpAddress">Public IP Address </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('public_ip_address') ? 'has-error' : ''}}">
{!! Form::text('public_ip_address', $server->public_ip_address, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Public IP Address' , 'id' => 'publicIpAddress']) !!}
{!! $errors->first('public_ip_address', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="privateIpAddress">Private IP Address </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('private_ip_address') ? 'has-error' : ''}}">
{!! Form::text('private_ip_address', $server->private_ip_address, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter private ip address' , 'id' => 'privateIpAddress']) !!}
{!! $errors->first('private_ip_address', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="mainUse">Main Use</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('main_use') ? 'has-error' : ''}}">
{!! Form::text('main_use', $server->main_use, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter main user' , 'id' => 'mainUse']) !!}
{!! $errors->first('main_use', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="remarks">Remarks </label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('remarks') ? 'has-error' : ''}}">
{!! Form::text('remarks', $server->remarks, ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter remarks' , 'id' => 'remarks']) !!}
{!! $errors->first('remarks', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="serverStatus">Status</label>
<div class="col-md-6 col-sm-6 col-xs-12 {{ $errors->has('status') ? 'has-error' : ''}}">
{!! Form::select('status', $status_arr ,old('status'), ['class' => 'form-control col-md-7 col-xs-12', 'id' => 'serverStatus']) !!}
{!! $errors->first('status', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="ln_solid"></div>
<div class="form-group">
<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
<button type="submit" class="btn btn-success btn-block"><i class="fa fa-save"></i> Update</button>
</div>
</div>
{!! Form::close() !!}
</div>
{{-- end of x_content --}}
</div>
{{-- end of x_panel --}}
</div>
</div>
</div>
@endsection
@section('javascript')
<script type="text/javascript">
$(function(){
$('select').select2();
});
</script>
@endsection

View File

@@ -0,0 +1,186 @@
@extends('layouts.master')
@section('page_title')
@if(isset($page_title))
{{ $page_title }}
@endif
@endsection
@section('css')
<link href="{!! url('public/assets/vendors/tabulator/css/bootstrap/tabulator_bootstrap.css') !!}" type="text/css" rel="stylesheet">
@endsection
@section('content')
<div class="">
<div class="page-title">
<div class="title_left">
<div class="title_left">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li class="active">Credentials</li>
</ol>
</div>
</div>
<div class="title_right">
<div class="row">
</div>
<div class="row">
<div class="col-sm-12">
<div class="pull-right">
<!-- <a href="{!! url('clients') !!}" class="btn btn-warning btn-xs"><i class="fa fa-refresh"></i> Reset Filter</a> -->
</div>
</div>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="row">
@include('commons.notifications')
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2> Credentials </h2>
<div class="clearfix"></div>
<div class="pull-left">
<button id="credentials-download-xlsx" class="btn btn-success btn-sm"><i class="fa fa-file-excel-o"></i> Download XLSX</button>
<button id="credentials-download-pdf" class="btn btn-danger btn-sm"><i class="fa fa-file-pdf-o"></i> Download PDF</button>
<a class="btn btn-primary btn-sm" href="{!! url('systemcreds/create') !!}"><i class="fa fa-plus-square"></i> Add Credentials</a>
</div>
<div class="pull-right">
<form method="GET" action="{!! url('systemcreds') !!}">
<input type="hidden" name="code_type" value="sms">
<div class="col-md-5 col-sm-5 col-xs-12 form-group">
<div style="margin-top:1px; margin-right:-90px;" class="top_search">
</div>
</div>
<div class="col-md-12 form-group pull-left top_search" style="margin-top: -2px;">
<div class="input-group">
<input type="text" name="keyword" class="form-control" id="keywordField" placeholder="Keyword here...">
<span class="input-group-btn">
<!-- <button type="submit" class="btn btn-primary" style="color: #fff;" type="button">Go!</button> -->
</span>
</div>
</div>
</form>
</div>
<div class="clearfix"></div>
<div class="pull-right">
</div>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div id="systemCredentialsTable"></div>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('javascript')
<script src="{!! url('public/assets/vendors/tabulator/js/tabulator.js') !!}"></script>
<script type="text/javascript" src="{!! url('public/assets/vendors/tabulator/js/xlsx.full.min.js') !!}"></script>
<script type="text/javascript" src="{!! url('public/assets/vendors/tabulator/js/jspdf.min.js') !!}"></script>
<script type="text/javascript" src="{!! url('public/assets/vendors/tabulator/js/jspdf.plugin.autotable.js') !!}"></script>
<script type="text/javascript">
$(document).ready(function(){
function link(cell, formatterParams){
var url = cell.getValue();
var rowID = cell.getData().id
return "<a href='"+ base_url + "/systemcreds/edit/"+rowID+"' class='btn btn-link'>"+url+"</a>";
}
var table = new Tabulator("#systemCredentialsTable", {
ajaxURL: "systemcreds/all",
paginationSize: 15,
layout: "fitColumns",
rowFormatter:function(row){
if(row.getData().connection_status == "active"){
//row.getElement().style.backgroundColor = "#1e3b20";
row.getElement().style.backgroundColor = "red";
}
},
pagination: "remote",
selectable: false,
printAsHtml: true,
ajaxLoaderLoading: $('#logo_spinner').html(),
columns: [
{
title: "Service Name",
field: "service",
sorter: "string",
// formatter:link,
},
{
title: "Client",
field: "clientName",
sorter: "string",
},
{
title: "Network Operator",
field: "networkOpsName",
sorter: "string",
},
{
title: "URL/Endpoint",
field: "url_endpoint",
sorter: "string",
},
{
title: "Expiry Date",
field: "expiry_date",
sorter: "string",
},
{
title: "Created By",
field: "created_by_user",
sorter: "string",
},
{
title: "Last Modified By",
field: "modified_by_user",
sorter: "string",
},
{
title: "Created At",
field: "created_at",
sorter: "string",
},
{
title: "Remarks",
field: "remarks",
sorter: "string",
}
],
rowClick:function(e, row){
var userID = row.getData().id;
console.log(userID);
//$('#userEditModal').modal('show');
},
});
document.getElementById("credentials-download-xlsx").addEventListener("click", function(){
table.download("xlsx", "click_credentials-list.xlsx", {sheetName:"CredentialsList"});
});
//trigger download of data.pdf file
document.getElementById("credentials-download-pdf").addEventListener("click", function(){
table.download("pdf", "click_credentials-list.pdf", {
orientation:"portrait", //set page orientation to portrait
title:"Click Mobile - Credentials List", //add title to report
});
});
$('#keywordField').on('keyup', function(){
console.log('up');
var keyword = $(this).val();
table.setData("systemcreds/all?keyword=" + keyword);
});
});
</script>
@endsection