From 157a5a1939d76a0238519f6961261b8919721ebf Mon Sep 17 00:00:00 2001
From: decoder <dalersho.rm@yandex.ru>
Date: Fri, 26 Apr 2024 20:45:01 +0500
Subject: [PATCH] fix lang bug

---
 resources/views/form_data/show.blade.php      | 227 +++++++++---------
 .../views/form_data/view_form_data.blade.php  |  80 +++---
 2 files changed, 165 insertions(+), 142 deletions(-)

diff --git a/resources/views/form_data/show.blade.php b/resources/views/form_data/show.blade.php
index 52e2c95..610c18d 100644
--- a/resources/views/form_data/show.blade.php
+++ b/resources/views/form_data/show.blade.php
@@ -16,7 +16,8 @@
                 visibility: hidden;
             }
 
-            #printSection, #printSection * {
+            #printSection,
+            #printSection * {
                 visibility: visible;
             }
 
@@ -40,7 +41,7 @@
                     $date_format = config('constants.APP_DATE_FORMAT');
                     if (config('constants.APP_TIME_FORMAT') == '12') {
                         $date_format .= ' h:i A';
-                    } else if (config('constants.APP_TIME_FORMAT') == '24') {
+                    } elseif (config('constants.APP_TIME_FORMAT') == '24') {
                         $date_format .= ' H:i';
                     } else {
                         $date_format = 'm/d/Y h:i A';
@@ -48,16 +49,18 @@
                 @endphp
                 <div class="card">
                     <div class="card-header">
-                        {{$form->name}}
+                        {{ $form->name }}
                     </div>
 
                     <form action="{{ @route('form-data.show', ['id' => $form->id]) }}" class="form row mt-3 mx-2 mb-0">
                         <div class="form-group mb-0 col-1">
-                            <input type="date" class="form-control" name="start_date" value="{{ request()->get('start_date') ?? \Carbon\Carbon::now()->subDays(7)->toDateString() }}">
+                            <input type="date" class="form-control" name="start_date"
+                                value="{{ request()->get('start_date') ?? \Carbon\Carbon::now()->subDays(7)->toDateString() }}">
                         </div>
 
                         <div class="form-group mb-0 col-1">
-                            <input type="date" class="form-control" name="end_date" value="{{ request()->get('end_date') ?? \Carbon\Carbon::now()->toDateString() }}">
+                            <input type="date" class="form-control" name="end_date"
+                                value="{{ request()->get('end_date') ?? \Carbon\Carbon::now()->toDateString() }}">
                         </div>
 
                         <div class="form-group mb-0 col-2 d-flex">
@@ -67,13 +70,16 @@
 
                     @php
                         $is_enabled_sub_ref_no = false;
-                        if(isset($form->schema['settings']['form_submision_ref']['is_enabled']) && $form->schema['settings']['form_submision_ref']['is_enabled']) {
+                        if (
+                            isset($form->schema['settings']['form_submision_ref']['is_enabled']) &&
+                            $form->schema['settings']['form_submision_ref']['is_enabled']
+                        ) {
                             $is_enabled_sub_ref_no = true;
                         }
 
                     @endphp
                     <div class="tab-content card-body table-responsive" role="tabpanel">
-                        @if(!empty($form->schema))
+                        @if (!empty($form->schema))
                             @php
                                 $schema = $form->schema['form'];
                                 $col_visible = $form['schema']['settings']['form_data']['col_visible'];
@@ -81,101 +87,108 @@
                             @endphp
                             <table class="table" id="submitted_data_table" style="width: 100%;">
                                 <thead>
-                                <tr>
-                                    @if(auth()->user()->hasRole([\App\Enums\User\RoleEnum::SUPERVISOR->value, \App\Enums\User\RoleEnum::ADMIN->value], 'web'))
-                                        <th>@lang('messages.action')</th>
-                                    @endif
-
-                                    @if($is_enabled_sub_ref_no)
-                                        <th>@lang('messages.submission_numbering')</th>
-                                    @endif
-                                    <th>@lang('messages.username')</th>
-                                    @foreach($schema as $element)
-                                        @if(in_array($element['name'], $col_visible))
-                                            <th>
-                                                {{$element['label']}}
-                                            </th>
+                                    <tr>
+                                        @if (auth()->user()->hasRole([\App\Enums\User\RoleEnum::SUPERVISOR->value, \App\Enums\User\RoleEnum::ADMIN->value], 'web'))
+                                            <th>@lang('messages.action')</th>
                                         @endif
-                                    @endforeach
-                                    <th>@lang('messages.submitted_on')</th>
-                                </tr>
+
+                                        @if ($is_enabled_sub_ref_no)
+                                            <th>@lang('messages.submission_numbering')</th>
+                                        @endif
+                                        <th>@lang('messages.username')</th>
+                                        @foreach ($schema as $element)
+                                            @if (in_array($element['name'], $col_visible))
+                                                <th>
+                                                    {{-- $element['label'] --}}
+                                                    @if (in_array(session()->get('locale'), ['ru', 'est']) && isset($element['label_' . session()->get('locale')]))
+                                                        {{ $element['label_' . session()->get('locale')] }}
+                                                    @else
+                                                        {{ $element['label'] }}
+                                                    @endif
+                                                </th>
+                                            @endif
+                                        @endforeach
+                                        <th>@lang('messages.submitted_on')</th>
+                                    </tr>
                                 </thead>
 
                                 <tbody>
-                                @foreach($data as $k => $row)
-                                    <tr>
-                                        @if(auth()->user()->hasRole([\App\Enums\User\RoleEnum::SUPERVISOR->value, \App\Enums\User\RoleEnum::ADMIN->value], 'web'))
-                                            <td>
-                                                @if(in_array('view', $btn_enabled))
-                                                    <button type="button" class="btn btn-info btn-sm view_form_data m-1"
-                                                            data-href="{{action([\App\Http\Controllers\FormDataController::class, 'viewData'], [$row->id])}}"
-                                                            data-toggle="modal">
-                                                        <i class="fa fa-eye" aria-hidden="true"></i>
-                                                        @lang('messages.view')
-                                                    </button>
-                                                @endif
-                                                @if(in_array('delete', $btn_enabled))
-                                                    <button type="button"
-                                                            class="btn btn-danger btn-sm delete_form_data m-1"
-                                                            data-href="{{action([\App\Http\Controllers\FormDataController::class, 'destroy'], [$row->id])}}">
-                                                        <i class="fa fa-trash" aria-hidden="true"></i>
-                                                        @lang('messages.delete')
-                                                    </button>
-                                                @endif
-                                                @php
-                                                    $form_id = !empty($form->slug) ? $form->slug : $form->id;
-                                                @endphp
-                                                <a class="btn btn-dark btn-sm m-1"
-                                                   href="{{action([\App\Http\Controllers\FormDataController::class, 'getEditformData'], ['slug' => $form_id,'id' => $row->id])}}">
-                                                    <i class="far fa-edit" aria-hidden="true"></i>
-                                                    @lang('messages.edit')
-                                                </a>
-                                            </td>
-                                        @endif
-
-                                        @if($is_enabled_sub_ref_no)
-                                            <td>
-                                                {{$row['submission_ref']}}
-                                            </td>
-                                        @endif
-
-                                        <td>{{ $row->submittedBy?->name }}</td>
-
-                                        @foreach($schema as $row_element)
-                                            @if(in_array($row_element['name'], $col_visible))
+                                    @foreach ($data as $k => $row)
+                                        <tr>
+                                            @if (auth()->user()->hasRole([\App\Enums\User\RoleEnum::SUPERVISOR->value, \App\Enums\User\RoleEnum::ADMIN->value], 'web'))
                                                 <td>
-                                                    @isset($row->data[$row_element['name']])
-                                                        @if($row_element['type'] == 'file_upload')
-
-                                                            @include('form_data.file_view', ['form_upload' => $row->data[$row_element['name']]])
-                                                        @elseif($row_element['type'] == 'signature')
-                                                            @if(!empty($row->data[$row_element['name']]))
-                                                                <a target="_blank"
-                                                                   href="{{$row->data[$row_element['name']]}}"
-                                                                   download="Signature">
-                                                                    <img src="{{$row->data[$row_element['name']]}}"
-                                                                         class="signature">
-                                                                </a>
-                                                            @endif
-                                                        @elseif(is_array($row->data[$row_element['name']]) && $row_element['type'] != 'file_upload')
-                                                            {{implode(', ', $row->data[$row_element['name']])}}
-                                                        @else
-                                                            {!! nl2br($row->data[$row_element['name']]) !!}
-                                                        @endif
-
-                                                    @endisset
+                                                    @if (in_array('view', $btn_enabled))
+                                                        <button type="button"
+                                                            class="btn btn-info btn-sm view_form_data m-1"
+                                                            data-href="{{ action([\App\Http\Controllers\FormDataController::class, 'viewData'], [$row->id]) }}"
+                                                            data-toggle="modal">
+                                                            <i class="fa fa-eye" aria-hidden="true"></i>
+                                                            @lang('messages.view')
+                                                        </button>
+                                                    @endif
+                                                    @if (in_array('delete', $btn_enabled))
+                                                        <button type="button"
+                                                            class="btn btn-danger btn-sm delete_form_data m-1"
+                                                            data-href="{{ action([\App\Http\Controllers\FormDataController::class, 'destroy'], [$row->id]) }}">
+                                                            <i class="fa fa-trash" aria-hidden="true"></i>
+                                                            @lang('messages.delete')
+                                                        </button>
+                                                    @endif
+                                                    @php
+                                                        $form_id = !empty($form->slug) ? $form->slug : $form->id;
+                                                    @endphp
+                                                    <a class="btn btn-dark btn-sm m-1"
+                                                        href="{{ action([\App\Http\Controllers\FormDataController::class, 'getEditformData'], ['slug' => $form_id, 'id' => $row->id]) }}">
+                                                        <i class="far fa-edit" aria-hidden="true"></i>
+                                                        @lang('messages.edit')
+                                                    </a>
                                                 </td>
                                             @endif
-                                        @endforeach
-                                        <td>
-                                            {{\Carbon\Carbon::createFromTimestamp(strtotime($row->updated_at))->format($date_format)}}
-                                            <br/>
-                                            <small>
-                                                {{$row->updated_at->diffForHumans()}}
-                                            </small>
-                                        </td>
-                                    </tr>
-                                @endforeach
+
+                                            @if ($is_enabled_sub_ref_no)
+                                                <td>
+                                                    {{ $row['submission_ref'] }}
+                                                </td>
+                                            @endif
+
+                                            <td>{{ $row->submittedBy?->name }}</td>
+
+                                            @foreach ($schema as $row_element)
+                                                @if (in_array($row_element['name'], $col_visible))
+                                                    <td>
+                                                        @isset($row->data[$row_element['name']])
+                                                            @if ($row_element['type'] == 'file_upload')
+                                                                @include('form_data.file_view', [
+                                                                    'form_upload' =>
+                                                                        $row->data[$row_element['name']],
+                                                                ])
+                                                            @elseif($row_element['type'] == 'signature')
+                                                                @if (!empty($row->data[$row_element['name']]))
+                                                                    <a target="_blank"
+                                                                        href="{{ $row->data[$row_element['name']] }}"
+                                                                        download="Signature">
+                                                                        <img src="{{ $row->data[$row_element['name']] }}"
+                                                                            class="signature">
+                                                                    </a>
+                                                                @endif
+                                                            @elseif(is_array($row->data[$row_element['name']]) && $row_element['type'] != 'file_upload')
+                                                                {{ implode(', ', $row->data[$row_element['name']]) }}
+                                                            @else
+                                                                {!! nl2br($row->data[$row_element['name']]) !!}
+                                                            @endif
+                                                        @endisset
+                                                    </td>
+                                                @endif
+                                            @endforeach
+                                            <td>
+                                                {{ \Carbon\Carbon::createFromTimestamp(strtotime($row->updated_at))->format($date_format) }}
+                                                <br />
+                                                <small>
+                                                    {{ $row->updated_at->diffForHumans() }}
+                                                </small>
+                                            </td>
+                                        </tr>
+                                    @endforeach
                                 </tbody>
                             </table>
                         @else
@@ -189,7 +202,7 @@
 @endsection
 @section('footer')
     <script type="text/javascript">
-        $(document).ready(function () {
+        $(document).ready(function() {
             $('#submitted_data_table').DataTable({
                 scrollY: "600px",
                 scrollX: true,
@@ -200,20 +213,20 @@
                 }
             });
             // view form data
-            $(document).on('click', '.view_form_data', function () {
+            $(document).on('click', '.view_form_data', function() {
                 var url = $(this).data("href");
                 $.ajax({
                     method: "GET",
                     dataType: "html",
                     url: url,
-                    success: function (result) {
+                    success: function(result) {
                         $("#modal_div").html(result).modal("show");
                     }
                 });
             });
 
             //delete form data
-            $(document).on('click', '.delete_form_data', function () {
+            $(document).on('click', '.delete_form_data', function() {
                 var url = $(this).data("href");
                 var result = confirm('Are You Sure?');
                 if (result == true) {
@@ -221,10 +234,10 @@
                         method: "DELETE",
                         url: url,
                         dataType: "json",
-                        success: function (result) {
+                        success: function(result) {
                             if (result.success == true) {
                                 toastr.success(result.msg);
-                                setTimeout(function () {
+                                setTimeout(function() {
                                     location.reload();
                                 }, 1000);
                             } else {
@@ -236,17 +249,17 @@
             });
 
             //print form data on btn click
-            $(document).on('click', '.formDataPrintBtn', function () {
+            $(document).on('click', '.formDataPrintBtn', function() {
                 printElement(document.getElementById("print_form_data"));
             });
 
-            $("#modal_div").on('shown.bs.modal', function () {
+            $("#modal_div").on('shown.bs.modal', function() {
                 if ($("form#add_comment_form").length) {
                     $("form#add_comment_form").validate();
                 }
             });
 
-            $(document).on('submit', 'form#add_comment_form', function (e) {
+            $(document).on('submit', 'form#add_comment_form', function(e) {
                 e.preventDefault();
                 var data = $("form#add_comment_form").serialize();
                 var url = $("form#add_comment_form").attr('action');
@@ -257,7 +270,7 @@
                     url: url,
                     dataType: "json",
                     data: data,
-                    success: function (response) {
+                    success: function(response) {
                         ladda.stop();
                         if (response.success) {
                             $("#comment").val('');
@@ -270,7 +283,7 @@
                 });
             });
 
-            $(document).on('click', '.delete-comment', function (e) {
+            $(document).on('click', '.delete-comment', function(e) {
                 e.preventDefault();
                 var element = $(this);
                 var comment_id = $(this).data('comment_id');
@@ -280,7 +293,7 @@
                         method: 'DELETE',
                         dataType: 'json',
                         url: '/form-data-comment/' + comment_id + '?form_data_id=' + form_data_id,
-                        success: function (response) {
+                        success: function(response) {
                             if (response.success) {
                                 toastr.success(response.msg);
                                 element.closest('.direct-chat-msg').remove();
diff --git a/resources/views/form_data/view_form_data.blade.php b/resources/views/form_data/view_form_data.blade.php
index 7fd9844..686929a 100644
--- a/resources/views/form_data/view_form_data.blade.php
+++ b/resources/views/form_data/view_form_data.blade.php
@@ -2,12 +2,12 @@
     <div class="modal-content" id="print_form_data">
         <div class="modal-header">
             <h5 class="modal-title" id="exampleModalLabel">
-                {{ucFirst($form_data->form->name)}} 
-                @if(!empty($form_data->submittedBy))
+                {{ ucFirst($form_data->form->name) }}
+                @if (!empty($form_data->submittedBy))
                     <small>
                         (
-                            <b>@lang('messages.submitted_by'): </b> 
-                            {{$form_data->submittedBy->name}}
+                        <b>@lang('messages.submitted_by'): </b>
+                        {{ $form_data->submittedBy->name }}
                         )
                     </small>
                 @endif
@@ -23,9 +23,11 @@
         <div class="modal-body">
             <div class="row mb-2">
                 <div class="col-md-6">
-                    @if(isset($form_data->form->schema['settings']['form_submision_ref']['is_enabled']) && $form_data->form->schema['settings']['form_submision_ref']['is_enabled'] && !empty($form_data->submission_ref))
-                      <b>@lang('messages.submission_numbering'):</b> 
-                      {{$form_data->submission_ref}}
+                    @if (isset($form_data->form->schema['settings']['form_submision_ref']['is_enabled']) &&
+                            $form_data->form->schema['settings']['form_submision_ref']['is_enabled'] &&
+                            !empty($form_data->submission_ref))
+                        <b>@lang('messages.submission_numbering'):</b>
+                        {{ $form_data->submission_ref }}
                     @endif
                 </div>
             </div>
@@ -37,42 +39,49 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($form_data->form->schema['form'] as $element)
+                    @foreach ($form_data->form->schema['form'] as $element)
                         @isset($form_data->data[$element['name']])
-                        <tr>
-                            <td>
-                                <strong>{{$element['label']}}</strong>
-                            </td>
-                            <td>
-                                @if($element['type'] == 'file_upload')
-
-                                    @include('form_data.file_view', ['form_upload' => $form_data->data[$element['name']]])
-                                @elseif($element['type'] == 'signature')
-                                    @if(!empty($form_data->data[$element['name']]))
-                                        <a target="_blank" href="{{$form_data->data[$element['name']]}}"
-                                            download="Signature">
-                                            <img src="{{$form_data->data[$element['name']]}}" class="signature">
-                                        </a>
+                            <tr>
+                                <td>
+                                    <strong>
+                                        @if (in_array(session()->get('locale'), ['ru', 'est']) && isset($element['label_' . session()->get('locale')]))
+                                            {{ $element['label_' . session()->get('locale')] }}
+                                        @else
+                                            {{ $element['label'] }}
+                                        @endif
+                                    </strong>
+                                </td>
+                                <td>
+                                    @if ($element['type'] == 'file_upload')
+                                        @include('form_data.file_view', [
+                                            'form_upload' => $form_data->data[$element['name']],
+                                        ])
+                                    @elseif($element['type'] == 'signature')
+                                        @if (!empty($form_data->data[$element['name']]))
+                                            <a target="_blank" href="{{ $form_data->data[$element['name']] }}"
+                                                download="Signature">
+                                                <img src="{{ $form_data->data[$element['name']] }}" class="signature">
+                                            </a>
+                                        @endif
+                                    @elseif(is_array($form_data->data[$element['name']]) && $element['type'] != 'file_upload')
+                                        {{ implode(', ', $form_data->data[$element['name']]) }}
+                                    @else
+                                        {!! nl2br($form_data->data[$element['name']]) !!}
                                     @endif
-                                @elseif(is_array($form_data->data[$element['name']]) && $element['type'] != 'file_upload')
-
-                                    {{implode(', ', $form_data->data[$element['name']])}}
-                                    
-                                @else
-                                    {!! nl2br($form_data->data[$element['name']]) !!}
-                                @endif
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         @endisset
                     @endforeach
                 </tbody>
             </table>
             <div class="no-print mt-4">
                 <hr>
-                <form id="add_comment_form" action="{{action([\App\Http\Controllers\FormDataCommentController::class, 'store'])}}" method="POST">
+                <form id="add_comment_form"
+                    action="{{ action([\App\Http\Controllers\FormDataCommentController::class, 'store']) }}"
+                    method="POST">
                     {{ csrf_field() }}
                     <!-- hiden fields -->
-                    <input type="hidden" name="form_data_id" id="form_data_id" value="{{$form_data->id}}">
+                    <input type="hidden" name="form_data_id" id="form_data_id" value="{{ $form_data->id }}">
                     <div class="form-group">
                         <label for="comment">
                             @lang('messages.comment'):
@@ -104,10 +113,11 @@
                 <i class="fas fa-print"></i>
                 @lang('messages.print')
             </button>
-            <a class="btn float-right btn-primary btn-sm m-1" target="_blank" href="{{action([\App\Http\Controllers\FormDataController::class, 'downloadPdf'], [$form_data->id])}}">
+            <a class="btn float-right btn-primary btn-sm m-1" target="_blank"
+                href="{{ action([\App\Http\Controllers\FormDataController::class, 'downloadPdf'], [$form_data->id]) }}">
                 <i class="far fa-file-pdf" aria-hidden="true"></i>
                 @lang('messages.download_pdf')
             </a>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>