Upgrade epsdk version to 2.6.0 (but keep overlay 2.5.0) (fix)
[vid.git] / epsdk-app-onap / src / main / webapp / WEB-INF / fusion / jsp / ebz / ebz_header.jsp
index 44fe53a..4571f34 100644 (file)
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ page isELIgnored="false"%>
-<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
-<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>
 <%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%>
-<%@ page import="org.onap.portalsdk.core.domain.MenuData"%>
+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css">
 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">
-<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css">
 
 
 <%--<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> --%>
                                        <a ng-click="toggleDrawer();isOpen = !isOpen" href="javascript:void(0);" class="arrow-icon-left" >
                                        <span class="icon-hamburger"></span></a>        
                                        <span ng-init="isOpen = true" ng-show="isOpen" style="font-size:16px; position:relative; top:-8px; left:-15px;">&nbsp&nbsp&nbsp {{app_name}}</span>
+                                       <span data-tests-id='app-version' ng-show="isOpen" style="font-size:13px; position:relative; top:15px; left:-45px; color:#666666;">{{app_version}}</span>
                                </span>
                                <div att-drawer drawer-slide="left" drawer-custom-top="{{drawer_custom_top}}px" drawer-size="200px" drawer-open="drawerOpen" drawer-custom-height="100%" >
                                    <div ng-style="adjustHLeftMenu('leftMenu')">
                        fullName:'',
                        email:''
        }
+               $scope.app_version="";
        /*Put user info into fields*/
        $scope.inputUserInfo = function(userInfo){
                if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
                                         }
                                         ];
                        return megaMenuDataObjectTemp;
-               }; 
+               };
+
+               var getAppVersion = function() {
+                       return $http.get('version')
+                               .then(function(response) {
+                                       if (typeof response.data === 'object') {
+                                               return response.data;
+                                       } else {
+                                               return $q.reject(response.data);
+                                       }
+                               }, function(response) {
+                                       // something went wrong
+                                       return $q.reject(response.data);
+                               });
+               }
                
                
                /*Left Menu*/
                        console.log('getAppName failed', error);
                });
 
-               
+               getAppVersion().then(function(response){
+                       var j = response;
+                       try{
+                               if(j){
+                                       $scope.app_version = j.displayVersion;
+
+                               }else{
+                                       throw "Version response is not in expected format.";
+                               }
+                       }catch (e) {
+                               console.log("Error happened while trying to get app version: "+e);
+                               return;
+                       }
+               },function(error){
+                       console.log('getAppVersion failed', error);
+               });
+
            $scope.getTopMenuStaticInfo();      
        $scope.getMenu=function() {
                
                }
                            
                                $scope.createFavoriteErrorMenu=function() {
-                               $scope.favoritesMenuItems = [
-//                                                          {
-//                                                                 "menuId": "93",
-//                                                                 "text": "JSONLint",
-//                                                                 "url": "http://http://jsonlint.com"
-//                                                               },
-//                                                               {
-//                                                                 "menuId": "22",
-//                                                                 "text": "ECOMP Wasteland",
-//                                                                 "url": "https://ecomp.homer.att.com/ecompportal/applicationsHome"
-//                                                               },
-//                                                               {
-//                                                                 "menuId": "94",
-//                                                                 "text": "HROneStop",
-//                                                                 "url": "http://ebiz.sbc.com/hronestop"
-//                                                               },
-//                                                               {
-//                                                                 "menuId": "91",
-//                                                                 "text": "Andy and his Astrophotgraphy",
-//                                                                 "url": "https://ecomp.homer.att.com/ecompportal/applicationsHome"
-//                                                               }
-                                                               ];
+                               $scope.favoritesMenuItems = [];
                                $scope.favoriteItemsCount = Object.keys($scope.favoritesMenuItems).length;
                                $log.info('number of favorite menus: ' + $scope.favoriteItemsCount);
                                }
                                            "parentMenuId": null,
                                            "url": ""
                                          },
-                                         {
-                                           "menuId": 90,
-                                           "column": 1,
-                                           "text": "Google",
-                                           "parentMenuId": 1,
-                                           "url": "http://google.com"
-                                         },
-                                         {
-                                           "menuId": 91,
-                                           "column": 1,
-                                           "text": "Mike Little's Coffee Cup",
-                                           "parentMenuId": 2,
-                                           "url": "http://coffee.com"
-                                         },
-                                         {
-                                           "menuId": 92,
-                                           "column": 2,
-                                           "text": "Andy and his Astrophotgraphy",
-                                           "parentMenuId": 3,
-                                           "url": "http://nightskypix.com"
-                                         },
-                                         {
-                                           "menuId": 93,
-                                           "column": 1,
-                                           "text": "JSONLint",
-                                           "parentMenuId": 4,
-                                           "url": "http://http://jsonlint.com"
-                                         },
-                                         {
-                                           "menuId": 94,
-                                           "column": 2,
-                                           "text": "HROneStop",
-                                           "parentMenuId": 4,
-                                           "url": "http://ebiz.sbc.com/hronestop"
-                                         },
-                                         {
-                                           "menuId": 95,
-                                           "column": 2,
-                                           "text": "4th Level App4a R16",
-                                           "parentMenuId": 4,
-                                           "url": "http://www.e-access.att.com/ecomp_portal_ist/ecompportal/widgets"
-                                         },
-                                         {
-                                           "menuId": 96,
-                                           "column": 3,
-                                           "text": "3rd Level App1c R200",
-                                           "parentMenuId": 4,
-                                           "url": "http://app1c.com"
-                                         },
-                                         {
-                                           "menuId": 97,
-                                           "column": 1,
-                                           "text": "3rd Level App4b R16",
-                                           "parentMenuId": 5,
-                                           "url": "http://app4b.com"
-                                         },
-                                         {
-                                           "menuId": 98,
-                                           "column": 2,
-                                           "text": "3rd Level App2b R16",
-                                           "parentMenuId": 5,
-                                           "url": "http://app2b.com"
-                                         },
                                          {
                                            "menuId": 99,
                                            "column": 1,
                        $scope.megaMenuDataObject = menuStructureConvert($scope.jsonMenuData);
 //                     $log.debug(JSON.stringify($scope.jsonMenuData));
        }
+
+       LeftMenuService.getLeftMenu().then(function (response) {
+               var menu = {
+                       parentList: JSON.parse(response.data),
+                       childItemList: JSON.parse(response.data2)
+               };
+
+               try {
+
                var childItemList="";
                var parentList = "";
                try{
-                       childItemList = ${menu.childItemList};
-                       parentList = ${menu.parentList};
+                       childItemList = menu.childItemList;
+                       parentList = menu.parentList;
                }catch(err){
                        console.log("ebz_header: failed to get child/parent lists", err);
                }
                $timeout(function() {
                        detectScrollEvent();
                }, 800);
-               
+
+               } catch (e) {
+                       console.log("error happened while trying to get app menu " + e);
+               }
+       }, function (error) {
+               console.log('getLeftMenu failed', error);
+       });
+
        });
        
        app.filter("ellipsis", function(){