Merge pull request 'ranjith-dev' (#675) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #675
This commit was merged in pull request #675.
This commit is contained in:
@@ -28,6 +28,10 @@ class LeakTestReadingResource extends Resource
|
|||||||
|
|
||||||
protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
|
protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
|
||||||
|
|
||||||
|
protected static ?string $navigationGroup = 'Testing Panel';
|
||||||
|
|
||||||
|
protected static ?int $navigationSort = 3;
|
||||||
|
|
||||||
public static function form(Form $form): Form
|
public static function form(Form $form): Form
|
||||||
{
|
{
|
||||||
return $form
|
return $form
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ class TestingPanelReadingResource extends Resource
|
|||||||
|
|
||||||
protected static ?string $navigationGroup = 'Testing Panel';
|
protected static ?string $navigationGroup = 'Testing Panel';
|
||||||
|
|
||||||
protected static ?int $navigationSort = 3;
|
protected static ?int $navigationSort = 4;
|
||||||
|
|
||||||
public static function form(Form $form): Form
|
public static function form(Form $form): Form
|
||||||
{
|
{
|
||||||
@@ -438,7 +438,7 @@ class TestingPanelReadingResource extends Resource
|
|||||||
Tables\Columns\TextColumn::make('motorTestingMaster.item.code')
|
Tables\Columns\TextColumn::make('motorTestingMaster.item.code')
|
||||||
->label('Item Code')
|
->label('Item Code')
|
||||||
->alignCenter(),
|
->alignCenter(),
|
||||||
Tables\Columns\TextColumn::make('motorTestingMaster.subassembly_code')
|
Tables\Columns\TextColumn::make('motorTestingMaster.subassembly_code')
|
||||||
->label('Subassembly Code')
|
->label('Subassembly Code')
|
||||||
->alignCenter(),
|
->alignCenter(),
|
||||||
Tables\Columns\TextColumn::make('motorTestingMaster.item.description')
|
Tables\Columns\TextColumn::make('motorTestingMaster.item.description')
|
||||||
@@ -639,7 +639,7 @@ class TestingPanelReadingResource extends Resource
|
|||||||
})->orderBy('code')->pluck('name', 'id');
|
})->orderBy('code')->pluck('name', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
//return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
|
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
|
||||||
})
|
})
|
||||||
->reactive()
|
->reactive()
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
@@ -732,7 +732,7 @@ class TestingPanelReadingResource extends Resource
|
|||||||
// ->pluck('description', 'id')
|
// ->pluck('description', 'id')
|
||||||
// ->toArray();
|
// ->toArray();
|
||||||
}
|
}
|
||||||
//return $query->pluck('description', 'description')->toArray();
|
// return $query->pluck('description', 'description')->toArray();
|
||||||
})
|
})
|
||||||
->reactive()
|
->reactive()
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
@@ -969,8 +969,8 @@ class TestingPanelReadingResource extends Resource
|
|||||||
// if (!empty($data['phase'])) {
|
// if (!empty($data['phase'])) {
|
||||||
// $indicators[] = 'Phase: ' . $data['phase'];
|
// $indicators[] = 'Phase: ' . $data['phase'];
|
||||||
// }
|
// }
|
||||||
if (!empty($data['connection'])) {
|
if (! empty($data['connection'])) {
|
||||||
$indicators[] = 'Connection: ' . $data['connection'];
|
$indicators[] = 'Connection: '.$data['connection'];
|
||||||
}
|
}
|
||||||
if (! empty($data['remark'])) {
|
if (! empty($data['remark'])) {
|
||||||
$indicators[] = 'Remark: '.$data['remark'];
|
$indicators[] = 'Remark: '.$data['remark'];
|
||||||
|
|||||||
Reference in New Issue
Block a user