From c08e58c90838f25a3aa931ea254a16123e1bffd2 Mon Sep 17 00:00:00 2001 From: Tanuja Pansare Date: Thu, 10 Sep 2026 18:09:41 +0530 Subject: [PATCH 1/4] Team 3 Form changes Doctor Activities for Neb 2 --- ...e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php | 58 +++++++++++++------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php index 7f980830..5bf860ca 100644 --- a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php +++ b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php @@ -105,25 +105,49 @@ - @if($sub->workflow_status=='approved' || isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'Yes' ) - - + @if($sub->workflow_status == 'approved' && + (!isset($sub->formdata->record_date) || $sub->formdata->record_date == 0)) + + + + + + @elseif($sub->workflow_status == 'rejected') + + + + + + @else + + + + @endif + - - @elseif($sub->workflow_status=='rejected') - - - - @else - - - - @endif - - - - - - - - + +
+
+

{{$formname}}

+
+ -
+ + @if(session()->has('message')) +
+ {{ session()->get('message') }} +
+ @endif + @if(session()->has('error')) +
+ {{ session()->get('error') }} +
+ @endif +
+
+
+
+
+
+
+ + + + + @foreach($questions as $code => $question) + @if($question->type == 'hidden') + @continue; + @endif + + @endforeach + + + + + @foreach($submissions as $submission) + + + @foreach($questions as $code => $question) + @if($question->type == 'hidden') + @continue; + @endif + @if($question->type == 'file') + + @elseif(count((array)$question->options) > 0 && 1==2 ) + + @else + + @endif + @endforeach + + + @endforeach + +
Submission Date{{$question->label}}Action
{{date("d M Y", strtotime($submission->updatedAt))}} Download{{ $question->options->{ $submission->formdata->{$code} } }}{{ isset($submission->formdata->{$code}) ? is_array($submission->formdata->{$code})? implode(', ', $submission->formdata->{$code}) :$submission->formdata->{$code} : $code }} + @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 ) + @if($submission->workflow == 'yes' && $submission->workflow_status == 'approved' ) +

Approved

+ @else + Edit + @if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes') + Delete + @endif + @endif + @endif +
+
+ +
+
+ +
+
+
+
+ + + + - @include('layouts.shared/footer-script') - - - - - + \ No newline at end of file