Commit Changes

unknown
1 parent 5e166421
Showing 3 changed files with 143 additions and 155 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/search-wp.js
@@ -639,106 +639,97 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     })
     // $rootScope.languageArray = [];
     $rootScope.loadSearchDataForBodyView = function () {
-        debugger;
+      
         var languageArray = [];
-        $scope.vocabTermTxtArray = [];
+        $rootScope.vocabTermTxtArray = [];
         var languageArray = $rootScope.lexiconLanguageArray;
+     
+        console.log(languageArray.length);
         console.log('loadSearchDataForBodyView');
         var currentBodyViewId = localStorage.getItem("currentBodyViewId");
+        for (var i = 0; i <= languageArray.length - 1; i++) {
+            var searchWorker = new Worker('search-wp.js');
-        var searchWorker = new Worker('search-wp.js');
-
-        //push workers in array to further used the refernece to delete the workers
-        $scope.runningSearchWorkers.push({ 'workerName': searchWorker })
-
-        //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
-
-        searchWorker.postMessage({
-            'currentBodyViewId': currentBodyViewId,
-            'languageArray': languageArray
-        })
-
-        searchWorker.onmessage = function (e) {
-            //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
+            //push workers in array to further used the refernece to delete the workers
+            $scope.runningSearchWorkers.push({ 'workerName': searchWorker })
+            //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
-            $rootScope.TermNumberData = e.data.TermNumberData,
-            $rootScope.VocabTermData = e.data.VocabTermData,//same
-            $scope.vocabTermTxt = e.data.vocabTermTxt,
-            $scope.vocabTermTxtArray = e.data.DataArray,
-            alert($rootScope.TermNumberData)
-            //$scope.vocabLang = e.data.a
-            alert($scope.vocabTermTxtArray[0].language);
-            alert($scope.vocabTermTxtArray[0].VocabTermData);
-            alert($scope.vocabTermTxtArray[0].vocabTermTxt);
-
-            console.log("language" + $scope.vocabTermTxtArray[0].language);
-            console.log("VocabTermData" + $scope.vocabTermTxtArray[0].VocabTermData);
-            console.log("vocabTermTxt" + $scope.vocabTermTxtArray[0].vocabTermTxt);
-
-
-            for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
+            searchWorker.postMessage({
+                'currentBodyViewId': currentBodyViewId,
+                'languageName': languageArray[i].language,
+                'languageID': languageArray[i].id
+            })
-                $scope.vocabTermTxtArray[i].vocabTermTxt = new jinqJs()
-                                     .from($scope.vocabTermTxtArray[i].vocabTermTxt)
-                                     .distinct('_TermText', '_ActualTermNumber')
-                                     .orderBy([{ field: '_TermText', sort: 'asc' }])
-                                     .select('_ActualTermNumber', '_TermText', '_cdId');
+            searchWorker.onmessage = function (e) {
+                //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
+                $rootScope.TermNumberData = e.data.TermNumberData;
+                $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 });
+                for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
+                 
-            }
-            alert("After" + $scope.vocabTermTxtArray.length);
-            //$scope.VocabTermTxt = new jinqJs()
-            //                     .from($scope.vocabTermTxt)
-            //                     .distinct('_TermText', '_ActualTermNumber')
-            //                     .orderBy([{ field: '_TermText', sort: 'asc' }])
-            //                     .select('_ActualTermNumber', '_TermText', '_cdId');
+                    $rootScope.vocabTermTxtArray[i].vocabTermTxt = new jinqJs()
+                                         .from($rootScope.vocabTermTxtArray[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);
+                }
+                //  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');
-            //$rootScope.languageArray.push({ language: $scope.vocabLang, Text: $scope.VocabTermTxt });
-            //alert($rootScope.languageArray.length);
-            console.log('JlinqActivity , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
+                console.log('JlinqActivity , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
-            if ($scope.runningSearchWorkers != null || $scope.runningSearchWorkers != undefined) {
+                if ($scope.runningSearchWorkers != null || $scope.runningSearchWorkers != undefined) {
-                var workerCount = $scope.runningSearchWorkers.length;
-                if (workerCount > 0) {
-                    for (var i = workerCount - 1; i >= 0; i--) {
+                    var workerCount = $scope.runningSearchWorkers.length;
+                    if (workerCount > 0) {
+                        for (var i = workerCount - 1; i >= 0; i--) {
-                        var runningWorker = $scope.runningSearchWorkers[i].workerName;
-                        runningWorker.terminate();
-                        $scope.runningSearchWorkers.splice(i, 1);
-                        // workerCount--;
+                            var runningWorker = $scope.runningSearchWorkers[i].workerName;
+                            runningWorker.terminate();
+                            $scope.runningSearchWorkers.splice(i, 1);
+                            // workerCount--;
+                        }
                     }
                 }
             }
-        }
-
-        //call watch on '$scope.VocabTermTxt and compile <li> and append to <ul> on first time load
-        $scope.$watch('$scope.VocabTermTxt', function (newValue, oldValue, scope) {
-            //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
-            //Remove the list and then Repopulate 
-            if ($('#searchListDiv').html() != "")
-                $('#searchListDiv').empty()
-            //Delay compile of ul li so that the remove of li is completed.
-            $timeout(function () {
-                var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
-                                                           '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
-                                                      ' </li></ul>').appendTo('#searchListDiv')
-                $compile($e2)($scope);
+            //call watch on '$scope.VocabTermTxt and compile <li> and append to <ul> on first time load
+            $scope.$watch('$scope.VocabTermTxt', function (newValue, oldValue, scope) {
-            }, 500);
+                //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
+                //Remove the list and then Repopulate 
+                if ($('#searchListDiv').html() != "")
+                    $('#searchListDiv').empty()
+                //Delay compile of ul li so that the remove of li is completed.
+                $timeout(function () {
+                    var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                                                               '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+                                                          ' </li></ul>').appendTo('#searchListDiv')
+                    $compile($e2)($scope);
-        }, true);
+                }, 500);
+            }, true);
+        }
     }
@@ -1592,9 +1583,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             if ($rootScope.multiAnnotationIsON == true) {
                 //    $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
-                alert(annotationText);
+               
                 $scope.MultiLanguageAnnationArray = [];
-                $scope.MultiLanguageAnnationArray.push(annotationText);
+                for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                    $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                }
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
             }
@@ -1609,18 +1603,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
-                    alert(annotationText);
+                 //   alert(annotationText);
                     $scope.MultiLanguageAnnationArray = [];
-                    $scope.MultiLanguageAnnationArray.push(annotationText);
+                    for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                        $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                    }
                     $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
                 }
                 else {
-                    alert(annotationText);
+                   // alert(annotationText);
                     //  $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
                     $scope.MultiLanguageAnnationArray = [];
-                    $scope.MultiLanguageAnnationArray.push(annotationText);
+                    for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                        $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                    }
                     $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
@@ -1975,9 +1975,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             if ($rootScope.multiAnnotationIsON == true) {
                 //   $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
-                alert(annotationText);
+             //   alert(annotationText);
                 $scope.MultiLanguageAnnationArray = [];
-                $scope.MultiLanguageAnnationArray.push(annotationText);
+                for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                    $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                }
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
             }
@@ -1999,7 +2002,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     //  $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
-                    $scope.MultiLanguageAnnationArray.push(annotationText);
+                   
+                    for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                        $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                    }
                     console.log('2. annotationText: ' + annotationText + ' , length: ' + $scope.MultiLanguageAnnationArray.length);
@@ -2008,7 +2015,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
                 else {
                     $scope.MultiLanguageAnnationArray = [];
-                    $scope.MultiLanguageAnnationArray.push(annotationText);
+                    for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+                        $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+                    }
                     console.log('3. annotationText: ' + annotationText + ' , length: ' + $scope.MultiLanguageAnnationArray.length);
@@ -2775,7 +2785,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //get annotation from term number
     $scope.GetAnnotationText = function (termNumber) {
-        debugger;
+        $rootScope.annotationText = [];
         var annotationText;
         var annotation = [];
         //0
@@ -2784,7 +2794,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
             $scope.TermNumber = termNumber;
             for (var j = 0; j <= $rootScope.lexiconLanguageArray.length - 1; j++) {
-                alert($rootScope.lexiconLanguageArray[j].language);
                 if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined) {
                     $scope.matchedTermNoData = new jinqJs()
                                                .from($rootScope.TermNumberData.TermData.Term)
@@ -2797,10 +2806,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         for (var z = 0; z < $scope.matchedTermNoData.length; z++) {
                             //send actual term no to get the term text.
                             actualTermNo = $scope.matchedTermNoData[0]._ActualTermNumber;
-                            annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo);
-                            alert(annotationText);
+                            annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo, $rootScope.lexiconLanguageArray[j].language);
                             annotation.push(annotationText);
-                            alert(annotation.length);
+                            $rootScope.annotationText.push(annotationText);
                             $rootScope.actualTermNumber = actualTermNo;
                             break;
                         };
@@ -2814,33 +2822,42 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
             }
         }
-        alert(annotation.length);
+      
         return annotation;
     }
-    $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) {
-       
+    $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) {
+      
         var Annotation;
         $scope.ActualTermNo = actualTermNo;
-        if ($rootScope.VocabTermData != null || $rootScope.VocabTermData != undefined) {
-            $scope.matchedActualTermData = new jinqJs()
-                                           .from($rootScope.VocabTermData.VocabTerms.Term)
-                                           .where('_ActualTermNumber == ' + actualTermNo)
-                                           .select();
+        for (var j = 0; j <= $rootScope.vocabTermTxtArray.length - 1; j++) {
+
+            if ($rootScope.vocabTermTxtArray[j].language == language) {
+
+                if ($rootScope.vocabTermTxtArray[j].VocabTermData != null || $rootScope.vocabTermTxtArray[j].VocabTermData != undefined) {
+                    $scope.matchedActualTermData = new jinqJs()
+                                                   .from($rootScope.vocabTermTxtArray[j].VocabTermData.VocabTerms.Term)
+                                                   .where('_ActualTermNumber == ' + actualTermNo)
+                                                   .select();
+
+                    if ($scope.matchedActualTermData != null || $scope.matchedActualTermData != undefined) {
+                        for (var z = 0; z <= $scope.matchedActualTermData.length; z++) {
+                            //send actual term no to get the term text.
+                            Annotation = $scope.matchedActualTermData[0]._TermText;
+                          //  alert("Annotation : " + Annotation);
+                            break;
+                        };
+                    }
+                    return Annotation;
+                }
+
+                else {
+                    return null;
+                }
-            if ($scope.matchedActualTermData != null || $scope.matchedActualTermData != undefined) {
-                for (var z = 0; z <= $scope.matchedActualTermData.length; z++) {
-                    //send actual term no to get the term text.
-                    Annotation = $scope.matchedActualTermData[0]._TermText;
-                    // alert("Annotation : " + Annotation);
-                    break;
-                };
             }
-            return Annotation;
-        }
-        else {
-            return null;
         }
+
     }
@@ -4944,9 +4961,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //    var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci";
-          alert(annotationText);
+         // alert(annotationText);
         $scope.MultiLanguageAnnationArray = [];
-        $scope.MultiLanguageAnnationArray.push(annotationText);
+        for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
+
+            $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
+        }
         if (annotationText == "undefined") {
         }
         else {
@@ -370,7 +370,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $("#lexiconLangDropdown :selected").remove();
                     $('#secondLax').append('<option val="' + $rootScope.selectedId + '">' + $rootScope.selectedText + '</option>');
                     $rootScope.lexiconLanguageArray.push({ id: $rootScope.selectedId, language: $rootScope.selectedText });
-                    alert($rootScope.lexiconLanguageArray.length);
+                 //   alert($rootScope.lexiconLanguageArray.length);
                 }
             });
@@ -387,7 +387,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $("#secondLax :selected").remove();
                     $('#lexiconLangDropdown').append('<option val="' + $rootScope.secondlaxdid + '">' + $rootScope.secondlaxtext + '</option>');
                     $rootScope.lexiconLanguageArray.splice($rootScope.secondlaxtext, 1);
-                    alert($rootScope.lexiconLanguageArray.length);
+                 //   alert($rootScope.lexiconLanguageArray.length);
                 }
             });
-loadTermData = function (currentBodyViewId, languageArray) {
+loadTermData = function (currentBodyViewId, languageName, languageID) {
     console.log('search-wp, loadTermData, time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
-    console.log('languageArray: ' + languageArray.length);
-
     var termNoJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_tm_sg_' + currentBodyViewId + '.json';
     var TermNumberData;
@@ -17,8 +15,8 @@ loadTermData = function (currentBodyViewId, languageArray) {
             TermNumberData = JSON.parse(AJAX_req.responseText);
             console.log("data returned: " + TermNumberData);
-            loadTermTextData(TermNumberData, languageArray);
-            // loadTermTextData(languageArray);
+            loadTermTextData(TermNumberData, languageName, languageID);
+           
         }
     }
     AJAX_req.send();
@@ -27,34 +25,19 @@ loadTermData = function (currentBodyViewId, languageArray) {
 }
-loadTermTextData = function (TermNumberData, arr) {
-    console.log(arr.length);
-    var DataArray = [];
-    var a;
-    for (var j = 0; j <= arr.length - 1; j++) {
-
-        //1. 
-        var a = arr[j].language;
-        var termTextJsonPath = '~/../content/data/json/da/vocab/' + arr[j].language + '/cm_dat_vocabterm_' + arr[j].id + '.json';
-        console.log(termTextJsonPath);
-
+loadTermTextData = function (TermNumberData, languageName, languageID) {
+        var termTextJsonPath = '~/../content/data/json/da/vocab/' + languageName + '/cm_dat_vocabterm_' + languageID + '.json';
         var VocabTermData;
         var AJAX_req = new XMLHttpRequest();
         AJAX_req.open("GET", termTextJsonPath, true);
         AJAX_req.setRequestHeader("Content-type", "application/json");
-
         AJAX_req.onreadystatechange = function () {
             if (AJAX_req.readyState == 4 && AJAX_req.status == 200) {
+                console.log('AJAX_req.readyState= ' + AJAX_req.readyState + ' and AJAX_req.status =' + AJAX_req.status);
                 VocabTermData = JSON.parse(AJAX_req.responseText);
-                console.log("data returned FOR VocabTermData: " + VocabTermData);
-
                 var vocabTermTxt = [];
-
                 TermNumberData.TermData.Term.forEach(function (value1, key1) {
-                    
-                    console.log("data returned FOR VocabTermData1: " + VocabTermData.VocabTerms);
                     VocabTermData.VocabTerms.Term.forEach(function (value2, key2) {
-
                         if (value1._ActualTermNumber === value2._ActualTermNumber) {
                             vocabTermTxt.push(
                                 {
@@ -65,40 +48,25 @@ loadTermTextData = function (TermNumberData, arr) {
                                 );
                         }
                     })
-
                 })
-                DataArray.push({ "language": a, "VocabTermData": VocabTermData, "vocabTermTxt": vocabTermTxt });
-                self.postMessage({
-                    'vocabTermTxt': vocabTermTxt,
-                    'TermNumberData': TermNumberData,
-                    'VocabTermData': VocabTermData,
-                    'DataArray': DataArray
-
-                });
+                    self.postMessage({
+                        'vocabTermTxt': vocabTermTxt,
+                        'TermNumberData': TermNumberData,
+                         'VocabTermData': VocabTermData,
+                         'language': languageName
+                    });
             }
         }
-
-
-
-    }
     AJAX_req.send();
-
-    //  var termTextJsonPath = '~/../content/data/json/da/vocab/english/cm_dat_vocabterm_1.json';
-
-    // readTextFile(termTextJsonPath, function (text) {
-
-
-
-
 }
 self.onmessage = function (e) {
     console.log("search");
     //console.log('search-wp onmessage time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
-    loadTermData(e.data.currentBodyViewId, e.data.languageArray);
-    //  loadTermData(e.data.languageArray);
+    loadTermData(e.data.currentBodyViewId, e.data.languageName, e.data.languageID);
+  
 }