From 1f8c4a8bd22bb81b4a4bf679ca4af7e535568dea Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Sep 2018 15:32:30 +0530 Subject: [PATCH] cpmit changes --- 400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs | 2 +- 400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs index 3541146..77dd165 100644 --- a/400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs @@ -260,7 +260,7 @@ namespace AIAHTML5.API.Controllers { aar.Add(User["EmailAdd"].ToString()); } - AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString()); + AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true); return Request.CreateResponse(HttpStatusCode.OK); } [Route("api/LabExercise/GetParameter")] diff --git a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs index 88f12bc..a02ff79 100644 --- a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs +++ b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs @@ -283,7 +283,7 @@ namespace AIAHTML5.API.Models } } - public static bool SendEmail(Newtonsoft.Json.Linq.JObject userInfo, ArrayList mailToList, string sender, string mailSubject = "", string mailBody = "") + public static bool SendEmail(Newtonsoft.Json.Linq.JObject userInfo, ArrayList mailToList, string sender, string mailSubject = "", string mailBody = "", bool isCalForLabExerciseReport=false) { ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType)); logger.Debug("Inside SendEmail with UserInfo =" + userInfo); @@ -301,8 +301,9 @@ namespace AIAHTML5.API.Models { lstToAddress.Add(email); } - - //emailMessage = "Unable to process request for "; + if (!isCalForLabExerciseReport) + emailMessage = "Unable to process request for "; + else emailMessage = " "; if (UserUtility.CheckIfPropertyExists(userInfo, "username") && !string.IsNullOrEmpty(userInfo["username"].ToString())) emailMessage += "username: " + userInfo["username"].ToString() + ""; -- libgit2 0.21.4