From e59b83bde323eba5f791afdc3a896ae6e88fc6d4 Mon Sep 17 00:00:00 2001 From: Utkarsh Singh Date: Sat, 16 Sep 2017 16:53:23 +0530 Subject: [PATCH] Committing updated restructuredcode --- 150-DOCUMENTATION/002-DBScripts/GetLicenseDetailByUserId.sql | 19 +++++++++++++++++++ 150-DOCUMENTATION/002-DBScripts/GetLicenseIdEditionIdByUserId.sql | 35 ----------------------------------- 400-SOURCECODE/AIAHTML5.API/Models/User.cs | 3 ++- 3 files changed, 21 insertions(+), 36 deletions(-) create mode 100644 150-DOCUMENTATION/002-DBScripts/GetLicenseDetailByUserId.sql delete mode 100644 150-DOCUMENTATION/002-DBScripts/GetLicenseIdEditionIdByUserId.sql diff --git a/150-DOCUMENTATION/002-DBScripts/GetLicenseDetailByUserId.sql b/150-DOCUMENTATION/002-DBScripts/GetLicenseDetailByUserId.sql new file mode 100644 index 0000000..c5f00d8 --- /dev/null +++ b/150-DOCUMENTATION/002-DBScripts/GetLicenseDetailByUserId.sql @@ -0,0 +1,19 @@ +-- ============================================= +-- Author: +-- Create date: <07/31/2017> +-- Description: +-- ============================================= +CREATE PROCEDURE GetLicenseDetailByUserId + -- Add the parameters for the stored procedure here + @iUserId int +AS +BEGIN + -- SET NOCOUNT ON added to prevent extra result sets from + -- interfering with SELECT statements. + SET NOCOUNT ON; + + -- Insert statements for procedure here + SELECT LicenseId, EditionId FROM LicenseToEdition + INNER JOIN AIAUserToLicenseEdition on AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id + WHERE AIAUserToLicenseEdition.UserId = @iUserId +END \ No newline at end of file diff --git a/150-DOCUMENTATION/002-DBScripts/GetLicenseIdEditionIdByUserId.sql b/150-DOCUMENTATION/002-DBScripts/GetLicenseIdEditionIdByUserId.sql deleted file mode 100644 index 7d89f91..0000000 --- a/150-DOCUMENTATION/002-DBScripts/GetLicenseIdEditionIdByUserId.sql +++ /dev/null @@ -1,35 +0,0 @@ --- ================================================ --- Template generated from Template Explorer using: --- Create Procedure (New Menu).SQL --- --- Use the Specify Values for Template Parameters --- command (Ctrl-Shift-M) to fill in the parameter --- values below. --- --- This block of comments will not be included in --- the definition of the procedure. --- ================================================ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO --- ============================================= --- Author: --- Create date: <07/31/2017> --- Description: --- ============================================= -CREATE PROCEDURE GetLicenseIdEditionIdByUserId - -- Add the parameters for the stored procedure here - @iUserId int -AS -BEGIN - -- SET NOCOUNT ON added to prevent extra result sets from - -- interfering with SELECT statements. - SET NOCOUNT ON; - - -- Insert statements for procedure here - SELECT LicenseId, EditionId FROM LicenseToEdition - INNER JOIN AIAUserToLicenseEdition on AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id - WHERE AIAUserToLicenseEdition.UserId = @iUserId -END -GO diff --git a/400-SOURCECODE/AIAHTML5.API/Models/User.cs b/400-SOURCECODE/AIAHTML5.API/Models/User.cs index 176f703..1b38b41 100644 --- a/400-SOURCECODE/AIAHTML5.API/Models/User.cs +++ b/400-SOURCECODE/AIAHTML5.API/Models/User.cs @@ -24,6 +24,7 @@ namespace AIAHTML5.API.Models public string UserType { get; set; } public int UserTypeId { get; set; } public bool IsActive { get; set; } + public bool IsCorrectLoginId { get; set; } public bool IsCorrectPassword { get; set; } public int IncorrectLoginAttemptCount { get; set; } public bool IsBlocked { get; set; } @@ -36,7 +37,7 @@ namespace AIAHTML5.API.Models public License License { get; set; } public LicenseSubscriptionDetails LicenseSubscriptions { get; set; } public bool IsSubscriptionExpired { get; set; } - public string SubscriptionExpirationDateString { get; set; } + public string SubscriptionExpirationDate { get; set; } public string TermsOfServiceTitle { get; set; } public string TermsOfServiceText { get; set; } -- libgit2 0.21.4