ADAM / AIAHTML5

Commit 763c8034d8189fffda44dc7592ec6d7e159ee74b

Authored by Birendra Kumar
2 parents c48a3e80 a5b01cb8

Merge branch 'AIA_Develop' into AIA_QA

Inline Side-by-side
Showing 11 changed files with 270 additions and 204 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
  View file @763c803
... ... @@ -3240,55 +3240,6 @@ namespace AIAHTML5.ADMIN.API.Entity
3240 3240 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetUserType_Result>("usp_GetUserType", idParameter);
3241 3241 }
3242 3242  
3243   - public virtual ObjectResult<Nullable<int>> usp_InsertAIAUser(string sLoginId, string sPassword, string sFirstname, string sLastname, Nullable<byte> iUserTypeId, string sEmailId, Nullable<byte> iSecurityQuesId, string sSecurityAnswer, Nullable<int> iCreatorId, Nullable<int> iLicenseId, Nullable<byte> iEditionId, ObjectParameter status)
3244   - {
3245   - var sLoginIdParameter = sLoginId != null ?
3246   - new ObjectParameter("sLoginId", sLoginId) :
3247   - new ObjectParameter("sLoginId", typeof(string));
3248   -
3249   - var sPasswordParameter = sPassword != null ?
3250   - new ObjectParameter("sPassword", sPassword) :
3251   - new ObjectParameter("sPassword", typeof(string));
3252   -
3253   - var sFirstnameParameter = sFirstname != null ?
3254   - new ObjectParameter("sFirstname", sFirstname) :
3255   - new ObjectParameter("sFirstname", typeof(string));
3256   -
3257   - var sLastnameParameter = sLastname != null ?
3258   - new ObjectParameter("sLastname", sLastname) :
3259   - new ObjectParameter("sLastname", typeof(string));
3260   -
3261   - var iUserTypeIdParameter = iUserTypeId.HasValue ?
3262   - new ObjectParameter("iUserTypeId", iUserTypeId) :
3263   - new ObjectParameter("iUserTypeId", typeof(byte));
3264   -
3265   - var sEmailIdParameter = sEmailId != null ?
3266   - new ObjectParameter("sEmailId", sEmailId) :
3267   - new ObjectParameter("sEmailId", typeof(string));
3268   -
3269   - var iSecurityQuesIdParameter = iSecurityQuesId.HasValue ?
3270   - new ObjectParameter("iSecurityQuesId", iSecurityQuesId) :
3271   - new ObjectParameter("iSecurityQuesId", typeof(byte));
3272   -
3273   - var sSecurityAnswerParameter = sSecurityAnswer != null ?
3274   - new ObjectParameter("sSecurityAnswer", sSecurityAnswer) :
3275   - new ObjectParameter("sSecurityAnswer", typeof(string));
3276   -
3277   - var iCreatorIdParameter = iCreatorId.HasValue ?
3278   - new ObjectParameter("iCreatorId", iCreatorId) :
3279   - new ObjectParameter("iCreatorId", typeof(int));
3280   -
3281   - var iLicenseIdParameter = iLicenseId.HasValue ?
3282   - new ObjectParameter("iLicenseId", iLicenseId) :
3283   - new ObjectParameter("iLicenseId", typeof(int));
3284   -
3285   - var iEditionIdParameter = iEditionId.HasValue ?
3286   - new ObjectParameter("iEditionId", iEditionId) :
3287   - new ObjectParameter("iEditionId", typeof(byte));
3288   -
3289   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<Nullable<int>>("usp_InsertAIAUser", sLoginIdParameter, sPasswordParameter, sFirstnameParameter, sLastnameParameter, iUserTypeIdParameter, sEmailIdParameter, iSecurityQuesIdParameter, sSecurityAnswerParameter, iCreatorIdParameter, iLicenseIdParameter, iEditionIdParameter, status);
3290   - }
3291   -
3292 3243 public virtual int usp_InsertDeleteUserManageRights(string roleName, Nullable<int> activityId, Nullable<int> userId, string requestType, ObjectParameter status)
3293 3244 {
3294 3245 var roleNameParameter = roleName != null ?
... ... @@ -4133,13 +4084,17 @@ namespace AIAHTML5.ADMIN.API.Entity
4133 4084 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseEditionById_Result>("usp_GetLicenseEditionById", licenseEditionIdParameter);
4134 4085 }
4135 4086  
4136   - public virtual ObjectResult<Nullable<bool>> usp_GetModestyForThisLicense(Nullable<int> licenseId)
  4087 + public virtual ObjectResult<Nullable<bool>> usp_GetModestyForThisLicense(Nullable<int> licenseId, Nullable<byte> editionId)
4137 4088 {
4138 4089 var licenseIdParameter = licenseId.HasValue ?
4139 4090 new ObjectParameter("licenseId", licenseId) :
4140 4091 new ObjectParameter("licenseId", typeof(int));
4141 4092  
4142   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<Nullable<bool>>("usp_GetModestyForThisLicense", licenseIdParameter);
  4093 + var editionIdParameter = editionId.HasValue ?
  4094 + new ObjectParameter("editionId", editionId) :
  4095 + new ObjectParameter("editionId", typeof(byte));
  4096 +
  4097 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<Nullable<bool>>("usp_GetModestyForThisLicense", licenseIdParameter, editionIdParameter);
4143 4098 }
4144 4099  
4145 4100 public virtual ObjectResult<usp_GetModuleStatusByLicenseId_Result> usp_GetModuleStatusByLicenseId(Nullable<int> iLicenseId)
... ... @@ -4982,5 +4937,54 @@ namespace AIAHTML5.ADMIN.API.Entity
4982 4937  
4983 4938 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_UpdateUserProfile", idParameter, firstNameParameter, lastNameParameter, emailIdParameter, status);
4984 4939 }
  4940 +
  4941 + public virtual int usp_InsertAIAUser(string sLoginId, string sPassword, string sFirstname, string sLastname, Nullable<byte> iUserTypeId, string sEmailId, Nullable<byte> iSecurityQuesId, string sSecurityAnswer, Nullable<int> iCreatorId, Nullable<int> iLicenseId, Nullable<byte> iEditionId, ObjectParameter status)
  4942 + {
  4943 + var sLoginIdParameter = sLoginId != null ?
  4944 + new ObjectParameter("sLoginId", sLoginId) :
  4945 + new ObjectParameter("sLoginId", typeof(string));
  4946 +
  4947 + var sPasswordParameter = sPassword != null ?
  4948 + new ObjectParameter("sPassword", sPassword) :
  4949 + new ObjectParameter("sPassword", typeof(string));
  4950 +
  4951 + var sFirstnameParameter = sFirstname != null ?
  4952 + new ObjectParameter("sFirstname", sFirstname) :
  4953 + new ObjectParameter("sFirstname", typeof(string));
  4954 +
  4955 + var sLastnameParameter = sLastname != null ?
  4956 + new ObjectParameter("sLastname", sLastname) :
  4957 + new ObjectParameter("sLastname", typeof(string));
  4958 +
  4959 + var iUserTypeIdParameter = iUserTypeId.HasValue ?
  4960 + new ObjectParameter("iUserTypeId", iUserTypeId) :
  4961 + new ObjectParameter("iUserTypeId", typeof(byte));
  4962 +
  4963 + var sEmailIdParameter = sEmailId != null ?
  4964 + new ObjectParameter("sEmailId", sEmailId) :
  4965 + new ObjectParameter("sEmailId", typeof(string));
  4966 +
  4967 + var iSecurityQuesIdParameter = iSecurityQuesId.HasValue ?
  4968 + new ObjectParameter("iSecurityQuesId", iSecurityQuesId) :
  4969 + new ObjectParameter("iSecurityQuesId", typeof(byte));
  4970 +
  4971 + var sSecurityAnswerParameter = sSecurityAnswer != null ?
  4972 + new ObjectParameter("sSecurityAnswer", sSecurityAnswer) :
  4973 + new ObjectParameter("sSecurityAnswer", typeof(string));
  4974 +
  4975 + var iCreatorIdParameter = iCreatorId.HasValue ?
  4976 + new ObjectParameter("iCreatorId", iCreatorId) :
  4977 + new ObjectParameter("iCreatorId", typeof(int));
  4978 +
  4979 + var iLicenseIdParameter = iLicenseId.HasValue ?
  4980 + new ObjectParameter("iLicenseId", iLicenseId) :
  4981 + new ObjectParameter("iLicenseId", typeof(int));
  4982 +
  4983 + var iEditionIdParameter = iEditionId.HasValue ?
  4984 + new ObjectParameter("iEditionId", iEditionId) :
  4985 + new ObjectParameter("iEditionId", typeof(byte));
  4986 +
  4987 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_InsertAIAUser", sLoginIdParameter, sPasswordParameter, sFirstnameParameter, sLastnameParameter, iUserTypeIdParameter, sEmailIdParameter, iSecurityQuesIdParameter, sSecurityAnswerParameter, iCreatorIdParameter, iLicenseIdParameter, iEditionIdParameter, status);
  4988 + }
4985 4989 }
4986 4990 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
  View file @763c803
... ... @@ -1103,6 +1103,7 @@
1103 1103 </Function>
1104 1104 <Function Name="usp_GetModestyForThisLicense" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
1105 1105 <Parameter Name="licenseId" Type="int" Mode="In" />
  1106 + <Parameter Name="editionId" Type="tinyint" Mode="In" />
1106 1107 </Function>
1107 1108 <Function Name="usp_GetModuleStatusByLicenseId" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
1108 1109 <Parameter Name="iLicenseId" Type="int" Mode="In" />
... ... @@ -2475,20 +2476,6 @@
2475 2476 <FunctionImport Name="usp_GetUserType" ReturnType="Collection(AIADatabaseV5Model.usp_GetUserType_Result)">
2476 2477 <Parameter Name="id" Mode="In" Type="Int32" />
2477 2478 </FunctionImport>
2478   - <FunctionImport Name="usp_InsertAIAUser" ReturnType="Collection(Int32)">
2479   - <Parameter Name="sLoginId" Mode="In" Type="String" />
2480   - <Parameter Name="sPassword" Mode="In" Type="String" />
2481   - <Parameter Name="sFirstname" Mode="In" Type="String" />
2482   - <Parameter Name="sLastname" Mode="In" Type="String" />
2483   - <Parameter Name="iUserTypeId" Mode="In" Type="Byte" />
2484   - <Parameter Name="sEmailId" Mode="In" Type="String" />
2485   - <Parameter Name="iSecurityQuesId" Mode="In" Type="Byte" />
2486   - <Parameter Name="sSecurityAnswer" Mode="In" Type="String" />
2487   - <Parameter Name="iCreatorId" Mode="In" Type="Int32" />
2488   - <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
2489   - <Parameter Name="iEditionId" Mode="In" Type="Byte" />
2490   - <Parameter Name="Status" Mode="InOut" Type="Int32" />
2491   - </FunctionImport>
2492 2479 <FunctionImport Name="usp_InsertDeleteUserManageRights">
2493 2480 <Parameter Name="RoleName" Mode="In" Type="String" />
2494 2481 <Parameter Name="ActivityId" Mode="In" Type="Int32" />
... ... @@ -2663,14 +2650,14 @@
2663 2650 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
2664 2651 </FunctionImport>
2665 2652 <FunctionImport Name="usp_DeleteLicense" ReturnType="Collection(String)">
2666   - <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
  2653 + <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
2667 2654 </FunctionImport>
2668 2655 <FunctionImport Name="usp_EC_GetAccountTypeList" ReturnType="Collection(AIADatabaseV5Model.usp_EC_GetAccountTypeList_Result)" />
2669 2656 <FunctionImport Name="usp_EC_GetCountryList" ReturnType="Collection(AIADatabaseV5Model.usp_EC_GetCountryList_Result)" />
2670 2657 <FunctionImport Name="usp_EC_GetSecurityQuestionList" ReturnType="Collection(AIADatabaseV5Model.usp_EC_GetSecurityQuestionList_Result)" />
2671 2658 <FunctionImport Name="usp_EC_GetStateList" ReturnType="Collection(AIADatabaseV5Model.usp_EC_GetStateList_Result)" />
2672 2659 <FunctionImport Name="usp_GetAIAUserToLicenseEditionDetailByUserId" ReturnType="Collection(AIADatabaseV5Model.usp_GetAIAUserToLicenseEditionDetailByUserId_Result)">
2673   - <Parameter Name="userId" Mode="In" Type="Int32" />
  2660 + <Parameter Name="userId" Mode="In" Type="Int32" />
2674 2661 </FunctionImport>
2675 2662 <FunctionImport Name="usp_GetBlockedUserByAccNoAndType" ReturnType="Collection(AIADatabaseV5Model.usp_GetBlockedUserByAccNoAndType_Result)">
2676 2663 <Parameter Name="iUserTypeId" Mode="In" Type="Byte" />
... ... @@ -2744,19 +2731,20 @@
2744 2731 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
2745 2732 </FunctionImport>
2746 2733 <FunctionImport Name="usp_GetIncorrectLoginAttempt" ReturnType="Collection(Int16)">
2747   - <Parameter Name="iUserId" Mode="In" Type="Int32" />
  2734 + <Parameter Name="iUserId" Mode="In" Type="Int32" />
2748 2735 </FunctionImport>
2749 2736 <FunctionImport Name="usp_GetLicenseByLicenseId" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseByLicenseId_Result)">
2750   - <Parameter Name="LicenseId" Mode="In" Type="Int32" />
  2737 + <Parameter Name="LicenseId" Mode="In" Type="Int32" />
2751 2738 </FunctionImport>
2752 2739 <FunctionImport Name="usp_GetLicenseEditionById" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseEditionById_Result)">
2753   - <Parameter Name="LicenseEditionId" Mode="In" Type="Int32" />
  2740 + <Parameter Name="LicenseEditionId" Mode="In" Type="Int32" />
2754 2741 </FunctionImport>
2755 2742 <FunctionImport Name="usp_GetModestyForThisLicense" ReturnType="Collection(Boolean)">
2756 2743 <Parameter Name="licenseId" Mode="In" Type="Int32" />
  2744 + <Parameter Name="editionId" Mode="In" Type="Byte" />
2757 2745 </FunctionImport>
2758 2746 <FunctionImport Name="usp_GetModuleStatusByLicenseId" ReturnType="Collection(AIADatabaseV5Model.usp_GetModuleStatusByLicenseId_Result)">
2759   - <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
  2747 + <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
2760 2748 </FunctionImport>
2761 2749 <FunctionImport Name="usp_GetNetAdSummaryReport" ReturnType="Collection(AIADatabaseV5Model.usp_GetNetAdSummaryReport_Result)">
2762 2750 <Parameter Name="sFromDate" Mode="In" Type="String" />
... ... @@ -2862,7 +2850,7 @@
2862 2850 <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
2863 2851 </FunctionImport>
2864 2852 <FunctionImport Name="usp_GetWrongAttemptInADayForThisUser" ReturnType="Collection(Int16)">
2865   - <Parameter Name="userId" Mode="In" Type="Int32" />
  2853 + <Parameter Name="userId" Mode="In" Type="Int32" />
2866 2854 </FunctionImport>
2867 2855 <FunctionImport Name="usp_InsertNewDiscount" ReturnType="Collection(String)">
2868 2856 <Parameter Name="dPercentage" Mode="In" Type="Decimal" />
... ... @@ -2992,6 +2980,20 @@
2992 2980 <Parameter Name="EmailId" Mode="In" Type="String" />
2993 2981 <Parameter Name="Status" Mode="InOut" Type="Int32" />
2994 2982 </FunctionImport>
  2983 + <FunctionImport Name="usp_InsertAIAUser">
  2984 + <Parameter Name="sLoginId" Mode="In" Type="String" />
  2985 + <Parameter Name="sPassword" Mode="In" Type="String" />
  2986 + <Parameter Name="sFirstname" Mode="In" Type="String" />
  2987 + <Parameter Name="sLastname" Mode="In" Type="String" />
  2988 + <Parameter Name="iUserTypeId" Mode="In" Type="Byte" />
  2989 + <Parameter Name="sEmailId" Mode="In" Type="String" />
  2990 + <Parameter Name="iSecurityQuesId" Mode="In" Type="Byte" />
  2991 + <Parameter Name="sSecurityAnswer" Mode="In" Type="String" />
  2992 + <Parameter Name="iCreatorId" Mode="In" Type="Int32" />
  2993 + <Parameter Name="iLicenseId" Mode="In" Type="Int32" />
  2994 + <Parameter Name="iEditionId" Mode="In" Type="Byte" />
  2995 + <Parameter Name="Status" Mode="InOut" Type="Int32" />
  2996 + </FunctionImport>
2995 2997 </EntityContainer>
2996 2998 <ComplexType Name="DA_GetBaseLayer_Result">
2997 2999 <Property Type="Int32" Name="Id" Nullable="false" />
... ... @@ -5809,7 +5811,6 @@
5809 5811 </ComplexTypeMapping>
5810 5812 </ResultMapping>
5811 5813 </FunctionImportMapping>
5812   - <FunctionImportMapping FunctionImportName="usp_InsertAIAUser" FunctionName="AIADatabaseV5Model.Store.usp_InsertAIAUser" />
5813 5814 <FunctionImportMapping FunctionImportName="usp_InsertDeleteUserManageRights" FunctionName="AIADatabaseV5Model.Store.usp_InsertDeleteUserManageRights" />
5814 5815 <FunctionImportMapping FunctionImportName="usp_InsertSubscriptionPlan" FunctionName="AIADatabaseV5Model.Store.usp_InsertSubscriptionPlan" />
5815 5816 <FunctionImportMapping FunctionImportName="usp_InsertUpdateLicenseUserGroup" FunctionName="AIADatabaseV5Model.Store.usp_InsertUpdateLicenseUserGroup" />
... ... @@ -6301,6 +6302,7 @@
6301 6302 <FunctionImportMapping FunctionImportName="usp_UpdateDiscount" FunctionName="AIADatabaseV5Model.Store.usp_UpdateDiscount" />
6302 6303 <FunctionImportMapping FunctionImportName="usp_UpdateLicenseAccount" FunctionName="AIADatabaseV5Model.Store.usp_UpdateLicenseAccount" />
6303 6304 <FunctionImportMapping FunctionImportName="usp_UpdateUserProfile" FunctionName="AIADatabaseV5Model.Store.usp_UpdateUserProfile" />
  6305 + <FunctionImportMapping FunctionImportName="usp_InsertAIAUser" FunctionName="AIADatabaseV5Model.Store.usp_InsertAIAUser" />
6304 6306 </EntityContainerMapping>
6305 6307 </Mapping>
6306 6308 </edmx:Mappings>
... ...
400-SOURCECODE/AIAHTML5.API/Controllers/ClientController.cs
  View file @763c803
... ... @@ -46,20 +46,24 @@ namespace AIAHTML5.API.Controllers
46 46 {
47 47 dynamic uerinfo = AIAHTML5.API.Models.Users.ValidateSiteLogin(siteUrl["siteIP"].ToString(), siteUrl["accountNumber"].ToString(), siteUrl["urlReferer"].ToString(), siteUrl["edition"].ToString(), siteId);
48 48 if (uerinfo != null)
  49 + {
  50 + uerinfo.siteId = siteId;
49 51 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(JsonConvert.SerializeObject(uerinfo)) };
  52 + }
50 53 else
51 54 {
52 55 //ser user = new User();
53 56 //user.LoginFailureCauseId = AIAConstants.INVALID_CLIENT;
54 57 //dynamic userinfo = user;
55 58 //response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(userInfo) };
56   -
  59 + logger.Debug("IVALID CLIENT");
57 60 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.INVALID_CLIENT) };
58 61 }
59 62 }
60 63  
61 64 else
62 65 {
  66 + logger.Debug("NOT AUTHORIZED");
63 67 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.MSG_NOT_AUTHORIZE_SITE_USER) };
64 68  
65 69 }
... ... @@ -70,7 +74,7 @@ namespace AIAHTML5.API.Controllers
70 74 response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = null };
71 75  
72 76 }
73   -
  77 + logger.Debug("response = " + response);
74 78 return response;
75 79 }
76 80 catch (SqlException e)
... ...
400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs
  View file @763c803
... ... @@ -260,8 +260,11 @@ namespace AIAHTML5.API.Controllers
260 260 {
261 261 aar.Add(User["EmailAdd"].ToString());
262 262 }
263   - AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
264   - return Request.CreateResponse(HttpStatusCode.OK);
  263 + // AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
  264 + // return Request.CreateResponse(HttpStatusCode.OK);
  265 + bool isEMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
  266 + // return Request.CreateResponse(HttpStatusCode.OK,);
  267 + return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(isEMailSent.ToString()) };
265 268 }
266 269 [Route("api/LabExercise/GetParameter")]
267 270 [HttpGet]
... ...
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
  View file @763c803
... ... @@ -302,6 +302,7 @@ namespace AIAHTML5.API.Models
302 302 objUser.UserTypeId = Convert.ToInt32(dr["UserTypeId"]);
303 303 objUser.UserType = objModel.GetUserTypeStringById(Convert.ToInt32(dr["UserTypeId"]));
304 304 objUser.IsActive = Convert.ToBoolean(dr["IsActive"]);
  305 + logger.Debug("objUser.Id= " + objUser.Id + ",objUser.FirstName= " + objUser.FirstName + ",objUser.LoginId= " + objUser.LoginId + ",objUser.Password= " + objUser.Password + ",objUser.SecurityQuestionId= " + objUser.SecurityQuestionId);
305 306 }
306 307 }
307 308 }
... ...
400-SOURCECODE/AIAHTML5.API/Models/User.cs
  View file @763c803
... ... @@ -38,6 +38,7 @@ namespace AIAHTML5.API.Models
38 38 public bool IsModestyOn { get; set; }
39 39 public ArrayList Modules { get; set; }
40 40 public int siteId { get; set; }
  41 + public string pwd { get; set; }
41 42  
42 43 public License LicenseInfo { get; set; }
43 44 public LicenseSubscriptionDetails LicenseSubscriptions { get; set; }
... ...
400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
  View file @763c803
... ... @@ -314,10 +314,10 @@ namespace AIAHTML5.API.Models
314 314 if (UserUtility.CheckIfPropertyExists(userInfo, "accountNumber") && !string.IsNullOrEmpty(userInfo["accountNumber"].ToString()))
315 315 emailMessage += "accountNumber: <b>" + userInfo["accountNumber"].ToString() + "</b><br/><br/>";
316 316  
317   - if (string.IsNullOrEmpty(sender))
  317 + // if (string.IsNullOrEmpty(sender))
318 318 senderEmailId = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]);
319   - else
320   - senderEmailId = sender;
  319 + // else
  320 + // senderEmailId = sender;
321 321  
322 322 emailMessage += mailBody;
323 323  
... ...
400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs
  View file @763c803
... ... @@ -31,6 +31,9 @@ namespace AIAHTML5.API.Utility
31 31  
32 32 public void SendMail(MailMessage mm)
33 33 {
  34 + ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
  35 + //logger.Debug("inside SendMail");
  36 +
34 37 try
35 38 {
36 39 SmtpClient smtp = new SmtpClient();
... ... @@ -39,11 +42,13 @@ namespace AIAHTML5.API.Utility
39 42 System.Net.NetworkCredential NetworkCred = new System.Net.NetworkCredential(mm.From.ToString(), ConfigurationManager.AppSettings["SenderPassword"]);
40 43 smtp.Credentials = NetworkCred;
41 44 smtp.Port = Convert.ToInt32(ConfigurationManager.AppSettings["SMTPPort"]);
42   - smtp.EnableSsl = false;
  45 + // smtp.EnableSsl = false;
43 46 smtp.Send(mm);
44 47 }
45 48 catch (Exception e)
46   - {
  49 + {
  50 + logger.Fatal("Exception inside SendMail. Ex= " + e.Message + "....STACKTRACE = " + e.StackTrace);
  51 +
47 52 throw;
48 53 }
49 54 }
... ... @@ -136,7 +141,7 @@ namespace AIAHTML5.API.Utility
136 141 catch (Exception ex)
137 142 {
138 143 logger.Fatal("exception in SendSmtpEmail.msg= " + ex.Message + ", stacktarce= " + ex.StackTrace);
139   - throw ex;
  144 + throw ;
140 145 }
141 146 }
142 147 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @763c803
... ... @@ -513,8 +513,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
513 513 else {
514 514 $rootScope.isVisibleLogin = false;
515 515  
516   - $rootScope.loadSearchData();
517   -
  516 +
518 517 console.log('currentBodyViewId picked from localStorage: ' + currentBodyViewId);
519 518  
520 519 var openViews;
... ... @@ -536,8 +535,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
536 535 var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
537 536 $rootScope.StoreTitleName(tittle);
538 537  
539   - // store image for export
540   - $scope.LoadImageToExport();
  538 + $rootScope.loadSearchData();
  539 +
  540 +
541 541  
542 542 //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
543 543 //if (openViews != null && openViews != undefined) {
... ... @@ -910,8 +910,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
910 910 }
911 911 }
912 912  
913   - // store image for export
914   - $scope.LoadImageToExport();
  913 +
915 914  
916 915 //console.log("s" + $rootScope.vocabTermDataArray);
917 916 //call watch on '$scope.VocabTermTxt and compile <li> and append to <ul> on first time load
... ... @@ -922,6 +921,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
922 921 //}, true);
923 922  
924 923 }
  924 + // store image for export
  925 + $scope.LoadImageToExport();
925 926  
926 927 }
927 928  
... ... @@ -8029,8 +8030,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8029 8030 // store image for export
8030 8031 var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
8031 8032 $rootScope.StoreTitleName(tittle);
8032   - $scope.LoadImageToExport();
8033   -
  8033 +
8034 8034 $rootScope.isLoading = true;
8035 8035  
8036 8036 }
... ... @@ -8066,7 +8066,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8066 8066 // store image for export
8067 8067 var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
8068 8068 $rootScope.StoreTitleName(tittle);
8069   - $scope.LoadImageToExport();
  8069 +
8070 8070  
8071 8071 $rootScope.isLoading = true;
8072 8072  
... ... @@ -8362,8 +8362,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8362 8362 // store image for export
8363 8363 var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
8364 8364 $rootScope.StoreTitleName(tittle);
8365   - $scope.LoadImageToExport();
8366   -
  8365 +
8367 8366 $rootScope.openViews.push(
8368 8367 {
8369 8368 "module": $rootScope.currentActiveModuleTitle, "bodyView": $rootScope.getLocalStorageValue("currentViewTitle"), "state": 'max', "BodyViewId": $rootScope.voId,
... ... @@ -8452,6 +8451,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8452 8451  
8453 8452 $scope.loadNavigatorForSelectedBodyView(data.bodyViewId);
8454 8453  
  8454 + // store image for export
  8455 + $scope.LoadImageToExport();
  8456 +
8455 8457 })
8456 8458 //Reload DA controller Body View after setting Change
8457 8459 $scope.$on('reloadDABodyViewEvent', function (event, data) {
... ... @@ -8475,6 +8477,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8475 8477  
8476 8478 $scope.loadNavigatorForSelectedBodyView(data.reloadDABodyViewId);
8477 8479  
  8480 + // store image for export
  8481 + $scope.LoadImageToExport();
  8482 +
8478 8483 if ($scope.layerNumber != 0) {
8479 8484 $scope.EnableUI();
8480 8485 }
... ... @@ -8488,10 +8493,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8488 8493  
8489 8494 $scope.loadNavigatorForSelectedBodyView = function (currentBodyViewId) {
8490 8495  
8491   -
8492   - // store image for export
8493   - $scope.LoadImageToExport();
8494   -
8495 8496 if ($rootScope.NavigatorData != null || $rootScope.NavigatorData != undefined) {
8496 8497 var navdtlOrient = new jinqJs()
8497 8498 .from($rootScope.NavigatorData.Navigtor.ViewOrientation)
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @763c803
... ... @@ -364,106 +364,102 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
364 364 $location.path('/');
365 365  
366 366 }
367   - else {
368   - if (result.LicenseInfo != null && result.LicenseInfo.IsTermAccepted)
369   - {
370   -
  367 + else
  368 + {
  369 + //1. set haveRoleAdmin = false because LicenseInfo is not null
  370 +
  371 + if (result.LicenseTypeId != 5) {
  372 +
  373 + $rootScope.haveRoleAdmin = true;
  374 +
  375 + }
  376 + if (result.UserTypeId == 8) {
  377 +
  378 + $rootScope.haveRoleAdmin = false;
  379 + }
  380 +
  381 + // Remove Admin Link for LicenseEditionId 3/4 of student
  382 + if (result.EditionId == 3 || result.EditionId == 4) {
  383 + $rootScope.haveRoleAdmin = false;
  384 +
  385 + }
  386 +
  387 + if (result.LicenseInfo != null) {
  388 +
371 389 // set license id
372   - $scope.UpdateUserExportImageData(result.Id,'LicenseId',result.LicenseId)
  390 + $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
373 391  
374   - // set license type :note 5 for demo/test license
375   - $scope.UpdateUserExportImageData(result.Id,'LicenseTypeId',result.LicenseInfo.LicenseTypeId);
376   -
377   - if(result.UserExportImageDetail!=null)
378   - {
  392 + // set license type :note 5 for demo/test license
  393 + $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
  394 +
  395 + if (result.UserExportImageDetail != null) {
379 396 // set already export image count
380   - $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
381   -
382   - // set Image limit
383   - $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
  397 + $scope.UpdateUserExportImageData(result.Id, 'CountExportImage', result.UserExportImageDetail.CountExportedImage);
384 398  
385   - // set is enable for export image
386   - $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
387   - }
388   -
389   -
390   - // disable export image option for demo and for cross the Image limit
391   - if(result.LicenseInfo.LicenseTypeId==5 || result.UserExportImageDetail.isExportImage==false)
392   - {
393   - $rootScope.exportImage = "disableSubMenu";
394   - }
  399 + // set Image limit
  400 + $scope.UpdateUserExportImageData(result.Id, 'ExptImageLimit', result.UserExportImageDetail.ExptImageLimit);
395 401  
396   - //0.
397   - $rootScope.userData = result;
398   - $rootScope.userModules = result.Modules;
399   -
400   - //1. set haveRoleAdmin = false because LicenseInfo is not null
401   -
402   - if (result.LicenseTypeId != 5 ) {
  402 + // set is enable for export image
  403 + $scope.UpdateUserExportImageData(result.Id, 'isExportImage', result.UserExportImageDetail.isExportImage);
  404 + }
403 405  
404   - $rootScope.haveRoleAdmin = true;
405 406  
406   - }
407   - if (result.UserTypeId == 8)
408   - {
409   -
410   - $rootScope.haveRoleAdmin = false;
  407 + // disable export image option for demo account
  408 + if (result.LicenseInfo.LicenseTypeId == 5 ) {
  409 + $rootScope.exportImage = "exportImage";
411 410 }
412 411  
413   - // Remove Admin Link for LicenseEditionId 3/4 of student
414   - if(result.EditionId==3 ||result.EditionId==4)
415   - {
416   - $rootScope.haveRoleAdmin = false;
417 412  
418   - }
  413 + if (result.LicenseInfo.IsTermAccepted) {
419 414  
420   - $("#modestyDiv").css("pointer-events", "none");
421   - $("#modestyDiv").css("opacity", 0.5);
422   - //2.
423   - if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
  415 + //0.
  416 + $rootScope.userData = result;
  417 + $rootScope.userModules = result.Modules;
424 418  
425   - localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
426   - }
  419 + $("#modestyDiv").css("pointer-events", "none");
  420 + $("#modestyDiv").css("opacity", 0.5);
  421 + //2.
  422 + if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
427 423  
428   - // 3.ShowAssignedModulesPopup
429   - //isCommingSoonModel =true only when user comes first time on application and login
430   - if (isCommingSoonModel == true)
431   - {
  424 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
  425 + }
432 426  
433   - // ShowAssignedModulesPopup(result.Modules);
434   - }
  427 + // 3.ShowAssignedModulesPopup
  428 + //isCommingSoonModel =true only when user comes first time on application and login
  429 + if (isCommingSoonModel == true) {
435 430  
436   - //4.
437   - if($scope.rememberChk)
438   - {
439   -
440   - $scope.saveRemeberMeDetails(result, userInfo);
441   - }
442   -
443   - //5.
  431 + // ShowAssignedModulesPopup(result.Modules);
  432 + }
  433 +
  434 + //4.
  435 + if ($scope.rememberChk) {
  436 +
  437 + $scope.saveRemeberMeDetails(result, userInfo);
  438 + }
  439 +
  440 + //5.
444 441 sessionStorage.setItem("loginSession", "true");
445 442 $rootScope.isVisibleLogin = false;
446   -
447   - //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
  443 +
  444 + //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
448 445 localStorage.setItem('isCommingSoonModel', false);
449   -
450   - $location.path('/');
451 446  
452   - }
453   - else {
454   - if ($('#dvTerms').length > 0) {
455   - $('#dvTerms').html(result.TermsAndConditionsText);
  447 + $location.path('/');
456 448 }
457   - $rootScope.isVisibleLogin = true;
458   - $('#dvTermCondition').fadeIn();
459   - $rootScope.userData = result;
460   - $rootScope.haveRoleAdmin = false;
461   - localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
462   - $location.path('/');
  449 + else {
  450 + if ($('#dvTerms').length > 0) {
  451 + $('#dvTerms').html(result.TermsAndConditionsText);
  452 + }
  453 + $rootScope.isVisibleLogin = true;
  454 + $('#dvTermCondition').fadeIn();
  455 + $rootScope.userData = result;
  456 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
  457 + $location.path('/');
  458 + }
  459 +
463 460 }
464   - }
465   -
466   -
  461 +
  462 + }
467 463  
468 464 }
469 465  
... ... @@ -697,10 +693,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
697 693 }
698 694  
699 695  
700   - // disable export image option for demo and for cross the Image limit
701   - if(result.LicenseInfo.LicenseTypeId==5 || result.UserExportImageDetail.isExportImage==false)
  696 + // disable export image option for demo account
  697 + if(result.LicenseInfo.LicenseTypeId==5)
702 698 {
703   - $rootScope.exportImage = "disableSubMenu";
  699 + $rootScope.exportImage = "exportImage";
704 700 }
705 701  
706 702 $rootScope.userData = result;
... ... @@ -5433,25 +5429,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5433 5429  
5434 5430 };
5435 5431  
5436   - $rootScope.ShowExportImageWindow = function () {
5437   -
5438   - var $ua = navigator.userAgent;
5439   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
5440   - $(".export-image-ipad").modal("show").draggable({ handle: ".modal-header" });
5441   -
5442   - $(".modal-backdrop").css("opacity", ".5");
5443   - $(".modal-backdrop").css("z-index", "1200001");
5444   - }
5445   - else {
5446   - $(".export-image").modal("show").draggable({ handle: ".modal-header" });
5447   -
5448   - $(".modal-backdrop").css("opacity", ".5");
5449   - $(".modal-backdrop").css("z-index", "1200001");
5450   - }
5451   - };
5452   -
5453   -
5454   -
  5432 +
5455 5433 $rootScope.ShowPrintWindow = function () { // Print Active Viewer
5456 5434 html2canvas($("#canvasDiv"), {
5457 5435 onrendered: function (canvas) {
... ... @@ -5832,7 +5810,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5832 5810 'Title': null,
5833 5811 'ModuleName': null,
5834 5812 'ImageName': null,
5835   - 'OriginalFileName': null
  5813 + 'OriginalFileName': null,
  5814 + 'LimitOverMessage': 'This License has exceeded the maximum limit of export image.<br>Please contact administrator.'
5836 5815  
5837 5816 });
5838 5817  
... ... @@ -5888,6 +5867,42 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5888 5867  
5889 5868 }
5890 5869  
  5870 + $rootScope.ShowExportImageWindow = function () {
  5871 +
  5872 + var userid = $rootScope.userData.Id;
  5873 + var isExportedImage = $scope.GetUserExportImageData(userid, 'isExportImage');
  5874 +
  5875 + if (isExportedImage)
  5876 + {
  5877 + var $ua = navigator.userAgent;
  5878 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  5879 + $(".export-image-ipad").modal("show").draggable({ handle: ".modal-header" });
  5880 +
  5881 + $(".modal-backdrop").css("opacity", ".5");
  5882 + $(".modal-backdrop").css("z-index", "1200001");
  5883 + }
  5884 + else
  5885 + {
  5886 + $(".export-image").modal("show").draggable({ handle: ".modal-header" });
  5887 +
  5888 + $(".modal-backdrop").css("opacity", ".5");
  5889 + $(".modal-backdrop").css("z-index", "1200001");
  5890 + }
  5891 +
  5892 + }
  5893 + else
  5894 + {
  5895 + var exptAlertMessage = $scope.GetUserExportImageData(userid, 'LimitOverMessage');
  5896 +
  5897 + $(".export-image-message").modal("show").draggable({ handle: ".modal-header" });
  5898 +
  5899 + $(".modal-backdrop").css("opacity", ".5");
  5900 + $(".modal-backdrop").css("z-index", "1200001");
  5901 + document.getElementById("expMessage").innerHTML = exptAlertMessage;
  5902 +
  5903 + }
  5904 +
  5905 + };
5891 5906  
5892 5907 $rootScope.SaveImagefile = function () {
5893 5908 $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
... ... @@ -5928,10 +5943,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5928 5943 $scope.UpdateUserExportImageData(userid,'isExportImage',result.isExportImage);
5929 5944  
5930 5945 // disable export image option when export Image limit over
5931   - if(result.isExportImage==false)
5932   - {
5933   - $rootScope.exportImage = "disableSubMenu";
5934   - }
  5946 + //if(result.isExportImage==false)
  5947 + //{
  5948 + // $rootScope.exportImage = "exportImage";
  5949 + //}
5935 5950 }
5936 5951  
5937 5952 }),
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @763c803
... ... @@ -1120,6 +1120,36 @@
1120 1120 </div>
1121 1121 </div>
1122 1122 </div>
  1123 +
  1124 + <!--Export Image Alert Model-->
  1125 + <div class="modal fade export-image-message ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
  1126 + style="z-index: 1200002;">
  1127 + <div class="modal-dialog modal-sm" role="document" style="width: 450px;">
  1128 + <div class="modal-content">
  1129 + <div class="modal-header annotation-modal-header ui-draggable-handle">
  1130 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
  1131 + <h4 class="modal-title" id="">Alert Message!</h4>
  1132 + </div>
  1133 + <div class="modal-body">
  1134 + <div class="row paddTopbtm15">
  1135 + <div class="col-sm-12">
  1136 + <div class="form-group">
  1137 + <label id="expMessage" style="font-weight:normal"></label>
  1138 + </div>
  1139 + </div>
  1140 + </div>
  1141 +
  1142 + </div>
  1143 + <div class="modal-footer">
  1144 + <div class="row">
  1145 + <div class="col-sm-12"><button id="btnAlert" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div>
  1146 + </div>
  1147 + </div>
  1148 +
  1149 + </div>
  1150 + </div>
  1151 + </div>
  1152 +
1123 1153 <!--Print Active Viewer-->
1124 1154 <div class="print-box-active portrait-box-active" id="printBox" style="display: none;">
1125 1155 <div id="printDivContent">
... ...