ADAM / AIAHTML5

Commit 7467395507d3f4cb370e163d864241ed529efd3d

Authored by Birendra
2 parents cddb25ff a716b737

merge Merge branch 'SiteLicenseReportBug' into AIA_Develop

Inline Side-by-side
Showing 8 changed files with 93 additions and 103 deletions
400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs
  View file @7467395
@@ -42,5 +42,6 @@ namespace AIAHTML5.API.Constants @@ -42,5 +42,6 @@ namespace AIAHTML5.API.Constants
42 public const string INSERT_EXPORTED_IMAGE = "usp_InsertExportedImage"; 42 public const string INSERT_EXPORTED_IMAGE = "usp_InsertExportedImage";
43 public const string GET_USER_DETAIL_BYLOGIN_AND_ACCOUNT = "usp_GetUserDetailsByLoginIdandAccount"; 43 public const string GET_USER_DETAIL_BYLOGIN_AND_ACCOUNT = "usp_GetUserDetailsByLoginIdandAccount";
44 public const string GET_USER_LOGIN_STATUS = "usp_ManageUserLoginStatus"; 44 public const string GET_USER_LOGIN_STATUS = "usp_ManageUserLoginStatus";
  45 + public const string INSERT_SITE_LOGIN_LOG = "usp_InsertSiteLoginLog";
45 } 46 }
46 } 47 }
47 \ No newline at end of file 48 \ No newline at end of file
400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs
  View file @7467395
@@ -52,10 +52,6 @@ namespace AIAHTML5.API.Controllers @@ -52,10 +52,6 @@ namespace AIAHTML5.API.Controllers
52 } 52 }
53 else 53 else
54 { 54 {
55 - //ser user = new User();  
56 - //user.LoginFailureCauseId = AIAConstants.INVALID_CLIENT;  
57 - //dynamic userinfo = user;  
58 - //response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(userInfo) };  
59 logger.Debug("IVALID CLIENT"); 55 logger.Debug("IVALID CLIENT");
60 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.INVALID_CLIENT) }; 56 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.INVALID_CLIENT) };
61 } 57 }
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
  View file @7467395
@@ -1239,21 +1239,6 @@ namespace AIAHTML5.API.Models @@ -1239,21 +1239,6 @@ namespace AIAHTML5.API.Models
1239 dt = new DataTable(); 1239 dt = new DataTable();
1240 da.Fill(dt); 1240 da.Fill(dt);
1241 1241
1242 - //if (dt != null && dt.Rows.Count > 0)  
1243 - //{  
1244 - // siteUrl = new SiteUrl();  
1245 - // foreach (DataRow dr in dt.Rows)  
1246 - // {  
1247 - // siteUrl.Id = Convert.ToInt32(dr["Id"]);  
1248 - // siteUrl.SiteIp = dr["SiteIp"].ToString();  
1249 - // siteUrl.SiteIpTo = dr["SiteIpTo"].ToString();  
1250 - // siteUrl.SiteMasterIpTo = dr["SiteMasterIpTo"].ToString();  
1251 - // siteUrl.IsMaster = Convert.ToInt32(dr["IsMaster"]);  
1252 -  
1253 - // }  
1254 - //}  
1255 -  
1256 - //return siteUrl;  
1257 return dt; 1242 return dt;
1258 } 1243 }
1259 1244
@@ -1276,24 +1261,39 @@ namespace AIAHTML5.API.Models @@ -1276,24 +1261,39 @@ namespace AIAHTML5.API.Models
1276 dt = new DataTable(); 1261 dt = new DataTable();
1277 da.Fill(dt); 1262 da.Fill(dt);
1278 1263
1279 - //if (dt != null && dt.Rows.Count > 0)  
1280 - //{  
1281 - // siteUrl = new SiteUrl();  
1282 - // foreach (DataRow dr in dt.Rows)  
1283 - // {  
1284 - // siteUrl.Id = Convert.ToInt32(dr["Id"]);  
1285 - // siteUrl.SiteIp = dr["SiteIp"].ToString();  
1286 - // siteUrl.SiteIpTo = dr["SiteIpTo"].ToString();  
1287 - // siteUrl.SiteMasterIpTo = dr["SiteMasterIpTo"].ToString();  
1288 - // siteUrl.IsMaster = Convert.ToInt32(dr["IsMaster"]);  
1289 -  
1290 - // }  
1291 - //}  
1292 -  
1293 - //return siteUrl;  
1294 return dt; 1264 return dt;
1295 1265
1296 } 1266 }
  1267 + internal int InsertSiteLoginDetails(String strAcccountNumber, String strUrlReferer, string strEdition)
  1268 + {
  1269 + int result = 0;
  1270 + SqlConnection conn = null;
  1271 + try
  1272 + {
  1273 + conn = new SqlConnection(dbConnectionString);
  1274 + SqlCommand cmd = new SqlCommand();
  1275 + conn.Open();
  1276 + cmd.Connection = conn;
  1277 + cmd.CommandText = DBConstants.INSERT_SITE_LOGIN_LOG;
  1278 + cmd.CommandType = CommandType.StoredProcedure;
  1279 + cmd.Parameters.AddWithValue("@nvAccountNumber", strAcccountNumber);
  1280 + cmd.Parameters.AddWithValue("@nvReferalUrl", strUrlReferer);
  1281 + cmd.Parameters.AddWithValue("@nvEdition", strEdition);
  1282 + cmd.Parameters.AddWithValue("@nvHttpReferer", null);
  1283 + result = cmd.ExecuteNonQuery();
  1284 + }
  1285 + catch (SqlException ex)
  1286 + {
  1287 + logger.Fatal("Exception in InsertSiteLoginDetails for strAcccountNumber= " + strAcccountNumber + ", Exception= " + ex.Message + ", STACKTRACE=" + ex.StackTrace);
  1288 + throw;
  1289 + }
  1290 + finally
  1291 + {
  1292 + conn.Dispose();
  1293 + }
  1294 +
  1295 + return result;
  1296 + }
1297 internal DataTable GetEditionsForModesty(int licenceId, int buildingLevelAcc) 1297 internal DataTable GetEditionsForModesty(int licenceId, int buildingLevelAcc)
1298 { 1298 {
1299 logger.Debug(" inside GetEditionsForModesty for licenceId= " + licenceId); 1299 logger.Debug(" inside GetEditionsForModesty for licenceId= " + licenceId);
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
  View file @7467395
@@ -507,38 +507,21 @@ namespace AIAHTML5.API.Models @@ -507,38 +507,21 @@ namespace AIAHTML5.API.Models
507 507
508 public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId) 508 public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId)
509 { 509 {
510 - Int32 intUserId = 0;  
511 bool isExpired = false; 510 bool isExpired = false;
512 User userInfo = null; 511 User userInfo = null;
513 - //try {  
514 - Int16 intErrorID = ErrorHelper.E_NO_ERROR;  
515 - String strStatus = AIAConstants.STATUS_OK;  
516 - 512 +
517 int intLicenseId = 0; 513 int intLicenseId = 0;
518 int intEditionId = Convert.ToInt16(strEdition); 514 int intEditionId = Convert.ToInt16(strEdition);
519 515
520 DateTime dtLogDate = DateTime.Now; 516 DateTime dtLogDate = DateTime.Now;
521 - //strSiteIP = (String)objRequest.GetData(AIAConstants.SITE_IP);  
522 - //strAcccountNumber = (String)objRequest.GetData(AIAConstants.ACCOUNT_NUMBER);  
523 - //intEditionId = Convert.ToInt16(objRequest.GetData(AIAConstants.EDITION_ID));  
524 - //strUrlReferer = (String)objRequest.GetData(AIAConstants.URL_REFERER);  
525 - //strEdition = (String)objRequest.GetData(AIAConstants.EDITION_ID);  
526 - //intSiteId = (Int32)objRequest.GetData(AIAConstants.SITE_ID);  
527 - //AdminDAL.AdminDal.GetLicenseBySiteIdDataTable dtLicense = new ADAM.AIA50.AdminDAL.AdminDal.GetLicenseBySiteIdDataTable(); 517 +
528 if (string.IsNullOrEmpty(strAcccountNumber)) 518 if (string.IsNullOrEmpty(strAcccountNumber))
529 { 519 {
530 - //----logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.ACCOUNT_NUMBER_NOT_NULL, strSiteIP, strEdition, strUrlReferer);  
531 - //intErrorID = ErrorHelper.E_ACCOUNT_NUMBER_NOT_NULL;  
532 - //strStatus = AIAConstants.STATUS_NOT_OK;  
533 -  
534 userInfo.LoginFailureCauseId = ErrorHelper.E_ACCOUNT_NUMBER_NOT_NULL; 520 userInfo.LoginFailureCauseId = ErrorHelper.E_ACCOUNT_NUMBER_NOT_NULL;
535 } 521 }
536 else if (string.IsNullOrEmpty(strEdition)) 522 else if (string.IsNullOrEmpty(strEdition))
537 { 523 {
538 strEdition = "0"; 524 strEdition = "0";
539 - //----logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.EDITION_ID_NOT_NULL, strSiteIP, strEdition, strUrlReferer);  
540 - //intErrorID = ErrorHelper.E_EDITION_ID_NOT_NULL;  
541 - //strStatus = AIAConstants.STATUS_NOT_OK;  
542 userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_ID_NOT_NULL; 525 userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_ID_NOT_NULL;
543 526
544 } 527 }
@@ -548,10 +531,8 @@ namespace AIAHTML5.API.Models @@ -548,10 +531,8 @@ namespace AIAHTML5.API.Models
548 DataTable dtLicense = objDBModel.GetLicenseBySiteId(intSiteId); 531 DataTable dtLicense = objDBModel.GetLicenseBySiteId(intSiteId);
549 if (dtLicense.Rows.Count > 0) 532 if (dtLicense.Rows.Count > 0)
550 { 533 {
551 - //foreach (DataRow licRow in dtLicense.Rows)  
552 - //{ 534 +
553 DataRow licRow = dtLicense.Rows[0]; 535 DataRow licRow = dtLicense.Rows[0];
554 - //isExpired = LicenseHelper.IsLicenseExpired(licRow["Id"]);  
555 userInfo = new User(); 536 userInfo = new User();
556 userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(Convert.ToInt32(licRow["Id"])); 537 userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(Convert.ToInt32(licRow["Id"]));
557 538
@@ -629,39 +610,26 @@ namespace AIAHTML5.API.Models @@ -629,39 +610,26 @@ namespace AIAHTML5.API.Models
629 610
630 611
631 // get exported image detail 612 // get exported image detail
632 - //note: not tested  
633 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId); 613 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId);
634 - 614 +
  615 + // insert login details
  616 + objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);
  617 +
635 } 618 }
636 else 619 else
637 { 620 {
638 - // logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.LICENSE_INACTIVE, strSiteIP, Convert.ToString(intEditionId), strUrlReferer);  
639 - // intErrorID = ErrorHelper.E_LICENCE_IS_INACTIVE;  
640 - // strStatus = AIAConstants.STATUS_NOT_OK;  
641 userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE; 621 userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE;
642 } 622 }
643 } 623 }
644 else 624 else
645 { 625 {
646 626
647 - // intErrorID = ErrorHelper.E_EDITION_NOT_LINKED_WITH_SITE;  
648 - // strStatus = AIAConstants.STATUS_NOT_OK;  
649 userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_NOT_LINKED_WITH_SITE; 627 userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_NOT_LINKED_WITH_SITE;
650 } 628 }
651 - //} 629 +
652 } 630 }
653 } 631 }
654 - //objResponse.ErrorCode = intErrorID;  
655 - //objResponse.Status = strStatus;  
656 - //objResponse.ErrorDesc = ErrorHelper.GetInstance().GetErrorDescriptionHelper(intErrorID).ToString();  
657 - //} catch (Exception objExp) {  
658 - // objResponse.Status = GlobalConstant.STATUS_NOT_OK;  
659 - // objResponse.ErrorCode = GlobalConstant.RUN_TIME_EXCEPTION;  
660 - // objResponse.strErrorDesc = objExp.Message;  
661 - //}  
662 - //if (isExpired != null && (bool)isExpired["result"])  
663 - // objResponse.strErrorDesc = objResponse.strErrorDesc.Replace("{0}", (string)isExpired["date"]);  
664 - //return intUserId; 632 +
665 return userInfo; 633 return userInfo;
666 } 634 }
667 635
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @7467395
@@ -311,7 +311,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -311,7 +311,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
311 } 311 }
312 else 312 else
313 { 313 {
314 - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; 314 + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;
315 $("#messageModal").modal('show'); 315 $("#messageModal").modal('show');
316 } 316 }
317 317
@@ -337,7 +337,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -337,7 +337,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
337 $("#btnConvertOpen").removeAttr("style"); 337 $("#btnConvertOpen").removeAttr("style");
338 $("#btnImportOpen").css({"display":"none"}) ; 338 $("#btnImportOpen").css({"display":"none"}) ;
339 $("#btnConvertDownLoad").css({"display":"none"}) ; 339 $("#btnConvertDownLoad").css({"display":"none"}) ;
340 - $rootScope.confirmMessage = "This curriculum is not completely converted to new format. Please contact ADAM or recreate it .\nDo you still want to open it?"; 340 + $rootScope.confirmMessage =AIAConstants.OPEN_CB_OLD_TO_NEW_ISSUE;
341 $timeout(function () { 341 $timeout(function () {
342 $rootScope.newCurriculumObject=curriculumobject; 342 $rootScope.newCurriculumObject=curriculumobject;
343 $("#cbMessageModal").modal('show'); 343 $("#cbMessageModal").modal('show');
@@ -464,7 +464,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -464,7 +464,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
464 } 464 }
465 else 465 else
466 { 466 {
467 - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; 467 + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;"";
468 $("#messageModal").modal('show'); 468 $("#messageModal").modal('show');
469 } 469 }
470 470
@@ -481,7 +481,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -481,7 +481,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
481 $("#btnConvertOpen").css({"display":"none"}) ; 481 $("#btnConvertOpen").css({"display":"none"}) ;
482 $rootScope.newCurriculumObject=curriculumobject; 482 $rootScope.newCurriculumObject=curriculumobject;
483 $rootScope.convertedfileName=myfileName; 483 $rootScope.convertedfileName=myfileName;
484 - $rootScope.confirmMessage = "This curriculum is not completely converted to new format. Please contact ADAM or recreate it .\nDo you still want to save in new format?"; 484 + $rootScope.confirmMessage =AIAConstants.CONVERT_CB_OLD_TO_NEW_ISSUE;
485 $timeout(function () { 485 $timeout(function () {
486 $("#cbMessageModal").modal('show'); 486 $("#cbMessageModal").modal('show');
487 }, 200); 487 }, 200);
@@ -1451,7 +1451,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1451,7 +1451,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1451 } 1451 }
1452 else 1452 else
1453 { 1453 {
1454 - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; 1454 + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;
1455 $("#messageModal").modal('show'); 1455 $("#messageModal").modal('show');
1456 1456
1457 } 1457 }
@@ -1475,7 +1475,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1475,7 +1475,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1475 $("#btnConvertDownLoad").css({"display":"none"}) ; 1475 $("#btnConvertDownLoad").css({"display":"none"}) ;
1476 $("#btnConvertOpen").css({"display":"none"}) ; 1476 $("#btnConvertOpen").css({"display":"none"}) ;
1477 $rootScope.newCurriculumObject=curriculumobject; 1477 $rootScope.newCurriculumObject=curriculumobject;
1478 - $rootScope.confirmMessage = "This curriculum is not completely converted to new format. Please contact ADAM or recreate it .\nDo you still want to import it?"; 1478 + $rootScope.confirmMessage = AIAConstants.IMPORT_CB_OLD_TO_NEW_ISSUE;
1479 $timeout(function () { 1479 $timeout(function () {
1480 $("#cbMessageModal").modal('show'); 1480 $("#cbMessageModal").modal('show');
1481 }, 200); 1481 }, 200);
@@ -2421,7 +2421,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -2421,7 +2421,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2421 if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState)) 2421 if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState))
2422 { 2422 {
2423 $rootScope.UnsaveCurriculum = true; 2423 $rootScope.UnsaveCurriculum = true;
2424 - $rootScope.errorMessage = 'This slide has some legacy version annotations and also not compatible with new format. Please contact ADAM or recreate it.'; 2424 + $rootScope.errorMessage =AIAConstants.CB_OLD_SLIDE_ANNOTATION_ISSUE;
2425 $("#messageModal").modal('show'); 2425 $("#messageModal").modal('show');
2426 windowData.annotationData=""; 2426 windowData.annotationData="";
2427 } 2427 }
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @7467395
@@ -622,16 +622,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -622,16 +622,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
622 $("#helplinkId").append("<li><a target='_blank' href='" + aboutADAM + "'> About A.D.A.M. </li>"); 622 $("#helplinkId").append("<li><a target='_blank' href='" + aboutADAM + "'> About A.D.A.M. </li>");
623 623
624 } 624 }
625 - $scope.EnableDisableExportImage=function() 625 + $scope.DisableDemoAccountOption=function()
626 { 626 {
627 //enable export image for instructors edition and for superadmin .disable for demo/test user 627 //enable export image for instructors edition and for superadmin .disable for demo/test user
628 if ((($rootScope.userData.EditionId == 1) || ($rootScope.userData.EditionId == 2) || ($rootScope.userData.EditionId == 0)) && ($rootScope.userData.UserTypeId != 8)) { 628 if ((($rootScope.userData.EditionId == 1) || ($rootScope.userData.EditionId == 2) || ($rootScope.userData.EditionId == 0)) && ($rootScope.userData.UserTypeId != 8)) {
629 629
630 - $('#exportImageAnchor').removeClass('exportImage');  
631 } 630 }
632 else 631 else
633 { 632 {
  633 + //disable for demo user
634 $('#exportImageAnchor').addClass('exportImage'); 634 $('#exportImageAnchor').addClass('exportImage');
  635 + $('#newCurriculumid').addClass('newCurriculum');
  636 + $("#printAVAnchor").addClass("PrintViewer");
  637 + $("#printAllAVAnchor").addClass("PrintViewer");
  638 + $("#printPreviewAnchor").addClass("PrintPreview");
635 } 639 }
636 640
637 } 641 }
@@ -2191,7 +2195,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2191,7 +2195,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2191 $("#openPictureId").removeClass("OpenPitures"); 2195 $("#openPictureId").removeClass("OpenPitures");
2192 $("#openAnimationId").removeClass("OpenPitures"); 2196 $("#openAnimationId").removeClass("OpenPitures");
2193 $rootScope.disableMenuoption = "disableMenuoption"; 2197 $rootScope.disableMenuoption = "disableMenuoption";
2194 - $rootScope.newCurriculum = "newCurriculum"; 2198 + $rootScope.ConvertCurriculum = "newCurriculum";
  2199 + $("#newCurriculumid").addClass("newCurriculum");
2195 $rootScope.openCurriculum = "openCurriculum"; 2200 $rootScope.openCurriculum = "openCurriculum";
2196 $rootScope.saveCurriculam = "saveCurriculam"; 2201 $rootScope.saveCurriculam = "saveCurriculam";
2197 $("#printAVAnchor").removeClass("PrintViewer"); 2202 $("#printAVAnchor").removeClass("PrintViewer");
@@ -2212,7 +2217,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2212,7 +2217,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2212 $("#openPictureId").removeClass("OpenPitures"); 2217 $("#openPictureId").removeClass("OpenPitures");
2213 $("#openAnimationId").removeClass("OpenPitures"); 2218 $("#openAnimationId").removeClass("OpenPitures");
2214 $rootScope.disableMenuoption = "disableMenuoption"; 2219 $rootScope.disableMenuoption = "disableMenuoption";
2215 - $rootScope.newCurriculum = "newCurriculum"; 2220 + $("#newCurriculumid").addClass("newCurriculum");
  2221 + $rootScope.ConvertCurriculum = "newCurriculum";
2216 $rootScope.openCurriculum = "openCurriculum"; 2222 $rootScope.openCurriculum = "openCurriculum";
2217 $rootScope.saveCurriculam = "saveCurriculam"; 2223 $rootScope.saveCurriculam = "saveCurriculam";
2218 $("#printAVAnchor").removeClass("PrintViewer"); 2224 $("#printAVAnchor").removeClass("PrintViewer");
@@ -2231,7 +2237,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2231,7 +2237,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2231 $("#openPictureId").removeClass("OpenPitures"); 2237 $("#openPictureId").removeClass("OpenPitures");
2232 $("#openAnimationId").removeClass("OpenPitures"); 2238 $("#openAnimationId").removeClass("OpenPitures");
2233 $rootScope.disableMenuoption = "disableMenuoption"; 2239 $rootScope.disableMenuoption = "disableMenuoption";
2234 - $rootScope.newCurriculum = "newCurriculum"; 2240 + $("#newCurriculumid").addClass("newCurriculum");
  2241 + $rootScope.ConvertCurriculum = "newCurriculum";
2235 $rootScope.openCurriculum = "openCurriculum"; 2242 $rootScope.openCurriculum = "openCurriculum";
2236 $rootScope.saveCurriculam = "saveCurriculam"; 2243 $rootScope.saveCurriculam = "saveCurriculam";
2237 $("#printAVAnchor").removeClass("PrintViewer"); 2244 $("#printAVAnchor").removeClass("PrintViewer");
@@ -2250,7 +2257,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2250,7 +2257,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2250 $("#openPictureId").removeClass("OpenPitures"); 2257 $("#openPictureId").removeClass("OpenPitures");
2251 $("#openAnimationId").removeClass("OpenPitures"); 2258 $("#openAnimationId").removeClass("OpenPitures");
2252 $rootScope.disableMenuoption = "disableMenuoption"; 2259 $rootScope.disableMenuoption = "disableMenuoption";
2253 - $rootScope.newCurriculum = "newCurriculum"; 2260 + $("#newCurriculumid").addClass("newCurriculum");
  2261 + $rootScope.ConvertCurriculum = "newCurriculum";
2254 $rootScope.openCurriculum = "openCurriculum"; 2262 $rootScope.openCurriculum = "openCurriculum";
2255 $rootScope.saveCurriculam = "saveCurriculam"; 2263 $rootScope.saveCurriculam = "saveCurriculam";
2256 $("#printAVAnchor").addClass("PrintViewer"); 2264 $("#printAVAnchor").addClass("PrintViewer");
@@ -2263,7 +2271,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2263,7 +2271,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2263 $("#openResourceId").addClass("openResources"); 2271 $("#openResourceId").addClass("openResources");
2264 $("#annotationButton").addClass("disableMenuoption"); 2272 $("#annotationButton").addClass("disableMenuoption");
2265 $("#Menuoptionid").addClass("disableMenuoption"); 2273 $("#Menuoptionid").addClass("disableMenuoption");
2266 - $rootScope.newCurriculum = ""; 2274 + $("#newCurriculumid").removeClass("newCurriculum");
  2275 + $rootScope.ConvertCurriculum = "";
2267 $rootScope.openCurriculum = ""; 2276 $rootScope.openCurriculum = "";
2268 $rootScope.saveCurriculam = "saveCurriculam"; 2277 $rootScope.saveCurriculam = "saveCurriculam";
2269 2278
@@ -2279,12 +2288,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2279,12 +2288,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2279 //close while back from cb 2288 //close while back from cb
2280 $rootScope.CloseAnnotationTool(); 2289 $rootScope.CloseAnnotationTool();
2281 $rootScope.CloseListManager(); 2290 $rootScope.CloseListManager();
  2291 + $scope.DisableDemoAccountOption();
2282 2292
2283 } 2293 }
2284 else if ($location.url() == "/curriculum-builder-detail") { 2294 else if ($location.url() == "/curriculum-builder-detail") {
2285 $("#fileMenuAnchor").removeClass("disableFileMenu"); 2295 $("#fileMenuAnchor").removeClass("disableFileMenu");
2286 $("#Menuoptionid").addClass("disableMenuoption"); 2296 $("#Menuoptionid").addClass("disableMenuoption");
2287 - $rootScope.newCurriculum = ""; 2297 + $("#newCurriculumid").removeClass("newCurriculum");
  2298 + $rootScope.ConvertCurriculum = "";
2288 $rootScope.openCurriculum = ""; 2299 $rootScope.openCurriculum = "";
2289 $rootScope.saveCurriculam = ""; 2300 $rootScope.saveCurriculam = "";
2290 $("#openResourceId").removeClass("openResources"); 2301 $("#openResourceId").removeClass("openResources");
@@ -2295,6 +2306,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2295,6 +2306,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2295 $("#printAllAVAnchor").addClass("PrintViewer"); 2306 $("#printAllAVAnchor").addClass("PrintViewer");
2296 $("#printPreviewAnchor").addClass("PrintPreview"); 2307 $("#printPreviewAnchor").addClass("PrintPreview");
2297 $("#exportImageAnchor").addClass("exportImage"); 2308 $("#exportImageAnchor").addClass("exportImage");
  2309 + $scope.DisableDemoAccountOption();
2298 } 2310 }
2299 else if ($location.url() == "/adam-images-detail") { 2311 else if ($location.url() == "/adam-images-detail") {
2300 $("#annotationButton").removeClass("disableMenuoption"); 2312 $("#annotationButton").removeClass("disableMenuoption");
@@ -2308,7 +2320,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2308,7 +2320,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2308 $("#openPictureId").removeClass("OpenPitures"); 2320 $("#openPictureId").removeClass("OpenPitures");
2309 $("#openAnimationId").removeClass("OpenPitures"); 2321 $("#openAnimationId").removeClass("OpenPitures");
2310 $rootScope.disableMenuoption = "disableMenuoption"; 2322 $rootScope.disableMenuoption = "disableMenuoption";
2311 - $rootScope.newCurriculum = "newCurriculum"; 2323 + $("#newCurriculumid").addClass("newCurriculum");
  2324 + $rootScope.ConvertCurriculum = "newCurriculum";
2312 $rootScope.openCurriculum = "openCurriculum"; 2325 $rootScope.openCurriculum = "openCurriculum";
2313 $rootScope.saveCurriculam = "saveCurriculam"; 2326 $rootScope.saveCurriculam = "saveCurriculam";
2314 $("#printAVAnchor").removeClass("PrintViewer"); 2327 $("#printAVAnchor").removeClass("PrintViewer");
@@ -2328,7 +2341,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2328,7 +2341,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2328 $("#openPictureId").removeClass("OpenPitures"); 2341 $("#openPictureId").removeClass("OpenPitures");
2329 $("#openAnimationId").removeClass("OpenPitures"); 2342 $("#openAnimationId").removeClass("OpenPitures");
2330 $rootScope.disableMenuoption = "disableMenuoption"; 2343 $rootScope.disableMenuoption = "disableMenuoption";
2331 - $rootScope.newCurriculum = "newCurriculum"; 2344 + $("#newCurriculumid").addClass("newCurriculum");
  2345 + $rootScope.ConvertCurriculum = "newCurriculum";
2332 $rootScope.openCurriculum = "openCurriculum"; 2346 $rootScope.openCurriculum = "openCurriculum";
2333 $rootScope.saveCurriculam = "saveCurriculam"; 2347 $rootScope.saveCurriculam = "saveCurriculam";
2334 $("#printAVAnchor").addClass("PrintViewer"); 2348 $("#printAVAnchor").addClass("PrintViewer");
@@ -2347,7 +2361,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2347,7 +2361,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2347 $("#openPictureId").removeClass("OpenPitures"); 2361 $("#openPictureId").removeClass("OpenPitures");
2348 $("#openAnimationId").removeClass("OpenPitures"); 2362 $("#openAnimationId").removeClass("OpenPitures");
2349 $rootScope.disableMenuoption = "disableMenuoption"; 2363 $rootScope.disableMenuoption = "disableMenuoption";
2350 - $rootScope.newCurriculum = "newCurriculum"; 2364 + $("#newCurriculumid").addClass("newCurriculum");
  2365 + $rootScope.ConvertCurriculum = "newCurriculum";
2351 $rootScope.openCurriculum = "openCurriculum"; 2366 $rootScope.openCurriculum = "openCurriculum";
2352 $rootScope.saveCurriculam = "saveCurriculam"; 2367 $rootScope.saveCurriculam = "saveCurriculam";
2353 $("#printAVAnchor").addClass("PrintViewer"); 2368 $("#printAVAnchor").addClass("PrintViewer");
@@ -2441,12 +2456,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2441,12 +2456,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2441 $("#optiontSetting").removeClass("disableSubMenu"); 2456 $("#optiontSetting").removeClass("disableSubMenu");
2442 2457
2443 $("#listManagerBody *").prop('disabled',false); 2458 $("#listManagerBody *").prop('disabled',false);
2444 - 2459 +
  2460 + $('#exportImageAnchor').removeClass('exportImage');
2445 $("#printAVAnchor").removeClass("PrintViewer"); 2461 $("#printAVAnchor").removeClass("PrintViewer");
2446 $("#printAllAVAnchor").removeClass("PrintViewer"); 2462 $("#printAllAVAnchor").removeClass("PrintViewer");
2447 $("#printPreviewAnchor").removeClass("PrintPreview"); 2463 $("#printPreviewAnchor").removeClass("PrintPreview");
2448 $rootScope.panelNameWithCb = paneld; 2464 $rootScope.panelNameWithCb = paneld;
2449 - $scope.EnableDisableExportImage(); 2465 + $scope.DisableDemoAccountOption();
2450 } 2466 }
2451 else if(paneld.match('AAImagePanel')) 2467 else if(paneld.match('AAImagePanel'))
2452 { 2468 {
@@ -2456,12 +2472,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2456,12 +2472,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2456 $("#annotationToolBarOptions").removeClass("disableSubMenu"); 2472 $("#annotationToolBarOptions").removeClass("disableSubMenu");
2457 2473
2458 $("#listManagerBody *").prop('disabled',false); 2474 $("#listManagerBody *").prop('disabled',false);
2459 - 2475 +
  2476 + $('#exportImageAnchor').removeClass('exportImage');
2460 $("#printAVAnchor").removeClass("PrintViewer"); 2477 $("#printAVAnchor").removeClass("PrintViewer");
2461 $("#printAllAVAnchor").removeClass("PrintViewer"); 2478 $("#printAllAVAnchor").removeClass("PrintViewer");
2462 $("#printPreviewAnchor").removeClass("PrintPreview"); 2479 $("#printPreviewAnchor").removeClass("PrintPreview");
2463 $rootScope.panelNameWithCb = paneld; 2480 $rootScope.panelNameWithCb = paneld;
2464 - $scope.EnableDisableExportImage(); 2481 + $scope.DisableDemoAccountOption();
2465 } 2482 }
2466 else if(paneld.match('aiImagePanel')) 2483 else if(paneld.match('aiImagePanel'))
2467 { 2484 {
@@ -2469,11 +2486,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2469,11 +2486,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2469 $("#Menuoptionid").removeClass("disableMenuoption"); 2486 $("#Menuoptionid").removeClass("disableMenuoption");
2470 $("#annotationToolBarOptions").removeClass("disableSubMenu"); 2487 $("#annotationToolBarOptions").removeClass("disableSubMenu");
2471 2488
  2489 + $('#exportImageAnchor').removeClass('exportImage');
2472 $("#printAVAnchor").removeClass("PrintViewer"); 2490 $("#printAVAnchor").removeClass("PrintViewer");
2473 $("#printAllAVAnchor").removeClass("PrintViewer"); 2491 $("#printAllAVAnchor").removeClass("PrintViewer");
2474 $("#printPreviewAnchor").removeClass("PrintPreview"); 2492 $("#printPreviewAnchor").removeClass("PrintPreview");
2475 $rootScope.panelNameWithCb = paneld; 2493 $rootScope.panelNameWithCb = paneld;
2476 - $scope.EnableDisableExportImage(); 2494 + $scope.DisableDemoAccountOption();
2477 } 2495 }
2478 else if(paneld.match('picImagePanel')) 2496 else if(paneld.match('picImagePanel'))
2479 { 2497 {
@@ -2481,11 +2499,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2481,11 +2499,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2481 $("#Menuoptionid").removeClass("disableMenuoption"); 2499 $("#Menuoptionid").removeClass("disableMenuoption");
2482 $("#annotationToolBarOptions").removeClass("disableSubMenu"); 2500 $("#annotationToolBarOptions").removeClass("disableSubMenu");
2483 2501
  2502 + $('#exportImageAnchor').removeClass('exportImage');
2484 $("#printAVAnchor").removeClass("PrintViewer"); 2503 $("#printAVAnchor").removeClass("PrintViewer");
2485 $("#printAllAVAnchor").removeClass("PrintViewer"); 2504 $("#printAllAVAnchor").removeClass("PrintViewer");
2486 $("#printPreviewAnchor").removeClass("PrintPreview"); 2505 $("#printPreviewAnchor").removeClass("PrintPreview");
2487 $rootScope.panelNameWithCb = paneld; 2506 $rootScope.panelNameWithCb = paneld;
2488 - $scope.EnableDisableExportImage(); 2507 + $scope.DisableDemoAccountOption();
2489 } 2508 }
2490 else if(paneld.match('ciImagePanel')) 2509 else if(paneld.match('ciImagePanel'))
2491 { 2510 {
@@ -2493,11 +2512,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -2493,11 +2512,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2493 $("#Menuoptionid").removeClass("disableMenuoption"); 2512 $("#Menuoptionid").removeClass("disableMenuoption");
2494 $("#annotationToolBarOptions").removeClass("disableSubMenu"); 2513 $("#annotationToolBarOptions").removeClass("disableSubMenu");
2495 2514
  2515 + $('#exportImageAnchor').removeClass('exportImage');
2496 $("#printAVAnchor").removeClass("PrintViewer"); 2516 $("#printAVAnchor").removeClass("PrintViewer");
2497 $("#printAllAVAnchor").removeClass("PrintViewer"); 2517 $("#printAllAVAnchor").removeClass("PrintViewer");
2498 $("#printPreviewAnchor").removeClass("PrintPreview"); 2518 $("#printPreviewAnchor").removeClass("PrintPreview");
2499 $rootScope.panelNameWithCb = paneld; 2519 $rootScope.panelNameWithCb = paneld;
2500 - $scope.EnableDisableExportImage(); 2520 + $scope.DisableDemoAccountOption();
2501 } 2521 }
2502 else if(paneld.match('caImagePanel')) 2522 else if(paneld.match('caImagePanel'))
2503 { 2523 {
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @7467395
@@ -543,7 +543,12 @@ AIA.constant(&quot;AIAConstants&quot;, { @@ -543,7 +543,12 @@ AIA.constant(&quot;AIAConstants&quot;, {
543 "PLEASE_ENTER_SEARCH_TEXT": "Please enter the text to search.", 543 "PLEASE_ENTER_SEARCH_TEXT": "Please enter the text to search.",
544 "SETTINGS_SAVED": "Your current settings has been saved.", 544 "SETTINGS_SAVED": "Your current settings has been saved.",
545 "SETTING_SAVE_ERROR":"There is some error in saving your current settings. Please try after sometime.", 545 "SETTING_SAVE_ERROR":"There is some error in saving your current settings. Please try after sometime.",
546 - "SAVE_ANIMATION_ERROR":"There is some error while saving your animation. Please try after sometime." 546 + "SAVE_ANIMATION_ERROR":"There is some error while saving your animation. Please try after sometime.",
  547 + "CB_FILE_FORMAT_ISSUE":"This Curriculum file is not supported! Please try again.",
  548 + "CONVERT_CB_OLD_TO_NEW_ISSUE":"The system detected some legacy functionality in the selected curriculum that cannot be fully converted to the new format (.json). Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to proceed with the conversion?",
  549 + "OPEN_CB_OLD_TO_NEW_ISSUE":"The selected curriculum is in a legacy format. The system detected some legacy functionality in the curriculum that cannot be completely converted to the new format (.json), and it may not work correctly. Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to continue to open the curriculum?",
  550 + "IMPORT_CB_OLD_TO_NEW_ISSUE":"The selected curriculum is in a legacy format. The system detected some legacy functionality in the curriculum that cannot be completely converted to the new format (.json), and it may not work correctly. Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to continue to import the curriculum?",
  551 + "CB_OLD_SLIDE_ANNOTATION_ISSUE":"This slide contains some legacy version annotations that are not compatible with the newer format of the Curriculum Builder. Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM."
547 }) 552 })
548 553
549 554
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @7467395
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 <li ng-class="disableMenuoption"><a href="#">Open Test</a></li> 11 <li ng-class="disableMenuoption"><a href="#">Open Test</a></li>
12 <li ng-class="disableMenuoption"><a href="#">Save Test As</a></li> 12 <li ng-class="disableMenuoption"><a href="#">Save Test As</a></li>
13 <li role="separator" class="divider"></li> 13 <li role="separator" class="divider"></li>
14 - <li ng-class="newCurriculum" ng-click="ConvertCurriculum()"><a href="#" >Convert Old To New Curriculum</a></li>  
15 - <li ng-class="newCurriculum" ng-click="CreateNewCurriculum()"><a href="#" >New Curriculum</a></li> 14 + <li ng-class="ConvertCurriculum" ng-click="ConvertCurriculum()"><a href="#" >Convert Curriculum (.sldshw to .json)</a></li>
  15 + <li id="newCurriculumid"><a href="#" ng-click="CreateNewCurriculum()" >New Curriculum</a></li>
16 <li ng-class="openCurriculum" ng-click="OpenExistingCurriculum($event)"><a href="#">Open Existing Curriculum</a></li> 16 <li ng-class="openCurriculum" ng-click="OpenExistingCurriculum($event)"><a href="#">Open Existing Curriculum</a></li>
17 <li ng-class="saveCurriculam" ng-click="saveCurricullam(false)"><a href="curriculum-builder-detail">Save Curriculum As</a></li> 17 <li ng-class="saveCurriculam" ng-click="saveCurricullam(false)"><a href="curriculum-builder-detail">Save Curriculum As</a></li>
18 <li role="separator" class="divider"></li> 18 <li role="separator" class="divider"></li>