Merge pull request 'Updated recent output_flag on every testing panel readings creation via post api' (#1481) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 15s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 15s
Reviewed-on: #1481
This commit was merged in pull request #1481.
This commit is contained in:
@@ -265,6 +265,10 @@ class TestingPanelController extends Controller
|
|||||||
// // ->select(TestingPanelReading::raw('MAX(CAST(update_count AS INTEGER)) AS max_update_count'))->value('max_update_count');
|
// // ->select(TestingPanelReading::raw('MAX(CAST(update_count AS INTEGER)) AS max_update_count'))->value('max_update_count');
|
||||||
// // ->value('update_count')
|
// // ->value('update_count')
|
||||||
|
|
||||||
|
$currOutputFlag = TestingPanelReading::where('plant_id', $plantId)->where('serial_number', $serial['serial_number'] ?? null)->orderByDesc('updated_at')->first();
|
||||||
|
|
||||||
|
$outputFlag = $currOutputFlag->output_flag ?? '0';
|
||||||
|
|
||||||
// First, get the maximum length
|
// First, get the maximum length
|
||||||
$maxLength = TestingPanelReading::where($updateCount)->selectRaw('MAX(LENGTH(update_count)) as max_length')->value('max_length');
|
$maxLength = TestingPanelReading::where($updateCount)->selectRaw('MAX(LENGTH(update_count)) as max_length')->value('max_length');
|
||||||
|
|
||||||
@@ -324,7 +328,7 @@ class TestingPanelController extends Controller
|
|||||||
'test_sequence_flag' => $serial['test_sequence_flag'] ?? '4',
|
'test_sequence_flag' => $serial['test_sequence_flag'] ?? '4',
|
||||||
'test_started_at' => $serial['test_started_at'] ?? null,
|
'test_started_at' => $serial['test_started_at'] ?? null,
|
||||||
'test_finished_at' => $serial['test_finished_at'] ?? null,
|
'test_finished_at' => $serial['test_finished_at'] ?? null,
|
||||||
'output_flag' => $serial['output_flag'] ?? 0,
|
'output_flag' => $outputFlag, // $serial['output_flag'] ?? 0,
|
||||||
'tested_by' => (($serial['tested_by'] == 'jothi') ? 'Admin' : $serial['tested_by']) ?? null,
|
'tested_by' => (($serial['tested_by'] == 'jothi') ? 'Admin' : $serial['tested_by']) ?? null,
|
||||||
'updated_by' => (($serial['updated_by'] == 'jothi') ? 'Admin' : $serial['updated_by']) ?? null,
|
'updated_by' => (($serial['updated_by'] == 'jothi') ? 'Admin' : $serial['updated_by']) ?? null,
|
||||||
'created_at' => $serial['created_at'] ?? null,
|
'created_at' => $serial['created_at'] ?? null,
|
||||||
|
|||||||
Reference in New Issue
Block a user