diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 25fb840..49086be 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -641,7 +641,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.loadSearchDataForBodyView = function () {
var languageArray = [];
- $rootScope.vocabTermTxtArray = [];
+ $rootScope.vocabTermDataArray = [];
var languageArray = $rootScope.lexiconLanguageArray;
console.log(languageArray.length);
@@ -671,29 +671,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.VocabTermData = e.data.VocabTermData,//same
$scope.vocabTermTxt = e.data.vocabTermTxt,
$scope.vocabLanguage = e.data.language,
- $rootScope.vocabTermTxtArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
+ $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
- $rootScope.vocabTermTxtArray[i].vocabTermTxt = new jinqJs()
- .from($rootScope.vocabTermTxtArray[i].vocabTermTxt)
+ $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs()
+ .from($rootScope.vocabTermDataArray[i].vocabTermTxt)
.distinct('_TermText', '_ActualTermNumber')
.orderBy([{ field: '_TermText', sort: 'asc' }])
.select('_ActualTermNumber', '_TermText', '_cdId');
- // alert("After" + $rootScope.vocabTermTxtArray.length);
- console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermTxtArray[i].vocabTermTxt[0]._TermText);
+
+ console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText);
}
-
- // alert("After" + $rootScope.vocabTermTxtArray[0].vocabTermTxt);
-
- //$scope.VocabTermTxt = new jinqJs()
- // .from($scope.vocabTermTxt)
- // .distinct('_TermText', '_ActualTermNumber')
- // .orderBy([{ field: '_TermText', sort: 'asc' }])
- // .select('_ActualTermNumber', '_TermText', '_cdId');
-
console.log('JlinqActivity , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
if ($scope.runningSearchWorkers != null || $scope.runningSearchWorkers != undefined) {
@@ -2830,13 +2821,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var Annotation;
$scope.ActualTermNo = actualTermNo;
- for (var j = 0; j <= $rootScope.vocabTermTxtArray.length - 1; j++) {
+ for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) {
- if ($rootScope.vocabTermTxtArray[j].language == language) {
+ if ($rootScope.vocabTermDataArray[j].language == language) {
- if ($rootScope.vocabTermTxtArray[j].VocabTermData != null || $rootScope.vocabTermTxtArray[j].VocabTermData != undefined) {
+ if ($rootScope.vocabTermDataArray[j].VocabTermData != null || $rootScope.vocabTermDataArray[j].VocabTermData != undefined) {
$scope.matchedActualTermData = new jinqJs()
- .from($rootScope.vocabTermTxtArray[j].VocabTermData.VocabTerms.Term)
+ .from($rootScope.vocabTermDataArray[j].VocabTermData.VocabTerms.Term)
.where('_ActualTermNumber == ' + actualTermNo)
.select();
@@ -2935,9 +2926,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$.each(BodyRegionDictionary, function (index, value) {
- //debugger;
- // alert(' $.each(BodyRegionDictionary1')
-
+
if (value.bodyRegionId == '3') {
var BR_SixTBData = new jinqJs()
@@ -2961,7 +2950,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom)
if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
//var transNumber = parseInt(document.getElementById("txtTransparencyChange").value);
- // debugger;
+
$scope.layerNumber = parseInt(txtlayerNumber.value);
if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
@@ -5063,7 +5052,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.transparencyCanvasHeight = tCanvasHeight;
$scope.transparencyCanvasWidth = tCanvasWidth;
- // debugger;
+
//create temp cavas to retain the original anavs data for use in transparency change as
//if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank
if (document.getElementById('tempCanvas') != null) {