From d10039a85d810b14ad466b8ad7d37c2e25c411d6 Mon Sep 17 00:00:00 2001
From: arjun <arjun>
Date: Thu, 13 Aug 2020 05:10:38 +0000
Subject: [PATCH]

---
 Common/Helper/GetStatic.cs                    | 29 +++++++++++++++-
 .../CustomerRegistration/Manage.aspx.cs       | 33 +------------------
 .../CustomerRegistration/PrintDetails.aspx.cs | 18 +++-------
 .../OnlineCustomerDao/CustomerRepository.cs   |  2 +-
 4 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/Common/Helper/GetStatic.cs b/Common/Helper/GetStatic.cs
index f6f063a..3407768 100644
--- a/Common/Helper/GetStatic.cs
+++ b/Common/Helper/GetStatic.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
+using System.IO;
 using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.UI;
@@ -358,9 +359,35 @@ namespace Common.Helper
             ScriptManager.RegisterStartupScript(page, page.GetType(), "cb", functionName, true);
         }
 
-        public static void CallBackJs2(Page page, string scriptName, string functionName)
+        public static string UploadSignatureImage(string imageData, string registerDate, string membershipId, string customerId)
         {
+            string errorCode = "1";
+            try
+            {
+                string fileExtension = ".png";
+                string fileName = customerId + "_signature_" + DateTime.Now.Hour.ToString() + DateTime.Now.Millisecond.ToString() + "_" + registerDate.Replace("-", "_") + fileExtension;
+                string path = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipId;
 
+                if (!Directory.Exists(path))
+                    Directory.CreateDirectory(path);
+
+                string fName = path + "\\" + fileName;
+                using (FileStream fs = new FileStream(fName, FileMode.CreateNew))
+                {
+                    using (BinaryWriter bw = new BinaryWriter(fs))
+                    {
+                        byte[] data = Convert.FromBase64String(imageData);
+                        bw.Write(data);
+                        bw.Close();
+                    }
+                }
+                errorCode = fileName;
+            }
+            catch (Exception ex)
+            {
+                errorCode = "1";
+            }
+            return errorCode;
         }
     }
 }
\ No newline at end of file
diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
index 91a8236..a2063b9 100644
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
@@ -210,37 +210,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
 
         }
 
-        public string UploadSignatureImage(string imageData, string registerDate, string membershipId, string customerId)
-        {
-            string errorCode = "1";
-            try
-            {
-                string fileExtension = ".png";
-                string fileName = customerId + "_signature_" + DateTime.Now.Hour.ToString() + DateTime.Now.Millisecond.ToString() + "_" + registerDate.Replace("-", "_") + fileExtension;
-                string path = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipId;
-
-                if (!Directory.Exists(path))
-                    Directory.CreateDirectory(path);
-
-                string fName = path + "\\" + fileName;
-                using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
-                {
-                    using (BinaryWriter bw = new BinaryWriter(fs))
-                    {
-                        byte[] data = Convert.FromBase64String(imageData);
-                        bw.Write(data);
-                        bw.Close();
-                    }
-                }
-                errorCode = fileName;
-            }
-            catch (Exception ex)
-            {
-                errorCode = "1";
-            }
-            return errorCode;
-        }
-
         public class CustomerAddress
         {
             public string errrorCode { get; set; }
@@ -355,7 +324,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
                     var membershipId = result[1];
                     var registerDate = result[2];
 
-                    string signatureName = UploadSignatureImage(hddImgURL.Value, registerDate, membershipId, customerId);
+                    string signatureName = GetStatic.UploadSignatureImage(hddImgURL.Value, registerDate, membershipId, customerId);
                     if (signatureName != "1")
                     {
                         _customerServices.AddCustomerSignature(customerId, GetStatic.GetUser(), signatureName, "agent-upload", null);
diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs
index fd9bb84..f3971f1 100644
--- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs
@@ -71,22 +71,12 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
             {
                 foreach (DataRow item in documentDetails.Rows)
                 {
-                    string imageUrl = "";
-                    string docName = "";
-
-                    if (item["documentType"].ToString() == "0")
-                    {
-                        docName = "Signature";
-                        imageUrl = "/Handler/CustomerSignature.ashx?registerDate=" + Convert.ToDateTime(registerDate).ToString("yyyy-MM-dd") + "&customerId=" + hdnCustomerId.Value + "&membershipNo=" + TxtMembershipId.InnerText;
-                    }
-                    else
-                    {
-                        docName = item["documentName"].ToString();
-                        imageUrl = "/WebPages/GetFileView.ashx?imageName=" + item["fileName"] + "&customerId=" + TxtMembershipId.InnerText + "&fileType=" + item["fileType"];
-                    }
+                    var customerId = dr["customerId"].ToString();
+                    var fileName = dr["fileName"].ToString();
+                    string imageUrl = "/Handler/CustomerSignature.ashx?registerDate=" + Convert.ToDateTime(registerDate).ToString("yyyy-MM-dd") + "&customerId=" + customerId + "&membershipNo=" + membershipId + "&fileName=" + fileName;
 
                     imageHtml.Append("<div class=\"col-md-3\"><div class=\"form-group\"><div class=\"col-md-12\">");
-                    imageHtml.Append("<label>" + docName + "</label>");
+                    imageHtml.Append("<label>" + item["documentName"].ToString() + "</label>");
                     imageHtml.Append("</div>");
                     imageHtml.Append("<div class=\"col-md-12\">");
                     imageHtml.Append("<img src=\"" + imageUrl + "\" height=\"150\" width=\"200\"  onclick=\'showImage(this);\'/>");
diff --git a/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs b/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs
index 70779cc..c3a0183 100644
--- a/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs
+++ b/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs
@@ -95,7 +95,7 @@ namespace Repository.Repository.OnlineCustomerDao
             string sql = "exec proc_customerDocumentType @flag='AddSignature',@customerId =" + FilterString(customerId);
             sql += " ,@user=" + FilterString(user);
             sql += " ,@fileName=" + FilterString(fileName);
-            sql += " ,@signatureType=" + FilterString(fileName);
+            sql += " ,@signatureType=" + FilterString(signaturetype);
             sql += " ,@signatureUploadId=" + FilterString(signatureId);
             return ParseDbResult(sql);
         }