1. removed image existence check from showing da view list code.

2. added code for showing different html on index page(main menu/da-view)

1. removed image existence check from showing da view list code.
2. added code for showing different html on index page(main menu/da-view)
Nikita Kulshreshtha
1 parent 1217960b
Showing 6 changed files with 43 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/content/css/main.css
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -40,6 +40,7 @@
   <ItemGroup>
     <Content Include="app\controllers\AuthenticationController.js" />
     <Content Include="app\controllers\DAController.js" />
+    <Content Include="app\controllers\HomeController.js" />
     <Content Include="app\main\AIA.js" />
     <Content Include="app\services\AuthenticationService.js" />
     <Content Include="app\services\load-json-service.js" />
@@ -2,8 +2,8 @@
 /// <reference path="../views/da/da-view.html" />
 'use strict';
-AIA.controller("DAController", ["$scope", "$compile", "$http", "$log", "$location", "$timeout","DA","$routeParams",
-function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) {
+AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "$routeParams",
+function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) {
         $scope.genderId = "";
         $scope.BodyViewData = null;
@@ -19,7 +19,7 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) {
         //get the DA body view list based on selected gender
         $scope.getDAViewList = function ($event) {
-            debugger;
+           // debugger;
             $("#bodyViewList").empty();
             //for default load
             if ($event == null) {
@@ -40,15 +40,22 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) {
                      var userModestysettings = DA[0].modesty;
                     var userSelectedSkintone = 'W';
                     $scope.userModestySetting = 'Y'
-                    var thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity + userModestysettings)) + '.jpg';
+                    var thumbnailImage;
+                    if((value._id==1)||(value._id==3)|| (value._id==5)||(value._id==6)||(value._id==7)||(value._id==11))
+                     thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity + userModestysettings)) + '.jpg';
+                    else {
+                        thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity)) + '.jpg';
+
+                    }
+
                     $scope.imagePath = "http://localhost/AIA/content/images/DA/BodyViews/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage;
-                    $scope.isImageExists = $scope.checkImgExistance($scope.imagePath);
-                    //debugger
+                    //$scope.isImageExists = $scope.checkImgExistance($scope.imagePath);
+                    ////debugger
-                    if ($scope.isImageExists == false) {
-                        $scope.imagePath = ($scope.imagePath).replace($scope.userModestySetting, "");
-                    }
+                    //if ($scope.isImageExists == false) {
+                    //    $scope.imagePath = ($scope.imagePath).replace($scope.userModestySetting, "");
+                    //}
                     //debugger
                     var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" data-ng-click="openView($event)"><div class="thumbnail" >'
@@ -94,6 +101,8 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) {
         $scope.openView = function ($event) {
             alert('clicked: ' + $event.currentTarget.id)
+            $rootScope.pageToOpen = 'app/views/da/da-view.html';
+            alert($rootScope.pageToOpen)
         }
+'use strict';
+
+AIA.controller("HomeController", ["$rootScope", "$log", "$location", "$timeout", 
+    function ($rootScope, $log, $location, $timeout) {
+
+        //$scope.pageToOpen = {
+        //    name: 'MainMenu'
+        //};
+        $rootScope.pageToOpen = 'MainMenu.html';
+    }]
+);
 \ No newline at end of file
@@ -22,7 +22,13 @@ AIA.constant(&#39;pages&#39;, [
         pageSlug: 'da-body-view/:bodyViewId',
         pageUrl: 'app/views/da/da-body-view.html',
         pageController: 'DAController'
-    }
+    },
+    {
+        name: 'index',
+        pageSlug: 'index',
+        pageUrl: 'index.html',
+        pageController: 'HomeController'
+    },
 ]);
@@ -399,7 +399,7 @@ footer.dark {
 	/*overflow: hidden;*/
 	position: fixed;
 	left: 0;
-	top: 0;
+	top: 100;
 	z-index: 1029;
 }
 .tools {
@@ -28,7 +28,7 @@
     <link href="themes/default/css/bootstrap/3.3.6/jquery-ui.css" rel="stylesheet" />
 </head>
-<body class="no-scroll">
+<body class="no-scroll" ng-controller="HomeController">
     <div class="container-fluid ">
         <!--Header-->
@@ -53,7 +53,9 @@
             </div>
             <!--Body-->
-            <div ng-include="'MainMenu.html'" />
+            <!--<div ng-include="'MainMenu.html'" />-->
+            <div ng-include="pageToOpen" />
+            <!--<div data-ng-include data-ng-src="' pageToOpen.name '"></div>-->
             <!-- Footer
             <footer>
               <div class="container-fluid text-center">Copyright &copy; 2016 Ebix Inc. All rights reserved.</div>
@@ -149,7 +151,7 @@
     <script src="content/js/custom/custom.js"></script>
     <script src="app/controllers/DAController.js"></script>
-
+    <script src="app/controllers/HomeController.js"></script>
     <script>
         $(function () {
             $("#slider-range-min-2").slider({