Merge pull request 'ranjith-dev' (#1354) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 26s

Reviewed-on: #1354
This commit was merged in pull request #1354.
This commit is contained in:
2026-11-02 04:17:31 +00:00
2 changed files with 3 additions and 2 deletions

View File

@@ -5923,7 +5923,7 @@ class CharacteristicsController extends Controller
$modelHeading = $request->header('model-heading'); $modelHeading = $request->header('model-heading');
$requestType = $request->header('request-type'); $requestType = $request->header('request-type');
Log::info("Request {$requestType} POST API >>", ['user-name' => $userName, 'characteristic-field' => $charField, 'plant-code' => $plantCode, 'work-center' => $workCenter, 'machine-name' => $machineName, 'aufnr' => $jobNo, 'gernr' => $serialNumber, 'item-code' => $itemCode, 'work-flow-id' => $workFlowId]); Log::info("Request {$requestType} GET API >>", ['user-name' => $userName, 'characteristic-field' => $charField, 'plant-code' => $plantCode, 'work-center' => $workCenter, 'machine-name' => $machineName, 'aufnr' => $jobNo, 'gernr' => $serialNumber, 'item-code' => $itemCode, 'work-flow-id' => $workFlowId]);
if (! $userName || $userName == null || $userName == '') { if (! $userName || $userName == null || $userName == '') {
return response()->json([ return response()->json([

View File

@@ -96,7 +96,8 @@
{{ $date }} {{ $date }}
</th> --}} </th> --}}
<th colspan="2" class="text-center border-r-4 border-gray-400"> <th colspan="2" class="text-center border-r-4 border-gray-400">
{{ $date }} {{-- {{ $date }} --}}
{{ \Carbon\Carbon::parse($date)->format('d-m-Y') }}
</th> </th>
@endforeach @endforeach
</tr> </tr>