Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents e70fd522 e49ead4a
Showing 18 changed files with 157 additions and 213 deletions
150-DOCUMENTATION/Audit/Sprints/OND/Ebix-Estimation Model_Health_Dev-Product Sprint 44(01-May-18).xlsx
400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs
400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html
400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig
400-SOURCECODE/AIAHTML5.Web/index.html
500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql
500-DBDump/additionalScript/UpdateModuleName.sql
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using System.Configuration;
+namespace AIAHTML5.API.Controllers
+{
+    public class ConfigurationController : ApiController
+    {
+        [Route("api/Configuration/GetConfigurationvalues")]
+        [HttpGet]
+         public HttpResponseMessage GetConfigurationvalues()
+        {
+            int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]);
+            HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year);
+            return response;
+        }
+    }
+}
 \ No newline at end of file
@@ -57,7 +57,7 @@
                             <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
                         </tr>
                         <tr>
-                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help  you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017  Ebix, Inc. All Rights Reserved. </em></td>
+                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help  you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%>  Ebix, Inc. All Rights Reserved. </em></td>
                         </tr>
                     </tbody>
                 </table>
@@ -75,7 +75,7 @@
                             <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
                         </tr>
                         <tr>
-                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help  you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017  Ebix, Inc. All Rights Reserved. </em></td>
+                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help  you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%>  Ebix, Inc. All Rights Reserved. </em></td>
                         </tr>
                     </tbody>
                 </table>
@@ -77,7 +77,7 @@
                         <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
                         <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
                         <tr>
-                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017  Ebix, Inc. All Rights Reserved. </em></td>
+                            <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%>  Ebix, Inc. All Rights Reserved. </em></td>
                         </tr>
                     </tbody>
                 </table>
@@ -31,6 +31,8 @@
   </log4net>
   <appSettings>
+   <add key="Copyrightyear" value="2018" />
+    <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
     <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
     <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
     <add key="SenderPassword" value="" />
@@ -39,7 +39,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
         ethnicity: null,
         modesty: null
     };
-    $rootScope.current_year = AIAConstants.current_year;
+  
     // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed.
     $rootScope.refreshcheck = null;
     var isCommingSoonModel = true;
@@ -172,13 +172,19 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             $rootScope.promptUserForCookies();
         }
-
+        $rootScope.getConfigurationValues();
     }
-
-    $rootScope.AuthenticateUser = function (userInfo)
+    $rootScope.getConfigurationValues = function ()
     {
-       
-       
+       AuthenticationService.getCofigValue()
+        .then(
+                     function (configresult) {
+                    $rootScope.current_year = configresult;
+           
+             });
+    }
+    $rootScope.AuthenticateUser = function (userInfo)
+    { 
         if (navigator.cookieEnabled) {
             $rootScope.errorMessage = "";
             if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) {
@@ -372,9 +378,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
         {
             $rootScope.promptUserForCookies();
         }
-
+       
     }
-
+   
     $scope.saveRemeberMeDetails = function (result, userInfo) {
         localStorage.setItem('RememberMeLoginId', result.LoginId);
@@ -516,7 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $rootScope.aaPinDataArray = [];
     $rootScope.isShowSelectedSystemPinsClicked = false;
     $scope.showAllPins = function () {
-     
+      
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
           .then(
@@ -534,7 +534,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 //draw pins
-             
                 $scope.aaPinData = result.data.Root.Item;
                 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
                     $rootScope.aaPinDataArray = $scope.aaPinData
@@ -559,12 +558,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                  console.log(' error in showAllPins: ' + error.statusText);
              }
             )
-        if ($scope.isSliderChange == true) {
+        //if ($scope.isSliderChange == true) {
             $timeout(function () {
-                $scope.activePinOnLayerChange();
+                   $scope.activePinOnLayerChange();
             }, 1000);
-        }
+        //}
     }
@@ -821,11 +820,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 else {
                     $scope.selectedSystemName = $scope.SelectedSystemTitle;
+                 
                     // get termText info
                     var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
                    .then(
                     function (response) {
-
+                    
                         $scope.TermInfo = response.data.Terms.Term;
                         //on gettng all required data, draw pins
@@ -893,6 +893,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         {
                 $scope.SelectedSystemID = event;
                 $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title");
+            
                 $scope.typeOfEvent = typeof event;
           //  $scope.isBodySystemSelected = true;
             $rootScope.isShowSelectedSystemPinsClicked = true;
@@ -919,8 +920,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 }
             }
             else {
-
+          
                 $scope.selectedSystemName = $scope.SelectedSystemTitle;
+                
                 // get termText info
                 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
                .then(
@@ -934,6 +936,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                 .from($scope.aaPinData)
                                 .where("_BodySystemName == " + $scope.selectedSystemName)
                                 .select();
+
+                        console.log($scope.selectedSystemPinData);
+
                         if ($scope.isHidePinBtnClicked) {
                             // $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
                             $scope.showAllPinsAfterHide();
@@ -973,11 +978,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $scope.activePinArray = [];
     $scope.isSearchOptionClicked = false;
     $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) {
-      
+       
         $scope.selectedPin = [];
         var isSameTermWithMultiPin = false;
-        var firstPinId = selectedPinData[0]._PinId;
-        var pinTermNumber = selectedPinData[0]._TermId;
+
+            var firstPinId = selectedPinData[0]._PinId;
+            var pinTermNumber = selectedPinData[0]._TermId;
         //check if other pin have same termNumber
         if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
@@ -987,11 +993,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                              .where("_TermId == " + pinTermNumber)
                                              .select();
-            //if ($scope.isSearchOptionClicked == true) {
-            //    $scope.activePinArray = [];
-            //    $scope.clickedPins = [];
-            //    $scope.isSearchOptionClicked = false;
-            //}
+       
             if ($scope.isBodySystemSelected == true) {
                 $scope.isSelectedSystemSelectedAftrChange = true;
@@ -1161,6 +1163,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
     $scope.sliderVal = 100;
     $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) {
+       
         x = x * $scope.sliderPercentValue;
         y = y * $scope.sliderPercentValue;
         if ($("#canvasDiv").find("div").length > 0) {
@@ -2003,18 +2006,37 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         }, 1000);
     }
-   
+ 
     $scope.highlightPinBasedOnSerachItem = function (id) {
         $scope.isSelectedSystemSelectedAftrChange = false;
         $scope.isSearchOptionClicked = true;
         $scope.listMangerID = [];
         $scope.searchItemId = id;
-      
-        $scope.searchItemText = $("#" + id).val();
+
+        // 30507 Atlas Anatomy > The pin selection should change in the below scenario.
+        $("div.tools div:eq(1) div").each(function () {
+            if ($(this).find("button").hasClass("btn-primary")) {
+                var btnID = $(this).find("button").attr("id")
+                if (btnID == "allPinBtn") {
+                }
+                else
+                {
+                    $("div.tools div:eq(1) div").find("button").removeClass("btn-primary");
+                    $('#' + btnID).addClass("btn-black");
+                    $("#allPinBtn").removeClass("btn-black");
+                    $("#allPinBtn").addClass("btn-primary");
+                    $scope.showAllPinsAfterHide();
+                }
+            }
+        });
+
+
+        $scope.searchItemText = $("#" + id).val(); 
         $rootScope.searchSelectedText = $("#" + id).val();
         $('#termList option[selected="selected"]').prop("selected", false);
         $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+       
         $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
         $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
@@ -2024,13 +2046,45 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         //selectedTermName.placeholder = $("#" + id).text();
         selectedTermName.value = $("#" + id).val();
         selectedTermName.placeholder = "search... ";
-     
-        //get data from pindata for this trem
+        if ($("#bodySystemList li.activeAASystemSelect a").attr("id") == 0) {
+         //   alert("All");
+        }
+        else
+        {
+            $("#bodySystemList li").each(function () {
+                if ($(this).hasClass("disabledSelectedSystem") || $(this).hasClass("divider") || ($(this).find("a").attr("id") == 0)) {
+                }
+                else {
+                    var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
+                 .then(
+                  function (response) {
+                      $scope.ListManagerTermInfo = response.data.Terms.Term;
+                      $rootScope.selectedSystemList = $('#termList option[id="' + id + '"]').text();
+                      $scope.selectedSystemPinDataForList = new jinqJs()
+                                   .from($scope.ListManagerTermInfo)
+                                   .where("__TermText == " + $('#termList option[id="' + id + '"]').text())
+                                   .select();
+                      $scope.showSelectedSystemPins($scope.selectedSystemPinDataForList[0].__BodySystemId);
+                  },
+                 function (error) {
+                     // handle errors here
+                     console.log(' error: ' + error.statusText);
+                 }
+                )
+                }
+
+            });
+        }
+
+
+        //get data from pindata for this trem
+     
         var pinDataForTerm = new jinqJs()
                                          .from($scope.aaPinData)
                                          .where("_TermId == " + $scope.searchItemId)
                                          .select();
+        $timeout(function () {
         //make all pin heads grey
         var radial = $('#aaDetailViewCanvas').createGradient({
             x1: 50, y1: 50,
@@ -2039,11 +2093,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             c1: 'rgba(100, 50, 0,0)',
             c2: 'rgb(216, 216, 216)'
         });
-
-
         $('#aaDetailViewCanvas').setLayers({
             fillStyle: radial,
         }).drawLayers();
+
         console.log(pinDataForTerm[0]._PinId);
         $scope.clickedPins = [];
         $scope.clickedPins.push({ 'id': pinDataForTerm[0]._PinId });
@@ -2051,9 +2104,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         var pinID = "PinArc_" + pinDataForTerm[0]._PinId;
         $scope.activePinArray.push({ 'id': pinID });
         $scope.showAnnotation(pinDataForTerm, false, false, true);
-        // maintaing scroll position on selection of options in list manager.
+            // maintaing scroll position on selection of options in list manager.
         var annotationTopPos = $(".common-drag").css("top").split("p");
         $("#canvasDiv").scrollTop(annotationTopPos[0]);
+        }, 700);
+
         $scope.IsSearchVisible = false;
     }
@@ -496,7 +496,6 @@ AIA.constant(&quot;UserModules&quot;, [
 AIA.constant("AIAConstants", {
     "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
     "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.",
-    "current_year": 2018,
     "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.",
     "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
 })
@@ -108,7 +108,25 @@
                 $("#messageModal").modal('show');
             });
             return deferred.promise;
-        }
+        },
+        getCofigValue: function()
+                {         
+                    var deferred = $q.defer();
+                     $http({
+                                 method: 'GET',
+                                 url: 'API/api/Configuration/GetConfigurationvalues'
+                     }).success(function (data, status, headers, config)
+                     {
+                                       console.log('success' + data);
+                                       deferred.resolve(data);
+                     }).error(function (data, status, headers, config)
+                     {
+                                         console.log('error')
+                                         deferred.reject(data);
+
+                     });
+                                          return deferred.promise;
+                  }
-    }
+           }
 });
 \ No newline at end of file
-<!--Body-->
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"></script>
-<div class="bodyWrap row" ng-controller="LabExercController">
-
-<<<<<<< HEAD
-    <div class="" ng-init="GetQuizByTopic()">
-        <div class="col-sm-12 pageHeading" id="LabExPageHeading">
-=======
-    <div class="" ng-init="InitializeLabExercise()">
-        <div class="col-sm-12 pageHeading">
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
-            <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
-        <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
-            <h4 class="pull-left">Lab Exercise - {{LabExerciseName}}</h4>
-            <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default" ng-click="minLabExPanel()"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
-            <div class="clearfix"></div>
-        </div>
-
-        <div class="col-sm-12">
-            <div class="pull-left btn-group LabEx-Panel-state-minimized" id="LabExMinimizedId">
-                <p class="pull-left" style="color:#fff">LAB Ex ...</p>
-                <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default" ng-click="maxLabExPanel()"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a>
-            </div>
-        </div>
-
-        <div class="col-sm-12">
-
-            <div class="container-fluid main-full">
-                <div class="row">
-<<<<<<< HEAD
-                    <div class="panel panel-default" id="labExPanel">
-=======
-                    <div class="panel panel-default" id="questionHtml">
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
-                        <div class="panel-heading">
-                            {{activityTitle}}<p style="margin:-20px 474px -1px;" class="text-primary">{{Title}}</p>
-                            <div class="pull-right" style="margin: -20px 20px;">
-                                <p>Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>
-                            </div>
-                        </div>
-                        <div class="panel-body" style="padding:2px;overflow:scroll">
-                            <div id="textblock" style="margin: 80px 20px; display block;">
-                                <div style="margin: 20px;" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}">
-                                    <div ng-bind-html="deliberatelyTrustDangerousSnippet(optionbox.QuizText)"></div>
-                                </div>
-                                <!--<ul>
-<<<<<<< HEAD
-                    <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
-                </ul>-->
-=======
-            <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
-        </ul>-->
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
-                            </div>
-                            <div align="center" class="dragger">
-                                <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true">
-                                    <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
-                                </div>
-                                <div class="col-sm-9">
-                                    <div style="position: relative; margin-left: 85px;" id="imgdiv">
-                                        <div id="imgblock">
-                                            <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" imageonload />
-                                        </div>
-
-                                        <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute',  'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div>
-                                        <div draggable="true" ng-repeat="ans in DraggedList" droppable="true" class="droppable ui-droppable answerdroppable" id="blockans-{{ans.id}}" ng-style="{'top':{{ans.topcoord}}, 'left':{{ans.leftcoord}},'position': 'absolute',  'width': '158px', 'height':'30px', 'border':'0px solid #333', 'background': 'transparent','font-size': '12px','border-color':'#FF0000','padding-top':'5px'}">{{ans.Value}}</div>
-                                    </div>
-
-<<<<<<< HEAD
-                                    <div class="col-sm-12" style="margin-left: 200px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
-=======
-                                    <div class="col-sm-12" style="margin-left: 215px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
-                                        <!--<div class="col-sm-3 col-lg-3  ui-draggable" >-->
-                                        <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'bottom'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
-                                        <!--</div>-->
-                                    </div>
-                                </div>
-                                <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true">
-                                    <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="panel-footer">
-                            <div class="pull-left">
-                                <!--<p>Question <strong>{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>-->
-                            </div>
-                            <div class="pull-right">
-                                <div class="btn-group pull-left marginR5">
-                                    <button class="btn btn-sm btn-primary" style="display:none;" ng-click="SubmitAttempt()" id="quizSubmitBtn">Submit</button>
-                                    <button class="btn btn-sm btn-primary" style="display:none;" id="reportBtn" ng-click="ReportGen()">Report</button>
-                                    <button class="btn btn-sm btn-primary" id="saveBtn" ng-click="SaveAnswer()">Save</button>
-                                    <button class="btn btn-sm btn-primary" id="reviewBtn" ng-click="ReviewAttempt()">Review Your Attempt</button>
-                                    <button class="btn btn-sm btn-primary" id="resetBtn" ng-click="OnResetClick()">Reset</button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>
-                                    <button class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button>
-                                </div>
-                            </div>
-                            <div class="clearfix"></div>
-                        </div>
-
-                    </div>
-
-
-                    <div class="panel panel-default" id="submitResultHtml" style="display:none;">
-                        <div class="panel-heading">
-                            <div class="row">
-                                <div class="col-sm-4 text-left"><strong>Cardiovascula System</strong></div>
-                                <div class="col-sm-4 text-center">Performace Report</div>
-                                <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
-                            </div>
-                        </div>
-                        <div class="panel-body no-padding">
-                            <div class="row">
-                                <div class="col-sm-12 table-responsive ">
-                                    <table class="table table-hover table-condensed bg-white">
-                                        <thead>
-                                            <tr class="active">
-                                                <th class="text-center">Total Question</th>
-                                                <th class="text-center">Correct Answers</th>
-                                                <th class="text-center">Incorrect Answers</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr class="text-center">
-                                                <td>{{TotalNumberofQuiz}}</td>
-                                                <td>{{CorrectAnswer}}</td>
-                                                <td>{{inCorrectAnswer}}</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-
-                                </div>
-                                <div class="col-sm-12 table-responsive">
-                                    <table class="table table-hover table-condensed  bg-white">
-                                        <thead>
-                                            <tr class="active">
-                                                <th>Question</th>
-                                                <th>Activity Title</th>
-                                                <th>Status</th>
-                                                <th>Action</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody id="resultLabData"></tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="panel-footer">
-                            <div class="text-center">
-                                <button class="btn btn-sm btn-primary">
-                                    Email
-                                </button>
-
-                            </div>
-                            <div class="clearfix"></div>
-                        </div>
-
-                    </div>
-
-
-                </div>
-            </div>
-        </div>
-
-
-
-    </div>
-</div>
-
-
@@ -234,7 +234,7 @@
                     <img class="browserIcons" src="content/images/common/mozilla-icon.png" />
                     <img class="browserIcons"  src="content/images/common/safari-icon.png" />
                 </div>
-                <div class="container-fluid text-center">Copyright &copy; 2017 Ebix Inc. All rights reserved.</div>
+                <div class="container-fluid text-center">Copyright &copy; {{current_year}} Ebix Inc. All rights reserved.</div>
             </footer>
         </div>
         <!-- Forgot User ID (Small modal) -->
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
+ 
+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  
+
+
-UPdate ResourceModule set Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE' 
-where Title='CAM';
 \ No newline at end of file
+UPdate ResourceModule set Title='Complementary and Alternative Medicine' 
+where Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE';
 \ No newline at end of file