fix Dec08

1. Corporation -> Block 2. Added coordinator Name and group Id instead of group code 3. text change in group list page
zwenie-tech · Dec 7, 2024 · d71b41a · d71b41a
1 parent 32aa9d1
commit d71b41a
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 37 deletions.
diff --git a/src/app/admin/NavLinks.tsx b/src/app/admin/NavLinks.tsx
@@ -19,7 +19,7 @@ const links = [
   { name: "Manage Activity Category", href: "/admin/activity-category" },
   { name: "Manage Challenges", href: "/admin/challenges" },
   { name: "Manage Contact us form", href: "/admin/contact-us-form" },
-  { name: "Manage Corporations", href: "/admin/corporation" },
+  { name: "Manage Blocks", href: "/admin/corporation" },
   { name: "Manage LSGD", href: "/admin/lsgd" },
   { name: "Manage Edu District", href: "/admin/edudistrict" },
   { name: "Manage Edu SubDistrict", href: "/admin/edusubdistrict" },

diff --git a/src/app/admin/activity/page.tsx b/src/app/admin/activity/page.tsx
@@ -1193,15 +1193,15 @@ const AdminGrid = () => {
                 <>
                   <div className="flex items-center mb-3 space-x-2">
                     <label htmlFor="groupFilter" className="text-sm font-medium">
-                      Corporation:
+                      Block:
                     </label>
                     <select
                       id="groupFilter"
                       value={selectedCorp}
                       onChange={handleFilterChangeCorp}
                       className="border border-gray-300 rounded p-1"
                     >
-                      <option value="">Choose Corporation</option>
+                      <option value="">Choose Block</option>
                       {corporation.map((corp) => (
                         <option key={corp.cop_id} value={corp.cop_name}>
                           {corp.cop_name}

diff --git a/src/app/admin/challenges/page.tsx b/src/app/admin/challenges/page.tsx
@@ -1063,15 +1063,15 @@ const AdminGrid = () => {
         {selectedDistrict && (
           <div className="flex flex-col mb-3 w-full">
             <label htmlFor="corpFilter" className="text-sm font-medium">
-              Corporation:
+              Block:
             </label>
             <select
               id="corpFilter"
               value={selectedCorp}
               onChange={handleFilterChangeCorp}
               className="border border-gray-300 rounded p-1 w-full"
             >
-              <option value="">Choose Corporation</option>
+              <option value="">Choose Block</option>
               {corporation.map((corp) => (
                 <option key={corp.cop_id} value={corp.cop_name}>
                   {corp.cop_name}

diff --git a/src/app/admin/coordinators/page.tsx b/src/app/admin/coordinators/page.tsx
@@ -1068,15 +1068,15 @@ setTotalcount("0");
   {selectedDistrict && (
     <div className="flex flex-col mb-3">
       <label htmlFor="corpFilter" className="text-sm font-medium">
-        Corporation:
+      Block:
       </label>
       <select
         id="corpFilter"
         value={selectedCorp}
         onChange={handleFilterChangeCorp}
         className="border border-gray-300 rounded p-1 w-full"
       >
-        <option value="">Choose Corporation</option>
+        <option value="">Choose Block</option>
         {corporation.map((corp) => (
           <option key={corp.cop_id} value={corp.cop_name}>
             {corp.cop_name}

diff --git a/src/app/admin/corporation/[id]/addcorpform.tsx b/src/app/admin/corporation/[id]/addcorpform.tsx
@@ -201,12 +201,12 @@ export function AddCorpform() {
       <DialogTrigger asChild>
         <div className="flex items-center justify-start gap-2 my-4 cursor-pointer text-primary float-right">
           <Plus />
-          <span className="text-base">Add Corporation</span>
+          <span className="text-base">Add Block</span>
         </div>
       </DialogTrigger>
       <DialogContent className="max-w-4xl overflow-y-scroll max-h-[98%]">
         <DialogHeader>
-          <DialogTitle>Add Corporation</DialogTitle>
+          <DialogTitle>Add Block</DialogTitle>
           <DialogDescription></DialogDescription>
         </DialogHeader>
         <div className="">

diff --git a/src/app/admin/corporation/[id]/corpform.tsx b/src/app/admin/corporation/[id]/corpform.tsx
@@ -206,7 +206,7 @@ export function Corpform() {
       </DialogTrigger>
       <DialogContent className="max-w-4xl overflow-y-scroll max-h-[98%]">
         <DialogHeader>
-          <DialogTitle>Edit Corporation</DialogTitle>
+          <DialogTitle>Edit Block</DialogTitle>
           <DialogDescription></DialogDescription>
         </DialogHeader>
         <div className="">

diff --git a/src/app/admin/corporation/[id]/page.tsx b/src/app/admin/corporation/[id]/page.tsx
@@ -69,7 +69,7 @@ function ActivityLabel() {
           }}
         >
           <ChevronLeft />
-          <span className="text-base">Manage Corporation</span>
+          <span className="text-base">Manage Block</span>
         </div>
 
         <Corpform />
@@ -86,7 +86,7 @@ function ActivityLabel() {
           <p className="text-base">{userData[0].dis_name}</p>
         </div>
         <div className="">
-          <p className="text-sm text-gray-500">Corporation Name</p>
+          <p className="text-sm text-gray-500">Block Name</p>
           <p className="text-base">{userData[0].cop_name}</p>
         </div>
       </div>

diff --git a/src/app/admin/corporation/page.tsx b/src/app/admin/corporation/page.tsx
@@ -54,7 +54,7 @@ const AdminGrid = () => {
   const [columnDefs, setColumnDefs] = useState<ColDef[]>([
     // { field: "state", headerName: "State" },
     { field: "dis_name", headerName: "District" },
-    { field: "cop_name", headerName: "Corporation" },
+    { field: "cop_name", headerName: "Block" },
   ]);
 
   const defaultColDef = useMemo(() => {
@@ -261,15 +261,15 @@ const fetchFilteredCorp = async (value: string) => {
   {selectedDistrict !== "" && (
     <div className="flex items-center space-x-2">
       <label htmlFor="corpFilter" className="text-sm font-medium">
-        Corporation:
+      Block:
       </label>
       <select
         id="corpFilter"
         value={selectedCorp}
         onChange={handleFilterChangeCorp}
         className="flex-1 border border-gray-300 rounded p-1"
       >
-        <option value="">Choose Corporation</option>
+        <option value="">Choose Block</option>
         {corporation.map((corp) => (
           <option key={corp.cop_id} value={corp.cop_name}>
             {corp.cop_name}

diff --git a/src/app/admin/group/[id]/edit-form.tsx b/src/app/admin/group/[id]/edit-form.tsx
@@ -556,7 +556,7 @@ export function EditForm() {
                       >
                         <SelectTrigger className="block w-full px-3 py-2 border border-gray-950 rounded-md shadow-sm focus:outline-none focus:ring-green-700 focus:border-green-700 sm:text-sm"
                         >
-                          <SelectValue placeholder="Choose a corporation" />
+                          <SelectValue placeholder="Choose a Block" />
                         </SelectTrigger>
                         <SelectContent>
                           {corporation.map((corp) => (

diff --git a/src/app/admin/group/[id]/page.tsx b/src/app/admin/group/[id]/page.tsx
@@ -197,7 +197,7 @@ function Page() {
             : ''}
           {uploadData[0].cop_name ?
             <div className="">
-              <p className="text-sm text-gray-500">Corporation </p>
+              <p className="text-sm text-gray-500">Block </p>
               <p className="text-base">{uploadData[0].cop_name}</p>
             </div>
             : ''}

diff --git a/src/app/admin/group/page.tsx b/src/app/admin/group/page.tsx
@@ -1083,15 +1083,15 @@ const AdminGrid = () => {
         {selectedDistrict && (
           <div className="flex flex-col mb-3 w-full">
             <label htmlFor="corpFilter" className="text-sm font-medium">
-              Corporation:
+            Block:
             </label>
             <select
               id="corpFilter"
               value={selectedCorp}
               onChange={handleFilterChangeCorp}
               className="border border-gray-300 rounded p-1 w-full"
             >
-              <option value="">Choose Corporation</option>
+              <option value="">Choose Block</option>
               {corporation.map((corp) => (
                 <option key={corp.cop_id} value={corp.cop_name}>
                   {corp.cop_name}

diff --git a/src/app/admin/lsgd/[id]/addlsgdform.tsx b/src/app/admin/lsgd/[id]/addlsgdform.tsx
@@ -256,7 +256,7 @@ export function AddLsgdform() {
                   >
                     <SelectTrigger className="block w-full px-3 py-2 border border-gray-950 rounded-md shadow-sm focus:outline-none focus:ring-green-700 focus:border-green-700 sm:text-sm"
                     >
-                      <SelectValue placeholder="Choose a corporation" />
+                      <SelectValue placeholder="Choose a Block" />
                     </SelectTrigger>
                     <SelectContent>
                       {corporation.map((corp) => (

diff --git a/src/app/admin/lsgd/[id]/lsgdform.tsx b/src/app/admin/lsgd/[id]/lsgdform.tsx
@@ -265,7 +265,7 @@ export function Lsgdform() {
                   >
                     <SelectTrigger className="block w-full px-3 py-2 border border-gray-950 rounded-md shadow-sm focus:outline-none focus:ring-green-700 focus:border-green-700 sm:text-sm"
                     >
-                      <SelectValue placeholder="Choose a corporation" />
+                      <SelectValue placeholder="Choose a Block" />
                     </SelectTrigger>
                     <SelectContent>
                       {corporation.map((corp) => (

diff --git a/src/app/admin/lsgd/[id]/page.tsx b/src/app/admin/lsgd/[id]/page.tsx
@@ -80,7 +80,7 @@ function Page() {
         </div>
 
         <div className="">
-          <p className="text-sm text-gray-500">Corporation</p>
+          <p className="text-sm text-gray-500">Block</p>
           <p className="text-base">{userData[0].cop_name}</p>
         </div>
         <div className="">

diff --git a/src/app/admin/lsgd/page.tsx b/src/app/admin/lsgd/page.tsx
@@ -60,7 +60,7 @@ const AdminGrid = () => {
   const [columnDefs, setColumnDefs] = useState<ColDef[]>([
     // { field: "state", headerName: "State" },
     { field: "dis_name", headerName: "District" },
-    { field: "cop_name", headerName: "Corporation" },
+    { field: "cop_name", headerName: "Block" },
     { field: "lsg_name", headerName: "LSGD" },
   ]);
 
@@ -329,15 +329,15 @@ const AdminGrid = () => {
   {selectedDistrict !== "" && (
     <div className="flex items-center space-x-2">
       <label htmlFor="corpFilter" className="text-sm font-medium">
-        Corporation:
+        Block:
       </label>
       <select
         id="corpFilter"
         value={selectedCorp}
         onChange={handleFilterChangeCorp}
         className="flex-1 border border-gray-300 rounded p-1"
       >
-        <option value="">Choose Corporation</option>
+        <option value="">Choose Block</option>
         {corporation.map((corp) => (
           <option key={corp.cop_id} value={corp.cop_name}>
             {corp.cop_name}

diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
@@ -1141,15 +1141,15 @@ const GridExample = () => {
         {selectedDistrict && (
           <div className="flex flex-col mb-3 w-full">
             <label htmlFor="corpFilter" className="text-sm font-medium">
-              Corporation:
+              Block:
             </label>
             <select
               id="corpFilter"
               value={selectedCorp}
               onChange={handleFilterChangeCorp}
               className="border border-gray-300 rounded p-1 w-full"
             >
-              <option value="">Choose Corporation</option>
+              <option value="">Choose Block</option>
               {corporation.map((corp) => (
                 <option key={corp.cop_id} value={corp.cop_name}>
                   {corp.cop_name}

diff --git a/src/app/admin/uploads/[id]/page.tsx b/src/app/admin/uploads/[id]/page.tsx
@@ -258,7 +258,7 @@ function Page() {
             : ''}
           {uploadData[0].cop_name ?
             <div className="">
-              <p className="text-sm text-gray-500">Corporation </p>
+              <p className="text-sm text-gray-500">Block </p>
               <p className="text-base">{uploadData[0].cop_name}</p>
             </div>
             : ''}

diff --git a/src/app/admin/uploads/[id]/uploadform.tsx b/src/app/admin/uploads/[id]/uploadform.tsx
@@ -529,7 +529,7 @@ export function Uploadform() {
                       >
                         <SelectTrigger className="block w-full px-3 py-2 border border-gray-950 rounded-md shadow-sm focus:outline-none focus:ring-green-700 focus:border-green-700 sm:text-sm"
                         >
-                          <SelectValue placeholder="Choose a corporation" />
+                          <SelectValue placeholder="Choose a Block" />
                         </SelectTrigger>
                         <SelectContent>
                           {corporation.map((corp) => (

diff --git a/src/app/admin/users/[id]/page.tsx b/src/app/admin/users/[id]/page.tsx
@@ -141,7 +141,7 @@ function Page() {
         </div>:""}
         {userData[0].cop_name ? 
         <div className="">
-          <p className="text-sm text-gray-500">Corporation</p>
+          <p className="text-sm text-gray-500">Block</p>
           <p className="text-base">{userData[0].cop_name}</p>
         </div>:''}
         {userData[0].lsg_name ? 

diff --git a/src/app/admin/users/page.tsx b/src/app/admin/users/page.tsx
@@ -1075,15 +1075,15 @@ const AdminGrid = () => {
                 <>
                   <div className="flex items-center mb-3 space-x-2">
                     <label htmlFor="groupFilter" className="text-sm font-medium">
-                      Corporation:
+                    Block:
                     </label>
                     <select
                       id="groupFilter"
                       value={selectedCorp}
                       onChange={handleFilterChangeCorp}
                       className="border border-gray-300 rounded p-1"
                     >
-                      <option value="">Choose Corporation</option>
+                      <option value="">Choose Block</option>
                       {corporation.map((corp) => (
                         <option key={corp.cop_id} value={corp.cop_name}>
                           {corp.cop_name}

diff --git a/src/app/group-list/page.tsx b/src/app/group-list/page.tsx
@@ -22,6 +22,7 @@ interface Group {
   gp_code: string;
   upload_count: number;
   activity_count: number;
+  co_ord_name: string;
 }
 
 interface ApiResponse {
@@ -730,7 +731,7 @@ console.log('part3')
           ഗ്രൂപ് കോഡ് (GROUP CODE) ലഭിക്കാൻ ഇവിടെ CLICK ചെയ്യുക.
         </p>
       </div> */}
-      <p className='ml-7 mt-4 p-3'>ഇപ്പോൾ മത്സരത്തിൽ പങ്കെടുക്കുന്ന സ്ഥാപനങ്ങളുടെ GROUP CODE ചുവടെ ചേർക്കുന്നു</p>
+      {/* <p className='ml-7 mt-4 p-3'>ഇപ്പോൾ മത്സരത്തിൽ പങ്കെടുക്കുന്ന സ്ഥാപനങ്ങളുടെ GROUP CODE ചുവടെ ചേർക്കുന്നു</p> */}
 
       {/* Search by Country Wise */}
       <div className='search1 mb-5'>
@@ -1460,9 +1461,10 @@ console.log('part3')
             <thead>
               <tr className="bg-gray-200 text-gray-600 uppercase text-sm leading-normal">
                 <th className="py-3 px-6 text-left w-16 rounded-tl-lg">Sl. No</th>
+                <th className="py-3 px-6 text-left">Group Id</th>
                 <th className="py-3 px-6 text-left">Group Name {orderdir1 === "DESC" ? <span className={orderfield === "gp_name" ? 'text-green-600' :'text-gray-400'} onClick={() => sort("ASC", "gp_name")}><ArrowUp/></span> 
                 : <span className={orderfield === "gp_name" ? 'text-green-600' :'text-gray-400'} onClick={() => sort("DESC", "gp_name")}><ArrowDown/></span>}</th>
-                <th className="py-3 px-6 text-left">Group Code</th>
+                <th className="py-3 px-6 text-left">Cordinator Name</th>
                 <th className="py-3 px-6 text-left">Upload Count {orderdir2 === "DESC" ? <span className={orderfield === "upload_count" ? 'text-green-600' :'text-gray-400'} onClick={() => sort("ASC", "upload_count")}><ArrowUp/></span> 
                 : <span className={orderfield === "upload_count" ? 'text-green-600' :'text-gray-400'} onClick={() => sort("DESC", "upload_count")}><ArrowDown/></span>}</th>
                 <th className="py-3 px-6 text-left">Activity Count {orderdir3 === "DESC" ? <span className={orderfield === "activity_count" ? 'text-green-600' :'text-gray-400'} onClick={() => sort("ASC", "activity_count")}><ArrowUp/></span> 
@@ -1474,8 +1476,9 @@ console.log('part3')
               {groups.map((group, index) => (
                 <tr key={group.gp_id} className="border border-gray-200 hover:bg-gray-100">
                   <td className="py-3 px-6 text-left">{startIndex + index + 1}</td>
+                  <td className="py-3 px-6 text-left">{group.gp_id}</td>
                   <a href={`/group-page?gname=${group.gp_name}&gid=${group.gp_id}&uc=${group.upload_count}`}><td className="py-3 px-6 text-left">{group.gp_name}</td></a>
-                  <td className="py-3 px-6 text-left">{group.gp_code}</td>
+                  <td className="py-3 px-6 text-left">{group.co_ord_name}</td>
                   <td className="py-3 px-6 text-left">{group.upload_count}</td>
                   <td className="py-3 px-6 text-left">{group.activity_count}</td>
                   <td className="py-3 px-6 text-left">{group.dis_name}</td>

diff --git a/src/app/participant-list/item/page.tsx b/src/app/participant-list/item/page.tsx
@@ -121,7 +121,7 @@ const Item: React.FC = () => {
               <div className="text-sm">{treeDetails.dis_name || 'N/A'}</div>
             </div>
             <div className="flex ml-2 mt-2 gap-2">
-              <div className="text-sm pl-5 mb-2">Corporation: </div>
+              <div className="text-sm pl-5 mb-2">Block: </div>
               <div className="text-sm">{treeDetails.cop_name || 'N/A'}</div>
             </div>
             <div className="flex ml-2 mt-2 gap-2">

diff --git a/src/app/participants/page.tsx b/src/app/participants/page.tsx
@@ -1590,7 +1590,7 @@ const ParticipateList = () => {
                 <th className="py-3 px-6 text-left">Country</th>
                 <th className="py-3 px-6 text-left">State</th>
                 <th className="py-3 px-6 text-left">District</th>
-                <th className="py-3 px-6 text-left">Corporation</th>
+                <th className="py-3 px-6 text-left">Block</th>
                 <th className="py-3 px-6 text-left rounded-tr-lg">LSGD</th>
               </tr>
             </thead>