mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-20 17:15:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed logic of invisible to a (forced) visibility field

Browse source
This commit is contained in:
Jan Böhmer 2023-12-03 15:29:17 +01:00
parent bc37d11f13
commit 7d69d6ba30
9 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Entity/EDA/EDACategoryInfo.php
View file

@ -38,10 +38,10 @@ class EDACategoryInfo
#[Groups(['full', 'category:read', 'category:write'])]
private ?string $reference_prefix = null;
/** @var bool|null If this is true, then this part is invisible for the EDA software */
#[Column(type: Types::BOOLEAN, nullable: true)]
/** @var bool|null Visibility of this part to EDA software in trinary logic. True=Visible, False=Invisible, Null=Auto */
#[Column(name: 'invisible', type: Types::BOOLEAN, nullable: true)] //TODO: Rename column to visibility
#[Groups(['full', 'category:read', 'category:write'])]
private ?bool $invisible = null;
private ?bool $visibility = null;
/** @var bool|null If this is set to true, then this part will be excluded from the BOM */
#[Column(type: Types::BOOLEAN, nullable: true)]
@ -74,14 +74,14 @@ class EDACategoryInfo
return $this;
}
public function getInvisible(): ?bool
public function getVisibility(): ?bool
{
return $this->invisible;
return $this->visibility;
}
public function setInvisible(?bool $invisible): EDACategoryInfo
public function setVisibility(?bool $visibility): EDACategoryInfo
{
$this->invisible = $invisible;
$this->visibility = $visibility;
return $this;
}

14
src/Entity/EDA/EDAPartInfo.php
View file

@ -43,10 +43,10 @@ class EDAPartInfo
#[Groups(['full', 'eda_info:read', 'eda_info:write'])]
private ?string $value = null;
/** @var bool|null If this is true, then this part is invisible for the EDA software */
#[Column(type: Types::BOOLEAN, nullable: true)]
/** @var bool|null Visibility of this part to EDA software in trinary logic. True=Visible, False=Invisible, Null=Auto */
#[Column(name: 'invisible', type: Types::BOOLEAN, nullable: true)] //TODO: Rename column to visibility
#[Groups(['full', 'eda_info:read', 'eda_info:write'])]
private ?bool $invisible = null;
private ?bool $visibility = null;
/** @var bool|null If this is set to true, then this part will be excluded from the BOM */
#[Column(type: Types::BOOLEAN, nullable: true)]
@ -100,14 +100,14 @@ class EDAPartInfo
return $this;
}
public function getInvisible(): ?bool
public function getVisibility(): ?bool
{
return $this->invisible;
return $this->visibility;
}
public function setInvisible(?bool $invisible): EDAPartInfo
public function setVisibility(?bool $visibility): EDAPartInfo
{
$this->invisible = $invisible;
$this->visibility = $visibility;
return $this;
}

5
src/Form/Part/EDA/EDACategoryInfoType.php
View file

@ -45,8 +45,9 @@ class EDACategoryInfoType extends AbstractType
]
]
)
->add('invisible', TriStateCheckboxType::class, [
'label' => 'eda_info.invisible',
->add('visibility', TriStateCheckboxType::class, [
'help' => 'eda_info.visibility.help',
'label' => 'eda_info.visibility',
])
->add('exclude_from_bom', TriStateCheckboxType::class, [
'label' => 'eda_info.exclude_from_bom',

5
src/Form/Part/EDA/EDAPartInfoType.php
View file

@ -50,8 +50,9 @@ class EDAPartInfoType extends AbstractType
'placeholder' => t('eda_info.value.placeholder'),
]
])
->add('invisible', TriStateCheckboxType::class, [
'label' => 'eda_info.invisible',
->add('visibility', TriStateCheckboxType::class, [
'help' => 'eda_info.visibility.help',
'label' => 'eda_info.visibility',
])
->add('exclude_from_bom', TriStateCheckboxType::class, [
'label' => 'eda_info.exclude_from_bom',

4
src/Services/EDA/KiCadHelper.php
View file

@ -80,7 +80,7 @@ class KiCadHelper
$result = [];
foreach ($categories as $category) {
//Skip invisible categories
if ($category->getEdaInfo()->getInvisible() ?? false) {
if ($category->getEdaInfo()->getVisibility() === false) {
continue;
}
@ -146,7 +146,7 @@ class KiCadHelper
$result = [];
foreach ($parts as $part) {
//If the part is invisible, then skip it
if ($part->getEdaInfo()->getInvisible() ?? $part->getCategory()?->getEdaInfo()->getInvisible() ?? false) {
if ($part->getEdaInfo()->getVisibility() === false || $part->getCategory()?->getEdaInfo()->getVisibility() === false) {
continue;
}

2
templates/admin/category_admin.html.twig
View file

@ -41,7 +41,7 @@
<div class="row">
<div class="col-sm-9 offset-sm-3">
{{ form_row(form.eda_info.invisible) }}
{{ form_row(form.eda_info.visibility) }}
</div>
</div>

2
templates/parts/edit/_eda.html.twig
View file

@ -3,7 +3,7 @@
<div class="row">
<div class="col-sm-9 offset-sm-3">
{{ form_row(form.eda_info.invisible) }}
{{ form_row(form.eda_info.visibility) }}
</div>
</div>

2
templates/parts/info/_extended_infos.html.twig
View file

@ -92,7 +92,7 @@
<br>
<b>{% trans %}eda_info.value{% endtrans %}:</b> {{ part.edaInfo.value }}
<br>
<b>{% trans %}eda_info.invisible{% endtrans %}:</b> {{ helper.boolean_badge( part.edaInfo.invisible ?? part.category.edaInfo.invisible ?? false) }}
<b>{% trans %}eda_info.visibility{% endtrans %}:</b> {{ helper.boolean_badge( part.edaInfo.visibility ?? part.category.edaInfo.visibility) }}
<br>
<b>{% trans %}eda_info.exclude_from_bom{% endtrans %}:</b> {{ helper.boolean_badge( part.edaInfo.excludeFromBom ?? part.category.edaInfo.excludeFromBom ?? false) }}
<br>

18
translations/messages.en.xlf
View file

@ -12107,12 +12107,6 @@ Please note, that you can not impersonate a disabled user. If you try you will g
<target>e.g. 100n</target>
</segment>
</unit>
<unit id="Q8nJNWg" name="eda_info.invisible">
<segment>
<source>eda_info.invisible</source>
<target>Invisible to EDA software</target>
</segment>
</unit>
<unit id="VphdbQ9" name="eda_info.exclude_from_bom">
<segment>
<source>eda_info.exclude_from_bom</source>
@ -12179,5 +12173,17 @@ Please note, that you can not impersonate a disabled user. If you try you will g
<target>KiCad API root URL</target>
</segment>
</unit>
<unit id="UXT_MIM" name="eda_info.visibility">
<segment>
<source>eda_info.visibility</source>
<target>Force visibility</target>
</segment>
</unit>
<unit id="NN5DZ4F" name="eda_info.visibility.help">
<segment>
<source>eda_info.visibility.help</source>
<target>By default, the visibility to the EDA software is automatically determined. With this checkbox, you can force the part to be visible or invisible.</target>
</segment>
</unit>
</file>
</xliff>