diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index 6b77e94..d2b4eaa 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -20965,6 +20965,7 @@ + Web.config diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a520e37..96e8b4a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -47,21 +47,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //get the DA body view list based on selected gender $scope.getDAViewList = function ($event) { - // debugger; + // debugger; if ($('#MainImage') != null) { $('#MainImage').remove(); } $rootScope.currentActiveModuleTitle = Modules[0].Name; $("#bodyViewList").empty(); //for default load - if ($event == null) { - $scope.genderId = "Male"; + if ($event == null || $event == undefined) { + //if ((localStorage.getItem("genderId") != "")||(localStorage.getItem("genderId")!="null")) { + // $scope.genderId = localStorage.getItem("genderId"); + //} + var selectedGender=localStorage.getItem("genderId") ; + if ((selectedGender == null)) { + $scope.genderId = "Male"; + } + else + $scope.genderId = localStorage.getItem("genderId"); + } else { $scope.genderId = $event.currentTarget.id; } - if ($event != null) { - if ($event.currentTarget.id == "Male") { + + localStorage.setItem("genderId", $scope.genderId); + + //if ($event != null) { + // if ($event.currentTarget.id == "Male") { + // $('#Male').addClass('active'); + // $('#Female').removeClass("active"); + // } + // else { + // $('#Female').addClass('active'); + // $('#Male').removeClass("active"); + // } + + //} + var selectedGender = localStorage.getItem("genderId"); + + if (selectedGender != null) { + if (selectedGender == "Male") { $('#Male').addClass('active'); $('#Female').removeClass("active"); } @@ -172,6 +197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.openBodyView = function () { //debugger; + $scope.voId = localStorage.getItem("currentBodyViewId");; //load bodyRegion data var brViewdata = GetJsonService.getJson('~/../content/data/json/da_dat_brview.json') @@ -325,7 +351,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // debugger; - $scope.voId = localStorage.getItem("currentBodyViewId");; $scope.layerNumber = 0; $scope.skinTone = DA[0].ethnicity; @@ -338,7 +363,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //calculate coordinates for body region images $scope.CalculateImageCordinates = function (viewOrientationId) { - + //set height of canvas div and left tool bar as per window size $scope.BodyRegionCordinatesData = []; // create an empty array diff --git a/400-SOURCECODE/AIAHTML5.Web/content/data/json/da_dat_bgart.json b/400-SOURCECODE/AIAHTML5.Web/content/data/json/da_dat_bgart.json new file mode 100644 index 0000000..55b9a5e --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/content/data/json/da_dat_bgart.json @@ -0,0 +1,338 @@ +{ + "BackgroundArts": { + "BackgroundArtDetail": [ + { + "_Id": "1", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "A", + "_Gender": "F", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "501.png" + }, + { + "_Id": "3", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "A", + "_Gender": "M", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "525.png" + }, + { + "_Id": "5", + "_ViewOrientationId": "5", + "_BodyRegionId": "3", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "A", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "509.png" + }, + { + "_Id": "7", + "_ViewOrientationId": "5", + "_BodyRegionId": "4", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "A", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "517.png" + }, + { + "_Id": "9", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "B", + "_Gender": "M", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "527.png" + }, + { + "_Id": "11", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "B", + "_Gender": "F", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "503.png" + }, + { + "_Id": "13", + "_ViewOrientationId": "5", + "_BodyRegionId": "3", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "B", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "511.png" + }, + { + "_Id": "15", + "_ViewOrientationId": "5", + "_BodyRegionId": "4", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "B", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "519.png" + }, + { + "_Id": "17", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "L", + "_Gender": "M", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "530.png" + }, + { + "_Id": "19", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "L", + "_Gender": "F", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "506.png" + }, + { + "_Id": "21", + "_ViewOrientationId": "5", + "_BodyRegionId": "3", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "L", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "514.png" + }, + { + "_Id": "23", + "_ViewOrientationId": "5", + "_BodyRegionId": "4", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "L", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "522.png" + }, + { + "_Id": "26", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "W", + "_Gender": "M", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "524.png" + }, + { + "_Id": "28", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "W", + "_Gender": "F", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "500.png" + }, + { + "_Id": "30", + "_ViewOrientationId": "5", + "_BodyRegionId": "3", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "W", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "508.png" + }, + { + "_Id": "32", + "_ViewOrientationId": "5", + "_BodyRegionId": "4", + "_isfr": "N", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "W", + "_Gender": "+", + "_lns": "0", + "_lne": "500", + "_X": "0", + "_Y": "0", + "_ImageId": "516.png" + }, + { + "_Id": "34", + "_ViewOrientationId": "1", + "_BodyRegionId": "2", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "F", + "_lns": "0", + "_lne": "8", + "_X": "2", + "_Y": "284", + "_ImageId": "6686.png" + }, + { + "_Id": "35", + "_ViewOrientationId": "1", + "_BodyRegionId": "3", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "F", + "_lns": "0", + "_lne": "13", + "_X": "304", + "_Y": "380", + "_ImageId": "6687F.png" + }, + { + "_Id": "36", + "_ViewOrientationId": "3", + "_BodyRegionId": "2", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "F", + "_lns": "0", + "_lne": "2", + "_X": "-34", + "_Y": "312", + "_ImageId": "6688.png" + }, + { + "_Id": "37", + "_ViewOrientationId": "2", + "_BodyRegionId": "2", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "F", + "_lns": "0", + "_lne": "3", + "_X": "452", + "_Y": "246", + "_ImageId": "6689.png" + }, + { + "_Id": "38", + "_ViewOrientationId": "1", + "_BodyRegionId": "3", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "M", + "_lns": "0", + "_lne": "25", + "_X": "310", + "_Y": "464", + "_ImageId": "6687.png" + }, + { + "_Id": "39", + "_ViewOrientationId": "5", + "_BodyRegionId": "2", + "_isfr": "Y", + "_Zoom": "100", + "_isbt": "N", + "_Skintone": "+", + "_Gender": "F", + "_lns": "0", + "_lne": "500", + "_X": "452", + "_Y": "246", + "_ImageId": "6689.png" + } + ] + "_id": "BackgroundArt", + + } +} \ No newline at end of file