diff --git a/400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs b/400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs index db51b65..f6b800a 100644 --- a/400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs +++ b/400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs @@ -42,5 +42,6 @@ namespace AIAHTML5.API.Constants public const string INSERT_EXPORTED_IMAGE = "usp_InsertExportedImage"; public const string GET_USER_DETAIL_BYLOGIN_AND_ACCOUNT = "usp_GetUserDetailsByLoginIdandAccount"; public const string GET_USER_LOGIN_STATUS = "usp_ManageUserLoginStatus"; + public const string INSERT_SITE_LOGIN_LOG = "usp_InsertSiteLoginLog"; } } \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs index aa23a95..1682417 100644 --- a/400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs @@ -52,10 +52,6 @@ namespace AIAHTML5.API.Controllers } else { - //ser user = new User(); - //user.LoginFailureCauseId = AIAConstants.INVALID_CLIENT; - //dynamic userinfo = user; - //response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(userInfo) }; logger.Debug("IVALID CLIENT"); response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.INVALID_CLIENT) }; } diff --git a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs index 22b7fd5..543f83e 100644 --- a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs +++ b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs @@ -1239,21 +1239,6 @@ namespace AIAHTML5.API.Models dt = new DataTable(); da.Fill(dt); - //if (dt != null && dt.Rows.Count > 0) - //{ - // siteUrl = new SiteUrl(); - // foreach (DataRow dr in dt.Rows) - // { - // siteUrl.Id = Convert.ToInt32(dr["Id"]); - // siteUrl.SiteIp = dr["SiteIp"].ToString(); - // siteUrl.SiteIpTo = dr["SiteIpTo"].ToString(); - // siteUrl.SiteMasterIpTo = dr["SiteMasterIpTo"].ToString(); - // siteUrl.IsMaster = Convert.ToInt32(dr["IsMaster"]); - - // } - //} - - //return siteUrl; return dt; } @@ -1276,24 +1261,39 @@ namespace AIAHTML5.API.Models dt = new DataTable(); da.Fill(dt); - //if (dt != null && dt.Rows.Count > 0) - //{ - // siteUrl = new SiteUrl(); - // foreach (DataRow dr in dt.Rows) - // { - // siteUrl.Id = Convert.ToInt32(dr["Id"]); - // siteUrl.SiteIp = dr["SiteIp"].ToString(); - // siteUrl.SiteIpTo = dr["SiteIpTo"].ToString(); - // siteUrl.SiteMasterIpTo = dr["SiteMasterIpTo"].ToString(); - // siteUrl.IsMaster = Convert.ToInt32(dr["IsMaster"]); - - // } - //} - - //return siteUrl; return dt; } + internal int InsertSiteLoginDetails(String strAcccountNumber, String strUrlReferer, string strEdition) + { + int result = 0; + SqlConnection conn = null; + try + { + conn = new SqlConnection(dbConnectionString); + SqlCommand cmd = new SqlCommand(); + conn.Open(); + cmd.Connection = conn; + cmd.CommandText = DBConstants.INSERT_SITE_LOGIN_LOG; + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.AddWithValue("@nvAccountNumber", strAcccountNumber); + cmd.Parameters.AddWithValue("@nvReferalUrl", strUrlReferer); + cmd.Parameters.AddWithValue("@nvEdition", strEdition); + cmd.Parameters.AddWithValue("@nvHttpReferer", null); + result = cmd.ExecuteNonQuery(); + } + catch (SqlException ex) + { + logger.Fatal("Exception in InsertSiteLoginDetails for strAcccountNumber= " + strAcccountNumber + ", Exception= " + ex.Message + ", STACKTRACE=" + ex.StackTrace); + throw; + } + finally + { + conn.Dispose(); + } + + return result; + } internal DataTable GetEditionsForModesty(int licenceId, int buildingLevelAcc) { logger.Debug(" inside GetEditionsForModesty for licenceId= " + licenceId); diff --git a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs index 001d0b0..2a71239 100644 --- a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs +++ b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs @@ -507,38 +507,21 @@ namespace AIAHTML5.API.Models public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId) { - Int32 intUserId = 0; bool isExpired = false; User userInfo = null; - //try { - Int16 intErrorID = ErrorHelper.E_NO_ERROR; - String strStatus = AIAConstants.STATUS_OK; - + int intLicenseId = 0; int intEditionId = Convert.ToInt16(strEdition); DateTime dtLogDate = DateTime.Now; - //strSiteIP = (String)objRequest.GetData(AIAConstants.SITE_IP); - //strAcccountNumber = (String)objRequest.GetData(AIAConstants.ACCOUNT_NUMBER); - //intEditionId = Convert.ToInt16(objRequest.GetData(AIAConstants.EDITION_ID)); - //strUrlReferer = (String)objRequest.GetData(AIAConstants.URL_REFERER); - //strEdition = (String)objRequest.GetData(AIAConstants.EDITION_ID); - //intSiteId = (Int32)objRequest.GetData(AIAConstants.SITE_ID); - //AdminDAL.AdminDal.GetLicenseBySiteIdDataTable dtLicense = new ADAM.AIA50.AdminDAL.AdminDal.GetLicenseBySiteIdDataTable(); + if (string.IsNullOrEmpty(strAcccountNumber)) { - //----logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.ACCOUNT_NUMBER_NOT_NULL, strSiteIP, strEdition, strUrlReferer); - //intErrorID = ErrorHelper.E_ACCOUNT_NUMBER_NOT_NULL; - //strStatus = AIAConstants.STATUS_NOT_OK; - userInfo.LoginFailureCauseId = ErrorHelper.E_ACCOUNT_NUMBER_NOT_NULL; } else if (string.IsNullOrEmpty(strEdition)) { strEdition = "0"; - //----logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.EDITION_ID_NOT_NULL, strSiteIP, strEdition, strUrlReferer); - //intErrorID = ErrorHelper.E_EDITION_ID_NOT_NULL; - //strStatus = AIAConstants.STATUS_NOT_OK; userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_ID_NOT_NULL; } @@ -548,10 +531,8 @@ namespace AIAHTML5.API.Models DataTable dtLicense = objDBModel.GetLicenseBySiteId(intSiteId); if (dtLicense.Rows.Count > 0) { - //foreach (DataRow licRow in dtLicense.Rows) - //{ + DataRow licRow = dtLicense.Rows[0]; - //isExpired = LicenseHelper.IsLicenseExpired(licRow["Id"]); userInfo = new User(); userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(Convert.ToInt32(licRow["Id"])); @@ -629,39 +610,26 @@ namespace AIAHTML5.API.Models // get exported image detail - //note: not tested userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId); - + + // insert login details + objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition); + } else { - // logAuthenticationTryForAccountNumber(strAcccountNumber, dtLogDate, ErrorHelper.LICENSE_INACTIVE, strSiteIP, Convert.ToString(intEditionId), strUrlReferer); - // intErrorID = ErrorHelper.E_LICENCE_IS_INACTIVE; - // strStatus = AIAConstants.STATUS_NOT_OK; userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE; } } else { - // intErrorID = ErrorHelper.E_EDITION_NOT_LINKED_WITH_SITE; - // strStatus = AIAConstants.STATUS_NOT_OK; userInfo.LoginFailureCauseId = ErrorHelper.E_EDITION_NOT_LINKED_WITH_SITE; } - //} + } } - //objResponse.ErrorCode = intErrorID; - //objResponse.Status = strStatus; - //objResponse.ErrorDesc = ErrorHelper.GetInstance().GetErrorDescriptionHelper(intErrorID).ToString(); - //} catch (Exception objExp) { - // objResponse.Status = GlobalConstant.STATUS_NOT_OK; - // objResponse.ErrorCode = GlobalConstant.RUN_TIME_EXCEPTION; - // objResponse.strErrorDesc = objExp.Message; - //} - //if (isExpired != null && (bool)isExpired["result"]) - // objResponse.strErrorDesc = objResponse.strErrorDesc.Replace("{0}", (string)isExpired["date"]); - //return intUserId; + return userInfo; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 7e7a4a9..10d1e09 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -311,7 +311,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } else { - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE; $("#messageModal").modal('show'); } @@ -337,7 +337,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#btnConvertOpen").removeAttr("style"); $("#btnImportOpen").css({"display":"none"}) ; $("#btnConvertDownLoad").css({"display":"none"}) ; - $rootScope.confirmMessage = "This curriculum is not completely converted to new format. Please contact ADAM or recreate it .\nDo you still want to open it?"; + $rootScope.confirmMessage =AIAConstants.OPEN_CB_OLD_TO_NEW_ISSUE; $timeout(function () { $rootScope.newCurriculumObject=curriculumobject; $("#cbMessageModal").modal('show'); @@ -464,7 +464,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } else { - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;""; $("#messageModal").modal('show'); } @@ -481,7 +481,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#btnConvertOpen").css({"display":"none"}) ; $rootScope.newCurriculumObject=curriculumobject; $rootScope.convertedfileName=myfileName; - $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?"; + $rootScope.confirmMessage =AIAConstants.CONVERT_CB_OLD_TO_NEW_ISSUE; $timeout(function () { $("#cbMessageModal").modal('show'); }, 200); @@ -1451,7 +1451,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } else { - $rootScope.errorMessage = "This Curriculum file is not supported! Please try again."; + $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE; $("#messageModal").modal('show'); } @@ -1475,7 +1475,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#btnConvertDownLoad").css({"display":"none"}) ; $("#btnConvertOpen").css({"display":"none"}) ; $rootScope.newCurriculumObject=curriculumobject; - $rootScope.confirmMessage = "This curriculum is not completely converted to new format. Please contact ADAM or recreate it .\nDo you still want to import it?"; + $rootScope.confirmMessage = AIAConstants.IMPORT_CB_OLD_TO_NEW_ISSUE; $timeout(function () { $("#cbMessageModal").modal('show'); }, 200); @@ -2421,7 +2421,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState)) { $rootScope.UnsaveCurriculum = true; - $rootScope.errorMessage = 'This slide has some legacy version annotations and also not compatible with new format. Please contact ADAM or recreate it.'; + $rootScope.errorMessage =AIAConstants.CB_OLD_SLIDE_ANNOTATION_ISSUE; $("#messageModal").modal('show'); windowData.annotationData=""; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index da63468..8cf6a32 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -622,16 +622,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#helplinkId").append("
  • About A.D.A.M.
    • "); } - $scope.EnableDisableExportImage=function() + $scope.DisableDemoAccountOption=function() { //enable export image for instructors edition and for superadmin .disable for demo/test user if ((($rootScope.userData.EditionId == 1) || ($rootScope.userData.EditionId == 2) || ($rootScope.userData.EditionId == 0)) && ($rootScope.userData.UserTypeId != 8)) { - $('#exportImageAnchor').removeClass('exportImage'); } else { + //disable for demo user $('#exportImageAnchor').addClass('exportImage'); + $('#newCurriculumid').addClass('newCurriculum'); + $("#printAVAnchor").addClass("PrintViewer"); + $("#printAllAVAnchor").addClass("PrintViewer"); + $("#printPreviewAnchor").addClass("PrintPreview"); } } @@ -2191,7 +2195,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $rootScope.ConvertCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").removeClass("PrintViewer"); @@ -2212,7 +2217,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").removeClass("PrintViewer"); @@ -2231,7 +2237,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").removeClass("PrintViewer"); @@ -2250,7 +2257,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").addClass("PrintViewer"); @@ -2263,7 +2271,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openResourceId").addClass("openResources"); $("#annotationButton").addClass("disableMenuoption"); $("#Menuoptionid").addClass("disableMenuoption"); - $rootScope.newCurriculum = ""; + $("#newCurriculumid").removeClass("newCurriculum"); + $rootScope.ConvertCurriculum = ""; $rootScope.openCurriculum = ""; $rootScope.saveCurriculam = "saveCurriculam"; @@ -2279,12 +2288,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data //close while back from cb $rootScope.CloseAnnotationTool(); $rootScope.CloseListManager(); + $scope.DisableDemoAccountOption(); } else if ($location.url() == "/curriculum-builder-detail") { $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#Menuoptionid").addClass("disableMenuoption"); - $rootScope.newCurriculum = ""; + $("#newCurriculumid").removeClass("newCurriculum"); + $rootScope.ConvertCurriculum = ""; $rootScope.openCurriculum = ""; $rootScope.saveCurriculam = ""; $("#openResourceId").removeClass("openResources"); @@ -2295,6 +2306,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#printAllAVAnchor").addClass("PrintViewer"); $("#printPreviewAnchor").addClass("PrintPreview"); $("#exportImageAnchor").addClass("exportImage"); + $scope.DisableDemoAccountOption(); } else if ($location.url() == "/adam-images-detail") { $("#annotationButton").removeClass("disableMenuoption"); @@ -2308,7 +2320,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").removeClass("PrintViewer"); @@ -2328,7 +2341,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").addClass("PrintViewer"); @@ -2347,7 +2361,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#openPictureId").removeClass("OpenPitures"); $("#openAnimationId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; - $rootScope.newCurriculum = "newCurriculum"; + $("#newCurriculumid").addClass("newCurriculum"); + $rootScope.ConvertCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; $rootScope.saveCurriculam = "saveCurriculam"; $("#printAVAnchor").addClass("PrintViewer"); @@ -2441,12 +2456,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optiontSetting").removeClass("disableSubMenu"); $("#listManagerBody *").prop('disabled',false); - + + $('#exportImageAnchor').removeClass('exportImage'); $("#printAVAnchor").removeClass("PrintViewer"); $("#printAllAVAnchor").removeClass("PrintViewer"); $("#printPreviewAnchor").removeClass("PrintPreview"); $rootScope.panelNameWithCb = paneld; - $scope.EnableDisableExportImage(); + $scope.DisableDemoAccountOption(); } else if(paneld.match('AAImagePanel')) { @@ -2456,12 +2472,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#annotationToolBarOptions").removeClass("disableSubMenu"); $("#listManagerBody *").prop('disabled',false); - + + $('#exportImageAnchor').removeClass('exportImage'); $("#printAVAnchor").removeClass("PrintViewer"); $("#printAllAVAnchor").removeClass("PrintViewer"); $("#printPreviewAnchor").removeClass("PrintPreview"); $rootScope.panelNameWithCb = paneld; - $scope.EnableDisableExportImage(); + $scope.DisableDemoAccountOption(); } else if(paneld.match('aiImagePanel')) { @@ -2469,11 +2486,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#Menuoptionid").removeClass("disableMenuoption"); $("#annotationToolBarOptions").removeClass("disableSubMenu"); + $('#exportImageAnchor').removeClass('exportImage'); $("#printAVAnchor").removeClass("PrintViewer"); $("#printAllAVAnchor").removeClass("PrintViewer"); $("#printPreviewAnchor").removeClass("PrintPreview"); $rootScope.panelNameWithCb = paneld; - $scope.EnableDisableExportImage(); + $scope.DisableDemoAccountOption(); } else if(paneld.match('picImagePanel')) { @@ -2481,11 +2499,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#Menuoptionid").removeClass("disableMenuoption"); $("#annotationToolBarOptions").removeClass("disableSubMenu"); + $('#exportImageAnchor').removeClass('exportImage'); $("#printAVAnchor").removeClass("PrintViewer"); $("#printAllAVAnchor").removeClass("PrintViewer"); $("#printPreviewAnchor").removeClass("PrintPreview"); $rootScope.panelNameWithCb = paneld; - $scope.EnableDisableExportImage(); + $scope.DisableDemoAccountOption(); } else if(paneld.match('ciImagePanel')) { @@ -2493,11 +2512,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#Menuoptionid").removeClass("disableMenuoption"); $("#annotationToolBarOptions").removeClass("disableSubMenu"); + $('#exportImageAnchor').removeClass('exportImage'); $("#printAVAnchor").removeClass("PrintViewer"); $("#printAllAVAnchor").removeClass("PrintViewer"); $("#printPreviewAnchor").removeClass("PrintPreview"); $rootScope.panelNameWithCb = paneld; - $scope.EnableDisableExportImage(); + $scope.DisableDemoAccountOption(); } else if(paneld.match('caImagePanel')) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 2c95f72..cec15b9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -543,7 +543,12 @@ AIA.constant("AIAConstants", { "PLEASE_ENTER_SEARCH_TEXT": "Please enter the text to search.", "SETTINGS_SAVED": "Your current settings has been saved.", "SETTING_SAVE_ERROR":"There is some error in saving your current settings. Please try after sometime.", - "SAVE_ANIMATION_ERROR":"There is some error while saving your animation. Please try after sometime." + "SAVE_ANIMATION_ERROR":"There is some error while saving your animation. Please try after sometime.", + "CB_FILE_FORMAT_ISSUE":"This Curriculum file is not supported! Please try again.", + "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?", + "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?", + "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?", + "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." }) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 80ed79f..decca36 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -11,8 +11,8 @@
  • Open Test
  • Save Test As
    • -
  • Convert Old To New Curriculum
    • -
  • New Curriculum
    • +
  • Convert Curriculum (.sldshw to .json)
    • +
  • New Curriculum
  • Open Existing Curriculum
  • Save Curriculum As