Jingga/oms-Production
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Production.git synced 2026-01-11 05:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-05-16 02:14:55 +00:00
parent c2d4c30feb
commit 05d0ce76ab
10 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Admin/Install/db.json
View File

@ -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

6
Models/MachineMapper.php
View File

@ -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'],
];

1
Models/NullProduction.php
View File

@ -24,5 +24,4 @@ namespace Modules\Production\Models;
*/
class NullProduction extends Production
{
}

2
Models/Production.php
View File

@ -54,6 +54,6 @@ class Production
public function __construct()
{
$this->createdAt = new \DateTimeImmutable('now');
$this->item = new NullItem();
$this->item = new NullItem();
}
}

14
Theme/Backend/Lang/de.lang.php
View File

@ -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',
]];

14
Theme/Backend/Lang/en.lang.php
View File

@ -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',
]];

2
Theme/Backend/machine-view.tpl.php
View File

@ -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();

2
Theme/Backend/production-list.tpl.php
View File

@ -36,7 +36,7 @@ echo $this->data['nav']->render(); ?>
<tbody>
<?php $c = 0;
foreach ([] as $key => $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); ?>
<tr>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>

4
Theme/Backend/production-view.tpl.php
View File

@ -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(); ?>
<div class="tabview tab-2">

2
info.json
View File

@ -12,7 +12,7 @@
},
"creator": {
"name": "Jingga",
"website": "jingga.app"
"website": "https://jingga.app"
},
"description": "Production module.",
"directory": "Production",