From e49ead4a4db3c765f074abf2293e1d4180ecf016 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Fri, 11 May 2018 17:48:33 +0530 Subject: [PATCH] after Merge Request #916, these changes are showing for commit --- 400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig | 173 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql | Bin 6246 -> 0 bytes 500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql | Bin 3670 -> 0 bytes 500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql | Bin 14758 -> 0 bytes 500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql | Bin 4460 -> 0 bytes 500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql | 16 ++++++++++++++++ 6 files changed, 16 insertions(+), 173 deletions(-) delete mode 100644 400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig create mode 100644 500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig deleted file mode 100644 index 560c535..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig +++ /dev/null @@ -1,173 +0,0 @@ - - -
- -<<<<<<< HEAD -
-
-======= -
-
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f - -

Lab Exercise - {{LabExerciseName}}

-
-
-
- -
-
-

LAB Ex ...

- -
-
- -
- -
-
-<<<<<<< HEAD -
-======= -
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f -
- {{activityTitle}}

{{Title}}

-
-

Question {{quiznumber}} of {{TotalNumberofQuiz}}

-
-
-
-
-
-
-
- -======= -
  • - --> ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f -
    -
    -
    -
    {{option.OptionTitle}}
    -
    -
    -
    -
    - -
    - -
    {{optionbox.Answervalue}}
    -
    {{ans.Value}}
    -
    - -<<<<<<< HEAD -
    -======= -
    ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f - -
    {{option.OptionTitle}}
    - -
    -
    -
    -
    {{option.OptionTitle}}
    -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - -
    -
    - - -
    -
    -
    -
    - -
    - - - - - -
    -
    -
    - - - -
    -
    - - diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql index ea21cdb..a649d86 100644 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql index 19bbd19..615d3f1 100644 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql index be224c0..546fbd6 100644 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql index d41e156..ad339b2 100644 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ diff --git a/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql new file mode 100644 index 0000000..ec352ed --- /dev/null +++ b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql @@ -0,0 +1,16 @@ + +CREATE PROCEDURE [dbo].[usp_GetProductEditionByLicense] + -- Add the parameters for the stored procedure here + @iLicenseId int +AS +BEGIN + -- SET NOCOUNT ON added to prevent extra result sets from + -- interfering with SELECT statements. + SET NOCOUNT ON; + SELECT Edition.Id, Edition.Title, Edition.IsActive, Edition.Priority + FROM Edition + INNER JOIN LicenseToEdition ON Edition.Id = LicenseToEdition.EditionId + WHERE LicenseToEdition.LicenseId =@iLicenseId +END + + -- libgit2 0.21.4