diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs index 997612b41..d8397a484 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs @@ -120,6 +120,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetFormData(string keyValue) { var FillinFromData = fillinFromIBLL.GetFillinFromEntity(keyValue); + if (FillinFromData.FillingCycle == "2") + { + FillinFromData.FillingTime2= FillinFromData.FillingTime; + } + else + { + FillinFromData.FillingTime1= FillinFromData.FillingTime; + } var jsonData = new { FillinFrom = FillinFromData, @@ -185,7 +193,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers else if (entity.FillingCycle == "3") { entity.FillingTime = entity.FillingTime1; - } + } #endregion fillinFromIBLL.SaveEntity(keyValue, entity);