From 41b5e7083a59cc15dc510e0fe043a413f9973bfe Mon Sep 17 00:00:00 2001
From: sourav <mailsourav014@gmail.com>
Date: Sat, 1 Feb 2025 05:12:47 +0530
Subject: [PATCH 1/3] added input field for email update

---
 src/components/Users/UserForm.tsx | 4 ++--
 src/types/user/user.ts            | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/Users/UserForm.tsx b/src/components/Users/UserForm.tsx
index 91222bea76d..1a63e9c4533 100644
--- a/src/components/Users/UserForm.tsx
+++ b/src/components/Users/UserForm.tsx
@@ -486,7 +486,7 @@ export default function UserForm({
           </>
         )}
 
-        {!isEditMode && (
+        {
           <FormField
             control={form.control}
             name="email"
@@ -505,7 +505,7 @@ export default function UserForm({
               </FormItem>
             )}
           />
-        )}
+        }
 
         <div className="grid grid-cols-2 gap-4">
           <FormField
diff --git a/src/types/user/user.ts b/src/types/user/user.ts
index 9b11dfa569a..43b3ab9d7d6 100644
--- a/src/types/user/user.ts
+++ b/src/types/user/user.ts
@@ -30,7 +30,4 @@ export type CreateUserModel = {
   geo_organization: string;
 };
 
-export type UpdateUserModel = Omit<
-  CreateUserModel,
-  "username" | "password" | "email"
->;
+export type UpdateUserModel = Omit<CreateUserModel, "username" | "password">;

From 14f2cfa9c2aa632ec3ecb694637fdc757e4228d5 Mon Sep 17 00:00:00 2001
From: sourav <mailsourav014@gmail.com>
Date: Sat, 1 Feb 2025 14:57:04 +0530
Subject: [PATCH 2/3] removed the remove button from allergies

---
 .../Questionnaire/QuestionnaireForm.tsx       | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index a7da1010ba2..436de574820 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -6,8 +6,6 @@ import { toast } from "sonner";
 
 import { cn } from "@/lib/utils";
 
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 
@@ -381,25 +379,6 @@ export function QuestionnaireForm({
                   </p>
                 )}
               </div>
-
-              {form.questionnaire.id !== questionnaireData?.id && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="sm"
-                  onClick={() => {
-                    setQuestionnaireForms((prev) =>
-                      prev.filter(
-                        (f) => f.questionnaire.id !== form.questionnaire.id,
-                      ),
-                    );
-                  }}
-                  disabled={isPending}
-                >
-                  <CareIcon icon="l-times-circle" />
-                  <span>Remove</span>
-                </Button>
-              )}
             </div>
 
             <QuestionRenderer

From 4ac0e738833792c13ba943bf067f54d90b041c50 Mon Sep 17 00:00:00 2001
From: sourav <mailsourav014@gmail.com>
Date: Sat, 1 Feb 2025 15:40:15 +0530
Subject: [PATCH 3/3] added created by username

---
 src/components/Patient/diagnosis/DiagnosisTable.tsx |  4 ++--
 src/components/Patient/symptoms/SymptomTable.tsx    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx
index d9134f6d0c8..704ca84a5ed 100644
--- a/src/components/Patient/diagnosis/DiagnosisTable.tsx
+++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx
@@ -101,8 +101,8 @@ export function DiagnosisTable({
                     className="w-4 h-4"
                     imageUrl={diagnosis.created_by?.profile_picture_url}
                   />
-                  <span className="text-sm">
-                    {formatName(diagnosis.created_by)}
+                  <span className="text-sm font-medium">
+                    {diagnosis.created_by?.username || "Unknown"}
                   </span>
                 </TableCell>
               </TableRow>
diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx
index b95e518d99d..10c5a88e541 100644
--- a/src/components/Patient/symptoms/SymptomTable.tsx
+++ b/src/components/Patient/symptoms/SymptomTable.tsx
@@ -12,7 +12,7 @@ import {
 
 import { Avatar } from "@/components/Common/Avatar";
 
-import { formatName } from "@/Utils/utils";
+// import { formatName } from "@/Utils/utils";
 import { Symptom } from "@/types/emr/symptom/symptom";
 
 export const getStatusBadgeStyle = (status: string) => {
@@ -103,12 +103,12 @@ export function SymptomTable({
                 </TableCell>
                 <TableCell className="whitespace-nowrap flex items-center gap-2">
                   <Avatar
-                    name={formatName(symptom.created_by)}
-                    className="w-4 h-4"
+                    name={symptom.created_by?.username || "Unknown"}
+                    className="w-6 h-6"
                     imageUrl={symptom.created_by?.profile_picture_url}
                   />
-                  <span className="text-sm">
-                    {formatName(symptom.created_by)}
+                  <span className="text-sm font-medium">
+                    {symptom.created_by?.username || "Unknown"}
                   </span>
                 </TableCell>
               </TableRow>