diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 12332d8..3125c18 100644 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -84,7 +84,7 @@ "null": false }, "production_recipe_quantity": { - "description": "Base quantity the recipe is based on", + "comment": "Base quantity the recipe is based on", "name": "production_recipe_quantity", "type": "BIGINT", "null": false @@ -145,13 +145,13 @@ "null": false }, "production_recipe_step_people": { - "description": "Amount of people performing this step", + "comment": "Amount of people performing this step", "name": "production_recipe_step_people", "type": "INT", "null": false }, "production_recipe_step_position": { - "description": "Which people group performs this step. Important to calculate costs and responsibilities", + "comment": "Which people group performs this step. Important to calculate costs and responsibilities", "name": "production_recipe_step_position", "type": "INT", "null": false, @@ -159,19 +159,19 @@ "foreignKey": "organization_position_id" }, "production_recipe_step_duration": { - "description": "Real duration it takes to finish", + "comment": "Real duration it takes to finish", "name": "production_recipe_step_duration", "type": "BIGINT", "null": false }, "production_recipe_step_additiveduration": { - "description": "Duration if no parallel work is performed. E.g. multiple people perform this step.", + "comment": "Duration if no parallel work is performed. E.g. multiple people perform this step.", "name": "production_recipe_step_additiveduration", "type": "BIGINT", "null": false }, "production_recipe_step_scalable": { - "description": "Scales linear with item quantity, jumps with machine usage, no scaling", + "comment": "Scales linear with item quantity, jumps with machine usage, no scaling", "name": "production_recipe_step_scalable", "type": "TINYINT", "null": false @@ -224,7 +224,7 @@ "null": false }, "production_recipe_step_machine_alt": { - "description": "Is alternative machine", + "comment": "Is alternative machine", "name": "production_recipe_step_machine_alt", "type": "TINYINT(1)", "null": false diff --git a/Models/MachineMapper.php b/Models/MachineMapper.php index 60bcd8c..51d4ead 100644 --- a/Models/MachineMapper.php +++ b/Models/MachineMapper.php @@ -38,9 +38,9 @@ final class MachineMapper extends DataMapperFactory */ public const COLUMNS = [ 'production_machine_id' => ['name' => 'production_machine_id', 'type' => 'int', 'internal' => 'id'], - 'production_machine_capacity' => ['name' => 'production_machine_capacity', 'type' => 'int', 'internal' => 'capacity'], - 'production_machine_equipment' => ['name' => 'production_machine_equipment', 'type' => 'int', 'internal' => 'equipment'], - 'production_machine_unitmeasure' => ['name' => 'production_machine_unitmeasure', 'type' => 'string', 'internal' => 'unitOfMeasure'], + 'production_machine_capacity' => ['name' => 'production_machine_capacity', 'type' => 'int', 'internal' => 'capacity'], + 'production_machine_equipment' => ['name' => 'production_machine_equipment', 'type' => 'int', 'internal' => 'equipment'], + 'production_machine_unitmeasure' => ['name' => 'production_machine_unitmeasure', 'type' => 'string', 'internal' => 'unitOfMeasure'], 'production_machine_unit' => ['name' => 'production_machine_unit', 'type' => 'int', 'internal' => 'unit'], ]; diff --git a/Models/NullProduction.php b/Models/NullProduction.php index 178f463..d9db53c 100644 --- a/Models/NullProduction.php +++ b/Models/NullProduction.php @@ -24,5 +24,4 @@ namespace Modules\Production\Models; */ class NullProduction extends Production { - } diff --git a/Models/Production.php b/Models/Production.php index d773106..f48b9e2 100644 --- a/Models/Production.php +++ b/Models/Production.php @@ -54,6 +54,6 @@ class Production public function __construct() { $this->createdAt = new \DateTimeImmutable('now'); - $this->item = new NullItem(); + $this->item = new NullItem(); } } diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 9c576e1..3bebccf 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -17,20 +17,20 @@ return ['Production' => [ 'Due' => 'Fällig', 'For' => 'Für', 'Name' => 'Name', - 'Items' => 'Artikel', + 'Items' => 'Artikel', 'Ordered' => 'Bestellt', 'Orderer' => 'Besteller', 'Process' => 'Prozess', 'Product' => 'Product', 'Productions' => 'Produktionen', 'Quantity' => 'Menge', - 'Machines' => 'Maschinen', - 'Machine' => 'Maschine', + 'Machines' => 'Maschinen', + 'Machine' => 'Maschine', 'Start' => 'Start', 'Status' => 'Status', 'Number' => 'Nummer', - 'Item' => 'Artikel', - 'ExpectedEnd' => 'Erwartete Fertigstellung', - 'Bill' => 'Beleg', - 'Production' => 'Produktion', + 'Item' => 'Artikel', + 'ExpectedEnd' => 'Erwartete Fertigstellung', + 'Bill' => 'Beleg', + 'Production' => 'Produktion', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 1416254..9c74c1f 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -17,20 +17,20 @@ return ['Production' => [ 'Due' => 'Due', 'For' => 'For', 'Name' => 'Name', - 'Items' => 'Items', + 'Items' => 'Items', 'Ordered' => 'Ordered', 'Orderer' => 'Orderer', 'Process' => 'Process', 'Product' => 'Product', 'Productions' => 'Productions', - 'Production' => 'Production', + 'Production' => 'Production', 'Quantity' => 'Quantity', 'Start' => 'Start', - 'Machines' => 'Machines', - 'Machine' => 'Machine', + 'Machines' => 'Machines', + 'Machine' => 'Machine', 'Status' => 'Status', 'Number' => 'Number', - 'Item' => 'Item', - 'ExpectedEnd' => 'Expected End', - 'Bill' => 'Bill', + 'Item' => 'Item', + 'ExpectedEnd' => 'Expected End', + 'Bill' => 'Bill', ]]; diff --git a/Theme/Backend/machine-view.tpl.php b/Theme/Backend/machine-view.tpl.php index 44ff93d..64cbe90 100644 --- a/Theme/Backend/machine-view.tpl.php +++ b/Theme/Backend/machine-view.tpl.php @@ -22,7 +22,7 @@ use phpOMS\Uri\UriFactory; */ $machine = $this->data['machine'] ?? new NullMachine(); $machineImage = $this->data['machineImage'] ?? new NullMedia(); -$isNew = $machine->id === 0; +$isNew = $machine->id === 0; $equipmentStatus = EquipmentStatus::getConstants(); diff --git a/Theme/Backend/production-list.tpl.php b/Theme/Backend/production-list.tpl.php index ad87fe3..c948629 100644 --- a/Theme/Backend/production-list.tpl.php +++ b/Theme/Backend/production-list.tpl.php @@ -36,7 +36,7 @@ echo $this->data['nav']->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}/production/machine/view?{?}&id=' . $value->id); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}/production/machine/view?{?}&id=' . $value->id); ?> id; ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/production-view.tpl.php b/Theme/Backend/production-view.tpl.php index f15e5f0..ae8e8e0 100644 --- a/Theme/Backend/production-view.tpl.php +++ b/Theme/Backend/production-view.tpl.php @@ -16,10 +16,10 @@ use Modules\Production\Models\NullProduction; use phpOMS\Uri\UriFactory; /** - * @var \phpOMS\Views\View $this + * @var \phpOMS\Views\View $this */ $production = $this->data['production'] ?? new NullProduction(); -$isNew = $production->id === 0; +$isNew = $production->id === 0; echo $this->data['nav']->render(); ?>
diff --git a/info.json b/info.json index aa9aca3..617588d 100644 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Production module.", "directory": "Production",