From e1af5d963510632a747af0d2b329b11dbc21a511 Mon Sep 17 00:00:00 2001
From: Dell <prasuhirpara@gmail.com>
Date: Wed, 16 Oct 2024 23:30:20 +0530
Subject: [PATCH 1/3] conflixt

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 4f968db..82a033e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1760,6 +1760,7 @@
       "version": "1.7.7",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
       "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",

From 35068812237167d9ff0edd3043a991df43d8b1df Mon Sep 17 00:00:00 2001
From: Dell <prasuhirpara@gmail.com>
Date: Wed, 16 Oct 2024 23:47:31 +0530
Subject: [PATCH 2/3] validating form and improving data quality factor

---
 Frontend/src/components/Appointments.jsx | 389 ++++++++++++-----------
 1 file changed, 202 insertions(+), 187 deletions(-)

diff --git a/Frontend/src/components/Appointments.jsx b/Frontend/src/components/Appointments.jsx
index 93aed3f..6f9172d 100644
--- a/Frontend/src/components/Appointments.jsx
+++ b/Frontend/src/components/Appointments.jsx
@@ -6,193 +6,208 @@ import "react-datepicker/dist/react-datepicker.css";
 import { useLocation } from 'react-router-dom';
 
 const Appointments = () => {
-	const [appointments, setAppointments] = useState([]);
-	const [doctors, setDoctors] = useState([]);
-	const [showForm, setShowForm] = useState(false);
-	const [searchTerm, setSearchTerm] = useState('');
-	const [newAppointment, setNewAppointment] = useState({
-		patientName: '',
-		doctorId: '',
-		appointmentDate: new Date(),
-		notes: ''
-	});
-
-	const location = useLocation();
-	const queryParams = new URLSearchParams(location.search);
-	const selectedDoctorId = queryParams.get('doctorId');
-
-	useEffect(() => {
-		// Simulating fetching doctors from an API
-		setDoctors([
-			{ id: 1, name: "Dr. Smith", specialty: "Cardiology" },
-			{ id: 2, name: "Dr. Johnson", specialty: "Pediatrics" },
-			{ id: 3, name: "Dr. Williams", specialty: "Orthopedics" },
-		]);
-
-		// Simulating fetching appointments from an API
-		setAppointments([
-			{ id: 1, patientName: "John Doe", doctorId: 1, appointmentDate: new Date(), notes: "Regular checkup", status: "Scheduled" },
-			{ id: 2, patientName: "Jane Smith", doctorId: 2, appointmentDate: new Date(Date.now() + 86400000), notes: "Follow-up", status: "Scheduled" },
-		]);
-
-		if (selectedDoctorId) {
-			setNewAppointment(prev => ({ ...prev, doctorId: selectedDoctorId }));
-			setShowForm(true);
-		}
-	}, [selectedDoctorId]);
-
-	const handleInputChange = (e) => {
-		const { name, value } = e.target;
-		setNewAppointment(prev => ({ ...prev, [name]: value }));
-	};
-
-	const handleDateChange = (date) => {
-		setNewAppointment(prev => ({ ...prev, appointmentDate: date }));
-	};
-
-	const handleSubmit = (e) => {
-		e.preventDefault();
-		const appointment = {
-			id: appointments.length + 1,
-			...newAppointment,
-			status: "Scheduled"
-		};
-		setAppointments([...appointments, appointment]);
-		setNewAppointment({ patientName: '', doctorId: '', appointmentDate: new Date(), notes: '' });
-		setShowForm(false);
-	};
-
-	const deleteAppointment = (id) => {
-		setAppointments(appointments.filter(appointment => appointment.id !== id));
-	};
-
-	const completeAppointment = (id) => {
-		setAppointments(appointments.map(appointment => 
-			appointment.id === id ? { ...appointment, status: "Completed" } : appointment
-		));
-	};
-
-	const filteredAppointments = appointments.filter(appointment =>
-		appointment.patientName.toLowerCase().includes(searchTerm.toLowerCase()) ||
-		doctors.find(d => d.id === appointment.doctorId)?.name.toLowerCase().includes(searchTerm.toLowerCase())
-	);
-
-	return (
-		<div className="bg-light min-h-screen p-4 sm:p-8">
-			<h1 className="text-3xl sm:text-4xl font-bold text-primary mb-6 sm:mb-8">Appointment Management</h1>
-			
-			<div className="mb-6 sm:mb-8 flex flex-col sm:flex-row justify-between items-center space-y-4 sm:space-y-0">
-				<motion.button
-					whileHover={{ scale: 1.05 }}
-					whileTap={{ scale: 0.95 }}
-					className="bg-accent text-primary px-6 py-2 rounded-full font-bold flex items-center"
-					onClick={() => setShowForm(!showForm)}
-				>
-					<FaCalendarPlus className="mr-2" />
-					{showForm ? 'Cancel' : 'New Appointment'}
-				</motion.button>
-				<div className="relative w-full sm:w-auto">
-					<FaSearch className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
-					<input
-						type="text"
-						placeholder="Search appointments..."
-						className="w-full sm:w-64 pl-10 pr-4 py-2 border border-gray-300 rounded-full focus:outline-none focus:ring-2 focus:ring-accent"
-						value={searchTerm}
-						onChange={(e) => setSearchTerm(e.target.value)}
-					/>
-				</div>
-			</div>
-
-			{showForm && (
-				<motion.form
-					initial={{ opacity: 0, y: -20 }}
-					animate={{ opacity: 1, y: 0 }}
-					className="bg-white p-6 rounded-lg shadow-lg mb-8"
-					onSubmit={handleSubmit}
-				>
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-						<input
-							type="text"
-							name="patientName"
-							placeholder="Patient Name"
-							className="p-2 border border-gray-300 rounded"
-							value={newAppointment.patientName}
-							onChange={handleInputChange}
-							required
-						/>
-						<select
-							name="doctorId"
-							className="p-2 border border-gray-300 rounded"
-							value={newAppointment.doctorId}
-							onChange={handleInputChange}
-							required
-						>
-							<option value="">Select Doctor</option>
-							{doctors.map(doctor => (
-								<option key={doctor.id} value={doctor.id}>
-									{doctor.name} - {doctor.specialty}
-								</option>
-							))}
-						</select>
-						<DatePicker
-							selected={newAppointment.appointmentDate}
-							onChange={handleDateChange}
-							showTimeSelect
-							dateFormat="MMMM d, yyyy h:mm aa"
-							className="p-2 border border-gray-300 rounded w-full"
-						/>
-						<textarea
-							name="notes"
-							placeholder="Notes"
-							className="p-2 border border-gray-300 rounded"
-							value={newAppointment.notes}
-							onChange={handleInputChange}
-						/>
-					</div>
-					<button type="submit" className="mt-4 bg-accent text-primary px-6 py-2 rounded-full font-bold">
-						Schedule Appointment
-					</button>
-				</motion.form>
-			)}
-
-			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-				{filteredAppointments.map((appointment) => (
-					<motion.div
-						key={appointment.id}
-						className="bg-white p-6 rounded-lg shadow-lg"
-						initial={{ opacity: 0, scale: 0.9 }}
-						animate={{ opacity: 1, scale: 1 }}
-						transition={{ duration: 0.3 }}
-					>
-						<h3 className="text-lg font-semibold mb-2">{appointment.patientName}</h3>
-						<p className="text-gray-600 mb-2">Doctor: {doctors.find(d => d.id === appointment.doctorId)?.name}</p>
-						<p className="text-gray-600 mb-2">Date: {appointment.appointmentDate.toLocaleString()}</p>
-						<p className="text-gray-600 mb-4">Notes: {appointment.notes}</p>
-						<div className="flex justify-between items-center">
-							<span className={`px-2 py-1 rounded-full text-xs ${
-								appointment.status === 'Completed' ? 'bg-green-200 text-green-800' : 'bg-yellow-200 text-yellow-800'
-							}`}>
-								{appointment.status}
-							</span>
-							<div>
-								<button className="text-blue-500 mr-2" title="Edit">
-									<FaEdit />
-								</button>
-								<button className="text-red-500 mr-2" onClick={() => deleteAppointment(appointment.id)} title="Delete">
-									<FaTrash />
-								</button>
-								{appointment.status !== 'Completed' && (
-									<button className="text-green-500" onClick={() => completeAppointment(appointment.id)} title="Mark as Completed">
-										<FaCheckCircle />
-									</button>
-								)}
-							</div>
-						</div>
-					</motion.div>
-				))}
-			</div>
-		</div>
-	);
+  const [appointments, setAppointments] = useState([]);
+  const [doctors, setDoctors] = useState([]);
+  const [showForm, setShowForm] = useState(false);
+  const [searchTerm, setSearchTerm] = useState('');
+  const [newAppointment, setNewAppointment] = useState({
+    patientName: '',
+    doctorId: '',
+    appointmentDate: new Date(),
+    notes: ''
+  });
+
+  const location = useLocation();
+  const queryParams = new URLSearchParams(location.search);
+  const selectedDoctorId = queryParams.get('doctorId');
+
+  useEffect(() => {
+    setDoctors([
+      { id: 1, name: "Dr. Smith", specialty: "Cardiology" },
+      { id: 2, name: "Dr. Johnson", specialty: "Pediatrics" },
+      { id: 3, name: "Dr. Williams", specialty: "Orthopedics" },
+    ]);
+
+    setAppointments([
+      { id: 1, patientName: "John Doe", doctorId: 1, appointmentDate: new Date(), notes: "Regular checkup", status: "Scheduled" },
+      { id: 2, patientName: "Jane Smith", doctorId: 2, appointmentDate: new Date(Date.now() + 86400000), notes: "Follow-up", status: "Scheduled" },
+    ]);
+
+    if (selectedDoctorId) {
+      setNewAppointment(prev => ({ ...prev, doctorId: selectedDoctorId }));
+      setShowForm(true);
+    }
+  }, [selectedDoctorId]);
+
+  const handleInputChange = (e) => {
+    const { name, value } = e.target;
+    setNewAppointment(prev => ({ ...prev, [name]: value }));
+  };
+
+  const handleDateChange = (date) => {
+    setNewAppointment(prev => ({ ...prev, appointmentDate: date }));
+  };
+
+  const validateName = (name) => {
+    const namePattern = /^[A-Za-z][A-Za-z\s]{3,}$/;
+    return namePattern.test(name);
+  };
+
+  const validateDate = (date) => {
+    return date > new Date();
+  };
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    if (!validateName(newAppointment.patientName)) {
+      alert("Patient name must start with a letter and be at least 4 characters long.");
+      return;
+    }
+    if (!validateDate(newAppointment.appointmentDate)) {
+      alert("Appointment date must be in the future.");
+      return;
+    }
+    const appointment = {
+      id: appointments.length + 1,
+      ...newAppointment,
+      status: "Scheduled"
+    };
+    setAppointments([...appointments, appointment]);
+    setNewAppointment({ patientName: '', doctorId: '', appointmentDate: new Date(), notes: '' });
+    setShowForm(false);
+  };
+
+  const deleteAppointment = (id) => {
+    setAppointments(appointments.filter(appointment => appointment.id !== id));
+  };
+
+  const completeAppointment = (id) => {
+    setAppointments(appointments.map(appointment => 
+      appointment.id === id ? { ...appointment, status: "Completed" } : appointment
+    ));
+  };
+
+  const filteredAppointments = appointments.filter(appointment =>
+    appointment.patientName.toLowerCase().includes(searchTerm.toLowerCase()) ||
+    doctors.find(d => d.id === appointment.doctorId)?.name.toLowerCase().includes(searchTerm.toLowerCase())
+  );
+
+  return (
+    <div className="bg-light min-h-screen p-4 sm:p-8">
+      <h1 className="text-3xl sm:text-4xl font-bold text-primary mb-6 sm:mb-8">Appointment Management</h1>
+      
+      <div className="mb-6 sm:mb-8 flex flex-col sm:flex-row justify-between items-center space-y-4 sm:space-y-0">
+        <motion.button
+          whileHover={{ scale: 1.05 }}
+          whileTap={{ scale: 0.95 }}
+          className="bg-accent text-primary px-6 py-2 rounded-full font-bold flex items-center"
+          onClick={() => setShowForm(!showForm)}
+        >
+          <FaCalendarPlus className="mr-2" />
+          {showForm ? 'Cancel' : 'New Appointment'}
+        </motion.button>
+        <div className="relative w-full sm:w-auto">
+          <FaSearch className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
+          <input
+            type="text"
+            placeholder="Search appointments..."
+            className="w-full sm:w-64 pl-10 pr-4 py-2 border border-gray-300 rounded-full focus:outline-none focus:ring-2 focus:ring-accent"
+            value={searchTerm}
+            onChange={(e) => setSearchTerm(e.target.value)}
+          />
+        </div>
+      </div>
+
+      {showForm && (
+        <motion.form
+          initial={{ opacity: 0, y: -20 }}
+          animate={{ opacity: 1, y: 0 }}
+          className="bg-white p-6 rounded-lg shadow-lg mb-8"
+          onSubmit={handleSubmit}
+        >
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <input
+              type="text"
+              name="patientName"
+              placeholder="Patient Name"
+              className="p-2 border border-gray-300 rounded"
+              value={newAppointment.patientName}
+              onChange={handleInputChange}
+              required
+            />
+            <select
+              name="doctorId"
+              className="p-2 border border-gray-300 rounded"
+              value={newAppointment.doctorId}
+              onChange={handleInputChange}
+              required
+            >
+              <option value="">Select Doctor</option>
+              {doctors.map(doctor => (
+                <option key={doctor.id} value={doctor.id}>
+                  {doctor.name} - {doctor.specialty}
+                </option>
+              ))}
+            </select>
+            <DatePicker
+              selected={newAppointment.appointmentDate}
+              onChange={handleDateChange}
+              showTimeSelect
+              dateFormat="MMMM d, yyyy h:mm aa"
+              className="p-2 border border-gray-300 rounded w-full"
+            />
+            <textarea
+              name="notes"
+              placeholder="Notes"
+              className="p-2 border border-gray-300 rounded"
+              value={newAppointment.notes}
+              onChange={handleInputChange}
+            />
+          </div>
+          <button type="submit" className="mt-4 bg-accent text-primary px-6 py-2 rounded-full font-bold">
+            Schedule Appointment
+          </button>
+        </motion.form>
+      )}
+
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+        {filteredAppointments.map((appointment) => (
+          <motion.div
+            key={appointment.id}
+            className="bg-white p-6 rounded-lg shadow-lg"
+            initial={{ opacity: 0, scale: 0.9 }}
+            animate={{ opacity: 1, scale: 1 }}
+            transition={{ duration: 0.3 }}
+          >
+            <h3 className="text-lg font-semibold mb-2">{appointment.patientName}</h3>
+            <p className="text-gray-600 mb-2">Doctor: {doctors.find(d => d.id === appointment.doctorId)?.name}</p>
+            <p className="text-gray-600 mb-2">Date: {appointment.appointmentDate.toLocaleString()}</p>
+            <p className="text-gray-600 mb-4">Notes: {appointment.notes}</p>
+            <div className="flex justify-between items-center">
+              <span className={`px-2 py-1 rounded-full text-xs ${
+                appointment.status === 'Completed' ? 'bg-green-200 text-green-800' : 'bg-yellow-200 text-yellow-800'
+              }`}>
+                {appointment.status}
+              </span>
+              <div>
+                <button className="text-blue-500 mr-2" title="Edit">
+                  <FaEdit />
+                </button>
+                <button className="text-red-500 mr-2" onClick={() => deleteAppointment(appointment.id)} title="Delete">
+                  <FaTrash />
+                </button>
+                {appointment.status !== 'Completed' && (
+                  <button className="text-green-500" onClick={() => completeAppointment(appointment.id)} title="Mark as Completed">
+                    <FaCheckCircle />
+                  </button>
+                )}
+              </div>
+            </div>
+          </motion.div>
+        ))}
+      </div>
+    </div>
+  );
 };
 
 export default Appointments;

From 0252eb62f261ee8f93740055b8f89db4057399a6 Mon Sep 17 00:00:00 2001
From: Dell <prasuhirpara@gmail.com>
Date: Thu, 17 Oct 2024 00:08:06 +0530
Subject: [PATCH 3/3] Adding Patient validation for data integrity

---
 Frontend/src/components/Patients.jsx | 30 +++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/Frontend/src/components/Patients.jsx b/Frontend/src/components/Patients.jsx
index 160c3fd..a2996b0 100644
--- a/Frontend/src/components/Patients.jsx
+++ b/Frontend/src/components/Patients.jsx
@@ -15,11 +15,35 @@ const Patients = () => {
         setNewPatient({ ...newPatient, [e.target.name]: e.target.value });
     };
 
+    const validateForm = () => {
+        const nameRegex = /^[A-Za-z][A-Za-z0-9 ]{3,}$/;
+        const contactRegex = /^[0-9]{3}-[0-9]{3}-[0-9]{4}$/;
+
+        if (!nameRegex.test(newPatient.name)) {
+            alert('Invalid name. Name should start with a letter and be at least 4 characters long.');
+            return false;
+        }
+
+        if (newPatient.age < 1 || newPatient.age > 120) {
+            alert('Age should be a number between 1 and 120.');
+            return false;
+        }
+
+        if (!contactRegex.test(newPatient.contact)) {
+            alert('Invalid contact number. It should follow the format XXX-XXX-XXXX.');
+            return false;
+        }
+
+        return true;
+    };
+
     const handleSubmit = (e) => {
         e.preventDefault();
-        setPatients([...patients, { id: patients.length + 1, ...newPatient }]);
-        setNewPatient({ name: '', age: '', gender: '', contact: '' });
-        setShowForm(false);
+        if (validateForm()) {
+            setPatients([...patients, { id: patients.length + 1, ...newPatient }]);
+            setNewPatient({ name: '', age: '', gender: '', contact: '' });
+            setShowForm(false);
+        }
     };
 
     const deletePatient = (id) => {