Skip to content

Commit d2b605e

Browse files
jbtronicsjbtronics
committed
Imrpoved bulk info provider manage page
1 parent 4c28871 commit d2b605e

File tree

2 files changed

+47
-49
lines changed

2 files changed

+47
-49
lines changed

‎templates/info_providers/bulk_import/manage.html.twig‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010

1111
{% block card_content %}
1212

13-
<div data-controller="bulk-job-manage"
14-
data-bulk-job-manage-delete-url-value="{{ path('bulk_info_provider_delete', {'jobId': '__JOB_ID__'}) }}"
15-
data-bulk-job-manage-stop-url-value="{{ path('bulk_info_provider_stop', {'jobId': '__JOB_ID__'}) }}"
16-
data-bulk-job-manage-delete-confirm-message-value="{% trans %}info_providers.bulk_import.confirm_delete_job{% endtrans %}"
17-
data-bulk-job-manage-stop-confirm-message-value="{% trans %}info_providers.bulk_import.confirm_stop_job{% endtrans %}">
13+
<div data-controller="bulk-job-manage"
14+
data-bulk-job-manage-delete-url-value="{{ path('bulk_info_provider_delete', {'jobId': '__JOB_ID__'}) }}"
15+
data-bulk-job-manage-stop-url-value="{{ path('bulk_info_provider_stop', {'jobId': '__JOB_ID__'}) }}"
16+
data-bulk-job-manage-delete-confirm-message-value="{% trans %}info_providers.bulk_import.confirm_delete_job{% endtrans %}"
17+
data-bulk-job-manage-stop-confirm-message-value="{% trans %}info_providers.bulk_import.confirm_stop_job{% endtrans %}">
1818

19-
<div class="d-flex justify-content-between align-items-center mb-3">
20-
<p class="text-muted mb-0">
21-
{% trans %}info_providers.bulk_import.manage_jobs_description{% endtrans %}
22-
</p>
23-
</div>
19+
<div class="d-flex justify-content-between align-items-center mb-3">
20+
<p class="text-muted mb-0">
21+
{% trans %}info_providers.bulk_import.manage_jobs_description{% endtrans %}
22+
</p>
23+
</div>
2424

25-
{% if jobs is not empty %}
26-
<div class="table-responsive">
27-
<table class="table table-striped">
28-
<thead>
25+
{% if jobs is not empty %}
26+
<div class="table-responsive">
27+
<table class="table table-striped">
28+
<thead>
2929
<tr>
3030
<th>{% trans %}info_providers.bulk_import.job_name{% endtrans %}</th>
3131
<th>{% trans %}info_providers.bulk_import.parts_count{% endtrans %}</th>
@@ -37,8 +37,8 @@
3737
<th>{% trans %}info_providers.bulk_import.completed_at{% endtrans %}</th>
3838
<th>{% trans %}info_providers.bulk_import.action.label{% endtrans %}</th>
3939
</tr>
40-
</thead>
41-
<tbody>
40+
</thead>
41+
<tbody>
4242
{% for job in jobs %}
4343
<tr>
4444
<td>
@@ -52,10 +52,10 @@
5252
<td>
5353
<div class="d-flex align-items-center">
5454
<div class="progress me-2" style="width: 80px; height: 12px;">
55-
<div class="progress-bar {% if job.isCompleted %}bg-success{% elseif job.isFailed %}bg-danger{% else %}bg-info{% endif %}"
56-
role="progressbar"
57-
style="width: {{ job.progressPercentage }}%"
58-
aria-valuenow="{{ job.progressPercentage }}"
55+
<div class="progress-bar {% if job.isCompleted %}bg-success{% elseif job.isFailed %}bg-danger{% else %}bg-info{% endif %}"
56+
role="progressbar"
57+
style="width: {{ job.progressPercentage }}%"
58+
aria-valuenow="{{ job.progressPercentage }}"
5959
aria-valuemin="0" aria-valuemax="100">
6060
</div>
6161
</div>
@@ -78,11 +78,11 @@
7878
<span class="badge bg-danger">{% trans %}info_providers.bulk_import.status.failed{% endtrans %}</span>
7979
{% endif %}
8080
</td>
81-
<td>{{ job.createdBy.username }}</td>
82-
<td>{{ job.createdAt|date('Y-m-d H:i') }}</td>
81+
<td>{{ job.createdBy.fullName(true) }}</td>
82+
<td>{{ job.createdAt|format_datetime('short') }}</td>
8383
<td>
8484
{% if job.completedAt %}
85-
{{ job.completedAt|date('Y-m-d H:i') }}
85+
{{ job.completedAt|format_datetime('short') }}
8686
{% else %}
8787
<span class="text-muted">-</span>
8888
{% endif %}
@@ -108,19 +108,17 @@
108108
</td>
109109
</tr>
110110
{% endfor %}
111-
</tbody>
112-
</table>
113-
</div>
114-
{% else %}
115-
<div class="alert alert-info" role="alert">
116-
<i class="fas fa-info-circle"></i>
117-
{% trans %}info_providers.bulk_import.no_jobs_found{% endtrans %}
118-
<a href="{{ path('bulk_info_provider_step1') }}" class="alert-link">
111+
</tbody>
112+
</table>
113+
</div>
114+
{% else %}
115+
<div class="alert alert-info" role="alert">
116+
<i class="fas fa-info-circle"></i>
117+
{% trans %}info_providers.bulk_import.no_jobs_found{% endtrans %}<br>
119118
{% trans %}info_providers.bulk_import.create_first_job{% endtrans %}
120-
</a>
121-
</div>
122-
{% endif %}
119+
</div>
120+
{% endif %}
123121

124-
</div>
122+
</div>
125123

126-
{% endblock %}
124+
{% endblock %}

‎translations/messages.en.xlf‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12475,7 +12475,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1247512475
<unit id="p7LGAIX" name="settings.ips.element14.apiKey.help">
1247612476
<segment state="translated">
1247712477
<source>settings.ips.element14.apiKey.help</source>
12478-
<target>You can register for an API key on &lt;a href="https://partner.element14.com/"&gt;https://partner.element14.com/&lt;/a&gt;.</target>
12478+
<target><![CDATA[You can register for an API key on <a href="https://partner.element14.com/">https://partner.element14.com/</a>.]]></target>
1247912479
</segment>
1248012480
</unit>
1248112481
<unit id="ZdUHpZc" name="settings.ips.element14.storeId">
@@ -12487,7 +12487,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1248712487
<unit id="XXGUxF6" name="settings.ips.element14.storeId.help">
1248812488
<segment state="translated">
1248912489
<source>settings.ips.element14.storeId.help</source>
12490-
<target>The store domain to retrieve the data from. This decides the language and currency of results. See &lt;a href="https://partner.element14.com/docs/Product_Search_API_REST__Description"&gt;here&lt;/a&gt; for a list of valid domains.</target>
12490+
<target><![CDATA[The store domain to retrieve the data from. This decides the language and currency of results. See <a href="https://partner.element14.com/docs/Product_Search_API_REST__Description">here</a> for a list of valid domains.]]></target>
1249112491
</segment>
1249212492
</unit>
1249312493
<unit id="WKWZIm2" name="settings.ips.tme">
@@ -12505,7 +12505,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1250512505
<unit id="_pYLrPT" name="settings.ips.tme.token.help">
1250612506
<segment state="translated">
1250712507
<source>settings.ips.tme.token.help</source>
12508-
<target>You can get an API token and secret on &lt;a href="https://developers.tme.eu/en/"&gt;https://developers.tme.eu/en/&lt;/a&gt;.</target>
12508+
<target><![CDATA[You can get an API token and secret on <a href="https://developers.tme.eu/en/">https://developers.tme.eu/en/</a>.]]></target>
1250912509
</segment>
1251012510
</unit>
1251112511
<unit id="yswx4bq" name="settings.ips.tme.secret">
@@ -12553,7 +12553,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1255312553
<unit id="gu.JlpT" name="settings.ips.mouser.apiKey.help">
1255412554
<segment state="translated">
1255512555
<source>settings.ips.mouser.apiKey.help</source>
12556-
<target>You can register for an API key on &lt;a href="https://eu.mouser.com/api-hub/"&gt;https://eu.mouser.com/api-hub/&lt;/a&gt;.</target>
12556+
<target><![CDATA[You can register for an API key on <a href="https://eu.mouser.com/api-hub/">https://eu.mouser.com/api-hub/</a>.]]></target>
1255712557
</segment>
1255812558
</unit>
1255912559
<unit id="Q66CNjw" name="settings.ips.mouser.searchLimit">
@@ -12631,7 +12631,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1263112631
<unit id="kKv0J3." name="settings.system.attachments">
1263212632
<segment state="translated">
1263312633
<source>settings.system.attachments</source>
12634-
<target>Attachments &amp; Files</target>
12634+
<target><![CDATA[Attachments & Files]]></target>
1263512635
</segment>
1263612636
</unit>
1263712637
<unit id="dsRff8T" name="settings.system.attachments.maxFileSize">
@@ -12655,7 +12655,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1265512655
<unit id="T.PBu5P" name="settings.system.attachments.allowDownloads.help">
1265612656
<segment state="translated">
1265712657
<source>settings.system.attachments.allowDownloads.help</source>
12658-
<target>With this option users can download external files into Part-DB by providing an URL. &lt;b&gt;Attention: This can be a security issue, as it might allow users to access intranet ressources via Part-DB!&lt;/b&gt;</target>
12658+
<target><![CDATA[With this option users can download external files into Part-DB by providing an URL. <b>Attention: This can be a security issue, as it might allow users to access intranet ressources via Part-DB!</b>]]></target>
1265912659
</segment>
1266012660
</unit>
1266112661
<unit id=".OyihML" name="settings.system.attachments.downloadByDefault">
@@ -12829,8 +12829,8 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1282912829
<unit id="0GRlEe5" name="settings.system.localization.base_currency_description">
1283012830
<segment state="translated">
1283112831
<source>settings.system.localization.base_currency_description</source>
12832-
<target>The currency that is used to store price information and exchange rates in. This currency is assumed, when no currency is set for a price information.
12833-
&lt;b&gt;Please note that the currencies are not converted, when changing this value. So changing the default currency after you already added price information, will result in wrong prices!&lt;/b&gt;</target>
12832+
<target><![CDATA[The currency that is used to store price information and exchange rates in. This currency is assumed, when no currency is set for a price information.
12833+
<b>Please note that the currencies are not converted, when changing this value. So changing the default currency after you already added price information, will result in wrong prices!</b>]]></target>
1283412834
</segment>
1283512835
</unit>
1283612836
<unit id="cvpTUeY" name="settings.system.privacy">
@@ -12860,7 +12860,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1286012860
<unit id="w07P3Dt" name="settings.misc.kicad_eda.category_depth.help">
1286112861
<segment state="translated">
1286212862
<source>settings.misc.kicad_eda.category_depth.help</source>
12863-
<target>This value determines the depth of the category tree, that is visible inside KiCad. 0 means that only the top level categories are visible. Set to a value &gt; 0 to show more levels. Set to -1, to show all parts of Part-DB inside a sigle cnategory in KiCad.</target>
12863+
<target><![CDATA[This value determines the depth of the category tree, that is visible inside KiCad. 0 means that only the top level categories are visible. Set to a value > 0 to show more levels. Set to -1, to show all parts of Part-DB inside a sigle cnategory in KiCad.]]></target>
1286412864
</segment>
1286512865
</unit>
1286612866
<unit id="VwvmcWE" name="settings.behavior.sidebar">
@@ -12878,7 +12878,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1287812878
<unit id="jc0JTvL" name="settings.behavior.sidebar.items.help">
1287912879
<segment state="translated">
1288012880
<source>settings.behavior.sidebar.items.help</source>
12881-
<target>The menus which appear at the sidebar by default. Order of items can be changed via drag &amp; drop.</target>
12881+
<target><![CDATA[The menus which appear at the sidebar by default. Order of items can be changed via drag & drop.]]></target>
1288212882
</segment>
1288312883
</unit>
1288412884
<unit id="gVSWDkE" name="settings.behavior.sidebar.rootNodeEnabled">
@@ -12926,7 +12926,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1292612926
<unit id="SUD8H3b" name="settings.behavior.table.parts_default_columns.help">
1292712927
<segment state="translated">
1292812928
<source>settings.behavior.table.parts_default_columns.help</source>
12929-
<target>The columns to show by default in part tables. Order of items can be changed via drag &amp; drop.</target>
12929+
<target><![CDATA[The columns to show by default in part tables. Order of items can be changed via drag & drop.]]></target>
1293012930
</segment>
1293112931
</unit>
1293212932
<unit id="hazr_g5" name="settings.ips.oemsecrets">
@@ -12980,7 +12980,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1298012980
<unit id="KLJYfJ0" name="settings.ips.oemsecrets.sortMode.M">
1298112981
<segment state="translated">
1298212982
<source>settings.ips.oemsecrets.sortMode.M</source>
12983-
<target>Completeness &amp; Manufacturer name</target>
12983+
<target><![CDATA[Completeness & Manufacturer name]]></target>
1298412984
</segment>
1298512985
</unit>
1298612986
<unit id="8C9ijHM" name="entity.export.flash.error.no_entities">
@@ -13688,7 +13688,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1368813688
<unit id="LheSXys" name="info_providers.bulk_import.create_first_job">
1368913689
<segment state="translated">
1369013690
<source>info_providers.bulk_import.create_first_job</source>
13691-
<target>Create your first bulk import job</target>
13691+
<target>Create your first bulk import job by selecting multiple parts in a part table and select the "Bulk info provider import" option.</target>
1369213692
</segment>
1369313693
</unit>
1369413694
<unit id="Lm_DPbH" name="info_providers.bulk_import.confirm_delete_job">

0 commit comments

Comments
 (0)