Compare commits
19
Commits
v0.5.5
..
0a88217443
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a88217443
|
||
|
|
2d783778a7
|
||
|
|
a3d4114044
|
||
|
|
cec54a45d7
|
||
|
|
3efa7101e1
|
||
|
|
861ff0650f
|
||
|
|
73f72d1bbe
|
||
|
|
a407a108ed
|
||
|
|
d6277d7766
|
||
|
|
5b1d741a16
|
||
|
|
5957868e0f
|
||
|
|
525d3bf326
|
||
|
|
0e1eb0da3f
|
||
|
|
4b81cc7f9f
|
||
|
|
c4d9236b16
|
||
|
|
2a5883375f
|
||
|
|
c4b6e39e9e
|
||
|
|
d3b5b6b6fd
|
||
|
|
bcde9fccf5
|
No files matched your search
+7
-39
@@ -210,7 +210,9 @@
|
||||
}
|
||||
|
||||
eventFilters.style.display = "block";
|
||||
updateAccountOptionsAndLoadEvents();
|
||||
updateAccountOptions();
|
||||
// Don't automatically fetch events on page load
|
||||
// Wait for user to explicitly select an account or click fetch
|
||||
} else {
|
||||
// User is not logged in
|
||||
loginView.style.display = "flex";
|
||||
@@ -253,7 +255,7 @@
|
||||
location.reload();
|
||||
}
|
||||
|
||||
function updateAccountOptionsAndLoadEvents() {
|
||||
function updateAccountOptions() {
|
||||
// Fetch available accounts from the server
|
||||
fetch(`${apiBaseUrl}/accounts`, {
|
||||
headers: { "Authorization": `Bearer ${storedApiKey}` }
|
||||
@@ -304,9 +306,6 @@
|
||||
|
||||
// Set the selected account in the dropdown
|
||||
accountSelect.value = accountToSelect;
|
||||
|
||||
// Automatically fetch events for the selected account
|
||||
fetchEvents(storedApiKey, accountToSelect);
|
||||
})
|
||||
.catch(error => {
|
||||
console.error("Erreur lors du chargement des comptes:", error);
|
||||
@@ -432,7 +431,6 @@
|
||||
<div class="card" style="border-left: 5px solid ${event.color}" data-id="${event.id_event}">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">${event.agegroup} - ${event.name}</h5>
|
||||
<p class="card-text">${event.title}</p>
|
||||
<p class="card-text"><strong>Adversaire:</strong> ${event.opponent}</p>
|
||||
<p class="card-text"><strong>Lieu:</strong> ${event.place}</p>
|
||||
<p class="card-text"><strong>Heure:</strong> ${event.start} - ${event.end}</p>
|
||||
@@ -454,46 +452,16 @@
|
||||
const sortedPlayers = data.convocation.available
|
||||
.sort((a, b) => (a.number || 0) - (b.number || 0));
|
||||
|
||||
// Calculate player statistics
|
||||
const totalPlayers = sortedPlayers.length;
|
||||
const positionCount = {};
|
||||
sortedPlayers.forEach(player => {
|
||||
const position = player.position || "N/A";
|
||||
positionCount[position] = (positionCount[position] || 0) + 1;
|
||||
});
|
||||
|
||||
// Generate position breakdown
|
||||
const positionBreakdown = Object.entries(positionCount)
|
||||
.map(([position, count]) => `${position}: ${count}`)
|
||||
.join(', ');
|
||||
|
||||
// Sort players by position first, then by number
|
||||
const playersByPosition = [...sortedPlayers].sort((a, b) => {
|
||||
// Sort by position first
|
||||
const positionA = a.position || "ZZZ"; // Put undefined positions at the end
|
||||
const positionB = b.position || "ZZZ";
|
||||
|
||||
if (positionA !== positionB) {
|
||||
return positionA.localeCompare(positionB);
|
||||
}
|
||||
|
||||
// If positions are the same, sort by number
|
||||
const numA = parseInt(a.number) || 0;
|
||||
const numB = parseInt(b.number) || 0;
|
||||
return numA - numB;
|
||||
});
|
||||
|
||||
eventDetailsContent.innerHTML = `
|
||||
<h5>${data.title}</h5>
|
||||
<p><strong>Type:</strong> ${data.type}</p>
|
||||
<p><strong>Lieu:</strong> ${data.place}</p>
|
||||
<p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
|
||||
<p><strong>Joueurs convoqués:</strong> ${totalPlayers} joueur${totalPlayers > 1 ? 's' : ''} (${positionBreakdown})</p>
|
||||
<h6>Liste des joueurs:</h6>
|
||||
<ul>${playersByPosition.map(player => {
|
||||
<h6>Joueurs convoqués:</h6>
|
||||
<ul>${sortedPlayers.map(player => {
|
||||
let number = player.number ? player.number : "N/A";
|
||||
let position = player.position ? player.position : "N/A";
|
||||
return `<li>[${position}] ${number} - ${player.fname} ${player.lname} (${player.dob})</li>`;
|
||||
return `<li>${number} - ${player.fname} ${player.lname} (${position}, ${player.dob})</li>`;
|
||||
}).join('')}</ul>
|
||||
`;
|
||||
new bootstrap.Modal(document.getElementById('eventDetailsModal')).show();
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ from . import myice
|
||||
# OIDC Configuration
|
||||
CLIENT_ID = os.environ.get("CLIENT_ID", "8ea04fbb-4237-4b1d-a895-0b3575a3af3f")
|
||||
CLIENT_SECRET = os.environ.get(
|
||||
"CLIENT_SECRET", "REDACTED_CLIENT_SECRET"
|
||||
"CLIENT_SECRET", "5iXycu7aU6o9e17NNTOUeetQkRkBqQlomoD2hTyLGLTAcwj0dwkkLH3mz1IrZSmJ"
|
||||
)
|
||||
REDIRECT_URI = os.environ.get("REDIRECT_URI", "http://localhost:8000/callback")
|
||||
AUTHORIZATION_ENDPOINT = "https://login.infomaniak.com/authorize"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "myice"
|
||||
version = "v0.5.5"
|
||||
version = "v0.5.4"
|
||||
description = "myice parsing"
|
||||
authors = [
|
||||
{ name = "Rene Luria", "email" = "<rene@luria.ch>"},
|
||||
|
||||
Reference in new issue
Block a user