ADAM / AIAHTML5

Commit f744dcd786a2d2c26c7fb9f7d1ae7f166d9becc4

Authored by Amrita Vishnoi
2 parents f0cdd538 ce248b25

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 9 changed files with 218 additions and 138 deletions
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
  View file @f744dcd
... ... @@ -67,6 +67,7 @@ namespace AIAHTML5.API.Models
67 67 foreach (DataRow drModule in dt.Rows)
68 68 {
69 69 userModuleHash = new Hashtable();
  70 + userModuleHash.Add(AIAConstants.KEY_ID, drModule["Id"]);
70 71 userModuleHash.Add(AIAConstants.KEY_NAME, drModule["Name"]);
71 72 userModuleHash.Add(AIAConstants.KEY_SLUG, drModule["Slug"]);
72 73 arrUserModules.Add(userModuleHash);
... ... @@ -207,6 +208,7 @@ namespace AIAHTML5.API.Models
207 208 foreach (DataRow dr in dt.Rows)
208 209 {
209 210 modulesHash = new Hashtable();
  211 + modulesHash.Add(AIAConstants.KEY_ID, dr["Id"]);
210 212 modulesHash.Add(AIAConstants.KEY_NAME, dr["Title"]);
211 213 modulesHash.Add(AIAConstants.KEY_SLUG, dr["Slug"]);
212 214 userModulelist.Add(modulesHash);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @f744dcd
... ... @@ -6730,9 +6730,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6730 6730 // $rootScope.isListManagerSelected = false;
6731 6731 $rootScope.CloseListManager();
6732 6732  
6733   - $rootScope.isHighlightBodyByBodySystem = false;
6734 6733  
6735   - if ($rootScope.isHighLight == true) {
  6734 + if ($rootScope.isHighlightBodyByBodySystem) {
  6735 + $rootScope.isHighlightBodyByBodySystem = false;
  6736 + //to make the system highlight if the body systme highlighted than Normal and again highlight
  6737 + $scope.isbodySystemHighlight = true;
  6738 + }
  6739 + // $rootScope.isHighlightBodyByBodySystem = false;
  6740 +
  6741 + if ($rootScope.isHighLight == true) {
6736 6742  
6737 6743 }
6738 6744 else {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @f744dcd
... ... @@ -272,23 +272,39 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
272 272  
273 273 function ShowAssignedModulesPopup(userModules) {
274 274 var allModules = Modules;
275   - var elemId = 0;
276   - for (var module = 0; module <= allModules.length; module++) {
277   - elemId = module + 1; // Id starts from 1
278   - $('#moduleDiv' + elemId).hide();
  275 + var arrPendingModules = [];
  276 + if ($('#dvPendingModules').length > 0) {
  277 + $('#dvPending').hide();
279 278 }
  279 + for (var module = 1; module <= allModules.length; module++) {
  280 + $('#moduleDiv' + module).hide();
  281 + }
  282 + if (('#moduleDiv1017').length > 0) {
  283 + $('#moduleDiv1017').hide();
  284 + }
  285 +
280 286 for (var count = 0; count < userModules.length; count++) {
281 287 for (var module = 0; module < allModules.length; module++) {
282   - if (userModules[count].name.trim() == allModules[module].Name.trim()) {
283   - elemId = count + 1; // Id starts from 1
284   - $('#moduleDiv' + elemId).show();
  288 + if (userModules[count].id == allModules[module].Id) {
  289 + $('#moduleDiv' + userModules[count].id).show();
285 290 break;
286 291 }
  292 +
  293 + if (userModules[count].id == 7)
  294 + arrPendingModules.push(userModules[count].id);
  295 + if (userModules[count].id == 8)
  296 + arrPendingModules.push(userModules[count].id);
  297 + if (userModules[count].id == 10)
  298 + arrPendingModules.push(userModules[count].id);
287 299 }
288 300 }
289 301 if (userModules.length > 0) {
290 302 $('#dvUserModulesInfo').modal('show');
291 303 }
  304 +
  305 + if (arrPendingModules.length > 0) {
  306 + $('#dvPendingModules').show();
  307 + }
292 308 }
293 309 $rootScope.UpdateLicenseTermStatus = function () {
294 310 $('#dvTermCondition').fadeOut();
... ... @@ -354,7 +370,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
354 370  
355 371 if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
356 372  
357   - if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) &&
  373 + if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { //(!result.IsSubscriptionExpired) &&
358 374  
359 375 $rootScope.userData = userInfo;
360 376  
... ... @@ -3808,11 +3824,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3808 3824 }, 1000);
3809 3825 }
3810 3826 $("#optionsListManagerTab").addClass("active");
3811   - var viewNameAftrSplit = $("#viewName").val().split(" ");
3812   - if (viewNameAftrSplit[0] == "null") {
3813   - document.location.href = "/";
  3827 + var viewNameAftrSplit;
  3828 + if ($("#viewName").val() !== null) {
  3829 + viewNameAftrSplit = $("#viewName").val().split(" ");
  3830 +
  3831 + if (viewNameAftrSplit[0] == "null") {
  3832 + document.location.href = "/";
  3833 + }
3814 3834 }
3815   -
3816 3835 if ($location.url() == "/module-item-view") {
3817 3836 $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
3818 3837 }
... ... @@ -4236,6 +4255,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4236 4255 };
4237 4256  
4238 4257 $rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview
  4258 + if ($location.url() == "/module-item-view") {
  4259 + if ($("#hidePinBtn").hasClass("btn-primary")) {
  4260 + $rootScope.isHidePinBtnActiveInPrintPreview = true;
  4261 + }
  4262 + if ($("#selectedPin").hasClass("btn-primary")) {
  4263 + $rootScope.isShowSelectedPinActiveInPrintPrevMode = true;
  4264 + }
  4265 + if ($("#allPinBtn").hasClass("btn-primary")) {
  4266 + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = true;
  4267 + }
  4268 + }
4239 4269 $(".tools").css("z-index", "1029");
4240 4270 $rootScope.CloseListManager();
4241 4271 $rootScope.CloseAnnotationTool();
... ... @@ -4273,6 +4303,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4273 4303 $("#printcontainer").css('width', $(window).outerWidth());
4274 4304 $("#printcontainer").css('height', $(window).outerHeight());
4275 4305 }
  4306 + if ($location.url() == "/module-item-view") {
  4307 + $("#aaDetailViewCanvas").css("display", "none");
  4308 + }
4276 4309 }, 520);
4277 4310 }
4278 4311 else {
... ... @@ -4287,6 +4320,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4287 4320 $("#printcontainer").css('width', $(window).outerWidth());
4288 4321 $("#printcontainer").css('height', $(window).outerHeight());
4289 4322 }
  4323 + if ($location.url() == "/module-item-view") {
  4324 + $("#aaDetailViewCanvas").css("display", "none");
  4325 + }
4290 4326 }, 320);
4291 4327 }
4292 4328  
... ... @@ -4300,6 +4336,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4300 4336 }
4301 4337 }
4302 4338 });
  4339 +
  4340 + if ($location.url() == "/module-item-view") {
  4341 + $timeout(function () {
  4342 + $rootScope.hidePins();
  4343 + }, 100);
  4344 + }
  4345 +
4303 4346 };
4304 4347  
4305 4348 function OpenJSPanel() {
... ... @@ -4436,6 +4479,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4436 4479 $("#annotationToolBarOptions").removeClass("disableMenuoption");
4437 4480 $("#optionsListManagerTab").removeClass("disableMenuoption");
4438 4481 $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
  4482 + $("#aaDetailViewCanvas").css("display", "block");
4439 4483 if ($('#jsPanel-1').length > 0)
4440 4484 $('#jsPanel-1').remove();
4441 4485 console.log('close');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @f744dcd
... ... @@ -143,7 +143,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
143 143  
144 144  
145 145 $scope.openListViewModuleItem = function (event) {
146   -
147 146 $("#demoView").remove();
148 147 var moduleItemDataToBeSavedID = event.currentTarget.id;
149 148 $("#list-view table tbody tr").removeClass("active");
... ... @@ -153,7 +152,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
153 152 var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
154 153 $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
155 154 $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
156   - $rootScope.listArray = [];
  155 + //$rootScope.listArray = [];
157 156 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
158 157 $("#viewList").append("<div class='col-xs-12 text-center' style='padding-top:15px;padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:15px;background-color:#fff;'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:95px!important;' src=" + $rootScope.OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
159 158 }
... ... @@ -304,10 +303,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
304 303 $rootScope.searchSelectedText = '';
305 304  
306 305 });
  306 +
  307 + $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
  308 +
  309 + if ($rootScope.isShowAllPinBtnActiveInPrintPreviewMode == true) {
  310 + $("#allPinBtn").trigger("click");
  311 + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = false;
  312 + }
  313 + if ($rootScope.isHidePinBtnActiveInPrintPreview == true) {
  314 + $("#hidePinBtn").trigger("click");
  315 + $rootScope.isHidePinBtnActiveInPrintPreview = false;
  316 + }
  317 + if($rootScope.isShowSelectedPinActiveInPrintPrevMode == true)
  318 + {
  319 + $("#selectedPin").trigger("click");
  320 + $rootScope.isShowSelectedPinActiveInPrintPrevMode = false;
  321 + }
  322 + });
  323 +
307 324 })
308 325 $rootScope.aaPinDataArray = [];
309 326 $scope.showAllPins = function () {
310   -
  327 +
311 328 $scope.allPinDataArray = [];
312 329 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
313 330  
... ... @@ -1245,7 +1262,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1245 1262 $scope.$on('listManagerEvent', function (event, data) {
1246 1263  
1247 1264 $("#viewName").empty();
1248   - $("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
  1265 +
  1266 + var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
  1267 + var viewNmeHtml = '<option>' + currentView + '</option>'
  1268 + $('#viewName').append(viewNmeHtml);
  1269 + //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
1249 1270 $rootScope.isLoading = false;
1250 1271 $('#spinner').css('visibility', 'hidden');
1251 1272  
... ... @@ -1338,11 +1359,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1338 1359 }
1339 1360 }
1340 1361  
1341   - $scope.hidePins = function () {
  1362 + $rootScope.hidePins = function () {
1342 1363  
1343 1364 $rootScope.isLoading = true;
1344 1365 $('#spinner').css('visibility', 'visible');
1345   -
1346 1366 $scope.hideSpeechBubble();
1347 1367  
1348 1368 $scope.isHidePinBtnClicked = true;
... ... @@ -1369,12 +1389,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1369 1389 }
1370 1390  
1371 1391 $scope.showAllPinsAfterHide = function (event) {
1372   -
1373   -
1374 1392 $rootScope.isLoading = true;
1375 1393 $('#spinner').css('visibility', 'visible');
1376   -
1377   -
1378 1394 $scope.isHidePinBtnClicked = false;
1379 1395  
1380 1396 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
... ... @@ -1399,7 +1415,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1399 1415  
1400 1416  
1401 1417 $scope.showSelectedPins = function () {
1402   -
1403 1418 $rootScope.isLoading = true;
1404 1419 $('#spinner').css('visibility', 'visible');
1405 1420  
... ... @@ -1717,9 +1732,9 @@ function showSelectedSystemPins(event) {
1717 1732  
1718 1733 function hidePins(event) {
1719 1734  
1720   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1721   - scope.$apply(function () {
1722   - scope.hidePins(event);
  1735 + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1736 + rootScope.$apply(function () {
  1737 + rootScope.hidePins(event);
1723 1738 });
1724 1739 }
1725 1740  
... ... @@ -1802,7 +1817,6 @@ function openListViewModuleItem(event) {
1802 1817 }
1803 1818  
1804 1819 function openCurrentView(event) {
1805   -
1806 1820 var scope = angular.element(document.getElementById("list-view")).scope();
1807 1821 scope.isListViewButtonClicked = true;
1808 1822 scope.isOpenBtnClicked = true;
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @f744dcd
... ... @@ -272,7 +272,7 @@ AIA.constant(&#39;Modules&#39;, [
272 272 Name: 'The Wellness Tools',
273 273 },
274 274 {
275   - Id: 17,
  275 + Id: 1017, // Updated from 17 to 1017 to match with database Id
276 276 Name: 'A.D.A.M. OnDemand',
277 277 },
278 278  
... ... @@ -308,59 +308,59 @@ AIA.constant(&quot;LoginConstants&quot;, {
308 308 "MAIL_SENT": "Mail sent.",
309 309 "SQL_CONNECTION_ERROR": "We are unable to connect with database. Please contact customer support",
310 310 "EXCEPTION_OCCURED": "We are facing some issue. Please try to login after sometime.",
311   - "E_NO_ERROR": "0",
312   - "E_USER_NOT_EXIST": "1",
313   - "E_PASSWORD_NOT_MATCH": "2",
314   - "E_USER_ID_BLOCKED_24_HRS": "3",
315   - "E_USER_NOT_ACTIVE": "4",
316   - "E_USER_ID_WILL_BLOCKED": "5",
317   - "E_EMAIL_ID_NOT_EXIT": "6",
318   - "E_LICENCE_IS_INACTIVE": "7",
319   - "E_USER_NOT_MAP_TO_LICENCE_EDITION": "8",
320   - "E_NO_ROW_FOUND_LICENCE_TO_EDITION_TABLE": "9",
321   - "E_NO_ROW_FOUND_LICENCE_TABLE": "10",
322   - "E_SECURITY_QUEST_NOT_MATCH": "11",
323   - "E_SEQURITY_ANSWER_NOT_MATCH": "12",
324   - "E_FORGOT_USER_ID_EMAIL_ID_NOT_EXIT": "13",
325   - "E_TOTAL_NUMBER_LOGIN_EXCEED": "14",
326   - "E_FORGOT_PASSWORD_EMAIL_ID_NOT_EXIST": "15",
327   - "E_TEST_SETUP_ACCOUNT_USER_NAME_EXIST": "16",
328   - "E_TEST_SETUP_ACCOUNT_EMAILID_EXIST": "17",
329   - "E_SP_ERROR": "18",
330   - "E_ACCOUNT_NUMBER_NOT_EXIST": "19",
331   - "E_ACCOUNT_NUMBER_ALREADY_EXIST": "20",
332   - "E_TEST_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "21",
333   - "E_MAIL_COULD_NOT_SENT": "22",
334   - "E_RESELLER_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "23",
335   - "E_LICENSE_TERM_CONDITION": "24",
336   - "E_EDITION_NOT_LINKED_WITH_SITE": "25",
337   - "E_LOGIN_SESSION_EXPIRE": "26",
338   - "E_DISCOUNT_CODE_NOT_EXIST": "27",
339   - "E_DISCOUNT_CODE_ALREADY_EXIST": "28",
340   -
341   - "E_SITE_IP_NOT_NULL": "29",
342   - "E_EDITION_ID_NOT_NULL": "30",
343   - "E_MASTER_SITEIP_NOT_EXIST": "31",
344   - "EDITION_ID_NOT_EXIST": "32",
345   - "E_ERROR_LOG": "33",
346   - "E_MASTER_SITE_ALREADY_EXIST": "34",
347   - "E_ACCOUNT_NUMBER_NOT_NULL": "35",
348   - "E_SITE_IP_ALREADY_EXIST": "36",
349   -
350   -
351   - "E_LICENCE_IS_EXPIRED": "37",
352   - "E_SINGLEACCOUNT_IS_BEING_USED": "38",
353   -
354   -
355   - "E_DATA_BASE_CONNECTION": "4060",
356   -
357   -
358   - //login failure error constant
359   - "ACCOUNT_NUMBER_NOT_NULL": "4",
360   - "EDITION_ID_NOT_NULL": "5",
361   - "ACCOUNT_NUMBER_NOT_EXIST": "1",
362   - "EDITION_NOT_EXIST": "3",
363   - "MASTER_SITEIP_NOT_EXIST": "2",
  311 + "E_NO_ERROR": "0",
  312 + "E_USER_NOT_EXIST": "1",
  313 + "E_PASSWORD_NOT_MATCH": "2",
  314 + "E_USER_ID_BLOCKED_24_HRS": "3",
  315 + "E_USER_NOT_ACTIVE": "4",
  316 + "E_USER_ID_WILL_BLOCKED": "5",
  317 + "E_EMAIL_ID_NOT_EXIT": "6",
  318 + "E_LICENCE_IS_INACTIVE": "7",
  319 + "E_USER_NOT_MAP_TO_LICENCE_EDITION": "8",
  320 + "E_NO_ROW_FOUND_LICENCE_TO_EDITION_TABLE": "9",
  321 + "E_NO_ROW_FOUND_LICENCE_TABLE": "10",
  322 + "E_SECURITY_QUEST_NOT_MATCH": "11",
  323 + "E_SEQURITY_ANSWER_NOT_MATCH": "12",
  324 + "E_FORGOT_USER_ID_EMAIL_ID_NOT_EXIT": "13",
  325 + "E_TOTAL_NUMBER_LOGIN_EXCEED": "14",
  326 + "E_FORGOT_PASSWORD_EMAIL_ID_NOT_EXIST": "15",
  327 + "E_TEST_SETUP_ACCOUNT_USER_NAME_EXIST": "16",
  328 + "E_TEST_SETUP_ACCOUNT_EMAILID_EXIST": "17",
  329 + "E_SP_ERROR": "18",
  330 + "E_ACCOUNT_NUMBER_NOT_EXIST": "19",
  331 + "E_ACCOUNT_NUMBER_ALREADY_EXIST": "20",
  332 + "E_TEST_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "21",
  333 + "E_MAIL_COULD_NOT_SENT": "22",
  334 + "E_RESELLER_ACCOUNT_CREATED_MAIL_COULD_NOT_SENT": "23",
  335 + "E_LICENSE_TERM_CONDITION": "24",
  336 + "E_EDITION_NOT_LINKED_WITH_SITE": "25",
  337 + "E_LOGIN_SESSION_EXPIRE": "26",
  338 + "E_DISCOUNT_CODE_NOT_EXIST": "27",
  339 + "E_DISCOUNT_CODE_ALREADY_EXIST": "28",
  340 +
  341 + "E_SITE_IP_NOT_NULL": "29",
  342 + "E_EDITION_ID_NOT_NULL": "30",
  343 + "E_MASTER_SITEIP_NOT_EXIST": "31",
  344 + "EDITION_ID_NOT_EXIST": "32",
  345 + "E_ERROR_LOG": "33",
  346 + "E_MASTER_SITE_ALREADY_EXIST": "34",
  347 + "E_ACCOUNT_NUMBER_NOT_NULL": "35",
  348 + "E_SITE_IP_ALREADY_EXIST": "36",
  349 +
  350 +
  351 + "E_LICENCE_IS_EXPIRED": "37",
  352 + "E_SINGLEACCOUNT_IS_BEING_USED": "38",
  353 +
  354 +
  355 + "E_DATA_BASE_CONNECTION": "4060",
  356 +
  357 +
  358 + //login failure error constant
  359 + "ACCOUNT_NUMBER_NOT_NULL": "4",
  360 + "EDITION_ID_NOT_NULL": "5",
  361 + "ACCOUNT_NUMBER_NOT_EXIST": "1",
  362 + "EDITION_NOT_EXIST": "3",
  363 + "MASTER_SITEIP_NOT_EXIST": "2",
364 364 "LICENSE_INACTIVE": "6"
365 365 });
366 366  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
  View file @f744dcd
1   -<div class="bodyWrap row ">
  1 +<div class="bodyWrap row ">
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadForModuleById(1)">
4 4 <!--<div class="main">-->
... ... @@ -86,7 +86,7 @@
86 86 <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
87 87 <div role="tabpanel" class="tab-pane active" id="grid-view">
88 88 <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
89   - <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" data-ng-click="openModuleItemView($event)">
  89 + <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)">
90 90 <div class="thumbnail">
91 91 <a href="#">
92 92 <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openModuleItemView($event)" alt="" title="">
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @f744dcd
... ... @@ -26,7 +26,7 @@
26 26 <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
27 27 <!--{{name}}-->
28 28 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
29   - <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li>
  29 + <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10"><!--{{module.name}}--></a></li>
30 30 </ul>
31 31 </div>
32 32  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f744dcd
... ... @@ -523,9 +523,9 @@
523 523 </div>
524 524 <div class="col-sm-6" style="padding-left:13px;padding-right:13px;">
525 525 <div class=" form-group">
526   - <label for="SystemFont" class="font13">Available Lexicons</label>
  526 + <label for="SystemFont" class="font13">Available Lexicons</label>
527 527 <select class="form-control" size="8" id="lexiconLangDropdown"></select>
528   - </div>
  528 + </div>
529 529 <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
530 530 </div>
531 531 <div class="clearfix"></div>
... ... @@ -1244,56 +1244,63 @@
1244 1244 <div class="panel-body">
1245 1245 <!-- form -->
1246 1246 <form class="form-horizontal">
1247   - <div class="form-group" id="moduleDiv1">
1248   - <div class="col-sm-8">• Dissectible Anatomy</div>
1249   - </div>
1250   - <div class="form-group" id="moduleDiv2">
1251   - <div class="col-sm-8">• Atlas Anatomy</div>
1252   - </div>
1253   - <div class="form-group" id="moduleDiv3">
1254   - <div class="col-sm-8">• 3D Anatomy</div>
1255   - </div>
1256   - <div class="form-group" id="moduleDiv4">
1257   - <div class="col-sm-8">• Clinical Illustration</div>
1258   - </div>
1259   - <div class="form-group" id="moduleDiv5">
1260   - <div class="col-sm-8">• Clinical Animation</div>
1261   - </div>
1262   - <div class="form-group" id="moduleDiv6">
1263   - <div class="col-sm-8">• Encyclopedia</div>
1264   - </div>
1265   - <div class="form-group" id="moduleDiv7">
1266   - <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div>
1267   - </div>
1268   - <div class="form-group" id="moduleDiv8">
1269   - <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div>
1270   - </div>
1271   - <div class="form-group" id="moduleDiv9">
1272   - <div class="col-sm-8">• IP 10</div>
1273   - </div>
1274   - <div class="form-group" id="moduleDiv10">
1275   - <div class="col-sm-8"><i>• Lab Exercise (To be available by 08/16/2017)</i></div>
1276   - </div>
1277   - <div class="form-group" id="moduleDiv11">
1278   - <div class="col-sm-8">• In - Depth Reports</div>
1279   - </div>
1280   - <div class="form-group" id="moduleDiv12">
1281   - <div class="col-sm-8">• Complementary and Alternative Medicine</div>
1282   - </div>
1283   - <div class="form-group" id="moduleDiv13">
1284   - <div class="col-sm-8">• A.D.A.M Images</div>
1285   - </div>
1286   - <div class="form-group" id="moduleDiv14">
1287   - <div class="col-sm-8">• Body Guide</div>
1288   - </div>
1289   - <div class="form-group" id="moduleDiv15">
1290   - <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
1291   - </div>
1292   - <div class="form-group" id="moduleDiv16">
1293   - <div class="col-sm-8">• The Wellness Tool</div>
  1247 + <div>
  1248 + <div class="form-group" id="moduleDiv1">
  1249 + <div class="col-sm-8">• Dissectible Anatomy</div>
  1250 + </div>
  1251 + <div class="form-group" id="moduleDiv2">
  1252 + <div class="col-sm-8">• Atlas Anatomy</div>
  1253 + </div>
  1254 + <div class="form-group" id="moduleDiv3">
  1255 + <div class="col-sm-8">• 3D Anatomy</div>
  1256 + </div>
  1257 + <div class="form-group" id="moduleDiv4">
  1258 + <div class="col-sm-8">• Clinical Illustrations</div>
  1259 + </div>
  1260 + <div class="form-group" id="moduleDiv5">
  1261 + <div class="col-sm-8">• Clinical Animations</div>
  1262 + </div>
  1263 + <div class="form-group" id="moduleDiv6">
  1264 + <div class="col-sm-8">• Encyclopedia</div>
  1265 + </div>
  1266 + <div class="form-group" id="moduleDiv9">
  1267 + <div class="col-sm-8">• IP 10</div>
  1268 + </div>
  1269 + <div class="form-group" id="moduleDiv11">
  1270 + <div class="col-sm-8">• In - Depth Reports</div>
  1271 + </div>
  1272 + <div class="form-group" id="moduleDiv12">
  1273 + <div class="col-sm-8">• Complementary and Alternative Medicine</div>
  1274 + </div>
  1275 + <div class="form-group" id="moduleDiv13">
  1276 + <div class="col-sm-8">• A.D.A.M Images</div>
  1277 + </div>
  1278 + <div class="form-group" id="moduleDiv14">
  1279 + <div class="col-sm-8">• Body Guide</div>
  1280 + </div>
  1281 + <div class="form-group" id="moduleDiv15">
  1282 + <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
  1283 + </div>
  1284 + <div class="form-group" id="moduleDiv16">
  1285 + <div class="col-sm-8">• The Wellness Tools</div>
  1286 + </div>
  1287 + <div class="form-group" id="moduleDiv1017">
  1288 + <div class="col-sm-8">• A.D.A.M on Demand</div>
  1289 + </div>
1294 1290 </div>
1295   - <div class="form-group" id="moduleDiv17">
1296   - <div class="col-sm-8">• A.D.A.M on Demand</div>
  1291 + <!--<hr style="border: 1px solid;"/>-->
  1292 + <div id="dvPending" style="margin: 15px 0;"><b>Pending Modules</b></div>
  1293 + <!--<hr style="border: 1px solid;" />-->
  1294 + <div>
  1295 + <div class="form-group" id="moduleDiv7">
  1296 + <div class="col-sm-12"><i>• Curriculum Builder</i></div> <!--(To be available by 09/25/2017)-->
  1297 + </div>
  1298 + <div class="form-group" id="moduleDiv8">
  1299 + <div class="col-sm-8"><i>• Anatomy Test</i></div> <!--(To be available by 08/28/2017)-->
  1300 + </div>
  1301 + <div class="form-group" id="moduleDiv10">
  1302 + <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
  1303 + </div>
1297 1304 </div>
1298 1305 <div class="form-group">
1299 1306 <div style="text-align: center">
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @f744dcd
... ... @@ -1093,4 +1093,11 @@ color:#ffffff !important;
1093 1093  
1094 1094 width : 400px !important;
1095 1095  
1096   - }
1097 1096 \ No newline at end of file
  1097 + }
  1098 +
  1099 +li[disabled], a[disabled] {
  1100 + pointer-events: none;
  1101 +}
  1102 +a[disabled] {
  1103 + color: #aaa !important;
  1104 +}
1098 1105 \ No newline at end of file
... ...