Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/588: project-dataprovider visibility #69

Merged
merged 5 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Added leantime support for projects and project sync.
* Added week-based planning view, based on issue duedates.
* Fixed minor leantime integration issues.
* Added dataprovider as column in project list.
* Added nested menus and current page highlight in menu.


Expand Down
4 changes: 4 additions & 0 deletions src/Form/InvoiceNewType.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Form;

use App\Entity\Invoice;
use App\Entity\Project;
use Doctrine\ORM\EntityRepository;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
Expand All @@ -25,6 +26,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
->orderBy('p.name', 'ASC');
},
'attr' => ['class' => 'form-element'],
'choice_label' => function (Project $pr) {
return $pr->getName().' ('.$pr->getDataProvider().')';
},
])
;
}
Expand Down
2 changes: 2 additions & 0 deletions templates/project/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<tr>
<th class="table-th{% if projects.isSorted('project.id') %} sorted{% endif %}">{{ knp_pagination_sortable(projects, 'project.id'|trans, 'project.id') }}</th>
<th class="table-th{% if projects.isSorted('project.name') %} sorted{% endif %}">{{ knp_pagination_sortable(projects, 'project.name'|trans, 'project.name') }}</th>
<th class="table-th">{{ 'project.data_provider_id'|trans }}</th>
<th class="table-th{% if projects.isSorted('project.projectTrackerKey') %} sorted{% endif %}">{{ knp_pagination_sortable(projects, 'project.project_tracker_key'|trans, 'project.projectTrackerKey') }}</th>
<th class="table-th{% if projects.isSorted('project.updatedAt') %} sorted{% endif %}">{{ knp_pagination_sortable(projects, 'project.updated_at'|trans, 'project.updatedAt') }}</th>
<th class="table-th">{{ 'project.include'|trans }}</th>
Expand All @@ -36,6 +37,7 @@
<tr class="{{ index % 2 == 0 ? 'table-tr' : 'table-tr-alt' }}">
<td class="table-td">{{ project.id }}</td>
<td class="table-td">{{ project.name }}</td>
<td class="table-td">{{ project.dataprovider }}</td>
<td class="table-td">{{ project.projectTrackerKey }}</td>
<td class="table-td">{{ project.updatedAt ? project.updatedAt|date : '' }}</td>
<td class="table-td">
Expand Down
1 change: 1 addition & 0 deletions translations/messages.da.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ project:
form_key: "Nøgle"
form_include: "Inkluderet"
information: "Kun inkluderede projekter bliver vist og synkroniseret i resten af system."
data_provider_id: "Data Provider"

exception:
invoices_record_entry_amount_not_set: "Faktura can ikke bogføres, da den indeholder fakturalinjer hvor antal ikke er sat. Se: %invoiceEntryUrl%."
Expand Down
Loading