Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into listMangerStateMaintainIssue1

unknown
2 parents 26fc1e9e 694babcb
Showing 6 changed files with 145 additions and 75 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json
@@ -634,6 +634,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
         }
+        //call watch on '$scope.VocabTermTxt and compile <li> and append to <ul> on first time load
+        $scope.$watch('$scope.VocabTermTxt', function (newValue, oldValue, scope) {
+
+            //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
+            //Remove the list and then Repopulate 
+            if ($('#searchListDiv').html()!="")
+              $('#searchListDiv').empty()
+            //Delay compile of ul li so that the remove of li is completed.
+            $timeout(function () {
+                var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                                                           '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+                                                      ' </li></ul>').appendTo('#searchListDiv')
+                $compile($e2)($scope);
+
+            }, 500);
+
+        }, true);
+
     }
     $scope.loadBodyViewData = function (currentVoid) {
@@ -6562,7 +6580,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
        // $rootScope.isHighlightBodyByBodySystem = false;
-       
+        //Remove the Search list and then Repopulate it on change of Gender
+        $('#searchListDiv').empty()
         $rootScope.isGenderChnage = true;
@@ -6791,7 +6810,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
       //  $rootScope.isHighlightBodyByBodySystem = false;
-
+        //Remove the search list and then Repopulate it on change of View
+        $('#searchListDiv').empty()
         if ($rootScope.openViews.length > 0) {
             $rootScope.openViews.splice($rootScope.openViews.length - 1);
@@ -7525,7 +7545,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             console.log('listManagerEvent');
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
-            $('#bodySystems').empty();
+            var optionsLength = $('#bodySystems option').length;//.children('option').length;
+            console.log('optionsLength= ' + optionsLength)
+            if (optionsLength>0)
+             $('#bodySystems').empty();
             var $all = $('<option  id="0" selected="">All</option>').appendTo('#bodySystems');
@@ -7559,7 +7582,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
         }
-
+    
     });
@@ -8179,6 +8202,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
     }
+    $scope.resetSearchListView = function () {
+
+        //Remove the list and then Repopulate it on change of $scope.searchFilter
+        $('#searchListDiv').empty()
+        // added the timeout to delay the compile of ul li
+        $timeout(function () {
+        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                                                   '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+                                              ' </li></ul>').appendTo('#searchListDiv')
+        $compile($e2)($scope);
+        }, 500);
+
+
+    }
+
 }]
@@ -71,11 +71,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.shapestyleborderWidth = 2;
         $rootScope.shapestyleborderStyles = "solid";
+
+
         $rootScope.initializeAIA = function () {
             $rootScope.isLoading = false;
             $rootScope.isVisibleLogin = true;
+            getUserDetails();
         }
         $rootScope.userInfo = {
@@ -87,43 +90,79 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.AuthenticateUser = function (userInfo) {
             $rootScope.isVisibleLogin = false;
-            //if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
+            if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
-            //    alert("Please enter correct information");
+                alert("Please enter correct information");
-            //}
-            //else {
+            }
+            else {
-            //    AuthenticationService.authenticateUser(userInfo)
-            //     .then(
-
-            //     function (result) {
-            //         if (result == LoginConstants.USER_NOT_FOUND) {
-
-            //             alert(result);
-            //         }
-            //         else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
-            //             alert(result);
-            //         }
-            //         else {
-            //             if (result.loginId != undefined || result.loginId != "" || result.loginId != null)
-
-            //                  $rootScope.userData = result;
-            //                  $rootScope.userModules = result.modules;
-            //                  $rootScope.isVisibleLogin = false;
-            //         }
-            //     },
-            //     function (error) {
-            //         console.log(' Error in authentication = ' + error.statusText);
-            //         alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
-            //     });
-            //}
+                AuthenticationService.authenticateUser(userInfo)
+                 .then(
+
+                 function (result) {
+                     if (result == LoginConstants.USER_NOT_FOUND) {
+
+                         alert(result);
+                     }
+                     else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
+                         alert(result);
+                     }
+                     else {
+                         if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
+
+                             $rootScope.userData = result;
+                             $rootScope.userModules = result.modules;
+                             $rootScope.isVisibleLogin = false;
+
+                             localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+                         }
+                     }
+                 },
+                 function (error) {
+                     console.log(' Error in authentication = ' + error.statusText);
+                     alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
+                 });
+            }
         }
+        $rootScope.LogoutUser = function () {
+            localStorage.removeItem('loggedInUserDetails');
+            document.location = '/';
+            $rootScope.isVisibleLogin = true;
+        }
-        $rootScope.$on("$locationChangeSuccess", function () {
+        function getUserDetails() {
+            //Retain logged in user details
+            var currentUserDetails = localStorage.getItem('loggedInUserDetails');
+            if (currentUserDetails) {
+                try {
+                    var userInfo = JSON.parse(storedUser);
+
+                    if (userInfo.loginId != undefined || userInfo.loginId != "" || userInfo.loginId != null) {
+                        $rootScope.isVisibleLogin = false;
+                        $rootScope.userData = userInfo;
+                        $rootScope.userModules = userInfo.modules;
+                    }
+                }
+                catch (e) {
+                    localStorage.removeItem('loggedInUserDetails');
+                }
+            }
+        }
+        $(document).ready(function () {
+            getUserDetails();
+        });
+
+        $rootScope.$on("$locationChangeSuccess", function () {
+            
+            $rootScope.isLeftMenuActive = function (moduleUrl) {
+              
+                return moduleUrl === $location.path();
+            }
+           
             if (($location.url() == "/da-body-view")) {
                 $rootScope.disableMenuannotation = " ";
                 $rootScope.disableMenuoption = " ";
@@ -300,6 +339,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $('.btnCursor').removeClass('activebtncolor');
             $(".btn-annotation").removeClass("activebtncolor");
             $rootScope.isAnnotaionToolBarDrawingModeActive = true;
+            $rootScope.switchCanvas();
         }
         $rootScope.CIAnotationIdentifyModeOff = false;
         $rootScope.OnIdentifyClick = function () {
@@ -2581,6 +2621,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }
         };
+
+        $rootScope.changeNavigatorModesty = function () {
+            var currentOpenViewId = localStorage.getItem("currentBodyViewId");//$rootScope.openViews[openViewLen - 1].BodyViewId;
+
+            $rootScope.$broadcast('changeNavigatorModestyEvent', { bodyViewId: currentOpenViewId }, true);
+
+        };
+
         $rootScope.ShowExportImageWindow = function () { 
             $(".export-image").css("display", "block");
         };
@@ -280,31 +280,17 @@
                 <div class="">
                     <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
-                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
+                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()"  placeholder=" search...">
                         <div id="backdrop" ng-show="IsSearchVisible">
-                            <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
-                                <!--#Bug 6591-->
-                                <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
-                                    <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
-                                        <!--<a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>-->
-                                        <a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>
-                                    </li>
-                                </ul>
+                            <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
+                       
                             </div>
                         </div>
-                        <!--</div>-->
                     </div>
                     <div class="btn-group">
-                        <!--<button type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
-                        </button>
-                        <ul class="dropdown-menu" style="width:100%;">
-                            <li><a href="#">{{currentTitleFromJson}}</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">All</a></li>
-                        </ul>-->
+            
                         <button type="button" id="btnDATermSearch" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success btn-sm" ng-mousedown="OnSearchBtnClick($event)">
                             <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
                         </button>
@@ -316,7 +302,7 @@
                         <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
                             <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
-                                <img id="navimg" alt=""></img>
+                                <img id="navimg" alt=""/>
                                 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
                                 </div>
                             </div>
+
 <div class="bodyWrap row container-fluid" >
     <div class="col-sm-12 col-md-12 pageHeading">
         <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
@@ -26,22 +27,22 @@
         <!--{{name}}-->
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
             <!--<li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible()">{{module.name}}</a></li>-->
-            <li><a href="da-view-list" ng-click="IsVisible()">Dissectible Anatomy</a></li>
-            <li><a href="3d-anatomy-list" ng-click="IsVisible()">3D Anatomy</a></li>
-            <li><a href="clinical-illustrations" ng-click="IsVisible()">Clinical Illustrations</a></li>
-            <li><a href="clinical-animations" ng-click="IsVisible()">Clinical Animations</a></li>
-            <li><a href="Link/encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
-            <li><a href="curriculum-builder" ng-click="IsVisible()">Curriculum Builder</a></li>
-            <li><a href="anatomy-test" ng-click="IsVisible()">Anatomy Tests</a></li>
-            <li><a href="Link/IP-10" ng-click="IsVisible()">IP 10</a></li>
-            <li><a href="lab-exercises" ng-click="IsVisible()">Lab Exercises</a></li>
-            <li><a href="Link/indepth-reports" ng-click="IsVisible()">In-Depth Reports</a></li>
-            <li><a href="Link/complementary-and-alternate-medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
-            <li><a href="ADAM-Images" ng-click="IsVisible()">A.D.A.M Images</a></li>
-            <li><a href="Link/bodyguide" ng-click="IsVisible()">Body Guide</a></li>
-            <li><a href="Link/symptom-navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
-            <li><a href="Link/wellness-tools" ng-click="IsVisible()">The Wellness Tools</a></li>
-            <li><a href="ADAM-on-demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
+            <li><a href="da-view-list" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/da-view-list')}">Dissectible Anatomy</a></li>
+            <li ><a href="3d-anatomy-list" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/3d-anatomy-list')}">3D Anatomy</a></li>
+            <li ><a href="clinical-illustrations" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/clinical-illustrations')}">Clinical Illustrations</a></li>
+            <li ><a href="clinical-animations" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/clinical-animations')}">Clinical Animations</a></li>
+            <li><a href="Link/encyclopedia" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/encyclopedia')}">Encyclopedia</a></li>
+            <li><a href="curriculum-builder" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/curriculum-builder')}">Curriculum Builder</a></li>
+            <li><a href="anatomy-test" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/anatomy-test')}">Anatomy Tests</a></li>
+            <li><a href="Link/IP-10" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/IP-10')}">IP 10</a></li>
+            <li><a href="lab-exercises" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/lab-exercises')}">Lab Exercises</a></li>
+            <li><a href="Link/indepth-reports" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/indepth-reports')}">In-Depth Reports</a></li>
+            <li><a href="Link/complementary-and-alternate-medicine" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/complementary-and-alternate-medicine')}">Complementary and Alternative Medicine</a></li>
+            <li><a href="ADAM-Images" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/ADAM-Images')}">A.D.A.M Images</a></li>
+            <li><a href="Link/bodyguide" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/bodyguide')}">Body Guide</a></li>
+            <li><a href="Link/symptom-navigator" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/symptom-navigator')}">Symptom Navigator</a></li>
+            <li><a href="Link/wellness-tools" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/Link/wellness-tools')}">The Wellness Tools</a></li>
+            <li><a href="ADAM-on-demand" ng-click="IsVisible()" ng-class="{active:isLeftMenuActive('/ADAM-on-demand')}">A.D.A.M OnDemand</a></li>
          </ul>
     </div>
@@ -94,3 +95,4 @@
         tooltipClass: 'customTooltip'
     });
 </script>
+
@@ -52,9 +52,9 @@
         <li><a href="#">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
-        <li class="visible-xs"><a href="index.html">Logout</a></li>
-        <li class="hidden-xs marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="index.html"><i class="fa fa-power-off"></i></a></li>
-    </ul>
+        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> 
+        <li class="hidden-xs marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
+      </ul>
     <div id="imaginary_container">
         <div class="input-group stylish-input-group paddTop5 hidden-sm">
             <input type="text" class="form-control width120" placeholder="Search">
@@ -150,8 +150,6 @@
 },{
 "FontName": "Sylfaen"
 },{
-"FontName": "Symbol"
-},{
 "FontName": "Tahoma"
 },{
 "FontName": "Tw Cen MT"
@@ -162,8 +160,6 @@
 },{
 "FontName": "Wide Latin"
 },{
-"FontName": "Wingdings"
-},{
 "FontName": "Yu Gothic"
 }]
 }