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.

Sign up for GitHub

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

feat: display new fields in orgs table #10499

Merged
merged 2 commits into from
Jul 2, 2024
Merged

feat: display new fields in orgs table #10499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8b450
display new fields
TheSussex Jun 26, 2024
404bb79
pass data in right column
TheSussex Jul 1, 2024
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
6 changes: 6 additions & 0 deletions po/common/common.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7044,4 +7044,10 @@ msgctxt "open_in_crm"
msgid "Open in CRM"
msgstr "Open in CRM"

msgctxt "last_login"
msgid "Last login date"
msgstr "Last login date"

msgctxt "last_import"
msgid "Last import date"
msgstr "Last import date"
8 changes: 8 additions & 0 deletions po/common/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7029,3 +7029,11 @@ msgstr "and your health!"
msgctxt "knowledge_panels_ingredients_rare_crops_divinfood"
msgid "Open Food Facts participates in the European project <a href=\"https://divinfood.eu/\">DIVINFOOD</a> (funded from European Union’s Horizon 2020 research and innovation programme). DIVINFOOD aims to develop food chains that value under-utilised agrobiodiversity in order to act against the decline of biodiversity and to meet the growing expectations of consumers for healthy, local products that contribute to sustainable food systems."
msgstr "Open Food Facts participates in the European project <a href=\"https://divinfood.eu/\">DIVINFOOD</a> (funded from European Union’s Horizon 2020 research and innovation programme). DIVINFOOD aims to develop food chains that value under-utilised agrobiodiversity in order to act against the decline of biodiversity and to meet the growing expectations of consumers for healthy, local products that contribute to sustainable food systems."

msgctxt "last_login"
msgid "Last login date"
msgstr "Last login date"

msgctxt "last_import"
msgid "Last import date"
msgstr "Last import date"
10 changes: 9 additions & 1 deletion po/common/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6934,4 +6934,12 @@ msgstr "Statut vérifié"

msgctxt "creation_date"
msgid "Date de création"
msgstr "Date de création"
msgstr "Date de création"

msgctxt "last_login"
msgid "Date de dernière connexion"
msgstr "Date de dernière connexion"

msgctxt "last_import"
msgid "Dernière date d'importation"
msgstr "Dernière date d'importation"
8 changes: 7 additions & 1 deletion templates/web/pages/dashboard/display_orgs_table.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<th>[% lang("org_id") %]</th>
<th>[% lang("verified_status") %]</th>
<th>[% lang("creation_date") %]</th>
<th>[% lang("last_login") %]</th>
<th>[% lang("last_import") %]</th>
<th>[% lang("data_sources_p") %]</th>
</tr>
</thead>
<tbody>
Expand All @@ -20,8 +23,11 @@
<td>[% org.name %]</td>
<td>[% org.creator %]</td>
<td>[% org.org_id %]</td>
<td>[% IF org.validated == 0 %]false[% ELSE %]true[% END %]</td>
<td>[% org.valid_org %]</td>
<td>[% display_date_tag(org.created_t) %]</td>
<td>[% display_date_tag(org.last_logged_member_t) %]</td>
<td>[% display_date_tag(org.last_import_t) %]</td>
<td>[% org.last_import_type %]</td>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that you are displaying the wrong value here.
In you screenshot wee can see "Manual import" in the "Last import date" column.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, the last import data is missing.

</tr>
[% SET count = count + 1 %]
[% END %]
Expand Down
Loading