Atul/PatientProTokenRepository
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Atul:3c7ff4cceb0f8d671216c8666fdf5140013d2b16
Branches Tags
Atul:main
Atul:dev/ui-changes-atul
Atul:dev/TokenTableCachingIssue
Atul:dev/loading-animation-searchbox-mahima
Atul:dev/dashboard-rbac
Atul:dev/fixTheBugOfHeaderInMultiBooking-sajan
Atul:dev/ui-changes-sajan
Atul:dev/ui-changes-mahima
Atul:dev/ui-work
Atul:feature/token-management
..
compare: Atul:e7d9b6966b637b740466704a7785d74e47e40c5e
Branches Tags
Atul:dev/ui-changes-atul
Atul:main
Atul:dev/TokenTableCachingIssue
Atul:dev/loading-animation-searchbox-mahima
Atul:dev/dashboard-rbac
Atul:dev/fixTheBugOfHeaderInMultiBooking-sajan
Atul:dev/ui-changes-sajan
Atul:dev/ui-changes-mahima
Atul:dev/ui-work
Atul:feature/token-management

No commits in common. "3c7ff4cceb0f8d671216c8666fdf5140013d2b16" and "e7d9b6966b637b740466704a7785d74e47e40c5e" have entirely different histories.
3c7ff4cceb ... e7d9b6966b

2 changed files with 294 additions and 275 deletions
Show Stats Expand all files Collapse all files

37
src/app/components/TokenTable.jsx
View File

@ -101,11 +101,11 @@ export default function TokenTable({ statusFilter }) {
return ( return (
<div className={`flex items-center justify-center min-h-[200px] ${darkMode ? 'bg-gray-900' : 'bg-white'}`}> <div className={`flex items-center justify-center min-h-[200px] ${darkMode ? 'bg-gray-900' : 'bg-white'}`}>
<div className="text-center"> <div className="text-center">
<div <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${
className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${darkMode === true ? "border-gray-100" : "border-blue-400" darkMode === true ? 'border-gray-100' : 'border-gray-900'
}`} }`}></div>
></div> <p className={`mt-4 text-lg font-semibold ${
<p className={`mt-4 text-lg font-semibold ${darkMode === true ? 'text-gray-100' : 'text-gray-900' darkMode === true ? 'text-gray-100' : 'text-gray-900'
}`}> }`}>
Loading... Loading...
</p> </p>
@ -115,9 +115,11 @@ export default function TokenTable({ statusFilter }) {
} }
if (loading) return ( if (loading) return (
<div className={`text-center py-10 ${darkMode ? 'bg-gray-900' : 'bg-white'}`}> <div className={`text-center py-10 ${darkMode ? 'bg-gray-900' : 'bg-white'}`}>
<div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 mx-auto ${darkMode ? 'border-gray-100' : 'border-blue-400' <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 mx-auto ${
darkMode ? 'border-gray-100' : 'border-gray-900'
}`}></div> }`}></div>
<p className={`mt-4 text-lg font-semibold ${darkMode ? 'text-gray-100' : 'text-gray-900' <p className={`mt-4 text-lg font-semibold ${
darkMode ? 'text-gray-100' : 'text-gray-900'
}`}> }`}>
Loading... Loading...
</p> </p>
@ -135,7 +137,8 @@ export default function TokenTable({ statusFilter }) {
<input <input
type="text" type="text"
placeholder="Search by token or name" placeholder="Search by token or name"
className={`mb-4 p-2 border rounded w-full max-w-sm transition-colors ${darkMode className={`mb-4 p-2 border rounded w-full max-w-sm transition-colors ${
darkMode
? 'bg-gray-800 border-gray-700 text-white placeholder-gray-400 focus:ring-blue-500 focus:border-blue-500' ? 'bg-gray-800 border-gray-700 text-white placeholder-gray-400 focus:ring-blue-500 focus:border-blue-500'
: 'bg-white border-gray-300 placeholder-gray-500 focus:ring-blue-500 focus:border-blue-500' : 'bg-white border-gray-300 placeholder-gray-500 focus:ring-blue-500 focus:border-blue-500'
}`} }`}
@ -169,7 +172,8 @@ export default function TokenTable({ statusFilter }) {
<td className="p-3">{entry.patientName}</td> <td className="p-3">{entry.patientName}</td>
<td className="p-3"> <td className="p-3">
<span <span
className={`px-2 py-1 rounded-full text-xs font-semibold ${entry.status === "done" className={`px-2 py-1 rounded-full text-xs font-semibold ${
entry.status === "done"
? darkMode ? darkMode
? "bg-green-900 text-green-100" ? "bg-green-900 text-green-100"
: "bg-green-100 text-green-800" : "bg-green-100 text-green-800"
@ -190,7 +194,8 @@ export default function TokenTable({ statusFilter }) {
<> <>
<button <button
onClick={() => updateStatus(entry.$id, "done")} onClick={() => updateStatus(entry.$id, "done")}
className={`border rounded-full px-2 py-1 text-xs transition-colors ${darkMode className={`border rounded-full px-2 py-1 text-xs transition-colors ${
darkMode
? 'border-green-400 text-green-400 hover:bg-green-900' ? 'border-green-400 text-green-400 hover:bg-green-900'
: 'border-green-600 text-green-600 hover:bg-green-50' : 'border-green-600 text-green-600 hover:bg-green-50'
}`} }`}
@ -199,7 +204,8 @@ export default function TokenTable({ statusFilter }) {
</button> </button>
<button <button
onClick={() => updateStatus(entry.$id, "missed")} onClick={() => updateStatus(entry.$id, "missed")}
className={`border rounded-full px-2 py-1 text-xs transition-colors ${darkMode className={`border rounded-full px-2 py-1 text-xs transition-colors ${
darkMode
? 'border-red-400 text-red-400 hover:bg-red-900' ? 'border-red-400 text-red-400 hover:bg-red-900'
: 'border-red-600 text-red-600 hover:bg-red-50' : 'border-red-600 text-red-600 hover:bg-red-50'
}`} }`}
@ -215,12 +221,14 @@ export default function TokenTable({ statusFilter }) {
</table> </table>
</div> </div>
<div className={`flex justify-between items-center mt-4 p-2 rounded ${darkMode ? 'bg-gray-800' : 'bg-gray-100' <div className={`flex justify-between items-center mt-4 p-2 rounded ${
darkMode ? 'bg-gray-800' : 'bg-gray-100'
}`}> }`}>
<button <button
disabled={currentPage === 1} disabled={currentPage === 1}
onClick={() => setCurrentPage((prev) => prev - 1)} onClick={() => setCurrentPage((prev) => prev - 1)}
className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${darkMode className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${
darkMode
? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent' ? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent'
: 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent' : 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent'
}`} }`}
@ -233,7 +241,8 @@ export default function TokenTable({ statusFilter }) {
<button <button
disabled={currentPage === totalPages} disabled={currentPage === totalPages}
onClick={() => setCurrentPage((prev) => prev + 1)} onClick={() => setCurrentPage((prev) => prev + 1)}
className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${darkMode className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${
darkMode
? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent' ? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent'
: 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent' : 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent'
}`} }`}

112
src/app/pages/entries/EntriesTable.js
View File

@ -1,3 +1,4 @@
"use client"; "use client";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { databases, Query } from "../../lib/appwrite"; import { databases, Query } from "../../lib/appwrite";
@ -5,7 +6,6 @@ import { DATABASE_ID, COLLECTION_ID } from "../../lib/api";
import Header from "../../components/partials/header"; import Header from "../../components/partials/header";
import { useTheme } from "../../context/ThemeContext"; import { useTheme } from "../../context/ThemeContext";
import { useAuth } from "../../context/AuthContext"; import { useAuth } from "../../context/AuthContext";
import { FaSearch } from 'react-icons/fa';
export default function EntriesTable() { export default function EntriesTable() {
const { userRole } = useAuth(); const { userRole } = useAuth();
@ -14,7 +14,7 @@ export default function EntriesTable() {
const [filteredEntries, setFilteredEntries] = useState([]); const [filteredEntries, setFilteredEntries] = useState([]);
const [searchQuery, setSearchQuery] = useState(""); const [searchQuery, setSearchQuery] = useState("");
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const [avgConsultTime, setAvgConsultTime] = useState(15); const [avgConsultTime, setAvgConsultTime] = useState(15); // Default 15 mins
const entriesPerPage = 20; const entriesPerPage = 20;
const [currentToken, setCurrentToken] = useState(null); const [currentToken, setCurrentToken] = useState(null);
@ -24,6 +24,7 @@ export default function EntriesTable() {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(null); const [error, setError] = useState(null);
// Calculate waiting time based on position in queue
const calculateWaitTime = (tokenNumber) => { const calculateWaitTime = (tokenNumber) => {
const bookedEntries = entries.filter((e) => e.status === "booked"); const bookedEntries = entries.filter((e) => e.status === "booked");
const position = bookedEntries.findIndex( const position = bookedEntries.findIndex(
@ -57,13 +58,19 @@ export default function EntriesTable() {
return; return;
} }
const currentIndex = entries.findIndex((entry) => entry.status === "booked"); const currentIndex = entries.findIndex(
(entry) => entry.status === "booked"
);
const current = currentIndex >= 0 ? entries[currentIndex] : null; const current = currentIndex >= 0 ? entries[currentIndex] : null;
setCurrentToken(current?.tokenNumber || null); setCurrentToken(current?.tokenNumber || null);
setPreviousToken(currentIndex > 0 ? entries[currentIndex - 1]?.tokenNumber : null); setPreviousToken(
currentIndex > 0 ? entries[currentIndex - 1]?.tokenNumber : null
);
setNextToken( setNextToken(
currentIndex < entries.length - 1 ? entries[currentIndex + 1]?.tokenNumber : null currentIndex < entries.length - 1
? entries[currentIndex + 1]?.tokenNumber
: null
); );
const missed = entries const missed = entries
@ -92,13 +99,18 @@ export default function EntriesTable() {
}; };
useEffect(() => { useEffect(() => {
if (userRole === "patient") return; if (userRole === "patient") return; // Don't load data if patient
const loadData = async () => { const loadData = async () => {
try { try {
const data = await getEntries(); const data = await getEntries();
setEntries(data); setEntries(data);
setFilteredEntries(data); setFilteredEntries(data);
updateTokenInfo(data); updateTokenInfo(data);
// Load settings (avg consultation time)
// const settings = await getSettings();
// setAvgConsultTime(settings?.avgConsultationTime || 15);
} catch (err) { } catch (err) {
setError(err.message); setError(err.message);
} finally { } finally {
@ -121,22 +133,32 @@ export default function EntriesTable() {
const indexOfLastEntry = currentPage * entriesPerPage; const indexOfLastEntry = currentPage * entriesPerPage;
const indexOfFirstEntry = indexOfLastEntry - entriesPerPage; const indexOfFirstEntry = indexOfLastEntry - entriesPerPage;
const currentEntries = filteredEntries.slice(indexOfFirstEntry, indexOfLastEntry); const currentEntries = filteredEntries.slice(
indexOfFirstEntry,
indexOfLastEntry
);
const totalPages = Math.ceil(filteredEntries.length / entriesPerPage); const totalPages = Math.ceil(filteredEntries.length / entriesPerPage);
if (loading) if (loading)
return ( return (
<div className="text-center mt-20"> <div className="text-center mt-50">
<div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto"></div> <div
<p className="mt-4 text-lg font-semibold">Loading...</p> className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto`}
></div>
<p className={`mt-4 text-lg font-semibold`}>Loading...</p>
</div> </div>
); );
if (error) return <div className="p-4 text-red-500">Error: {error}</div>; if (error) return <div className="p-4 text-red-500">Error: {error}</div>;
// Check user role and show permission message if patient
if (userRole === "patient") { if (userRole === "patient") {
return ( return (
<div className={`min-h-screen w-full ${darkMode ? "bg-gray-900 text-white" : "bg-white text-black"}`}> <div
className={`min-h-screen w-full ${
darkMode ? "bg-gray-900 text-white" : "bg-white text-black"
}`}
>
<div className="flex items-center justify-center h-screen"> <div className="flex items-center justify-center h-screen">
<div className="text-center"> <div className="text-center">
<h1 className="text-2xl font-bold mb-4">Access Denied</h1> <h1 className="text-2xl font-bold mb-4">Access Denied</h1>
@ -148,56 +170,28 @@ export default function EntriesTable() {
} }
return ( return (
<div className={`min-h-screen w-full ${darkMode ? "bg-gray-900 text-white" : "bg-white text-black"}`}> <div
className={`min-h-screen w-full ${
darkMode ? "bg-gray-900 text-white" : "bg-white text-black"
}`}
>
<div className="sticky top-0 z-10 bg-white shadow-md mb-4"> <div className="sticky top-0 z-10 bg-white shadow-md mb-4">
<Header <Header
currentToken={currentToken} currentToken={currentToken}
previousToken={previousToken} previousToken={previousToken}
nextToken={nextToken} nextToken={nextToken}
missedTokens={missedTokens} missedTokens={missedTokens}
entries={entries} entries={entries} // Pass the entries data
/> />
</div> </div>
<div className="p-4">
<h1 className="text-2xl font-bold mb-4">Today&apos;s Entries</h1> <h1 className="text-2xl font-bold mb-4">Today&apos;s Entries</h1>
<div className={`
hidden md:flex items-center gap-[2px]
border ${darkMode ? 'border-gray-600 bg-gray-800' : 'border-gray-300 bg-white'}
p-2 rounded-lg
h-[45px] w-[300px] lg:w-[400px] ml-2 mb-6
transition-colors duration-300
focus-within:ring-2 focus-within:ring-blue-500 focus-within:ring-opacity-50
${darkMode ? 'focus-within:border-gray-500' : 'focus-within:border-blue-500'}
`}>
<div className="relative flex-1">
<FaSearch className={`
absolute left-3 top-1/2 transform -translate-y-1/2
${darkMode ? 'text-gray-400' : 'text-gray-500'}
`} />
<input <input
type="text" type="text"
placeholder="Search by token or name" placeholder="Search by token or name"
className={` className="mb-4 p-2 border rounded bg-white w-full max-w-sm"
w-full bg-transparent border-none
pl-10 pr-10 py-2
focus:outline-none
${darkMode ? 'text-gray-200 placeholder-gray-500' : 'text-gray-800 placeholder-gray-400'}
text-sm
`}
value={searchQuery} value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)} onChange={(e) => setSearchQuery(e.target.value)}
/> />
</div>
<div className={`
px-2 py-1
${darkMode ? 'bg-gray-700 text-gray-300' : 'bg-gray-100 text-gray-500'}
text-xs rounded-md
font-mono
`}>
⌘K
</div>
</div>
{filteredEntries.length === 0 ? ( {filteredEntries.length === 0 ? (
<div className="p-4">No entries found for today.</div> <div className="p-4">No entries found for today.</div>
@ -208,7 +202,9 @@ export default function EntriesTable() {
<tr> <tr>
<th className="p-3 text-left">Token</th> <th className="p-3 text-left">Token</th>
<th className="p-3 text-left">Name</th> <th className="p-3 text-left">Name</th>
{/* <th className="p-3 text-left">Booked By</th> */}
<th className="p-3 text-left">Status</th> <th className="p-3 text-left">Status</th>
{/* <th className="p-3 text-left">Wait Time</th> */}
<th className="p-3 text-left">Actions</th> <th className="p-3 text-left">Actions</th>
</tr> </tr>
</thead> </thead>
@ -216,23 +212,38 @@ export default function EntriesTable() {
{currentEntries.map((entry) => ( {currentEntries.map((entry) => (
<tr <tr
key={entry.$id} key={entry.$id}
className={`border ${darkMode ? "border-gray-700" : "border-gray-200"}`} className={`border ${
darkMode ? "border-gray-700" : "border-gray-200"
}`}
> >
<td className="p-3 font-mono">{entry.tokenNumber}</td> <td className="p-3 font-mono">{entry.tokenNumber}</td>
<td className="p-3">{entry.patientName}</td> <td className="p-3">{entry.patientName}</td>
{/* <td className="p-3">
<span className={`text-xs px-2 py-1 rounded ${entry.bookedBy === 'staff' ?
'bg-purple-100 text-purple-800' :
'bg-blue-100 text-blue-800'
}`}>
{entry.bookedBy}
</span>
</td> */}
<td className="p-3"> <td className="p-3">
<span <span
className={`px-2 py-1 rounded-full text-xs font-semibold ${ className={`px-2 py-1 rounded-full text-xs ${
entry.status === "done" entry.status === "done"
? "bg-green-100 text-green-800" ? "bg-green-100 text-green-800"
: entry.status === "booked" : entry.status === "booked"
? "bg-yellow-100 text-yellow-800" ? "bg-yellow-100 text-yellow-800"
: "bg-red-100 text-red-800" : "bg-red-100 text-red-800"
}`} } font-semibold`}
> >
{entry.status === "booked" ? "In-Queue" : entry.status} {entry.status === "booked" ? "In-Queue" : entry.status}
</span> </span>
</td> </td>
{/* <td className="p-3">
{entry.status === "booked" ?
`~${calculateWaitTime(entry.tokenNumber)} mins` :
'-'}
</td> */}
<td className="p-3 flex gap-2"> <td className="p-3 flex gap-2">
{entry.status === "booked" && ( {entry.status === "booked" && (
<> <>
@ -258,7 +269,7 @@ export default function EntriesTable() {
{/* Pagination */} {/* Pagination */}
<div <div
className={`flex justify-between items-center mt-6 ${ className={`flex justify-between items-center mt-4 ${
darkMode ? "text-white" : "text-gray-700" darkMode ? "text-white" : "text-gray-700"
}`} }`}
> >
@ -283,6 +294,5 @@ export default function EntriesTable() {
</> </>
)} )}
</div> </div>
</div>
); );
} }