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

RDISCROWD-7794 Component Usage Dashboard updates #475

Merged
merged 1 commit into from
Nov 14, 2024
Merged

RDISCROWD-7794 Component Usage Dashboard updates #475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions templates/admin/usage_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h2 id ="large-header">{{ _('Platform Totals — ')}}</h2>
{% if value|length and value[0][1] != None %}
{% set ids = value|map(attribute='1')|join(',') %}
{% set count = ids.split(",") | length %}
<a href="#" class="stat-link" data-toggle="modal" data-target="#statsModal" data-ids="{{ ids }}" data-names="{{ value|map(attribute='2')|join(',') }}" data-owner-names="{{ value|map(attribute='4')|join(',') }}" data-owner-emails="{{ value|map(attribute='5')|join(',') }}">{{ count }}</a>
<a href="#" class="stat-link" data-toggle="modal" data-target="#statsModal" data-ids="{{ ids }}" data-names="{{ value|map(attribute='2')|join(',') }}" data-owner-names="{{ value|map(attribute='4')|join(',') }}" data-owner-emails="{{ value|map(attribute='5')|join(',') }}" data-last-submissions="{{ value|map(attribute='6')|join(',') }}" data-project-published="{{ value|map(attribute='7')|join(',') }}">{{ count }}</a>
{% elif value|length %}
{{ value[0][0] }}
{% else %}
Expand Down Expand Up @@ -88,6 +88,8 @@ <h3 class="modal-title" id="statsDetailLabel">Projects Using: <span id='modal-su
<th>Project ID</th>
<th>Project Name</th>
<th>Owner</th>
<th>Last Submission Date</th>
<th>Published</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -146,18 +148,34 @@ <h3 class="modal-title" id="statsDetailLabel">Projects Using: <span id='modal-su
const names = `${$(this).data('names')}`.split(',');
const owner_names = `${$(this).data('owner-names')}`.split(',');
const owner_emails = `${$(this).data('owner-emails')}`.split(',');
const last_submissions = `${$(this).data('last-submissions')}`.split(',');
const project_published = `${$(this).data('project-published')}`.split(',');
const table = document.getElementById('project-table').getElementsByTagName('tbody')[0];

// Clear the table before adding new rows
const formattedSubmissions = last_submissions.map(dateString => {
dateString = dateString.trim();

return (dateString === "None" || dateString === "") ? "-" : new Date(dateString).toLocaleDateString('en-US', {
year: 'numeric',
month: 'numeric',
day: 'numeric'
});
});

// Clear the table before adding new rows.
table.innerHTML = '';
for (let i = 0; i < ids.length; i++) {
const row = table.insertRow();
const cell1 = row.insertCell(0);
const cell2 = row.insertCell(1);
const cell3 = row.insertCell(2);
const cell4 = row.insertCell(3);
const cell5 = row.insertCell(4);
cell1.textContent = ids[i].trim();
cell2.innerHTML = `<a href="/projectid/${ids[i].trim()}" target="_blank">${names[i]}</a>`;
cell3.innerHTML = `<span title="${owner_emails[i]}">${owner_names[i]}</span>`;
cell4.innerHTML = `<span title="${formattedSubmissions[i]}">${formattedSubmissions[i]}</span>`;
cell5.innerHTML = `<span title="${project_published[i]}">${project_published[i]}</span>`;
}
});
})
Expand Down
Loading