Commit c33092da0cd4e3983bad7c5825352306433d9a3c
merged develop
Showing
7 changed files
with
92 additions
and
277 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js.orig deleted
| 1 | -AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", | ||
| 2 | -function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { | ||
| 3 | - | ||
| 4 | - | ||
| 5 | - $scope.showTabButton = false; | ||
| 6 | - $scope.threeDAnatomyData; | ||
| 7 | - $scope.Id; | ||
| 8 | - $scope.$on('$viewContentLoaded', function (event) { | ||
| 9 | - var currentURL = $location.path(); | ||
| 10 | - var selectedModuleName = ''; | ||
| 11 | - //set module title | ||
| 12 | - angular.forEach($rootScope.userModules, function (value, key) { | ||
| 13 | -<<<<<<< HEAD | ||
| 14 | - if (value.slug === currentURL.replace('/', '')) { | ||
| 15 | - selectedModuleName = value.name; | ||
| 16 | -======= | ||
| 17 | - // if (value.slug === currentURL.replace('/', '')) { | ||
| 18 | - if (value.slug === "3d-anatomy-list") { | ||
| 19 | - selectedModuleName = value.name; | ||
| 20 | ->>>>>>> a3f0825d877d83f47a713081fef2e780c2d2c693 | ||
| 21 | - } | ||
| 22 | - $rootScope.currentActiveModuleTitle = selectedModuleName; | ||
| 23 | - }) | ||
| 24 | - if ($rootScope.refreshcheck == null) { | ||
| 25 | - $location.path('/'); | ||
| 26 | - } | ||
| 27 | - $scope.scroll(); | ||
| 28 | - var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') | ||
| 29 | - promise.then( | ||
| 30 | - function (result) { | ||
| 31 | - $scope.threeDAnatomyData = result; | ||
| 32 | - | ||
| 33 | - // $scope.selectedThreeDAdata = $scope.threeDAnatomyData.root.ThreeDAData; | ||
| 34 | - | ||
| 35 | - $scope.selectedThreeDAdata = new jinqJs() | ||
| 36 | - .from($scope.threeDAnatomyData.root.ThreeDAData) | ||
| 37 | - .orderBy([{ field: '_Title', sort: 'asc' }]) | ||
| 38 | - .select(); | ||
| 39 | - | ||
| 40 | - // console.log($scope.selectedCIListViewData); | ||
| 41 | - $('#grid-view').empty(); | ||
| 42 | - angular.forEach($scope.selectedThreeDAdata, function (value, key) { | ||
| 43 | - $scope.imagePath = "~/../content/images/3da/thumbnails/" + value._ThumbnailImage; | ||
| 44 | - | ||
| 45 | - var $el = $('<div id="3dView' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '">' | ||
| 46 | - + '<div class="thumbnail">' | ||
| 47 | - + '<img id="' + value._id + '"ng-src="' + $scope.imagePath + '" alt="" title="' + value._Title + '" data-ng-click="Open3DModel($event)" >' | ||
| 48 | - + '<div class="caption"><p>' + value._Title + '</p></div></div></div>').appendTo('#grid-view'); | ||
| 49 | - | ||
| 50 | - | ||
| 51 | - $compile($el)($scope); | ||
| 52 | - | ||
| 53 | - $(".sidebar").mCustomScrollbar({ | ||
| 54 | - autoHideScrollbar: true, | ||
| 55 | - //theme:"rounded" | ||
| 56 | - }); | ||
| 57 | - | ||
| 58 | - }); | ||
| 59 | - | ||
| 60 | - }, | ||
| 61 | - function (error) { | ||
| 62 | - // handle errors here | ||
| 63 | - console.log(' $scope.threeDAnatomyData = ' + error.statusText); | ||
| 64 | - } | ||
| 65 | - ); | ||
| 66 | - | ||
| 67 | - }); | ||
| 68 | - $scope.scroll = function () { | ||
| 69 | - // $window.scrollTo(0, 0); | ||
| 70 | - $("html,body").scrollTop(0); | ||
| 71 | - //alert("scroll"); | ||
| 72 | - } | ||
| 73 | - $scope.IsVisible = function () { | ||
| 74 | - //$scope.scroll(); | ||
| 75 | - | ||
| 76 | - $location.url("/3dAnatomy"); | ||
| 77 | - | ||
| 78 | - } | ||
| 79 | - | ||
| 80 | - | ||
| 81 | - $scope.Open3DModel = function ($event) { | ||
| 82 | - $rootScope.currentBodyViewId = $event.currentTarget.id; | ||
| 83 | - if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { | ||
| 84 | - var ThreeDTitle = []; | ||
| 85 | - ThreeDTitle = new jinqJs() | ||
| 86 | - .from($scope.selectedThreeDAdata) | ||
| 87 | - .where('_id = ' + $event.currentTarget.id) | ||
| 88 | - .select('_Title'); | ||
| 89 | - | ||
| 90 | - $rootScope.ViewTitle = ThreeDTitle[0]._Title; | ||
| 91 | - } | ||
| 92 | - else { | ||
| 93 | - $rootScope.ViewTitle = $event.currentTarget.textContent; | ||
| 94 | - | ||
| 95 | - } | ||
| 96 | - | ||
| 97 | - | ||
| 98 | - localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); | ||
| 99 | - localStorage.setItem("currentBodyViewId", $event.currentTarget.id); | ||
| 100 | - | ||
| 101 | - var u = $location.url(); | ||
| 102 | - $location.url('/3d-anatomy-details'); | ||
| 103 | - | ||
| 104 | - } | ||
| 105 | - | ||
| 106 | - $scope.Open3DModelBody = function () { | ||
| 107 | - | ||
| 108 | - if ($rootScope.refreshcheck == null) { | ||
| 109 | - $location.path('/'); | ||
| 110 | - | ||
| 111 | - } | ||
| 112 | - $rootScope.isLoading = true; | ||
| 113 | - $('#spinner').css('visibility', 'visible'); | ||
| 114 | - //alert($rootScope.getLocalStorageValue("currentBodyViewId")); | ||
| 115 | - $scope.voId3D = $rootScope.getLocalStorageValue("currentBodyViewId"); | ||
| 116 | - | ||
| 117 | - //alert($scope.voId3D); | ||
| 118 | - | ||
| 119 | - | ||
| 120 | - //once you get id in scope push detail in jspanel content | ||
| 121 | - | ||
| 122 | - var openViews; | ||
| 123 | -<<<<<<< HEAD | ||
| 124 | - if ($rootScope.openViews.length > 0) { | ||
| 125 | - openViews = new jinqJs() | ||
| 126 | - .from($rootScope.openViews) | ||
| 127 | - .where("BodyViewId==" + $scope.voId3D) | ||
| 128 | - .select(); | ||
| 129 | - } | ||
| 130 | - var counter = 1; | ||
| 131 | - var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); | ||
| 132 | - | ||
| 133 | - if (openViews != null && openViews.length > 0) { | ||
| 134 | - angular.forEach(openViews, function (value, key) { | ||
| 135 | - | ||
| 136 | - if (value.body - views == tittle) { | ||
| 137 | - tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; | ||
| 138 | - $rootScope.currentActiveViewTitle = tittle; | ||
| 139 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 140 | - } | ||
| 141 | - | ||
| 142 | - }); | ||
| 143 | - } | ||
| 144 | - else { | ||
| 145 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 146 | - | ||
| 147 | - } | ||
| 148 | -======= | ||
| 149 | - //if ($rootScope.openViews.length > 0) { | ||
| 150 | - // openViews = new jinqJs() | ||
| 151 | - // .from($rootScope.openViews) | ||
| 152 | - // .where("BodyViewId==" + $scope.voId3D) | ||
| 153 | - // .select(); | ||
| 154 | - //} | ||
| 155 | - //var counter = 1; | ||
| 156 | - var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); | ||
| 157 | - $rootScope.currentActiveViewTitle = tittle; | ||
| 158 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 159 | - //if (openViews != null && openViews.length > 0) { | ||
| 160 | - // angular.forEach(openViews, function (value, key) { | ||
| 161 | - | ||
| 162 | - // if (value.body - views == tittle) { | ||
| 163 | - // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; | ||
| 164 | - // $rootScope.currentActiveViewTitle = tittle; | ||
| 165 | - // localStorage.setItem("currentViewTitle", tittle); | ||
| 166 | - // } | ||
| 167 | - | ||
| 168 | - // }); | ||
| 169 | - //} | ||
| 170 | - //else { | ||
| 171 | - // localStorage.setItem("currentViewTitle", tittle); | ||
| 172 | - | ||
| 173 | - //} | ||
| 174 | ->>>>>>> a3f0825d877d83f47a713081fef2e780c2d2c693 | ||
| 175 | - | ||
| 176 | - // alert($rootScope.getLocalStorageValue("currentViewTitle")); | ||
| 177 | - | ||
| 178 | - var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') | ||
| 179 | - promise.then( | ||
| 180 | - function (result) { | ||
| 181 | - $scope.threeDAnatomyData = result; | ||
| 182 | - | ||
| 183 | - var clicked3dAview = []; | ||
| 184 | - clicked3dAview = new jinqJs().from($scope.threeDAnatomyData.root.ThreeDAData) | ||
| 185 | - .where('_id == ' + $scope.voId3D) | ||
| 186 | - .select('_Title', '_3dimagepath'); | ||
| 187 | - $scope.Selected3DImagePath = clicked3dAview[0]._3dimagepath; | ||
| 188 | - $scope.threeDBodySystemTitle = clicked3dAview[0]._Title; | ||
| 189 | - | ||
| 190 | - if (clicked3dAview.length > 0) { | ||
| 191 | - | ||
| 192 | - $rootScope.isLoading = false; | ||
| 193 | - $('#spinner').css('visibility', 'hidden'); | ||
| 194 | - | ||
| 195 | - $.jsPanel({ | ||
| 196 | - id: '3DImagePanel', | ||
| 197 | - selector: '.threeDView', | ||
| 198 | - theme: 'success', | ||
| 199 | - currentController: '3dAController', | ||
| 200 | - parentSlug: '3d-anatomy-list', | ||
| 201 | - content: '<div class="col-sm-12">' + | ||
| 202 | - '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' + | ||
| 203 | - '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#3DImagePanel").css("width", "100%"); }});</script>', | ||
| 204 | - title: $rootScope.getLocalStorageValue("currentViewTitle"), | ||
| 205 | - position: { | ||
| 206 | - top: 70, | ||
| 207 | - left: 1, | ||
| 208 | - }, | ||
| 209 | - | ||
| 210 | - size: { width: $(window).outerWidth() - 20, height: $(window).outerHeight() - 10 }, | ||
| 211 | - | ||
| 212 | - }); | ||
| 213 | - | ||
| 214 | - $rootScope.currentSlug = '3d-anatomy-details'; | ||
| 215 | - | ||
| 216 | - $rootScope.openViews.push( | ||
| 217 | - { | ||
| 218 | - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, | ||
| 219 | - "slug": $rootScope.currentSlug | ||
| 220 | - }); | ||
| 221 | - | ||
| 222 | - | ||
| 223 | - } | ||
| 224 | - | ||
| 225 | - | ||
| 226 | - }, | ||
| 227 | - function (error) { | ||
| 228 | - // handle errors here | ||
| 229 | - console.log(' $scope.CIllustrationData = ' + error.statusText); | ||
| 230 | - } | ||
| 231 | - | ||
| 232 | - ); | ||
| 233 | - $('#ThreeDView').css("height", $(window).outerHeight()); | ||
| 234 | - | ||
| 235 | - $('#ThreeDView').css("width", $(window).outerWidth()); | ||
| 236 | - | ||
| 237 | - } | ||
| 238 | - | ||
| 239 | - | ||
| 240 | - | ||
| 241 | -}] | ||
| 242 | - | ||
| 243 | - | ||
| 244 | - | ||
| 245 | -); | ||
| 246 | \ No newline at end of file | 0 | \ No newline at end of file |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -363,8 +363,18 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A | @@ -363,8 +363,18 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A | ||
| 363 | $rootScope.userModules = result.Modules; | 363 | $rootScope.userModules = result.Modules; |
| 364 | 364 | ||
| 365 | //1. set haveRoleAdmin = false because LicenseInfo is not null | 365 | //1. set haveRoleAdmin = false because LicenseInfo is not null |
| 366 | - $rootScope.haveRoleAdmin = false; | 366 | + if (result.LicenseTypeId != 5) { |
| 367 | + | ||
| 368 | + $rootScope.haveRoleAdmin = true; | ||
| 369 | + | ||
| 370 | + } | ||
| 371 | + if (result.UserTypeId == 8){ | ||
| 372 | + | ||
| 373 | + $rootScope.haveRoleAdmin = false; | ||
| 374 | + } | ||
| 367 | 375 | ||
| 376 | + $("#modestyDiv").css("pointer-events", "none"); | ||
| 377 | + $("#modestyDiv").css("opacity", 0.5); | ||
| 368 | //2. | 378 | //2. |
| 369 | if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") { | 379 | if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") { |
| 370 | 380 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
| @@ -15,7 +15,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -15,7 +15,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 15 | $scope.LabExerciseUserData = []; | 15 | $scope.LabExerciseUserData = []; |
| 16 | $scope.LabExercise = []; | 16 | $scope.LabExercise = []; |
| 17 | $scope.dragableId = ""; | 17 | $scope.dragableId = ""; |
| 18 | - $scope.UserAttempt = []; | 18 | + |
| 19 | $scope.blReviewAttempt = false; | 19 | $scope.blReviewAttempt = false; |
| 20 | $scope.isResetClicked = false; | 20 | $scope.isResetClicked = false; |
| 21 | $scope.$on('$viewContentLoaded', function (event) { | 21 | $scope.$on('$viewContentLoaded', function (event) { |
| @@ -307,7 +307,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -307,7 +307,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 307 | $scope.CreateLabExerciseDataToSave(); | 307 | $scope.CreateLabExerciseDataToSave(); |
| 308 | } | 308 | } |
| 309 | $scope.dragableId = ""; | 309 | $scope.dragableId = ""; |
| 310 | - $scope.UserAttempt = []; | 310 | + // $scope.UserAttempt = []; |
| 311 | if ($scope.quiznumber == 1) | 311 | if ($scope.quiznumber == 1) |
| 312 | return; | 312 | return; |
| 313 | else | 313 | else |
| @@ -370,15 +370,51 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -370,15 +370,51 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 370 | $("#resultLabData").empty(); | 370 | $("#resultLabData").empty(); |
| 371 | var sortedQuestionHtml = ''; | 371 | var sortedQuestionHtml = ''; |
| 372 | 372 | ||
| 373 | + | ||
| 374 | + | ||
| 375 | + | ||
| 376 | + | ||
| 377 | + // console.log($scope.SavedLabExercise); | ||
| 378 | + | ||
| 379 | + $scope.usersCorrectQuestDataArray = []; | ||
| 380 | + | ||
| 381 | + for (var j = 0; j <= $scope.usersCorrectQuestData.length - 1; j++) { | ||
| 382 | + | ||
| 383 | + for (var i = 0; i <= $scope.SavedLabExercise.labExercise.length - 1; i++) { | ||
| 384 | + | ||
| 385 | + if ($scope.SavedLabExercise.labExercise[i].QuestionNo == $scope.usersCorrectQuestData[j].QuestionNo) { | ||
| 386 | + // alert($scope.SavedLabExercise.labExercise[i].QuestionNo + " " + $scope.usersCorrectQuestData[j].QuestionNo); | ||
| 387 | + } | ||
| 388 | + else { | ||
| 389 | + | ||
| 390 | + if ($scope.SavedLabExercise.labExercise[i].MaxScore == $scope.SavedLabExercise.labExercise[i].Score) { | ||
| 391 | + $scope.usersCorrectQuestDataArray.push({ "CorrectAnswer": $scope.SavedLabExercise.labExercise[i].CorrectAnswers, "CorrectStatus": "Correct", "DragItems": $scope.SavedLabExercise.labExercise[i].DragItems, "MaxScore": $scope.SavedLabExercise.labExercise[i].MaxScore, "QuestionNo": $scope.SavedLabExercise.labExercise[i].QuestionNo, "Score": $scope.SavedLabExercise.labExercise[i].Score, "UserAnswers": $scope.SavedLabExercise.labExercise[i].UserAnswers, "title": " " }); | ||
| 392 | + | ||
| 393 | + } | ||
| 394 | + else { | ||
| 395 | + $scope.usersCorrectQuestDataArray.push({ "CorrectAnswer": $scope.SavedLabExercise.labExercise[i].CorrectAnswers, "CorrectStatus": "Incorrect", "DragItems": $scope.SavedLabExercise.labExercise[i].DragItems, "MaxScore": $scope.SavedLabExercise.labExercise[i].MaxScore, "QuestionNo": $scope.SavedLabExercise.labExercise[i].QuestionNo, "Score": $scope.SavedLabExercise.labExercise[i].Score, "UserAnswers": $scope.SavedLabExercise.labExercise[i].UserAnswers, "title": " " }); | ||
| 396 | + } | ||
| 397 | + } | ||
| 398 | + } | ||
| 399 | + } | ||
| 400 | + console.log($scope.usersCorrectQuestDataArray); | ||
| 401 | + for (var i = 0; i <= $scope.usersCorrectQuestDataArray.length - 1; i++) { | ||
| 402 | + $scope.usersCorrectQuestData.push({ "CorrectAnswer": $scope.usersCorrectQuestDataArray[i].CorrectAnswer, "CorrectStatus": $scope.usersCorrectQuestDataArray[i].CorrectStatus, "DragItems": $scope.usersCorrectQuestDataArray[i].DragItems, "MaxScore": $scope.usersCorrectQuestDataArray[i].MaxScore, "QuestionNo": $scope.usersCorrectQuestDataArray[i].QuestionNo, "Score": $scope.usersCorrectQuestDataArray[i].Score, "UserAnswers": $scope.usersCorrectQuestDataArray[i].UserAnswers, "title": " " }); | ||
| 403 | + } | ||
| 404 | + | ||
| 405 | + //console.log($scope.usersCorrectQuestData); | ||
| 406 | + | ||
| 407 | + | ||
| 408 | + | ||
| 373 | for (var j = $scope.TotalNumberofQuiz; j >= 1; j--) { | 409 | for (var j = $scope.TotalNumberofQuiz; j >= 1; j--) { |
| 374 | for (var i = 0; i <= $scope.usersCorrectQuestData.length - 1; i++) { | 410 | for (var i = 0; i <= $scope.usersCorrectQuestData.length - 1; i++) { |
| 375 | if (j == $scope.usersCorrectQuestData[i].QuestionNo) { | 411 | if (j == $scope.usersCorrectQuestData[i].QuestionNo) { |
| 376 | if ($scope.usersCorrectQuestData[i].CorrectStatus == "Correct") { | 412 | if ($scope.usersCorrectQuestData[i].CorrectStatus == "Correct") { |
| 377 | - var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#007ab3;border-color:#007ab3;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>"); | 413 | + var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#007ab3;border-color:#007ab3;color:#ffffff;'> Review</button></td></tr>"); |
| 378 | $compile(labExerciseHtml)($scope); | 414 | $compile(labExerciseHtml)($scope); |
| 379 | } | 415 | } |
| 380 | else { | 416 | else { |
| 381 | - var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#d9534f;border-color:#d9534f;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>"); | 417 | + var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#d9534f;border-color:#d9534f;color:#ffffff;'> Review</button></td></tr>"); |
| 382 | $compile(labExerciseHtml)($scope); | 418 | $compile(labExerciseHtml)($scope); |
| 383 | } | 419 | } |
| 384 | $scope.isValueExist = true; | 420 | $scope.isValueExist = true; |
| @@ -399,10 +435,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -399,10 +435,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 399 | if (j == $(this).text()) { | 435 | if (j == $(this).text()) { |
| 400 | $q = $(this).parent(); | 436 | $q = $(this).parent(); |
| 401 | if ($q.find("td:nth-child(3)").text() == "Correct") { | 437 | if ($q.find("td:nth-child(3)").text() == "Correct") { |
| 402 | - sortedQuestionHtml += '<tr><td>' + $q.find("td:nth-child(1)").text() + '</td><td>' + $q.find("td:nth-child(2)").text() + '</td><td>' + $q.find("td:nth-child(3)").text() + '</td><td><button ng-click="reviewAttemptAnswer($event);" id=' + $q.find("td:nth-child(1)").text() + ' class="btn btn-sm" style="background-color:#007ab3;border-color:#007ab3;color:#ffffff;"><i class="fa fa-times"></i> Review</button></td></tr>'; | 438 | + sortedQuestionHtml += '<tr><td>' + $q.find("td:nth-child(1)").text() + '</td><td>' + $q.find("td:nth-child(2)").text() + '</td><td>' + $q.find("td:nth-child(3)").text() + '</td><td><button ng-click="reviewAttemptAnswer($event);" id=' + $q.find("td:nth-child(1)").text() + ' class="btn btn-sm" style="background-color:#007ab3;border-color:#007ab3;color:#ffffff;"><i class="fa fa-check-circle" style="pointer-events:none;"></i> Review</button></td></tr>'; |
| 403 | } | 439 | } |
| 404 | else { | 440 | else { |
| 405 | - sortedQuestionHtml += '<tr><td>' + $q.find("td:nth-child(1)").text() + '</td><td>' + $q.find("td:nth-child(2)").text() + '</td><td>' + $q.find("td:nth-child(3)").text() + '</td><td><button ng-click="reviewAttemptAnswer($event);" id=' + $q.find("td:nth-child(1)").text() + ' class="btn btn-sm" style="background-color:#d9534f;border-color:#d9534f;color:#ffffff;"><i class="fa fa-times"></i> Review</button></td></tr>'; | 441 | + sortedQuestionHtml += '<tr><td>' + $q.find("td:nth-child(1)").text() + '</td><td>' + $q.find("td:nth-child(2)").text() + '</td><td>' + $q.find("td:nth-child(3)").text() + '</td><td><button ng-click="reviewAttemptAnswer($event);" id=' + $q.find("td:nth-child(1)").text() + ' class="btn btn-sm" style="background-color:#d9534f;border-color:#d9534f;color:#ffffff;"><i class="fa fa-times-circle" style="pointer-events:none;"></i> Review</button></td></tr>'; |
| 406 | } | 442 | } |
| 407 | } | 443 | } |
| 408 | }); | 444 | }); |
| @@ -429,7 +465,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -429,7 +465,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 429 | if ($(this).text().length == 1) { | 465 | if ($(this).text().length == 1) { |
| 430 | var a = parseInt($(this).prev().text()) - 1; | 466 | var a = parseInt($(this).prev().text()) - 1; |
| 431 | $(this).text($scope.labExerciseModuleData[0].Questions[a].activityTitle); | 467 | $(this).text($scope.labExerciseModuleData[0].Questions[a].activityTitle); |
| 432 | - $(this).next().text("Not Attempted"); | 468 | + //if ($(this).next().text() == "Correct") { $(this).next().text("Correct"); } |
| 469 | + //else { | ||
| 470 | + // $(this).next().text("Incorrect"); | ||
| 471 | + //} | ||
| 433 | } | 472 | } |
| 434 | }); | 473 | }); |
| 435 | } | 474 | } |
| @@ -883,6 +922,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -883,6 +922,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
| 883 | $scope.usersCorrectQuestData = []; | 922 | $scope.usersCorrectQuestData = []; |
| 884 | $scope.CreateLabExerciseDataToSave = function () { | 923 | $scope.CreateLabExerciseDataToSave = function () { |
| 885 | 924 | ||
| 925 | + if ($scope.UserAttempt.length == 0) { | ||
| 926 | + $("#imgdiv").find("div").each(function () { | ||
| 927 | + if ($(this).attr("id").split("-")[0] == "blockans") { | ||
| 928 | + $scope.UserAttempt.push({ "BlankBoxName": $(this).attr("id").split("-")[1], "OptionName": $(this).attr("draggedattr").split("-")[1] }); | ||
| 929 | + } | ||
| 930 | + }); | ||
| 931 | + } | ||
| 932 | + | ||
| 886 | $scope.LabExerciseAttemptedData = []; | 933 | $scope.LabExerciseAttemptedData = []; |
| 887 | $scope.lb = []; | 934 | $scope.lb = []; |
| 888 | //get user answers | 935 | //get user answers |
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | </div> | 25 | </div> |
| 26 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> | 26 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> |
| 27 | <div class="form-group"> | 27 | <div class="form-group"> |
| 28 | - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> | 28 | + <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6> |
| 29 | <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> | 29 | <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> |
| 30 | <option value="">All</option> | 30 | <option value="">All</option> |
| 31 | </select> | 31 | </select> |
| @@ -33,15 +33,18 @@ | @@ -33,15 +33,18 @@ | ||
| 33 | </div> | 33 | </div> |
| 34 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> | 34 | <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3"> |
| 35 | <div class="form-group"> | 35 | <div class="form-group"> |
| 36 | - <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 37 | - | ||
| 38 | - | ||
| 39 | - <div class="btn-group col-xs-12" style="padding:0;"> | ||
| 40 | - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> | ||
| 41 | - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)"> | ||
| 42 | - <i class="fa fa-search"></i> | ||
| 43 | - </button> | ||
| 44 | - | 36 | + |
| 37 | + <div class="col-xs-12" style="padding:0;"> | ||
| 38 | + <div class="col-xs-5" style="padding:0 2px 0 0;"> | ||
| 39 | + <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 40 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch(query)"> | ||
| 41 | + <i class="fa fa-search"></i> | ||
| 42 | + </button> | ||
| 43 | + </div> | ||
| 44 | + <div class="col-xs-7" style="padding:0;"> | ||
| 45 | + <h6 class="text-center text-primary txt-white f11" style="padding:0;">Show All</h6> | ||
| 46 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(query)"><i class="fa fa-eye"></i></button> | ||
| 47 | + </div> | ||
| 45 | </div> | 48 | </div> |
| 46 | 49 | ||
| 47 | 50 |
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | </div> | 41 | </div> |
| 42 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> | 42 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
| 43 | <div class="form-group"> | 43 | <div class="form-group"> |
| 44 | - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> | 44 | + <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6> |
| 45 | <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> | 45 | <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> |
| 46 | <option value="">All</option> | 46 | <option value="">All</option> |
| 47 | </select> | 47 | </select> |
| @@ -49,18 +49,18 @@ | @@ -49,18 +49,18 @@ | ||
| 49 | </div> | 49 | </div> |
| 50 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> | 50 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
| 51 | <div class="form-group"> | 51 | <div class="form-group"> |
| 52 | - <h6 class="text-center text-primary txt-white f11">Search</h6> | ||
| 53 | - | ||
| 54 | - <div class="btn-group col-xs-12" style="padding:0;"> | ||
| 55 | - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> | ||
| 56 | - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)"> | ||
| 57 | - <i class="fa fa-search"></i> | ||
| 58 | - </button> | ||
| 59 | - | 52 | + <div class="col-xs-12" style="padding:0;"> |
| 53 | + <div class="col-xs-5" style="padding:0 2px 0 0;"> | ||
| 54 | + <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6> | ||
| 55 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch(query)" style="margin-right:2px;"> | ||
| 56 | + <i class="fa fa-search"></i> | ||
| 57 | + </button> | ||
| 58 | + </div> | ||
| 59 | + <div class="col-xs-7" style="padding:0;"> | ||
| 60 | + <h6 class="text-center text-primary txt-white f11 col-xs-12" style="padding:0;">Show All</h6> | ||
| 61 | + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(query)"><i class="fa fa-eye"></i></button> | ||
| 62 | + </div> | ||
| 60 | </div> | 63 | </div> |
| 61 | - | ||
| 62 | - | ||
| 63 | - | ||
| 64 | <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button> <button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>--> | 64 | <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button> <button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>--> |
| 65 | </div> | 65 | </div> |
| 66 | </div> | 66 | </div> |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | </ul> | 51 | </ul> |
| 52 | </li> | 52 | </li> |
| 53 | <!--redirecting to Admin--> | 53 | <!--redirecting to Admin--> |
| 54 | - <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" style="cursor: pointer;">Admin</a></liclass> | 54 | + <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li> |
| 55 | </ul> | 55 | </ul> |
| 56 | <ul class="nav navbar-nav navbar-right"> | 56 | <ul class="nav navbar-nav navbar-right"> |
| 57 | <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> | 57 | <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> |
400-SOURCECODE/AIAHTML5.Web/index.aspx
| @@ -577,7 +577,7 @@ | @@ -577,7 +577,7 @@ | ||
| 577 | </div> | 577 | </div> |
| 578 | </div> | 578 | </div> |
| 579 | <div class=""> | 579 | <div class=""> |
| 580 | - <div class="col-sm-6"> | 580 | + <div class="col-sm-6" id="modestyDiv" > |
| 581 | <h5 class="font13 bolder">Modesty Settings</h5> | 581 | <h5 class="font13 bolder">Modesty Settings</h5> |
| 582 | <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5"> | 582 | <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5"> |
| 583 | <div class="radio"> | 583 | <div class="radio"> |