time mismatch issue
This commit is contained in:
parent
d6a87928b8
commit
67a9ab2a45
22
src/App.js
22
src/App.js
@ -125,6 +125,8 @@ const apiService = {
|
||||
console.error("Server responded with error:", response.status, errorData);
|
||||
console.log("Sending exact payload:", JSON.stringify(resultData));
|
||||
throw new Error(`Failed to publish result: ${response.status}`);
|
||||
}else{
|
||||
console.log("Response is ok")
|
||||
}
|
||||
|
||||
return response.json();
|
||||
@ -520,7 +522,7 @@ const ResultCalendar = () => {
|
||||
<tr>
|
||||
<th>Team</th>
|
||||
<th>Result</th>
|
||||
<th>Announcement Time</th>
|
||||
<th>Result Time</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -528,8 +530,8 @@ const ResultCalendar = () => {
|
||||
{results.map(result => (
|
||||
<tr key={result.id}>
|
||||
<td>{result.team}</td>
|
||||
<td>{result.result}</td>
|
||||
<td>{result.announcement_time}</td>
|
||||
<td>{result.visible_result}</td>
|
||||
<td>{new Date(result.result_time).toISOString().split('T').join(" ").replace("Z", "").slice(0, -4)}</td>
|
||||
<td>
|
||||
<Link to={`/admin/results/edit/${result.id}?date=${date}`} className="btn-secondary">Edit</Link>
|
||||
<button
|
||||
@ -584,9 +586,8 @@ const ResultForm = ({ isEdit = false }) => {
|
||||
if (result) {
|
||||
setFormData({
|
||||
team: result.team_id.toString(),
|
||||
result: result.result,
|
||||
date: result.result_date,
|
||||
announcement_time: result.announcement_time
|
||||
result: result.visible_result,
|
||||
result_time: result.result_time
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -610,9 +611,8 @@ const ResultForm = ({ isEdit = false }) => {
|
||||
try {
|
||||
const payload = {
|
||||
team: formData.team, // This should be the team ID
|
||||
date: formData.date,
|
||||
result: formData.result,
|
||||
announcement_time: formData.announcement_time
|
||||
result_time: formData.date + " " + formData.result_time
|
||||
};
|
||||
|
||||
if (isEdit) {
|
||||
@ -669,11 +669,11 @@ const ResultForm = ({ isEdit = false }) => {
|
||||
/>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
<label>Announcement Time</label>
|
||||
<label>Result Time</label>
|
||||
<input
|
||||
type="time"
|
||||
name="announcement_time"
|
||||
value={formData.announcement_time}
|
||||
name="result_time"
|
||||
value={formData.result_time}
|
||||
onChange={handleChange}
|
||||
required
|
||||
/>
|
||||
|
||||
@ -388,7 +388,7 @@ const ResultCalendar = () => {
|
||||
{results.map(result => (
|
||||
<tr key={result.id}>
|
||||
<td>{result.team}</td>
|
||||
<td>{result.result}</td>
|
||||
<td>{result.visible_result}</td>
|
||||
<td>
|
||||
<Link to={`/results/edit/${result.id}?date=${date}`} className="btn-secondary">Edit</Link>
|
||||
</td>
|
||||
@ -439,7 +439,7 @@ const ResultForm = ({ isEdit = false }) => {
|
||||
console.log(result)
|
||||
setFormData({
|
||||
team: result.team,
|
||||
result: result.result,
|
||||
result: result.visible_result,
|
||||
date: result.date
|
||||
});
|
||||
}
|
||||
|
||||
@ -59,18 +59,19 @@ const Home = () => {
|
||||
results[yesterdayFormatted] = yesterdayResults[index].result;
|
||||
}
|
||||
|
||||
// Add today's result if available
|
||||
const todayResult = todayResultsResponse.data.find(r => r.team === team.name);
|
||||
if (todayResult) {
|
||||
results[todayFormatted] = todayResult.result;
|
||||
}
|
||||
|
||||
// Extract time from team name or use default
|
||||
let time = "XX:XX";
|
||||
const timePart = team.name.match(/\d{2}:\d{2}\s*(?:AM|PM)/i);
|
||||
if (timePart) {
|
||||
time = timePart[0];
|
||||
}
|
||||
// Add today's result if available
|
||||
const todayResult = todayResultsResponse.data.find(r => r.team === team.name);
|
||||
if (todayResult) {
|
||||
console.log("test 1: " + todayResult.visible_result);
|
||||
results[todayFormatted] = todayResult.visible_result;
|
||||
}
|
||||
|
||||
// Extract time from today's result or use default
|
||||
let time = "XX:XX";
|
||||
if (todayResult && todayResult.result_time) {
|
||||
const resultTime = new Date(todayResult.result_time);
|
||||
time = resultTime.toLocaleTimeString("en-US", { hour: '2-digit', minute: '2-digit', hour12: true });
|
||||
}
|
||||
|
||||
return {
|
||||
id: team.id,
|
||||
@ -187,7 +188,7 @@ const Home = () => {
|
||||
|
||||
if (dayData && dayData.results.length > 0) {
|
||||
dayData.results.forEach(result => {
|
||||
teamResults[result.team] = result.result;
|
||||
teamResults[result.team] = result.visible_result;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ const Home2 = () => {
|
||||
// Add today's result if available
|
||||
const todayResult = todayResultsResponse.data.find(r => r.team === team.name);
|
||||
if (todayResult) {
|
||||
results[todayFormatted] = todayResult.result;
|
||||
results[todayFormatted] = todayresult.visible_result;
|
||||
}
|
||||
|
||||
// Extract time from team name or use default
|
||||
@ -187,7 +187,7 @@ const Home2 = () => {
|
||||
|
||||
if (dayData && dayData.results.length > 0) {
|
||||
dayData.results.forEach(result => {
|
||||
teamResults[result.team] = result.result;
|
||||
teamResults[result.team] = result.visible_result;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ const TeamResults = () => {
|
||||
const sanitizedData = data.map((team) => ({
|
||||
...team,
|
||||
name: sanitizeString(team.name),
|
||||
announcement_time: team.announcement_time || "N/A", // Handle missing time
|
||||
result_time: team.result_time || "N/A", // Handle missing time
|
||||
results: team.results || {} // Ensure results exist
|
||||
}));
|
||||
|
||||
@ -53,7 +53,7 @@ const TeamResults = () => {
|
||||
{teams.map((team) => (
|
||||
<div key={team.id} className="border p-4 rounded-md shadow-md">
|
||||
<h3 className="text-lg font-semibold">{team.name}</h3>
|
||||
<p className="text-sm text-gray-600">Time: {team.announcement_time}</p>
|
||||
<p className="text-sm text-gray-600">Time: {team.result_time}</p>
|
||||
|
||||
<div className="mt-2">
|
||||
<h4 className="font-semibold">Results:</h4>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user