History file changes
Specific Folder FTP Upload / ftp-deploy (push) Successful in 1m47s
Details
Specific Folder FTP Upload / ftp-deploy (push) Successful in 1m47s
Details
This commit is contained in:
parent
f55f9b3f06
commit
7f55aad9ed
|
|
@ -37,6 +37,23 @@ class FormController extends Controller
|
|||
$this->_base_url = '/formaction';
|
||||
}
|
||||
|
||||
protected function sessionAttr($data, $key, $default = null)
|
||||
{
|
||||
if (is_object($data) && isset($data->{$key})) {
|
||||
return $data->{$key};
|
||||
}
|
||||
if (is_array($data) && array_key_exists($key, $data)) {
|
||||
return $data[$key];
|
||||
}
|
||||
return $default;
|
||||
}
|
||||
|
||||
protected function sessionFlag($data, $key)
|
||||
{
|
||||
$value = $this->sessionAttr($data, $key, false);
|
||||
return $value === true || $value === 1 || $value === '1' || $value === 'true';
|
||||
}
|
||||
|
||||
protected function deliverform($formdata, $questions, $id = false) {
|
||||
$additional_info = $this->get_additional_info($formdata);
|
||||
// if($formdata->form_id == '1711609582-e93dba24-9c98-43e7-b97a-b22d64d9b9fc') {
|
||||
|
|
@ -286,7 +303,8 @@ class FormController extends Controller
|
|||
|
||||
//print_r($finfo->data->submissions);exit;
|
||||
$sessionForm = $request->session()->get('formdata');
|
||||
$canDeleteByPermission = is_object($sessionForm) && !empty($sessionForm->delete_submission);
|
||||
$canDeleteByPermission = $request->input('delete_submission') == 1
|
||||
|| $this->sessionFlag($sessionForm, 'delete_submission');
|
||||
foreach($submissions as $submission) {
|
||||
if (!isset($submission->user_info->name)) continue;
|
||||
$row = [
|
||||
|
|
@ -551,14 +569,18 @@ class FormController extends Controller
|
|||
public function deletesubmission(Request $request) {
|
||||
$formdata = $request->session()->get('formdata');
|
||||
Log::debug(print_r($formdata, true));
|
||||
$canDeleteByPermission = is_object($formdata) && !empty($formdata->delete_submission);
|
||||
$canDeleteByUser = is_object($formdata) && isset($formdata->allow_delete_by_user) && $formdata->allow_delete_by_user == 'yes';
|
||||
$canDeleteByPermission = $this->sessionFlag($formdata, 'delete_submission');
|
||||
$canDeleteByUser = $this->sessionAttr($formdata, 'allow_delete_by_user') == 'yes';
|
||||
if(!$canDeleteByPermission && !$canDeleteByUser) {
|
||||
return response()->json(['success' => false, 'message' => 'Unauthorized'], 403);
|
||||
}
|
||||
$id = $request->input('id', false);
|
||||
$form_id = $request->input('form_id', false);
|
||||
list($application, $domain) = explode("-", $formdata->partition);
|
||||
$partition = $this->sessionAttr($formdata, 'partition');
|
||||
if (!$partition) {
|
||||
return response()->json(['success' => false, 'message' => 'Unauthorized'], 403);
|
||||
}
|
||||
list($application, $domain) = explode("-", $partition);
|
||||
$token = DB::table('users')->select("access_token")->where("domain", $domain)->where("permissions", 'like', '%contact_create%')->orderBy('updated_at', 'desc')->skip(0)->take(1)->get();
|
||||
//print_r(['form_id' => $form_id, 'id' => $id ]); exit;
|
||||
LambdaRequest::getrequest('form', 'formentity/deletesubmission', ['form_id' => $form_id, 'id' => $id ], $token[0]->access_token);
|
||||
|
|
@ -8131,7 +8153,7 @@ class FormController extends Controller
|
|||
$history = LambdaRequest::postrequest('form', 'formentity/getformhistory', ['form_id' => $form_id, 'user_id' => $formdata->user_id, 'partition' => $formdata->partition ]);
|
||||
//echo '<pre>'; print_r($history); print_r($formdata); exit;
|
||||
//Log::debug(print_r($history, true));
|
||||
$canDeleteSubmission = is_object($formdata) && !empty($formdata->delete_submission);
|
||||
$canDeleteSubmission = $this->sessionFlag($formdata, 'delete_submission');
|
||||
if($form_id == '1713426268-c89f38eb-ec32-43ba-a81b-b690a8f90d6a') {
|
||||
$plan_id = $request->input('plan_id', '');
|
||||
$submissions = [];
|
||||
|
|
|
|||
|
|
@ -97,16 +97,20 @@
|
|||
@endif
|
||||
@endforeach
|
||||
<th>
|
||||
@php
|
||||
$isApproved = ($submission->workflow ?? '') == 'yes' && ($submission->workflow_status ?? '') == 'approved';
|
||||
$showFieldDelete = isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes' && !$isApproved;
|
||||
@endphp
|
||||
@if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'approved' )
|
||||
@if($isApproved)
|
||||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if($showFieldDelete || !empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@
|
|||
const loggedInUser = @json($formdata->user_id ?? "");
|
||||
const allAccess = @json(isset($formdata->all_data_access) ? $formdata->all_data_access : 0);
|
||||
const formId = @json($form_id);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
|
||||
let table = $('#basic-datatable').DataTable({
|
||||
"responsive": false,
|
||||
|
|
@ -196,7 +197,7 @@
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -460,6 +461,7 @@
|
|||
@else
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = canDeleteSubmission ? 1 : 0;
|
||||
|
||||
params = Object.assign(params, extraParams);
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif --}}
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -102,11 +102,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif --}}
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -87,11 +87,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@elseif($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@elseif($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@elseif($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@elseif($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
{{-- <p>UnApproved</p> --}}
|
||||
<a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}&edit=1" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -92,11 +92,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
{{-- <p>UnApproved</p> --}}
|
||||
<a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}&edit=1" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -92,11 +92,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@elseif($submission->workflow == 'yes' && $submission->workflow_status == 'approved' )
|
||||
|
|
@ -80,6 +80,10 @@
|
|||
|
||||
|
||||
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
{{-- <p>UnApproved</p> --}}
|
||||
<a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -98,11 +98,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
|
||||
<a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -95,11 +95,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@
|
|||
const loggedInUser = @json($formdata->user_id ?? "");
|
||||
const allAccess = @json(isset($formdata->all_data_access) ? $formdata->all_data_access : 0);
|
||||
const formId = @json($form_id);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
const partition = @json($formdata->partition ?? '');
|
||||
|
||||
function buildGeneratedImageDownloadHtml(row, iconOnly) {
|
||||
|
|
@ -178,7 +179,7 @@
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -382,6 +383,7 @@
|
|||
params['user_id'] = '{{ $formdata->user_id ?? '' }}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = canDeleteSubmission ? 1 : 0;
|
||||
|
||||
params = Object.assign(params, extraParams);
|
||||
// Ensure form_id is never dropped by filters / load-more
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -62,11 +62,14 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Upload Invoice</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
</th>
|
||||
<th>{{date("d M Y", strtotime($submission->updatedAt))}}</th>
|
||||
@foreach($questions as $code => $question)
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -640,6 +640,7 @@
|
|||
params['user_id'] = '{{ $formdata->user_id }}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = @json(!empty($formdata->delete_submission)) ? 1 : 0;
|
||||
|
||||
// Merge extraParams (e.g., date range, form_id)
|
||||
params = Object.assign(params, extraParams);
|
||||
|
|
|
|||
|
|
@ -223,6 +223,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
const nextApprover = row?.workflow_next_approver ?? "";
|
||||
const noofneb = row?.no_of_nebulizer ?? [];
|
||||
const allAccess = @json($formdata->all_data_access ?? 0);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
// console.log("row:", row);
|
||||
// console.log('workflowType'+workflowType);
|
||||
|
||||
|
|
@ -239,7 +240,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -380,6 +381,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
params['user_id'] = '{{$formdata->user_id}}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = @json(!empty($formdata->delete_submission)) ? 1 : 0;
|
||||
|
||||
// Merge extraParams (e.g., date range, form_id)
|
||||
params = Object.assign(params, extraParams);
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
|
||||
<script>
|
||||
const user_id = @json($logged_in_user);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
console.log('user'+ user_id);
|
||||
|
||||
const is_authorised = @json($is_authorised);
|
||||
|
|
@ -267,10 +268,9 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
}
|
||||
if ((user_id == '1655447765-e31f1d42-78f2-47b4-9f1d-2df00913d82f' && row.actions.includes('delete')) || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
}
|
||||
// if(is_authorised){
|
||||
if(row.no_of_nebulizer <= 5){
|
||||
|
|
@ -372,6 +372,7 @@ $is_authorised = in_array('1655449174-a39a5017-8232-4d58-a253-90d06bc733d0', $ro
|
|||
params['user_id'] = '{{$formdata->user_id}}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = canDeleteSubmission ? 1 : 0;
|
||||
|
||||
// Merge extraParams (e.g., date range, form_id)
|
||||
params = Object.assign(params, extraParams);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
{{-- <a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -111,11 +111,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
@if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
@if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -69,11 +69,15 @@
|
|||
{{-- @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status == 'rejected' )
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -79,11 +79,15 @@
|
|||
<!-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit
|
||||
|
||||
</button> -->
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -102,11 +102,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif --}}
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -71,11 +71,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -73,11 +73,15 @@
|
|||
|
||||
@if($submission->workflow == 'yes' && $submission->workflow_status =='rejected')
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -77,11 +77,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
{{-- <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button> --}}
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@
|
|||
const loggedInUser = @json($formdata->user_id ?? "");
|
||||
const allAccess = @json(isset($formdata->all_data_access) ? $formdata->all_data_access : 0);
|
||||
const formId = @json($form_id);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
const partition = @json($formdata->partition ?? '');
|
||||
|
||||
function buildGeneratedImageDownloadHtml(row, iconOnly) {
|
||||
|
|
@ -178,7 +179,7 @@
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -382,6 +383,7 @@
|
|||
params['user_id'] = '{{ $formdata->user_id ?? '' }}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = canDeleteSubmission ? 1 : 0;
|
||||
|
||||
params = Object.assign(params, extraParams);
|
||||
// Ensure form_id is never dropped by filters / load-more
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
{{-- <p>UnApproved</p> --}}
|
||||
<a href="/form/show?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}" class="btn btn-primary btn-xs">Edit</a>
|
||||
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{ $submission->formdata->form_id }}&id={{ $submission->id }}"
|
||||
onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');"
|
||||
class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
|
|
@ -98,11 +98,15 @@
|
|||
<p>Approved</p>
|
||||
@else
|
||||
<a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
|
||||
@if((isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') || !empty($can_delete_submission))
|
||||
@if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
|
||||
@endif
|
||||
@endif
|
||||
@endif --}}
|
||||
@if(!empty($can_delete_submission))
|
||||
<a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</a>
|
||||
@endif
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -278,6 +278,7 @@
|
|||
const workflowType = (document.getElementById('workflow_type')?.value ?? "").toLowerCase();
|
||||
const nextApprover = row?.workflow_next_approver ?? "";
|
||||
const allAccess = @json($formdata->all_data_access ?? 0);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
|
||||
// console.log("loggedInUser:", loggedInUser);
|
||||
// console.log("workflowType:", workflowType);
|
||||
|
|
@ -290,7 +291,7 @@
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -377,6 +378,7 @@
|
|||
params['user_id'] = '{{$formdata->user_id}}';
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = @json(!empty($formdata->delete_submission)) ? 1 : 0;
|
||||
|
||||
// Merge extraParams (e.g., date range, form_id)
|
||||
params = Object.assign(params, extraParams);
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@
|
|||
const loggedInUser = @json($formdata->user_id ?? "");
|
||||
const allAccess = @json(isset($formdata->all_data_access) ? $formdata->all_data_access : 0);
|
||||
const formId = @json($form_id);
|
||||
const canDeleteSubmission = @json(!empty($formdata->delete_submission));
|
||||
|
||||
let table = $('#basic-datatable').DataTable({
|
||||
"responsive": false,
|
||||
|
|
@ -196,7 +197,7 @@
|
|||
if (row.actions.includes('edit')) {
|
||||
buttons += ` <button title="Edit" class="btn btn-warning btn-xs waves-effect waves-light btn-edit" submission="${row.submission_id}"><i class="mdi mdi-pencil-outline"></i></button>`;
|
||||
}
|
||||
if (row.actions.includes('delete')) {
|
||||
if (row.actions.includes('delete') || canDeleteSubmission) {
|
||||
buttons += ` <button title="Delete" class="btn btn-danger btn-xs waves-effect waves-light btn-delete" submission="${row.submission_id}"><i class="mdi mdi-delete-outline"></i></button>`;
|
||||
}
|
||||
|
||||
|
|
@ -460,6 +461,7 @@
|
|||
@else
|
||||
params['team_report'] = 1;
|
||||
@endif
|
||||
params['delete_submission'] = canDeleteSubmission ? 1 : 0;
|
||||
|
||||
params = Object.assign(params, extraParams);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue