ADAM / AIAHTML5

Commit 49f26b4e6bd65ce1796e242ee03f96e7ab20b3ab

Authored by Nikita Kulshreshtha
1 parent cdc2ad80

added bgart json file. 

fix: on close of male body views, male list is open and on female close, female list is open
Inline Side-by-side
Showing 3 changed files with 371 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @49f26b4
@@ -20965,6 +20965,7 @@ @@ -20965,6 +20965,7 @@
20965 <Content Include="libs\jquery\jquery_plugin\jsPanel\jspanel\images\ui-icons_454545_256x240 - Kopie.psd" /> 20965 <Content Include="libs\jquery\jquery_plugin\jsPanel\jspanel\images\ui-icons_454545_256x240 - Kopie.psd" />
20966 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\example.json" /> 20966 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\example.json" />
20967 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\README.md" /> 20967 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\README.md" />
  20968 + <Content Include="content\data\json\da_dat_bgart.json" />
20968 <None Include="Web.Debug.config"> 20969 <None Include="Web.Debug.config">
20969 <DependentUpon>Web.config</DependentUpon> 20970 <DependentUpon>Web.config</DependentUpon>
20970 </None> 20971 </None>
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @49f26b4
@@ -47,21 +47,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -47,21 +47,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
47 //get the DA body view list based on selected gender 47 //get the DA body view list based on selected gender
48 $scope.getDAViewList = function ($event) { 48 $scope.getDAViewList = function ($event) {
49 49
50 - // debugger; 50 + // debugger;
51 if ($('#MainImage') != null) { 51 if ($('#MainImage') != null) {
52 $('#MainImage').remove(); 52 $('#MainImage').remove();
53 } 53 }
54 $rootScope.currentActiveModuleTitle = Modules[0].Name; 54 $rootScope.currentActiveModuleTitle = Modules[0].Name;
55 $("#bodyViewList").empty(); 55 $("#bodyViewList").empty();
56 //for default load 56 //for default load
57 - if ($event == null) {  
58 - $scope.genderId = "Male"; 57 + if ($event == null || $event == undefined) {
  58 + //if ((localStorage.getItem("genderId") != "")||(localStorage.getItem("genderId")!="null")) {
  59 + // $scope.genderId = localStorage.getItem("genderId");
  60 + //}
  61 + var selectedGender=localStorage.getItem("genderId") ;
  62 + if ((selectedGender == null)) {
  63 + $scope.genderId = "Male";
  64 + }
  65 + else
  66 + $scope.genderId = localStorage.getItem("genderId");
  67 +
59 } 68 }
60 else { 69 else {
61 $scope.genderId = $event.currentTarget.id; 70 $scope.genderId = $event.currentTarget.id;
62 } 71 }
63 - if ($event != null) {  
64 - if ($event.currentTarget.id == "Male") { 72 +
  73 + localStorage.setItem("genderId", $scope.genderId);
  74 +
  75 + //if ($event != null) {
  76 + // if ($event.currentTarget.id == "Male") {
  77 + // $('#Male').addClass('active');
  78 + // $('#Female').removeClass("active");
  79 + // }
  80 + // else {
  81 + // $('#Female').addClass('active');
  82 + // $('#Male').removeClass("active");
  83 + // }
  84 +
  85 + //}
  86 + var selectedGender = localStorage.getItem("genderId");
  87 +
  88 + if (selectedGender != null) {
  89 + if (selectedGender == "Male") {
65 $('#Male').addClass('active'); 90 $('#Male').addClass('active');
66 $('#Female').removeClass("active"); 91 $('#Female').removeClass("active");
67 } 92 }
@@ -172,6 +197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -172,6 +197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
172 197
173 $scope.openBodyView = function () { 198 $scope.openBodyView = function () {
174 //debugger; 199 //debugger;
  200 + $scope.voId = localStorage.getItem("currentBodyViewId");;
175 201
176 //load bodyRegion data 202 //load bodyRegion data
177 var brViewdata = GetJsonService.getJson('~/../content/data/json/da_dat_brview.json') 203 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 @@ -325,7 +351,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
325 351
326 // debugger; 352 // debugger;
327 353
328 - $scope.voId = localStorage.getItem("currentBodyViewId");;  
329 $scope.layerNumber = 0; 354 $scope.layerNumber = 0;
330 $scope.skinTone = DA[0].ethnicity; 355 $scope.skinTone = DA[0].ethnicity;
331 356
@@ -338,7 +363,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -338,7 +363,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
338 //calculate coordinates for body region images 363 //calculate coordinates for body region images
339 $scope.CalculateImageCordinates = function (viewOrientationId) { 364 $scope.CalculateImageCordinates = function (viewOrientationId) {
340 365
341 - 366 +
342 367
343 //set height of canvas div and left tool bar as per window size 368 //set height of canvas div and left tool bar as per window size
344 $scope.BodyRegionCordinatesData = []; // create an empty array 369 $scope.BodyRegionCordinatesData = []; // create an empty array
400-SOURCECODE/AIAHTML5.Web/content/data/json/da_dat_bgart.json 0 → 100644
  View file @49f26b4
  1 +{
  2 + "BackgroundArts": {
  3 + "BackgroundArtDetail": [
  4 + {
  5 + "_Id": "1",
  6 + "_ViewOrientationId": "5",
  7 + "_BodyRegionId": "2",
  8 + "_isfr": "N",
  9 + "_Zoom": "100",
  10 + "_isbt": "N",
  11 + "_Skintone": "A",
  12 + "_Gender": "F",
  13 + "_lns": "0",
  14 + "_lne": "500",
  15 + "_X": "0",
  16 + "_Y": "0",
  17 + "_ImageId": "501.png"
  18 + },
  19 + {
  20 + "_Id": "3",
  21 + "_ViewOrientationId": "5",
  22 + "_BodyRegionId": "2",
  23 + "_isfr": "N",
  24 + "_Zoom": "100",
  25 + "_isbt": "N",
  26 + "_Skintone": "A",
  27 + "_Gender": "M",
  28 + "_lns": "0",
  29 + "_lne": "500",
  30 + "_X": "0",
  31 + "_Y": "0",
  32 + "_ImageId": "525.png"
  33 + },
  34 + {
  35 + "_Id": "5",
  36 + "_ViewOrientationId": "5",
  37 + "_BodyRegionId": "3",
  38 + "_isfr": "N",
  39 + "_Zoom": "100",
  40 + "_isbt": "N",
  41 + "_Skintone": "A",
  42 + "_Gender": "+",
  43 + "_lns": "0",
  44 + "_lne": "500",
  45 + "_X": "0",
  46 + "_Y": "0",
  47 + "_ImageId": "509.png"
  48 + },
  49 + {
  50 + "_Id": "7",
  51 + "_ViewOrientationId": "5",
  52 + "_BodyRegionId": "4",
  53 + "_isfr": "N",
  54 + "_Zoom": "100",
  55 + "_isbt": "N",
  56 + "_Skintone": "A",
  57 + "_Gender": "+",
  58 + "_lns": "0",
  59 + "_lne": "500",
  60 + "_X": "0",
  61 + "_Y": "0",
  62 + "_ImageId": "517.png"
  63 + },
  64 + {
  65 + "_Id": "9",
  66 + "_ViewOrientationId": "5",
  67 + "_BodyRegionId": "2",
  68 + "_isfr": "N",
  69 + "_Zoom": "100",
  70 + "_isbt": "N",
  71 + "_Skintone": "B",
  72 + "_Gender": "M",
  73 + "_lns": "0",
  74 + "_lne": "500",
  75 + "_X": "0",
  76 + "_Y": "0",
  77 + "_ImageId": "527.png"
  78 + },
  79 + {
  80 + "_Id": "11",
  81 + "_ViewOrientationId": "5",
  82 + "_BodyRegionId": "2",
  83 + "_isfr": "N",
  84 + "_Zoom": "100",
  85 + "_isbt": "N",
  86 + "_Skintone": "B",
  87 + "_Gender": "F",
  88 + "_lns": "0",
  89 + "_lne": "500",
  90 + "_X": "0",
  91 + "_Y": "0",
  92 + "_ImageId": "503.png"
  93 + },
  94 + {
  95 + "_Id": "13",
  96 + "_ViewOrientationId": "5",
  97 + "_BodyRegionId": "3",
  98 + "_isfr": "N",
  99 + "_Zoom": "100",
  100 + "_isbt": "N",
  101 + "_Skintone": "B",
  102 + "_Gender": "+",
  103 + "_lns": "0",
  104 + "_lne": "500",
  105 + "_X": "0",
  106 + "_Y": "0",
  107 + "_ImageId": "511.png"
  108 + },
  109 + {
  110 + "_Id": "15",
  111 + "_ViewOrientationId": "5",
  112 + "_BodyRegionId": "4",
  113 + "_isfr": "N",
  114 + "_Zoom": "100",
  115 + "_isbt": "N",
  116 + "_Skintone": "B",
  117 + "_Gender": "+",
  118 + "_lns": "0",
  119 + "_lne": "500",
  120 + "_X": "0",
  121 + "_Y": "0",
  122 + "_ImageId": "519.png"
  123 + },
  124 + {
  125 + "_Id": "17",
  126 + "_ViewOrientationId": "5",
  127 + "_BodyRegionId": "2",
  128 + "_isfr": "N",
  129 + "_Zoom": "100",
  130 + "_isbt": "N",
  131 + "_Skintone": "L",
  132 + "_Gender": "M",
  133 + "_lns": "0",
  134 + "_lne": "500",
  135 + "_X": "0",
  136 + "_Y": "0",
  137 + "_ImageId": "530.png"
  138 + },
  139 + {
  140 + "_Id": "19",
  141 + "_ViewOrientationId": "5",
  142 + "_BodyRegionId": "2",
  143 + "_isfr": "N",
  144 + "_Zoom": "100",
  145 + "_isbt": "N",
  146 + "_Skintone": "L",
  147 + "_Gender": "F",
  148 + "_lns": "0",
  149 + "_lne": "500",
  150 + "_X": "0",
  151 + "_Y": "0",
  152 + "_ImageId": "506.png"
  153 + },
  154 + {
  155 + "_Id": "21",
  156 + "_ViewOrientationId": "5",
  157 + "_BodyRegionId": "3",
  158 + "_isfr": "N",
  159 + "_Zoom": "100",
  160 + "_isbt": "N",
  161 + "_Skintone": "L",
  162 + "_Gender": "+",
  163 + "_lns": "0",
  164 + "_lne": "500",
  165 + "_X": "0",
  166 + "_Y": "0",
  167 + "_ImageId": "514.png"
  168 + },
  169 + {
  170 + "_Id": "23",
  171 + "_ViewOrientationId": "5",
  172 + "_BodyRegionId": "4",
  173 + "_isfr": "N",
  174 + "_Zoom": "100",
  175 + "_isbt": "N",
  176 + "_Skintone": "L",
  177 + "_Gender": "+",
  178 + "_lns": "0",
  179 + "_lne": "500",
  180 + "_X": "0",
  181 + "_Y": "0",
  182 + "_ImageId": "522.png"
  183 + },
  184 + {
  185 + "_Id": "26",
  186 + "_ViewOrientationId": "5",
  187 + "_BodyRegionId": "2",
  188 + "_isfr": "N",
  189 + "_Zoom": "100",
  190 + "_isbt": "N",
  191 + "_Skintone": "W",
  192 + "_Gender": "M",
  193 + "_lns": "0",
  194 + "_lne": "500",
  195 + "_X": "0",
  196 + "_Y": "0",
  197 + "_ImageId": "524.png"
  198 + },
  199 + {
  200 + "_Id": "28",
  201 + "_ViewOrientationId": "5",
  202 + "_BodyRegionId": "2",
  203 + "_isfr": "N",
  204 + "_Zoom": "100",
  205 + "_isbt": "N",
  206 + "_Skintone": "W",
  207 + "_Gender": "F",
  208 + "_lns": "0",
  209 + "_lne": "500",
  210 + "_X": "0",
  211 + "_Y": "0",
  212 + "_ImageId": "500.png"
  213 + },
  214 + {
  215 + "_Id": "30",
  216 + "_ViewOrientationId": "5",
  217 + "_BodyRegionId": "3",
  218 + "_isfr": "N",
  219 + "_Zoom": "100",
  220 + "_isbt": "N",
  221 + "_Skintone": "W",
  222 + "_Gender": "+",
  223 + "_lns": "0",
  224 + "_lne": "500",
  225 + "_X": "0",
  226 + "_Y": "0",
  227 + "_ImageId": "508.png"
  228 + },
  229 + {
  230 + "_Id": "32",
  231 + "_ViewOrientationId": "5",
  232 + "_BodyRegionId": "4",
  233 + "_isfr": "N",
  234 + "_Zoom": "100",
  235 + "_isbt": "N",
  236 + "_Skintone": "W",
  237 + "_Gender": "+",
  238 + "_lns": "0",
  239 + "_lne": "500",
  240 + "_X": "0",
  241 + "_Y": "0",
  242 + "_ImageId": "516.png"
  243 + },
  244 + {
  245 + "_Id": "34",
  246 + "_ViewOrientationId": "1",
  247 + "_BodyRegionId": "2",
  248 + "_isfr": "Y",
  249 + "_Zoom": "100",
  250 + "_isbt": "N",
  251 + "_Skintone": "+",
  252 + "_Gender": "F",
  253 + "_lns": "0",
  254 + "_lne": "8",
  255 + "_X": "2",
  256 + "_Y": "284",
  257 + "_ImageId": "6686.png"
  258 + },
  259 + {
  260 + "_Id": "35",
  261 + "_ViewOrientationId": "1",
  262 + "_BodyRegionId": "3",
  263 + "_isfr": "Y",
  264 + "_Zoom": "100",
  265 + "_isbt": "N",
  266 + "_Skintone": "+",
  267 + "_Gender": "F",
  268 + "_lns": "0",
  269 + "_lne": "13",
  270 + "_X": "304",
  271 + "_Y": "380",
  272 + "_ImageId": "6687F.png"
  273 + },
  274 + {
  275 + "_Id": "36",
  276 + "_ViewOrientationId": "3",
  277 + "_BodyRegionId": "2",
  278 + "_isfr": "Y",
  279 + "_Zoom": "100",
  280 + "_isbt": "N",
  281 + "_Skintone": "+",
  282 + "_Gender": "F",
  283 + "_lns": "0",
  284 + "_lne": "2",
  285 + "_X": "-34",
  286 + "_Y": "312",
  287 + "_ImageId": "6688.png"
  288 + },
  289 + {
  290 + "_Id": "37",
  291 + "_ViewOrientationId": "2",
  292 + "_BodyRegionId": "2",
  293 + "_isfr": "Y",
  294 + "_Zoom": "100",
  295 + "_isbt": "N",
  296 + "_Skintone": "+",
  297 + "_Gender": "F",
  298 + "_lns": "0",
  299 + "_lne": "3",
  300 + "_X": "452",
  301 + "_Y": "246",
  302 + "_ImageId": "6689.png"
  303 + },
  304 + {
  305 + "_Id": "38",
  306 + "_ViewOrientationId": "1",
  307 + "_BodyRegionId": "3",
  308 + "_isfr": "Y",
  309 + "_Zoom": "100",
  310 + "_isbt": "N",
  311 + "_Skintone": "+",
  312 + "_Gender": "M",
  313 + "_lns": "0",
  314 + "_lne": "25",
  315 + "_X": "310",
  316 + "_Y": "464",
  317 + "_ImageId": "6687.png"
  318 + },
  319 + {
  320 + "_Id": "39",
  321 + "_ViewOrientationId": "5",
  322 + "_BodyRegionId": "2",
  323 + "_isfr": "Y",
  324 + "_Zoom": "100",
  325 + "_isbt": "N",
  326 + "_Skintone": "+",
  327 + "_Gender": "F",
  328 + "_lns": "0",
  329 + "_lne": "500",
  330 + "_X": "452",
  331 + "_Y": "246",
  332 + "_ImageId": "6689.png"
  333 + }
  334 + ]
  335 + "_id": "BackgroundArt",
  336 +
  337 + }
  338 +}
0 \ No newline at end of file 339 \ No newline at end of file