Updated validations and success durations and added serial_number maximum length should be 20 digit and clear field if invalid input
This commit is contained in:
@@ -234,7 +234,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
if ($serialNumber)
|
||||
{
|
||||
$excelSerials[] = $serialNumber;
|
||||
if (strlen($serialNumber) < 9) {
|
||||
if (strlen($serialNumber) < 9 || strlen($serialNumber) > 20) {
|
||||
$invalidSerial[] = $serialNumber;
|
||||
} elseif (!ctype_alnum($serialNumber)) {
|
||||
$invalidSerial[] = $serialNumber;
|
||||
@@ -253,7 +253,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
if (count($uniqueInvalidSerial) > 0) {
|
||||
Notification::make()
|
||||
->title('Invalid Serial Numbers Found')
|
||||
->body('The following serial numbers are invalid, length should contain minimum of 9 digits alpha numeric values:<br>' . implode(', ', $uniqueInvalidSerial))
|
||||
->body('The following serial numbers are invalid, length should contain minimum of 9 digits (and maximum 20 digits) alpha numeric values:<br>' . implode(', ', $uniqueInvalidSerial))
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->send();
|
||||
@@ -607,7 +607,6 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Storage::delete($fullPath);
|
||||
|
||||
if ($insertedCount > 0) {
|
||||
@@ -910,8 +909,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -929,16 +928,16 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
}
|
||||
else if (strlen($scanSno) < 9)
|
||||
else if (strlen($scanSno) < 9 || strlen($scanSno) > 20)
|
||||
{
|
||||
Notification::make()
|
||||
->title("Serial number '$scanSno' must be at least 9 digits.")
|
||||
->title("Serial number should contain minimum 9 digits and maximum 20 digits.")
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->send();
|
||||
@@ -947,7 +946,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -965,7 +964,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -985,7 +984,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1002,7 +1001,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1025,7 +1024,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1044,7 +1043,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1070,7 +1069,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1088,7 +1087,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1106,7 +1105,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1134,7 +1133,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1142,6 +1141,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$locatorQuantity = Locator::where('plant_id',$plantId)->where('locator_number', $scanLocator)->first();
|
||||
|
||||
$userName = Filament::auth()->user()->name;
|
||||
@@ -1170,8 +1170,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
}
|
||||
@@ -1196,8 +1196,6 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->dispatch('loadData', $scanLocator, $scanSno, $plantId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function viewLocator()
|
||||
{
|
||||
$plantId = $this->filters['plant_id'] ?? null;
|
||||
@@ -1243,9 +1241,9 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
}
|
||||
else if ($scanSno && $scanLocator)
|
||||
{
|
||||
if (strlen($scanSno) < 9) {
|
||||
if (strlen($scanSno) < 9 || strlen($scanSno) > 20) {
|
||||
Notification::make()
|
||||
->title("Serial number '$scanSno' must be at least 9 digits.")
|
||||
->title("Serial number should contain minimum 9 digits and maximum 20 digits.")
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->send();
|
||||
@@ -1254,7 +1252,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1272,7 +1270,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1291,7 +1289,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1313,7 +1311,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1338,7 +1336,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1361,8 +1359,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1381,8 +1379,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1399,8 +1397,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1409,9 +1407,9 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
}
|
||||
else if ($scanSno)
|
||||
{
|
||||
if (strlen($scanSno) < 9) {
|
||||
if (strlen($scanSno) < 9 || strlen($scanSno) > 20) {
|
||||
Notification::make()
|
||||
->title("Serial number '$scanSno' must be at least 9 digits.")
|
||||
->title("Serial number should contain minimum 9 digits and maximum 20 digits.")
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->send();
|
||||
@@ -1420,7 +1418,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1438,7 +1436,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1464,8 +1462,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1482,8 +1480,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1500,8 +1498,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1528,7 +1526,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1546,7 +1544,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1568,7 +1566,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1590,7 +1588,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1611,7 +1609,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1620,16 +1618,16 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
{
|
||||
Notification::make()
|
||||
->title("Locator number '$scanLocator' exist in pallet table.")
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->success()
|
||||
->duration(1000)
|
||||
->send();
|
||||
|
||||
$this->dispatch('loadData', $scanLocator, $scanSno, $plantId);
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1675,8 +1673,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1693,15 +1691,15 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
}
|
||||
else if (strlen($scanSno) < 9) {
|
||||
else if (strlen($scanSno) < 9 || strlen($scanSno) > 20) {
|
||||
Notification::make()
|
||||
->title("Serial number '$scanSno' must be at least 9 digits.")
|
||||
->title("Serial number should contain minimum 9 digits and maximum 20 digits.")
|
||||
->danger()
|
||||
->duration(1200)
|
||||
->send();
|
||||
@@ -1710,7 +1708,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1728,7 +1726,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1747,7 +1745,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1765,7 +1763,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1785,7 +1783,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
@@ -1810,7 +1808,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1836,7 +1834,7 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => $scanLocator,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
@@ -1859,8 +1857,8 @@ class UploadSerialLocator extends Page implements HasForms
|
||||
$this->form->fill
|
||||
([
|
||||
'plant_id' => $plantId,
|
||||
'scan_serial_number' => $scanSno,
|
||||
'scan_locator' => $scanLocator,
|
||||
'scan_serial_number' => null,
|
||||
'scan_locator' => null,
|
||||
'upload_serial_locator' => null,
|
||||
]);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user