Changes
This commit is contained in:
parent
21ec862635
commit
a380dab1ac
|
|
@ -58,7 +58,7 @@ class MagmediaController extends Controller
|
|||
foreach($groups->data->items as $group){
|
||||
$groups_dd[$group->id] = $group->name;
|
||||
}
|
||||
return [
|
||||
$fields = [
|
||||
'name' => ['title' => 'Media Name', 'type' => 'text', 'required' => true],
|
||||
'points' => ['title' => 'Points', 'type' => 'text', 'required' => true],
|
||||
'description' => ['title' => 'Media Description', 'type' => 'textarea', 'required' => true, 'fullwidth' => true],
|
||||
|
|
@ -70,6 +70,7 @@ class MagmediaController extends Controller
|
|||
'gallery' => ['title' => 'Multiple Media File (only for gallery)', 'type' => 'multiimage'],
|
||||
'ext_url' => ['title' => 'Media Url (form, external)', 'type' => 'text'],
|
||||
];
|
||||
return $fields;
|
||||
}
|
||||
|
||||
protected function _beforesave($type, $request) {
|
||||
|
|
@ -84,15 +85,24 @@ class MagmediaController extends Controller
|
|||
if($data['media_type'] == 'form' || $data['media_type'] == 'external') {
|
||||
$data['media_url'] = $data['ext_url'];
|
||||
}
|
||||
if($data['media_type'] == 'gallery' && $request->file('gallery')) {
|
||||
if($data['media_type'] == 'gallery') {
|
||||
$galleries = [];
|
||||
foreach($request->file('gallery') as $img) {
|
||||
$galleries[] = env('AWS_URL').'/'.$img->store('magazine_media', 's3');
|
||||
if($request->file('gallery')) {
|
||||
foreach($request->file('gallery') as $img) {
|
||||
$galleries[] = env('AWS_URL').'/'.$img->store('magazine_media', 's3');
|
||||
}
|
||||
}
|
||||
if(isset($data['gallery_existing'])) {
|
||||
foreach($data['gallery_existing'] as $gallery_existing) {
|
||||
$galleries[] = $gallery_existing;
|
||||
}
|
||||
}
|
||||
$data['media_url'] = json_encode($galleries);
|
||||
}
|
||||
unset($data['gallery_existing']);
|
||||
unset($data['gallery']);
|
||||
unset($data['ext_url']);
|
||||
//echo '<pre>'; print_r($data); exit;
|
||||
return $data;
|
||||
}
|
||||
|
||||
|
|
@ -103,6 +113,9 @@ class MagmediaController extends Controller
|
|||
} else {
|
||||
$values->ext_url = '';
|
||||
}
|
||||
if($values->media_type == 'gallery' ) {
|
||||
$values->gallery = json_decode($values->media_url);
|
||||
}
|
||||
unset($values->user_info);
|
||||
unset($values->likes);
|
||||
unset($values->likes_users);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ class MetricreportController extends Controller
|
|||
break;
|
||||
case 'details':
|
||||
if($response->data->graph->chart == 'tabular') {
|
||||
$headers = ['User', 'Designation', 'Zone', 'Region', "Area", "Territory"];
|
||||
$headers = ['User', 'Employee Code', 'Designation', 'Zone', 'Region', "Area", "Territory"];
|
||||
foreach($response->data->graph->values->metrics as $metric) {
|
||||
$headers[] = $metric->metric;
|
||||
}
|
||||
|
|
@ -128,6 +128,7 @@ class MetricreportController extends Controller
|
|||
foreach($response->data->graph->values->users as $user) {
|
||||
$row = [];
|
||||
$row[] = $user->name;
|
||||
$row[] = $user->employee_code;
|
||||
$row[] = $user->designation;
|
||||
$row[] = isset($user->positions->Zone) ? $user->positions->Zone : '-';
|
||||
$row[] = isset($user->positions->Region) ? $user->positions->Region : '-';
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<link href="{{asset('assets/libs/select2/select2.min.css')}}" rel="stylesheet" type="text/css" />
|
||||
<link href="{{asset('assets/libs/multiselect/multiselect.min.css')}}" rel="stylesheet" type="text/css" />
|
||||
<link href="{{ URL::asset('assets/libs/dropify/dropify.min.css')}}" rel="stylesheet" type="text/css" />
|
||||
<link rel="stylesheet" href="//code.jquery.com/ui/1.13.1/themes/base/jquery-ui.css">
|
||||
<!-- third party css end -->
|
||||
@endsection
|
||||
|
||||
|
|
@ -98,6 +99,18 @@
|
|||
<input type="file" name="{{$field}}[]" id="field-{{$field}}" multiple class="dropify" data-allowed-file-extensions="png jpg jpeg gif" />
|
||||
<p class="text-muted text-center mt-2 mb-0">500MB Max File size</p>
|
||||
</div>
|
||||
@if($mode=='edit' && is_array($item->{$field}) )
|
||||
<div class="row" id="sortable">
|
||||
@foreach($item->{$field} as $i => $image)
|
||||
<div class="col-md-3">
|
||||
<div class="form-check mb-2 form-check-success">
|
||||
<input class="form-check-input" type="checkbox" name="{{$field}}_existing[]" value="{{$image}}" checked>
|
||||
</div>
|
||||
<img src="{{$image}}" class="img-fluid mb-2">
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
@break
|
||||
@case('file')
|
||||
<div class="mt-3" id="file_wrapper">
|
||||
|
|
@ -135,9 +148,13 @@
|
|||
<script src="{{asset('assets/libs/multiselect/multiselect.min.js')}}"></script>
|
||||
<script src="{{asset('assets/libs/multiselect/jquery.quicksearch.js')}}"></script>
|
||||
<script src="{{ URL::asset('assets/libs/dropify/dropify.min.js')}}"></script>
|
||||
<script src="https://code.jquery.com/ui/1.13.1/jquery-ui.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$('[data-toggle="select2"]').select2();
|
||||
$( "#sortable" ).sortable();
|
||||
$( "#sortable" ).disableSelection();
|
||||
|
||||
$('.dropify').dropify({
|
||||
messages: {
|
||||
'default': 'Drag and drop a file here or click',
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<p class="text-muted"><i class="mdi mdi-calendar" aria-hidden="true"></i> {{$graph->valid_from}} to {{$graph->valid_till}}</p>
|
||||
</div>
|
||||
<div class="col-4 text-end">
|
||||
@if(in_array($post['type'], ['trend','leaderboard']) || ($post['type'] == 'graphical' && $graph->type == 'grouped') )
|
||||
@if((in_array($post['type'], ['trend','leaderboard']) && !in_array($post['chart'], ['line', 'bar']) ) || ($post['type'] == 'graphical' && $graph->type == 'grouped') )
|
||||
<button class="btn btn-warning btn-xs" id="email-export">Send me Email</button>
|
||||
@endif
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
<p class="text-muted"><i class="mdi mdi-calendar" aria-hidden="true"></i> {{$graph->valid_from}} to {{$graph->valid_till}}</p>
|
||||
</div>
|
||||
<div class="col-4 text-end">
|
||||
@if(in_array($post['type'], ['trend','leaderboard']) || ($post['type'] == 'graphical' && $graph->type == 'grouped') || ($post['type'] == 'details' && $graph->chart == 'tabular') )
|
||||
@if((in_array($post['type'], ['trend','leaderboard']) && !in_array($post['chart'], ['line', 'bar']) ) || ($post['type'] == 'graphical' && $graph->type == 'grouped') || ($post['type'] == 'details' && $graph->chart == 'tabular') )
|
||||
<button class="btn btn-dark btn-xs" id="export">Export</button>
|
||||
<button class="btn btn-warning btn-xs" id="email-export">Send me Email</button>
|
||||
@endif
|
||||
|
|
@ -177,6 +177,7 @@
|
|||
<thead class="table-light">
|
||||
<tr>
|
||||
<th colspan="2">User</th>
|
||||
<th>Employee Code</th>
|
||||
<th>Zone</th>
|
||||
<th>Region</th>
|
||||
<th>Area</th>
|
||||
|
|
@ -189,8 +190,9 @@
|
|||
<tbody>
|
||||
@foreach($graph->values->users as $user)
|
||||
<tr>
|
||||
<td><img src="{{$user->avatar}}" class="avatar-sm rounded-circle"></td>
|
||||
<td>{{$user->name}} <br/>{{$user->designation}}</td>
|
||||
<td><img src="{{isset($user->avatar) ? $user->avatar : ''}}" class="avatar-sm rounded-circle"></td>
|
||||
<td>{{ $user->name }} <br/>{{$user->designation}}</td>
|
||||
<td>{{ isset($user->employee_code) ? $user->employee_code:''}}</td>
|
||||
<td>{{ isset($user->positions->Zone) ? $user->positions->Zone : '-' }}</td>
|
||||
<td>{{ isset($user->positions->Region) ? $user->positions->Region : '-' }}</td>
|
||||
<td>{{ isset($user->positions->Area) ? $user->positions->Area : '-' }}</td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue