fixed issue to open course with secure link

Birendra
1 parent be36035b
Showing 3 changed files with 42 additions and 49 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -60,7 +60,6 @@
     <add key ="ForgotUserIdEmailTemplate" value="~/Templates/forgot-UserId.html"/>
      <!-- Aod used: Added by Birendra-->
-     <!-- Access-Control-Allow-Origin: change origin also to resolve CORS policy on UAT and PROD for AOD domain-->
     <add key="Aod_site_Url" value="https://uat.adamondemand.com/"/>
     <add key="aiapasskey" value="as@2$eDu8Jk"/>
@@ -110,12 +109,6 @@
     </assemblyBinding>
   </runtime>
   <system.webServer>
-     <httpProtocol>
-        <customHeaders>
-          <add name="Access-Control-Allow-Origin" value="https://uat.adamondemand.com" />
-          <!--<add name="Access-Control-Allow-Origin" value="https://adamondemand.com" />-->
-        </customHeaders>
-      </httpProtocol>
     <handlers>
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <remove name="OPTIONSVerbHandler" />
@@ -10,7 +10,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     'moduleName': '',
                     'aodUrl':'',
                     'courseId':'',
-                    'uid':'2',
+                    'uid':'2',//categoty id. courseid cheched in category id
+                    'requestType':'SCORMPackage',
                     'currentViewTitle': '',
                     'parentSlugName': '',
                     'currentSlug': '',
@@ -358,7 +359,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var aodlink = $rootScope.aodDomainName+ $scope.GetAODwindowStoreData(windowviewid, 'aodUrl');
         var courseid = $scope.GetAODwindowStoreData(windowviewid, 'courseId');
         var uid =  $scope.GetAODwindowStoreData(windowviewid, 'uid');
-        var aodSiteUrl = aodlink+"?aodkeypass="+$rootScope.aodkeypass+ "&SessionId=" +  $rootScope.userData.SessionId + "&Courseid=" + courseid + "&uID=" + uid+ ",_self"
+        var requestType =  $scope.GetAODwindowStoreData(windowviewid, 'requestType');
+        var aodSiteUrl = aodlink+"?SessionId=" +  $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
         $scope.jsPanelWidth = $(window).outerWidth() - 20;
         $scope.jsPanelHeight = $(window).outerHeight() - 140;
@@ -374,7 +376,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'),
                     content: '<div style="height: 100%;overflow: scroll;" >' +
                     '<iframe name="aodFrame" src="" style="width: 100%;height:100%"  id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)"></iframe>'+
-                //    '<object data="' + aodurl + '" width="100%" height="100%" id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)"></object>' +
                     '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#AODView").css("width");$("#AODView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#aodImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>',
                     title: tittle,
                     position: {
@@ -417,7 +418,42 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.MyAODvideoOnLoad = function (windowviewid)
     {
-        $scope.EnableUI();     
+        $scope.EnableUI();  
+        $scope.JsPanelMouseEnter(windowviewid);   
+    }
+
+    $scope.JsPanelMouseEnter = function (windowviewid) {
+        $rootScope.resetMenuOption();
+
+        var timeintval = null;
+        timeintval = $interval(PointerEventEnableDisable, 5000);
+
+        function PointerEventEnableDisable() {
+            var pointevents =  $("#aodvideo_" + windowviewid).css('pointer-events');                                                      
+            if (pointevents=='auto') {
+                $scope.stop3drefresh(timeintval);
+                timeintval = $interval(PointerEventEnableDisable, 500);
+                $("#aodvideo_" + windowviewid).css('pointer-events', 'none');                                    
+            }
+            else if(pointevents=='none')
+            {
+                $("#aodvideo_" + windowviewid).css('pointer-events', 'auto');
+                $scope.stop3drefresh(timeintval);
+                timeintval = $interval(PointerEventEnableDisable, 10000);
+            }
+            else
+            {
+                //auto clode interval when panel close
+                $scope.stop3drefresh(timeintval);
+            }
+        } 
+
+        $scope.stop3drefresh = function (timeintval) {
+            if (angular.isDefined(timeintval)) {
+                $interval.cancel(timeintval);
+                timeintval = undefined;
+            }
+        }; 
     }
     }]);
@@ -714,7 +714,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                 $rootScope.aiaPingInterval = configresult.pingInterval;
                                 $rootScope.aiaAnimationPath = configresult.serverPath;
                                 $rootScope.MaxOneFileSize = configresult.fileSize;
-                                $rootScope.aodkeypass = configresult.aodkeypass;
                                 $rootScope.aodDomainName = configresult.aodSiteUrl;
                                 var loggedInUser = JSON.parse($scope.currentUserDetails);
@@ -949,7 +948,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                     $rootScope.aiaPingInterval = configresult.pingInterval;
                     $rootScope.aiaAnimationPath = configresult.serverPath;
                     $rootScope.MaxOneFileSize = configresult.fileSize;
-                    $rootScope.aodkeypass = configresult.aodkeypass;
                     $rootScope.aodDomainName = configresult.aodSiteUrl;
                 });
@@ -1195,13 +1193,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                      $rootScope.userData = result;
                                      $rootScope.userModules = result.Modules;
-                                     //update slag of aod untill push to PROD
-                                     $rootScope.userModules = new jinqJs()
-                                            .from($rootScope.userModules)
-                                                .update(function (coll, index) { coll[index].slug = 'ADAM-on-demand'; })
-                                                .at("id == " + 17)
-                                                .select();
-
                                      localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
                                      if (isCommingSoonModel == true) {
@@ -1267,13 +1258,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                              $rootScope.userData = result;
                                              $rootScope.userModules = result.Modules;
-                                              //update slag of aod untill push to PROD
-                                              $rootScope.userModules = new jinqJs()
-                                              .from($rootScope.userModules)
-                                                  .update(function (coll, index) { coll[index].slug = 'ADAM-on-demand'; })
-                                                  .at("id == " + 17)
-                                                  .select();
-
                                               //only instructor allowed to change modesty
                                               //concurrent user of non-instructor
                                                 if( result.UserTypeId == 6 && result.EditionId!=1 && result.EditionId!=2)
@@ -1489,7 +1473,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                     $rootScope.aiaPingInterval = configresult.pingInterval;
                                     $rootScope.aiaAnimationPath = configresult.serverPath;
                                     $rootScope.MaxOneFileSize = configresult.fileSize;
-                                    $rootScope.aodkeypass = configresult.aodkeypass;
                                     $rootScope.aodDomainName = configresult.aodSiteUrl;
                                     userInfo.username = result.LoginId;
@@ -1545,7 +1528,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                         $rootScope.aiaPingInterval = configresult.pingInterval;
                         $rootScope.aiaAnimationPath = configresult.serverPath;
                         $rootScope.MaxOneFileSize = configresult.fileSize;
-                        $rootScope.aodkeypass = configresult.aodkeypass;
                         $rootScope.aodDomainName = configresult.aodSiteUrl;
                         var loggedInUser = JSON.parse($scope.currentUserDetails);
@@ -1739,13 +1721,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                     $rootScope.userData = result;
                                     $rootScope.userModules = result.Modules;
-                                      //update slag of aod untill push to PROD
-                                      $rootScope.userModules = new jinqJs()
-                                      .from($rootScope.userModules)
-                                          .update(function (coll, index) { coll[index].slug = 'ADAM-on-demand'; })
-                                          .at("id == " + 17)
-                                          .select();
-
+                                     
                                     localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
                                     if (isCommingSoonModel == true) {
@@ -1796,13 +1772,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                          $rootScope.userData = result;
                                          $rootScope.userModules = result.Modules;
-                                          //update slag of aod untill push to PROD
-                                          $rootScope.userModules = new jinqJs()
-                                          .from($rootScope.userModules)
-                                              .update(function (coll, index) { coll[index].slug = 'ADAM-on-demand'; })
-                                              .at("id == " + 17)
-                                              .select();
-
+                                         
                                         //1. set haveRoleAdmin = false because LicenseInfo is not null
                                         $rootScope.haveRoleAdmin = false;
@@ -1924,12 +1894,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                  $rootScope.userData = userInfo;
                                  $rootScope.userModules = userInfo.Modules;
-                                  //update slag of aod untill push to PROD
-                                  $rootScope.userModules = new jinqJs()
-                                  .from($rootScope.userModules)
-                                      .update(function (coll, index) { coll[index].slug = 'ADAM-on-demand'; })
-                                      .at("id == " + 17)
-                                      .select();
                                  //  ShowAssignedModulesPopup(userInfo.Modules);;
                                  // for reseller type user first need to update profile
                                  if (userInfo.UserTypeId == 7 && (userInfo.FirstName == "" || userInfo.EmailId == "" || userInfo.LastName == "")) {