From fd90409fc8a51ef6379d891f6cf9a16de042e6b6 Mon Sep 17 00:00:00 2001 From: gagan Date: Tue, 18 Aug 2020 06:47:22 +0000 Subject: [PATCH] --- Business/Customer/CustomerServices.cs | 5 + Business/Customer/ICustomerServices.cs | 2 + .../PublishProfiles/FolderProfile.pubxml.user | 34 ++-- .../BenificiaryRegistration/Manage.aspx | 159 +++++++++++++++--- .../BenificiaryRegistration/Manage.aspx.cs | 31 ++++ .../Manage.aspx.designer.cs | 18 ++ .../WebPages/CustomerRegistration/Manage.aspx | 20 +-- .../CustomerRegistration/PrintDetails.aspx | 39 +++-- .../CustomerRegistration/PrintDetails.aspx.cs | 1 - .../PrintDetails.aspx.designer.cs | 53 +++--- .../OnlineCustomerDao/CustomerRepository.cs | 8 + .../OnlineCustomerDao/ICustomerRepository.cs | 2 + 12 files changed, 272 insertions(+), 100 deletions(-) diff --git a/Business/Customer/CustomerServices.cs b/Business/Customer/CustomerServices.cs index 75f0f73..c6343cc 100644 --- a/Business/Customer/CustomerServices.cs +++ b/Business/Customer/CustomerServices.cs @@ -90,5 +90,10 @@ namespace Business.Customer { return _customerRepo.UpdateCustomerDocument(cdId, customerId, fileName, fileDescription, fileType, documentType, user); } + + public DataSet GetCustomerAndReceiver(string customerId, string user) + { + return _customerRepo.GetCustomerAndReceiver(customerId, user); + } } } diff --git a/Business/Customer/ICustomerServices.cs b/Business/Customer/ICustomerServices.cs index 39172a7..65a9d07 100644 --- a/Business/Customer/ICustomerServices.cs +++ b/Business/Customer/ICustomerServices.cs @@ -36,5 +36,7 @@ namespace Business.Customer DataTable GetCustomerDetailsWitDT(string customerId, string user); DataSet GetCustomerInfoFromMembershiId(string user, string membershipId, string receiverId, string rowId); + + DataSet GetCustomerAndReceiver(string customerId, string user); } } diff --git a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user index 240e85c..335b2db 100644 --- a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -37,16 +37,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:02 - 08/16/2020 13:11:54 + 08/17/2020 11:16:47 - 08/16/2020 13:11:54 + 08/17/2020 11:16:47 - 08/13/2020 17:18:29 + 08/17/2020 11:16:46 - 08/13/2020 17:18:29 + 08/17/2020 11:16:46 08/11/2020 16:56:02 @@ -55,10 +55,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:02 - 08/17/2020 10:06:54 + 08/17/2020 12:43:00 - 08/17/2020 10:06:54 + 08/17/2020 12:43:00 08/11/2020 16:56:02 @@ -121,10 +121,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:02 - 08/16/2020 13:11:53 + 08/17/2020 11:16:46 - 08/16/2020 13:11:53 + 08/17/2020 11:16:46 08/11/2020 16:56:02 @@ -784,7 +784,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/17/2020 10:05:18 + 08/17/2020 10:52:57 08/12/2020 14:27:30 @@ -853,10 +853,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/17/2020 10:05:23 + 08/17/2020 10:53:12 - 08/17/2020 09:31:45 + 08/17/2020 10:34:16 08/11/2020 16:56:08 @@ -889,7 +889,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/12/2020 16:34:49 + 08/17/2020 12:28:30 10/25/2019 16:47:02 @@ -1282,7 +1282,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 10/20/2019 15:35:21 - 08/13/2020 16:15:34 + 08/17/2020 12:43:02 08/11/2020 16:56:09 @@ -1309,7 +1309,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/12/2020 15:58:42 - 08/17/2020 09:30:35 + 08/17/2020 12:28:29 08/17/2020 09:57:44 @@ -1318,10 +1318,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/16/2020 11:01:08 + 08/17/2020 12:28:29 - 08/17/2020 09:53:41 + 08/17/2020 11:07:57 08/11/2020 16:56:09 @@ -1342,7 +1342,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/17/2020 09:52:49 - 08/17/2020 08:59:55 + 08/17/2020 12:28:29 07/31/2020 10:42:21 diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx index 9b8807e..4668466 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx @@ -9,18 +9,6 @@
-
-
-
-

-
    -
    2. -
  2. Registration
    3. -
  3. Add Beneficiary
    4. -
-
-
-
@@ -30,16 +18,62 @@ Add Beneficiary
-
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+

Beneficiary List

+
+
+
+ + + + + + + + + + + + +
S. No.NameAddressMobileIdType
+
+
+
+ + +
+
+
+
+ +
+
+
@@ -76,7 +110,7 @@
-
+ @@ -366,7 +366,7 @@
- +
@@ -472,7 +472,7 @@
- +
@@ -561,7 +561,7 @@ diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx index 5229dd5..cb0dcaa 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx @@ -33,17 +33,31 @@ Personal Information + + + Country: - - Zip Code : - + + Native Country : + + Address: - + + + + Date of Birth: + + + + City: - + txtCity + Gender: + + Occupation : @@ -55,8 +69,9 @@ Source Of Fund : - Native Country : - + Zip Code : + + @@ -85,13 +100,7 @@ SSN No. : - - Date of Birth : - - Gender: - - @@ -128,10 +137,6 @@ Beneficiary Type: - - Email: - - Full Name: diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs index f41f818..96c4751 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs @@ -92,7 +92,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { recCountry.InnerText = dr["country"].ToString(); recBeneficiaryType.InnerText = dr["receiverType"].ToString(); - recEmail.InnerText = dr["email"].ToString(); recFullName.InnerText = dr["customerName"].ToString(); recNativeCountry.InnerText = dr["NativeCountry"].ToString(); recAddress.InnerText = dr["address"].ToString(); diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs index 298cb9f..731a2ba 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs @@ -49,13 +49,13 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { protected global::System.Web.UI.HtmlControls.HtmlTableCell txtCountry; /// - /// txtZipcCode control. + /// txtNativeCountry control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlTableCell txtZipcCode; + protected global::System.Web.UI.HtmlControls.HtmlTableCell txtNativeCountry; /// /// txtAddress control. @@ -66,6 +66,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell txtAddress; + /// + /// txtDateOfBirth control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableCell txtDateOfBirth; + /// /// txtCity control. /// @@ -75,6 +84,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell txtCity; + /// + /// txtGender control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableCell txtGender; + /// /// txtOccupation control. /// @@ -103,13 +121,13 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { protected global::System.Web.UI.HtmlControls.HtmlTableCell txtSourceOfFund; /// - /// txtNativeCountry control. + /// txtZipcCode control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlTableCell txtNativeCountry; + protected global::System.Web.UI.HtmlControls.HtmlTableCell txtZipcCode; /// /// txtMonthlyIncome control. @@ -183,24 +201,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell txtSSnNo; - /// - /// txtDateOfBirth control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlTableCell txtDateOfBirth; - - /// - /// txtGender control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlTableCell txtGender; - /// /// txtRemarks control. /// @@ -282,15 +282,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell recBeneficiaryType; - /// - /// recEmail control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlTableCell recEmail; - /// /// recFullName control. /// diff --git a/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs b/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs index db95f6e..d00142c 100644 --- a/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs +++ b/Repository/Repository/OnlineCustomerDao/CustomerRepository.cs @@ -342,5 +342,13 @@ namespace Repository.Repository.OnlineCustomerDao sql += ",@user =" + FilterString(user); return ExecuteDataTable(sql); } + + public DataSet GetCustomerAndReceiver(string customerId, string user) + { + string sql = "Exec proc_customerInfo @flag='getCustomerAndReceiverInfo'"; + sql += " ,@customerId =" + FilterString(customerId); + sql += " ,@user =" + FilterString(user); + return ExecuteDataSet(sql); + } } } diff --git a/Repository/Repository/OnlineCustomerDao/ICustomerRepository.cs b/Repository/Repository/OnlineCustomerDao/ICustomerRepository.cs index 043b728..4758273 100644 --- a/Repository/Repository/OnlineCustomerDao/ICustomerRepository.cs +++ b/Repository/Repository/OnlineCustomerDao/ICustomerRepository.cs @@ -39,5 +39,7 @@ namespace Repository.Repository.OnlineCustomerDao DataTable GetDocumentByCustomerId(string customerId, string fileDescription, string sessionId); DataSet GetCustomerInfoFromMembershiId(string user, string membershipId, string receiverId, string rowId); + DataSet GetCustomerAndReceiver(string customerId, string user); + } }