diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index a3fc2ba..b642cb2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -10,6 +10,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou var CLINICAL_ILLUSTRATION = 'Clinical Illustrations'; var CLINICAL_ANIMATION = 'Clinical Animations'; $rootScope.closeBtnImgPath = "~/../content/images/speeachBubbleClose.png"; + $rootScope.listArray = []; //variables to bind Filter by Controls $scope.searchAAListViewData = []; $scope.SelectedAAthumbImage = []; @@ -49,36 +50,37 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou else { $('#grid-view').css("display", "none"); - if ($scope.isListViewDataLoaded == true) { - var htm = ''; - htm += ""; - $.ajax({ - url: '~/../content/data/json/aa/aa_dat_contentlist.json', - dataType: "json", - success: function (result) { - $(result.root.Item).each(function (key, value) { - console.log(key + " " + value); - htm += "" - htm += ''; - htm += "" - }); - htm += "
Title Region SystemView Type
' + value._Title + '' + value._BodyRegion + '' + value._BodySystem + '' + value._ViewOrientation + '' + value._ImageType + '
"; - $("#list-view").html(htm); - $compile(htm)($scope); - } - }); - $('#list-view').css("display", "block"); - $scope.isListViewDataLoaded = false; - } - else { + //if ($scope.isListViewDataLoaded == true) { + // var htm = ''; + // htm += ""; + // $.ajax({ + // url: '~/../content/data/json/aa/aa_dat_contentlist.json', + // dataType: "json", + // success: function (result) { + // $(result.root.Item).each(function (key, value) { + // console.log(key + " " + value); + // htm += "" + // htm += ''; + // htm += "" + // }); + // htm += "
Title Region SystemView Type
' + value._Title + '' + value._BodyRegion + '' + value._BodySystem + '' + value._ViewOrientation + '' + value._ImageType + '
"; + // $("#list-view").html(htm); + // $compile(htm)($scope); + // } + // }); + // $('#list-view').css("display", "block"); + // $scope.isListViewDataLoaded = false; + //} + //else { $('#list-view').css("display", "block"); - } + //} $timeout(function () { // if ($rootScope.isListViewRowClicked == true) { // $rootScope.isListViewRowClicked = false; $("#demoView").remove(); - $("#viewList").append("
" + $rootScope.listArray[0].text + "
Open
"); + if ($rootScope.listArray.length>0) + $("#viewList").append("
" + $rootScope.listArray[0].text + "
Open
"); var moduleItemDataToBeSavedID $("#list-view table tbody tr").removeClass("active"); var moduleItemDataToBeSavedID = localStorage.getItem("listViewSelectedID"); @@ -149,13 +151,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if ($scope.isListViewButtonClicked == true) { if ($scope.isOpenBtnClicked == true) { - var moduleItemDataToBeSaved = $("#demoText").html(); + var moduleItemDataToBeSaved = $("#demoText").html().trim(); $scope.isOpenBtnClicked = false; } else { var moduleItemDataToBeSavedID = event.currentTarget.id; localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID); - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text(); + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim(); } } else { @@ -173,7 +175,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.bodySystemName = $rootScope.OpenedTileData[2]; $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; $scope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; - $rootScope.listArray = []; + //$rootScope.listArray = []; $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved }); //3. set opened module item ti localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]); @@ -194,7 +196,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID); $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active"); localStorage.setItem("AAListViewScroll", $("#list-view table tbody").scrollTop()); - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text(); + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim(); $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; $rootScope.listArray = []; @@ -395,6 +397,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.FilterByImage = function (moduleId, query) { //alert(JSON.stringify(query)); $scope.moduleId = moduleId; + $scope.filterstring = true; console.log('loadForModuleById is called') $rootScope.moduleName = Modules[moduleId].Name; @@ -509,26 +512,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.imagePath = "../content/images/aa/thumbnails/" + value._TileImageName; - var $el = $('
' - + '
' - + '' + var $el = $('').appendTo('#grid-view'); $compile($el)($scope); } - else { - var htm = ''; - htm += ""; - //angular.forEach($scope.selectedAAListViewData, function (value, key) { - htm += "" - htm += ''; - htm += "" - //}); - htm += "
Title Region SystemView Type
' + value._Title + '' + value._BodyRegion + '' + value._BodySystem + '' + value._ViewOrientation + '' + value._ImageType + '
"; - $("#list-view").html(htm); - $compile(htm)($scope); - } + //else { + // var htm = ''; + // htm += ""; + // //angular.forEach($scope.selectedAAListViewData, function (value, key) { + // htm += "" + // htm += ''; + // htm += "" + // //}); + // htm += "
Title Region SystemView Type
' + value._Title + '' + value._BodyRegion + '' + value._BodySystem + '' + value._ViewOrientation + '' + value._ImageType + '
"; + // $("#list-view").html(htm); + // $compile(htm)($scope); + //} $(".sidebar").mCustomScrollbar({ autoHideScrollbar: true, @@ -564,7 +567,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $('#ListViewDiv').append('No illustration found for the selected search criteria!'); } - console.log(JSON.stringify(result, null, 4)); + //console.log(JSON.stringify(result, null, 4)); + console.log('UTK--' + $scope.searchAAListViewData); }, function (error) { // handle errors here diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html index 945ee5c..20ef6b9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html @@ -86,7 +86,7 @@ - +
+