From 05be80a74edfe566fbb9a98fb516291b7ebda385 Mon Sep 17 00:00:00 2001 From: mashfiq Date: Mon, 21 Jul 2025 17:22:45 +0600 Subject: [PATCH] digitalservicebook --- DatabaseComparison/Form1.cs | 2 +- HRM.Report/Class/rptDigitalServiceBook.cs | 36 ++++++++++++++++----- HRM.Report/RDLC/DigitalServiceBook.rdlc | 7 ++-- HRM.UI/ClientApp/src/app/app.api.service.ts | 2 +- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/DatabaseComparison/Form1.cs b/DatabaseComparison/Form1.cs index 4f5bfb9..c880257 100644 --- a/DatabaseComparison/Form1.cs +++ b/DatabaseComparison/Form1.cs @@ -1166,7 +1166,7 @@ namespace DatabaseComparison GO"); sql.AppendFormat("\r\n\r\n"); sql.AppendFormat(@"CREATE VIEW VW_EMPDigitalServiceBook AS - SELECT E.EMPLOYEEID, E.EMPLOYEENO, E.BENGALINAME AS NAME, E.FATHERNAME, E.MOTHERNAME, ES.NAME AS SPOUSENAME, E.JOININGDATE, E.EMPLOYEESTATUS, + SELECT E.EMPLOYEEID, E.EMPLOYEENO, E.BANGLANAME AS NAME, E.FATHERNAME, E.MOTHERNAME, ES.NAME AS SPOUSENAME, E.JOININGDATE, E.EMPLOYEESTATUS, DES.NAMEINBANGLA AS DESIGNATION, EC.PARMANENTADDRESS AS PARMANENTADDRESS, EC.PRESENTADDRESS AS PRESENTADDRESS, EC.PERMANENTPOSTOFFICE AS POSTOFFICE, EC.PERMANENTPOSTCODENO AS POSTCODENO, EC.PERMANENTVILLAGE AS VILLAGE, EC.PERMANENTROADNO AS ROADNO, EC.PERMANENTWARDNO AS WARDNO, E.BIRTHDATE AS BIRTHDATE, E.PHOTOPATH AS PHOTO, E.NATIONALID AS NIDNO, E.HEIGHT AS HEIGHT, E.BLOODGROUP AS BLOODGROUP, diff --git a/HRM.Report/Class/rptDigitalServiceBook.cs b/HRM.Report/Class/rptDigitalServiceBook.cs index 7900939..d738b73 100644 --- a/HRM.Report/Class/rptDigitalServiceBook.cs +++ b/HRM.Report/Class/rptDigitalServiceBook.cs @@ -34,18 +34,28 @@ namespace HRM.Report oDR["FATHERNAME"] = oDRow["FATHERNAME"]; oDR["MOTHERNAME"] = oDRow["MOTHERNAME"]; oDR["SPOUSENAME"] = oDRow["SPOUSENAME"]; - oDR["JOININGDATE"] = Convert.ToDateTime(oDRow["JOININGDATE"]).ToString("dd/MM/yyyy"); + //oDR["JOININGDATE"] = Convert.ToDateTime(oDRow["JOININGDATE"]).ToString("dd/MM/yyyy"); + + DateTime jointDate = Convert.ToDateTime(oDRow["JOININGDATE"]); + oDR["JOININGDATE"] = string.Format("{0} {1} {2}", jointDate.Day, GlobalExtensions.BanglaMonth(jointDate), jointDate.Year); + oDR["DESIGNATION"] = oDRow["DESIGNATION"]; //oDR["DESIGNATION"] = rptDigitalServiceBook.ConvertToBijoy(oDRow["DESIGNATION"].ToString()); oDR["PARMANENTADDRESS"] = oDRow["PARMANENTADDRESS"]; oDR["PRESENTADDRESS"] = oDRow["PRESENTADDRESS"]; - oDR["BIRTHDATE"] = Convert.ToDateTime(oDRow["BIRTHDATE"]).ToString("dd/MM/yyyy"); + + //oDR["BIRTHDATE"] = Convert.ToDateTime(oDRow["BIRTHDATE"]).ToString("dd/MM/yyyy"); + + DateTime birthDate = Convert.ToDateTime(oDRow["BIRTHDATE"]); + oDR["BIRTHDATE"] = string.Format("{0} {1} {2}", birthDate.Day, GlobalExtensions.BanglaMonth(birthDate), birthDate.Year); + //if (oDRow["PHOTO"] is not DBNull) // oDR["PHOTO"] = Convert.ToBase64String((byte[])oDRow["PHOTO"]); oDR["NIDNO"] = oDRow["NIDNO"]; oDR["HEIGHT"] = oDRow["HEIGHT"]; - oDR["BLOODGROUP"] = GlobalExtensions.BloodGroupToFriendlyName((EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup), - Convert.ToInt32(oDRow["BLOODGROUP"]).ToString())); + //oDR["BLOODGROUP"] = GlobalExtensions.BloodGroupToFriendlyName((EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup), + // Convert.ToInt32(oDRow["BLOODGROUP"]).ToString())); + oDR["BLOODGROUP"] = GlobalFunctions.BloodGroupToBangla((EnumBloodGroup)Convert.ToInt32(oDRow["BLOODGROUP"])); //oDR["BLOODGROUP"] = (EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup), Convert.ToInt32(oDRow["BLOODGROUP"]).ToString()); oDR["LMDESIGNATION"] = oDRow["LMDESIGNATION"]; //oDR["LMDESIGNATION"] = rptDigitalServiceBook.ConvertToBijoy(oDRow["LMDESIGNATION"].ToString()); @@ -95,7 +105,9 @@ namespace HRM.Report foreach (DataRow oDRow in dtEmplifecycle.Rows) { oDR = dTable.NewRow(); - oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy"); + //oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy"); + DateTime efectDate = Convert.ToDateTime(oDRow["EFFECTDATE"]); + oDR["EFFECTDATE"] = string.Format("{0} {1} {2}", efectDate.Day, GlobalExtensions.BanglaMonth(efectDate), efectDate.Year); //Designation Designation = new DesignationService().Get(Convert.ToInt32(oDRow["DESIGNATIONID"])); //oDR["DESIGNATION"] = Designation.NameInBangla; Grade oGrade = new GradeService().Get(Convert.ToInt32(oDRow["GradeID"])); @@ -124,8 +136,14 @@ namespace HRM.Report foreach (DataRow oDRow in oLeaveEntry.Tables[0].Rows) { oDR = dTable.NewRow(); - oDR["FROMDATE"] = Convert.ToDateTime(oDRow["APRFROMDATE"]).ToString("dd/MM/yyyy"); - oDR["TODATE"] = Convert.ToDateTime(oDRow["APRTODATE"]).ToString("dd/MM/yyyy"); + + DateTime fromDateDr = Convert.ToDateTime(oDRow["APRFROMDATE"]); + oDR["FROMDATE"] = string.Format("{0} {1} {2}", fromDateDr.Day, GlobalExtensions.BanglaMonth(fromDateDr), fromDateDr.Year); + DateTime toDateDr = Convert.ToDateTime(oDRow["APRTODATE"]); + oDR["TODATE"] = string.Format("{0} {1} {2}", toDateDr.Day, GlobalExtensions.BanglaMonth(toDateDr), toDateDr.Year); + + //oDR["FROMDATE"] = Convert.ToDateTime(oDRow["APRFROMDATE"]).ToString("dd/MM/yyyy"); + //oDR["TODATE"] = Convert.ToDateTime(oDRow["APRTODATE"]).ToString("dd/MM/yyyy"); oDR["TOTALDAYS"] = Convert.ToInt32(oDRow["APRTOTALDAYS"]).ToString(); dTable.Rows.Add(oDR); @@ -146,7 +164,9 @@ namespace HRM.Report foreach (DataRow oDRow in oComplain.Tables[0].Rows) { oDR = dTable.NewRow(); - oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy"); + //oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy"); + DateTime efectDate = Convert.ToDateTime(oDRow["EFFECTDATE"]); + oDR["EFFECTDATE"] = string.Format("{0} {1} {2}", efectDate.Day, GlobalExtensions.BanglaMonth(efectDate), efectDate.Year); //if (oDRow["DESCRIPTIONINBANGLA"] is DBNull) // oDR["DESCRIPTION"] = oDRow["DESCRIPTION"]; //else diff --git a/HRM.Report/RDLC/DigitalServiceBook.rdlc b/HRM.Report/RDLC/DigitalServiceBook.rdlc index 2da3620..75e28f1 100644 --- a/HRM.Report/RDLC/DigitalServiceBook.rdlc +++ b/HRM.Report/RDLC/DigitalServiceBook.rdlc @@ -483,7 +483,7 @@ - =Convert.ToDateTime(DateTime.Now).ToString("dd-MM-yyyy") + =Convert.ToDateTime(DateTime.Now).ToString("dd/MM/yyyy") + true @@ -6164,7 +6165,7 @@ =First(Fields!BLOODGROUP.Value, "EMPDigitalServiceBook") diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index ba10d27..4e30b20 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -14,7 +14,7 @@ export class ApiService { public isSSO = false; public versionDeployement = false; // public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01"; - public versionNumber = `V-20250427-`+"01"; + public versionNumber = `V-20250721-`+"01"; public static BASE_URL = ''; public base_url = ''; // public currentLink = '';