Add app version to welcome page

[vid.git] / epsdk-app-onap / src / main / webapp / WEB-INF / fusion / jsp / ebz / ebz_header.jsp

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
index ad3201c..4808ccd 100644 (file)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
@@ -20,10 +20,10 @@
 <%@ 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.openecomp.portalsdk.core.util.SystemProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%>
-<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%>
+<%@ 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"%>
 <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" >
@@ -44,7 +44,7 @@
 <script src="static/fusion/js/att_angular_gridster/ui-gridster-tpls.js"></script>
 <script src="static/fusion/js/att_angular_gridster/angular-gridster.js"></script>
 <script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script>
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/0.10.0/lodash.min.js"></script>
+<script type="text/javascript" src="app/fusion/external/lodash/lodash.min.0.10.js"></script>
 <%--<script src="app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script>--%>
 <script src="app/fusion/external/angular-1.4.8/angular-touch.min.js"></script>
 <script src="app/fusion/external/angular-1.4.8/angular-animate.min.js"></script>
@@ -246,6 +246,7 @@
                                        <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')">
@@ -313,6 +314,7 @@
                        fullName:'',
                        email:''
        }
+               $scope.app_version="";
        /*Put user info into fields*/
        $scope.inputUserInfo = function(userInfo){
                if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
@@ -388,7 +390,21 @@
                                         }
                                         ];
                        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*/
@@ -425,7 +441,23 @@
                        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() {