From 276b253e2df58082793f0beb7e7f3ac7ba5ecb98 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 26 May 2025 11:25:13 +0530
Subject: [PATCH] Added fixed height to table elements

---
 .../EmailTemplates/project-report.html        | 105 +++++++++---------
 Marco.Pms.Services/Service/EmailSender.cs     |  22 ++--
 .../appsettings.Development.json              |   2 +-
 3 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/Marco.Pms.Services/EmailTemplates/project-report.html b/Marco.Pms.Services/EmailTemplates/project-report.html
index 4414b53..10a6da8 100644
--- a/Marco.Pms.Services/EmailTemplates/project-report.html
+++ b/Marco.Pms.Services/EmailTemplates/project-report.html
@@ -389,82 +389,86 @@
                                                                     Project Status Reported - Generated at {{TIMESTAMP}}
                                                                 </span>
                                                                 <table cellpadding="1" cellspacing="0" width="100%"
-                                                                       border="0">
+                                                                       border="0" style="margin-top: 15px">
                                                                     <tr style="vertical-align:middle">
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 135px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Todays Attendane
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803;margin:20px!important; font-weight:bold; ">
+                                                                                <div style="font-size: 25px; color: #bc3803;margin:20px 20px 0px!important; font-weight:bold; ">
                                                                                     {{TODAYS_ATTENDANCES}} /
                                                                                     {{TOTAL_EMPLOYEES}}
                                                                                 </div>
                                                                                 <span style="font-size: 10px; color: #0984e3; font-weight: bold;">
-                                                                                    * Checked-in / Assigned
+                                                                                    Checked-in / Assigned
                                                                                 </span>
                                                                             </div>
                                                                         </td>
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 135px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Daily Tasks Completed
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px !important; font-weight: bold;">
+                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px 20px 0px !important; font-weight: bold;">
                                                                                     {{TODAYS_COMPLETED}} / 
                                                                                     {{TODAYS_PLANNED}}
                                                                                 </div>
                                                                                 <span style="font-size: 10px; color: #0984e3; font-weight: bold;">
-                                                                                    * Today's Completed Task / Today's Planned Task
+                                                                                    Today's Completed Task / Today's Planned Task
                                                                                 </span>
                                                                             </div>
                                                                         </td>
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 135px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Project Completion Status
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px !important; font-weight: bold; ">
+                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px 20px 0px !important; font-weight: bold; ">
                                                                                     {{TOTAL_COMPLETED}} /
-                                                                                    {{TOTAL_PLANNED}} ({{PROJECT_STATUS}})
+                                                                                    {{TOTAL_PLANNED}}
+                                                                                    <div style="padding-top: 5px;"> ({{PROJECT_STATUS}})</div>
                                                                                 </div>
                                                                                 <span style="font-size: 10px; color: #0984e3; font-weight: bold;">
-                                                                                    * Total Completed Task / Total Planned Task
+                                                                                    Total Completed Task / Total Planned Task
                                                                                 </span>
                                                                             </div>
                                                                         </td>
                                                                     </tr>
                                                                     <tr style="vertical-align:middle">
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 100px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Regularization Pending
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px !important; font-weight: bold;">
+                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px 20px 0px !important; font-weight: bold;">
                                                                                     {{REGULRIZATION_PENDING}}
                                                                                 </div>
                                                                             </div>
                                                                         </td>
 
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 100px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Checkout Pending
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px !important; font-weight: bold;">
+                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px 20px 0px !important; font-weight: bold;">
                                                                                     {{CHECKOUT_PRNDING}}
                                                                                 </div>
                                                                             </div>
                                                                         </td>
                                                                         <td class="column" style="text-align:center">
-                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px;">
+                                                                            <div style="border: 1px solid #d5d5d5; border-radius: 10px; margin: 10px 10px; padding: 10px; height: 100px !important">
                                                                                 <div style="font-size: 18px; color: #525b75 ">
                                                                                     Activity Report Pending
                                                                                 </div>
-                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px !important; font-weight: bold;">
+                                                                                <div style="font-size: 25px; color: #bc3803; margin: 20px 20px 0px !important; font-weight: bold;">
                                                                                     {{REPORT_PENDING}} /
                                                                                     {{TODAYS_ASSIGNED}}
                                                                                 </div>
+                                                                                <span style="font-size: 10px; color: #0984e3; font-weight: bold;">
+                                                                                    Total Pending Report / Today's' Assigned Task
+                                                                                </span>
                                                                             </div>
                                                                         </td>
 
@@ -499,28 +503,27 @@
                                                                     (Tasks) Performed Today
                                                                 </span> <br />
 
-                                                                <table cellpadding="1" cellspacing="0" width="100%"
-                                                                       border="1">
-                                                                    <tr style="vertical-align:middle">
-                                                                        <th style="text-align:center">
-                                                                            Activity/ <br />
-                                                                            Location
-                                                                        </th>
-                                                                        <th style="text-align:center">
-                                                                            Assigned
-                                                                            Today/<br /> Pending
-                                                                        </th>
-                                                                        <th style="text-align:center">
-                                                                            Completed Today
-                                                                        </th>
-                                                                        <th style="text-align:center">Date </th>
-                                                                        <th style="text-align:center">Team Members</th>
-                                                                        <th style="text-align:center">Comment</th>
-                                                                    </tr>
-                                                                    <tr></tr>
-                                                                    {{PERFORMED_TASK}}
-
-                                                                </table>
+                                                                        <table cellpadding="1" cellspacing="0" width="100%"
+                                                                               border="1">
+                                                                            <tr style="vertical-align:middle">
+                                                                                <th style="text-align:center">
+                                                                                    Activity/ <br />
+                                                                                    Location
+                                                                                </th>
+                                                                                <th style="text-align:center">
+                                                                                    Assigned
+                                                                                    Today/<br /> Pending
+                                                                                </th>
+                                                                                <th style="text-align:center">
+                                                                                    Completed Today
+                                                                                </th>
+                                                                                <th style="text-align:center">Date </th>
+                                                                                <th style="text-align:center">Team Members</th>
+                                                                                <th style="text-align:center">Comment</th>
+                                                                            </tr>
+                                                                            <tr></tr>
+                                                                            {{PERFORMED_TASK}}
+                                                                        </table>
                                                             </div>
                                                         </td>
                                                     </tr>
@@ -535,18 +538,18 @@
                                                                     Performed Today
                                                                 </span> <br />
 
-                                                                <table cellpadding="1" cellspacing="0" width="100%"
-                                                                       border="1">
-                                                                    <tr style="vertical-align:middle">
-                                                                        <th style="text-align:center">Name</th>
-                                                                        <th style="text-align:center">Job Role</th>
-                                                                        <th style="text-align:center">Check In</th>
-                                                                        <th style="text-align:center">Check Out </th>
-                                                                        <th style="text-align:center">Comment</th>
-                                                                    </tr>
-                                                                    <tr></tr>
-                                                                    {{PERFORMED_ATTENDANCE}}
-                                                                </table>
+                                                                        <table cellpadding="1" cellspacing="0" width="100%"
+                                                                               border="1">
+                                                                            <tr style="vertical-align:middle">
+                                                                                <th style="text-align:center">Name</th>
+                                                                                <th style="text-align:center">Job Role</th>
+                                                                                <th style="text-align:center">Check In</th>
+                                                                                <th style="text-align:center">Check Out </th>
+                                                                                <th style="text-align:center">Comment</th>
+                                                                            </tr>
+                                                                            <tr></tr>
+                                                                            {{PERFORMED_ATTENDANCE}}
+                                                                        </table>
                                                             </div>
                                                         </td>
                                                     </tr>
diff --git a/Marco.Pms.Services/Service/EmailSender.cs b/Marco.Pms.Services/Service/EmailSender.cs
index 61757b1..5c3b278 100644
--- a/Marco.Pms.Services/Service/EmailSender.cs
+++ b/Marco.Pms.Services/Service/EmailSender.cs
@@ -123,17 +123,17 @@ namespace MarcoBMS.Services.Service
                 {"DATE",date },
                 {"PROJECT_NAME",report.ProjectName },
                 {"TIMESTAMP",report.TimeStamp },
-                {"TODAYS_ATTENDANCES", report.TodaysAttendances.ToString()},
-                {"TOTAL_EMPLOYEES",report.TotalEmployees.ToString() },
-                {"TODAYS_PLANNED",report.TotalPlannedTask.ToString() },
-                {"TODAYS_COMPLETED",report.TotalCompletedTask.ToString() },
-                {"REGULRIZATION_PENDING", report.RegularizationPending.ToString() },
-                {"CHECKOUT_PRNDING",report.CheckoutPending.ToString() },
-                {"TOTAL_PLANNED",report.TotalPlannedWork.ToString() },
+                {"TODAYS_ATTENDANCES", report.TodaysAttendances.ToString("N0")},
+                {"TOTAL_EMPLOYEES",report.TotalEmployees.ToString("N0") },
+                {"TODAYS_PLANNED",report.TotalPlannedTask.ToString("N0") },
+                {"TODAYS_COMPLETED",report.TotalCompletedTask.ToString("N0") },
+                {"REGULRIZATION_PENDING", report.RegularizationPending.ToString("N0") },
+                {"CHECKOUT_PRNDING",report.CheckoutPending.ToString("N0") },
+                {"TOTAL_PLANNED",report.TotalPlannedWork.ToString("N0") },
                 {"TOTAL_COMPLETED",report.TotalCompletedWork.ToString() },
                 {"PROJECT_STATUS",report.CompletionStatus.ToString("P") },
-                {"TODAYS_ASSIGNED",report.TodaysAssignTasks.ToString() },
-                {"REPORT_PENDING",report.ReportPending.ToString() }
+                {"TODAYS_ASSIGNED",report.TodaysAssignTasks.ToString("N0") },
+                {"REPORT_PENDING",report.ReportPending.ToString("N0") }
             };
 
             string emailBody = await GetEmailTemplate("project-report", replacements);
@@ -173,7 +173,7 @@ namespace MarcoBMS.Services.Service
             }
             else
             {
-                taskHtml.Append("<tr><td colspan=\"6\"><span style=\"font-size: 18px; line-height: 25.2px; color: #666666;margin:10px\">No Activities (Tasks) Performed Today</span></td></tr>");
+                taskHtml.Append("<tr><td style=\"padding: 10px 0px 5px;\" colspan=\"6\"><span style=\"line-height: 25.2px; color: #666666;margin:10px\">No Activities (Tasks) Performed Today</span></td></tr>");
             }
 
             emailBody = emailBody.Replace("{{PERFORMED_TASK}}", taskHtml.ToString());
@@ -189,7 +189,7 @@ namespace MarcoBMS.Services.Service
             }
             else
             {
-                attendanceHtml.Append("<tr><td colspan=\"5\"><span style=\"font-size: 18px; line-height: 25.2px; color: #666666;margin:10px\">No Attendance  Performed Today</span></td></tr>");
+                attendanceHtml.Append("<tr><td style=\"padding: 10px 0px 5px;\" colspan=\"5\"><span style=\"line-height: 25.2px; color: #666666;margin:10px\">No Attendance  Performed Today</span></td></tr>");
             }
 
             emailBody = emailBody.Replace("{{PERFORMED_ATTENDANCE}}", attendanceHtml.ToString());
diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json
index 98e8098..a4d0431 100644
--- a/Marco.Pms.Services/appsettings.Development.json
+++ b/Marco.Pms.Services/appsettings.Development.json
@@ -7,7 +7,7 @@
 
     "ConnectionStrings": {
         //"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
-        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSProd"
+        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSGuid"
     },
     "SmtpSettings": {
         "SmtpServer": "smtp.gmail.com",