From 09b72f946b76a1a1d70e0139c941aac7ac868c2b Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 8 Mar 2018 15:23:14 +0530 Subject: [PATCH] merged PreQA into develop --- 400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 6 +++--- 400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js | 57 +++++++++++++++++++++++++++++++++++++++++---------------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html | 11 +++++++---- 400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html | 6 +++--- 400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html | 19 ++++++++++++++++--- 400-SOURCECODE/AIAHTML5.Web/index.html | 3 +++ 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 16 +++++++++++++++- 500-DBDump/AIA-StoredProcedures/GetLicenseSubscriptionDetails.sql | 37 +++++++++++++++++++++++++++++++++++++ 500-DBDump/AIA-StoredProcedures/dbo.GetCustomerSummary.StoredProcedure.sql | Bin 15912 -> 0 bytes 500-DBDump/AIA-StoredProcedures/usp_SaveLabExerciseAttempts.sql | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 500-DBDump/DeleteIncorretLoginAttempts.sql | 33 +++++++++++++++++++++++++++++++++ 500-DBDump/ExtendLicense-WKLabGuide1replacement.sql | 12 ++++++++++++ 500-DBDump/ExtendingLicenseExpiry_2.sql | 30 ++++++++++++++++++++++++++++++ 500-DBDump/GetLicenseSubscriptionDetails.sql | 37 +++++++++++++++++++++++++++++++++++++ 500-DBDump/additionalScript/AddCallFromColumn_LabExercise.sql | 2 ++ 500-DBDump/additionalScript/AddSlugColumnInResourceModuleTable.sql | 21 +++++++++++++++++++++ 500-DBDump/additionalScript/CreateContentTable.sql | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 500-DBDump/additionalScript/CreateLabExerciseTempTableType.sql | 9 +++++++++ 500-DBDump/getAIAUserListBasedOnInstitute.sql | 1 + 500-DBDump/missingOnProduction/GetLicenseSubscriptionDetails.sql | 37 +++++++++++++++++++++++++++++++++++++ 24 files changed, 469 insertions(+), 34 deletions(-) create mode 100644 500-DBDump/AIA-StoredProcedures/GetLicenseSubscriptionDetails.sql create mode 100644 500-DBDump/AIA-StoredProcedures/usp_SaveLabExerciseAttempts.sql create mode 100644 500-DBDump/DeleteIncorretLoginAttempts.sql create mode 100644 500-DBDump/ExtendLicense-WKLabGuide1replacement.sql create mode 100644 500-DBDump/ExtendingLicenseExpiry_2.sql create mode 100644 500-DBDump/GetLicenseSubscriptionDetails.sql create mode 100644 500-DBDump/additionalScript/AddCallFromColumn_LabExercise.sql create mode 100644 500-DBDump/additionalScript/AddSlugColumnInResourceModuleTable.sql create mode 100644 500-DBDump/additionalScript/CreateContentTable.sql create mode 100644 500-DBDump/additionalScript/CreateLabExerciseTempTableType.sql create mode 100644 500-DBDump/getAIAUserListBasedOnInstitute.sql create mode 100644 500-DBDump/missingOnProduction/GetLicenseSubscriptionDetails.sql diff --git a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs index d371aeb..04a295c 100644 --- a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs +++ b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs @@ -41,7 +41,7 @@ namespace AIAHTML5.API.Constants public const string FORGOT_USERID_EMAIL_SUBJECT = "UserID recovery mail for:"; public const string FORGOT_PASSWORD_EMAIL_SUBJECT = "Password recovery mail for:"; public const string UNBLOCK_USER_EMAIL_SUBJECT = "Unblock user request mail for:"; - public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved successfully."; + public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved."; public const string LAB_EXERCISE_SAVE_FAILURE = "We are unable to save your lab exercise attempt, please try again."; public const string SAVED_LAB_EXERCISE_NOT_FOUND = "Saved Lab Exercise not found."; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index b4d0c17..36325f6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -8486,7 +8486,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //body highlight options functinality - $scope.LoadBodySystemData = function () { + $scope.LoadBodySystemData = function (event) { event.stopPropagation(); $("#structureDropdown").toggle(); $("#genderChangeId").css("display", "none"); @@ -9914,7 +9914,7 @@ function onListManagerTermSelection(id, isTermListOptionClicked) { } -function genderChange(){ +function genderChange(event) { event.stopPropagation(); $("#structureDropdown").css("display", "none"); $("#viewID").css("display", "none"); @@ -9926,7 +9926,7 @@ function genderChange(){ } -function viewChange() { +function viewChange(event) { event.stopPropagation(); $("#structureDropdown").css("display", "none"); $("#genderChangeId").css("display", "none"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 4c2d6ed..e46c749 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -400,7 +400,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, $scope.handleDragStart = function (e) { this.style.opacity = '0.4'; - if ($.browser.msie) { + var $ua = navigator.userAgent; + if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) { localStorage.setItem("text", this.innerHTML); } else @@ -409,7 +410,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, } $scope.dragableId = $(this).attr("Id"); - // alert($scope.dragableId); + console.log($scope.dragableId); $scope.dragableText = $("#" + $scope.dragableId).text(); // alert($("#" + $scope.dragableId).text()); @@ -425,7 +426,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, .where('OptionTitle == ' + optionText) .select(); var option = optionData[0].OptionNumber; - $scope.dragableId = optionText + '-' + option; + // $scope.dragableId = optionText + '-' + option; } //if user drag already selected answer from one blankbox to another than it gets id of blank box so need to get answer @@ -469,7 +470,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, //console.log($rootScope.selectedDivArray); var keywords = $location.search(); - if ($.browser.msie) { + var $ua = navigator.userAgent; + if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) { dataText = localStorage.getItem("text"); localStorage.setItem("text", ''); } @@ -521,7 +523,11 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, ) } else { - if ($(this).css('background-color') == 'rgb(232, 232, 232)') { + $(this).each(function (key, value) { + + var droppedID = $(this).attr("id").split("-"); + + if (droppedID[0] == 'blockbox') { var labExerciseModulePath = '~/../content/data/json/le/' + keywords.labexercise + '.json'; DataService.getAnotherJson(labExerciseModulePath).then( function (result) { @@ -533,16 +539,26 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, $.each(Options, function (inx, value2) { if (Options[inx].BoxName == id.split('-')[1]) { if ($scope.DraggedList != null) { - $.each($scope.DraggedList, function (inx1, value3) { + //$.each($scope.DraggedList, function (inx1, value3) { + // if ($scope.DraggedList[inx1].Value == dataText) { + // $scope.DraggedList.splice(inx1, 1); + // } + //}); + for (var i = 0; i <= $scope.DraggedList.length - 1; i++) { + + if ($scope.DraggedList[i].Value == undefined) { + i = 0; + continue; + } - if ($scope.DraggedList[inx1].Value == dataText) { - $scope.DraggedList.splice(inx1, 1); + if ($scope.DraggedList[i].Value == dataText) { + $scope.DraggedList.splice(i, 1); } - }); + } } - // $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); - //$scope.UserAttempt.push({ balnkBox: +$scope.dragableId.split('-')[1] }); - $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); + // $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); + //$scope.UserAttempt.push({ balnkBox: +$scope.dragableId.split('-')[1] }); + $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); $scope.DraggedList.push({ "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord }); $('#' + $scope.dragableId).css("display", "none"); $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important"); @@ -554,13 +570,16 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, } }); - + + }, function (error) { console.log(error.statusText) } ) - } + } + }); + } $scope.$apply(); @@ -572,14 +591,14 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, $scope.minLabExPanel = function () { - $("#labExPanel").css("display", "none"); + $("#questionHtml").css("display", "none"); $("#LabExPageHeading").css("display", "none"); $("#LabExMinimizedId").css("display", "block"); } $scope.maxLabExPanel = function () { - $("#labExPanel").css("display", "block"); + $("#questionHtml").css("display", "block"); $("#LabExPageHeading").css("display", "block"); $("#LabExMinimizedId").css("display", "none"); @@ -1043,6 +1062,9 @@ AIA.directive('draggable', function () { link: function ($scope, element, attrs) { element[0].addEventListener('dragstart', $scope.handleDragStart, false); element[0].addEventListener('dragend', $scope.handleDragEnd, false); + + element[0].addEventListener('touchstart', $scope.handleDragStart, false); + element[0].addEventListener('touchend', $scope.handleDragEnd, false); } } }); @@ -1052,6 +1074,9 @@ AIA.directive('droppable', function () { link: function ($scope, element, attrs) { element[0].addEventListener('drop', $scope.handleDrop, false); element[0].addEventListener('dragover', $scope.handleDragOver, false); + + element[0].addEventListener('touchmove', $scope.handleDragOver, false); + element[0].addEventListener('touchend', $scope.handleDrop, false); } } }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 81ccf43..738e599 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -2155,7 +2155,7 @@ function onZoom(scope) { } -function systemChange() { +function systemChange(event) { event.stopPropagation(); $("#bodySystemList").toggle(); var $ua = navigator.userAgent; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html index f00ee9f..307966b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html @@ -23,10 +23,13 @@
-
- {{activityTitle}}

{{Title}}

-
-

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

+
+
+ {{activityTitle}} +
+
{{Title}}
+
+ Question {{quiznumber}} of {{TotalNumberofQuiz}}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html index 5386a06..e8358b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html @@ -76,7 +76,7 @@
Select System
- +