update

Former-commit-id: 8e0beecf6751fb157f35cdef84af818382b6565d
Former-commit-id: f78490fece85f82a7cd770af1c9622a4fc2f5214

labs/Teacher/Infrastructure/Extensions/ObjectMapperExtensions.cs

@@ -38,6 +38,12 @@ namespace Infrastructure.Extensions
             };
             return (T)target.InjectFrom(injection, source);
         }
+
+        public static T FromWhere<T>(this T target, object source, Func<PropertyInfo,PropertyInfo,bool> update)
+        {
+            var injection = new NullableInjection { update = update };
+            return (T)target.InjectFrom(injection, source);
+        }
     }
 
     public class NullableInjection : LoopInjection
@@ -47,6 +53,8 @@ namespace Infrastructure.Extensions
         public Func<PropertyInfo, bool> SkipFunc { get; set; }
         public bool SkipReadonly { get; set; }
 
+        public Func<PropertyInfo, PropertyInfo,bool> update { get; set; }
+
         protected override bool MatchTypes(Type sourceType, Type targetType)
         {
             var snt = Nullable.GetUnderlyingType(sourceType);
@@ -59,6 +67,13 @@ namespace Infrastructure.Extensions
 
         protected override void SetValue(object source, object target, PropertyInfo sp, PropertyInfo tp)
         {
+            if(this.update is not null)
+            {
+                if(!update.Invoke(sp,tp))
+                {
+                    return;
+                }
+            }
             if (sp is null)
             {
                 throw new ArgumentNullException(nameof(sp));

labs/Teacher/TeacherExt/Controllers/HomeController.cs

@@ -210,8 +210,9 @@ namespace TeacherExt.Controllers
                         ToStatus = model.CheckStatus
                     });
                 }
-                entity.From(model);
-                this.ModelToEntity(model, entity);
+                this.UpdateInternal(entity,model);
+                //entity.From(model);
+                //this.ModelToEntity(model, entity);
                 this._personRepo.SaveChanges();
                 if (this.IsJsonRequest())
                 {
@@ -223,6 +224,67 @@ namespace TeacherExt.Controllers
             model.LoginName = login.LoginName;
             return Result<EditTeacherModel>(model);
         }
+
+        private void UpdateInternal(Person entity, EditTeacherModel model)
+        {
+            var self = this.HttpContext.Request.Query.ContainsKey("self") || (this.HttpContext.Request.Method == "POST" && this.HttpContext.Request.Form.ContainsKey("self"));
+            if(self)
+            {
+                if (entity.CheckStatus==model.CheckStatus)
+                {
+                    if(model.CheckStatus== "未提交"||model.CheckStatus== "审核失败")
+                    {
+                        entity.From(model);
+                        this.ModelToEntity(model, entity);
+                    }
+                    else
+                    {
+                        if(entity.RequestEditStatus!=model.RequestEditStatus)
+                        {
+                            entity.RequestEditStatus = model.RequestEditStatus;
+                        }
+                    }
+                }
+                else
+                {
+                    if (entity.CheckStatus == "未提交" || entity.CheckStatus == "审核失败")
+                    {
+                        if (model.CheckStatus == "待审核")
+                        {
+                            entity.From(model);
+                            this.ModelToEntity(model, entity);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (User.IsInRole("城中区教育局管理员"))
+                {
+                    if (model.CheckStatus == "未提交"&&model.RequestEditStatus== "未申请")
+                    {
+                        entity.CheckStatus = model.CheckStatus;
+                        entity.RequestEditStatus = model.RequestEditStatus;
+                        entity.Comment = model.Comment;
+                    }
+                }
+                else if (User.IsInRole("学校管理员"))
+                {
+                    if (model.CheckStatus == "审核成功" || model.CheckStatus == "审核失败")
+                    {
+                        entity.Comment = model.Comment;
+                        entity.CheckStatus = model.CheckStatus;
+                        entity.FromWhere(model,(s,t)=>s.Name.EndsWith("Checked"));
+                    }
+                    if (entity.RequestEditStatus!=model.RequestEditStatus)
+                    {
+                        entity.CheckStatus = model.CheckStatus;
+                        entity.RequestEditStatus = model.RequestEditStatus;
+                    }
+                }
+            }
+        }
+
         private void ValidModelStatus(Person entity, EditTeacherModel model)
         {
             var self = this.HttpContext.Request.Query.ContainsKey("self") || (this.HttpContext.Request.Method == "POST" && this.HttpContext.Request.Form.ContainsKey("self"));
@@ -271,11 +333,11 @@ namespace TeacherExt.Controllers
                             ModelState.AddModelError(nameof(model.CheckStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.CheckStatus}]状态");
                         }
                     }
-                    if(model.RequestEditStatus== "未申请")
+                    if(entity.RequestEditStatus != model.RequestEditStatus)
                     {
-                        if(entity.RequestEditStatus!="已申请")
+                        if(entity.CheckStatus!="待审核"&& entity.CheckStatus != "审核成功")
                         {
-                            ModelState.AddModelError(nameof(model.RequestEditStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.RequestEditStatus}]状态");
+                            ModelState.AddModelError(nameof(model.RequestEditStatus), $"无法从[{entity.RequestEditStatus}]状态修改为[{model.RequestEditStatus}]状态");
                         }
                     }
                 }

labs/Teacher/TeacherExt/TeacherExt.csproj

@@ -5,7 +5,7 @@
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>0.7.0.0</Version>
+		<Version>0.8.0.0</Version>
 		<UserSecretsId>13a75881-1072-47ca-88e9-4d78bd678d65</UserSecretsId>
 	</PropertyGroup>
 

labs/Teacher/TeacherExt/Views/Home/Update.cshtml

@@ -81,7 +81,7 @@
                                 }
                                 @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" })
                             </div>
-                            <div class="col-sm-2">
+                            <div class="col-sm-2 checkbox">
                                 @{
                                     var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked");
                                     @if (checkedProp != null)
@@ -130,59 +130,54 @@
                 </div>
                 <div class="col-sm-2"></div>
             </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group row">
-                        <div class="col-sm-4"> </div>
-                        <div class="col-sm-8">
-                            @if (!iframe)
+            <div class="row text-center">
+                <div class="col-sm-12">
+                    @if (!iframe)
+                    {
+                        <a href="@Url.Action("Index","Home")" class="btn btn-primary">返回</a>
+                    }
+                    @if (self)
+                    {
+                        @if (Model.CheckStatus == "未提交" || Model.CheckStatus == "审核失败")
+                        {
+                            <button class="btn btn-primary" type="submit">保存</button>
+                            <button id="submitCheckRequest" type="button" class="btn btn-primary">提交审核</button>
+                        }
+                        else
+                        {
+                            if (Model.RequestEditStatus == "已申请")
                             {
-                                <a href="@Url.Action("Index","Home")" class="btn btn-primary">返回</a>
+                                <button id="cancelModifyRequest" type="button" class="btn btn-primary">取消申请</button>
                             }
-                            @if (self)
+                            else
                             {
-                                @if (Model.CheckStatus == "未提交" || Model.CheckStatus == "审核失败")
-                                {
-                                    <button class="btn btn-primary" type="submit">保存</button>
-                                    <button id="submitCheckRequest" type="button" class="btn btn-primary">提交审核</button>
-                                }
-                                else
-                                {
-                                    if (Model.RequestEditStatus == "已申请")
-                                    {
-                                        <button id="cancelModifyRequest" type="button" class="btn btn-primary">取消申请</button>
-                                    }
-                                    else
-                                    {
-                                        <button id="submitModifyRequest" type="button" class="btn btn-primary">申请修改</button>
-                                    }
-                                }
+                                <button id="submitModifyRequest" type="button" class="btn btn-primary">申请修改</button>
                             }
-                            else
+                        }
+                    }
+                    else
+                    {
+                        @if (User.IsInRole("城中区教育局管理员") && Model.CheckStatus == "审核成功")
+                        {
+                            <span>教育局管理员:</span>
+                            <button id="super" type="button" class="btn btn-primary">退回</button>
+                        }
+                        else if (User.IsInRole("学校管理员"))
+                        {
+                            @if (Model.CheckStatus == "待审核")
                             {
-                                @if (User.IsInRole("城中区教育局管理员") && Model.CheckStatus == "审核成功")
-                                {
-                                    <span>教育局管理员:</span>
-                                    <button id="super" type="button" class="btn btn-primary">退回</button>
-                                }
-                                else if (User.IsInRole("学校管理员"))
-                                {
-                                    @if (Model.CheckStatus == "待审核")
-                                    {
-                                        <span>学校管理员:</span>
-                                        <button id="admin1" type="button" class="btn btn-primary">审核通过</button>
-                                        <button id="admin2" type="button" class="btn btn-primary">审核失败</button>
-                                    }
-                                    @if (Model.RequestEditStatus == "已申请")
-                                    {
-                                        <span>学校管理员:</span>
-                                        <button id="admin3" type="button" class="btn btn-primary">批准修改申请</button>
-                                        <button id="admin4" type="button" class="btn btn-primary">拒绝修改申请</button>
-                                    }
-                                }
+                                <span>学校管理员:</span>
+                                <button id="admin1" type="button" class="btn btn-primary">审核通过</button>
+                                <button id="admin2" type="button" class="btn btn-primary">审核失败</button>
                             }
-                        </div>
-                    </div>
+                            @if (Model.RequestEditStatus == "已申请")
+                            {
+                                <span>学校管理员:</span>
+                                <button id="admin3" type="button" class="btn btn-primary">批准修改申请</button>
+                                <button id="admin4" type="button" class="btn btn-primary">拒绝修改申请</button>
+                            }
+                        }
+                    }
                 </div>
             </div>
         </div>

labs/Teacher/TeacherExt/wwwroot/css/site.css

@@ -162,4 +162,7 @@ button.swal2-styled{
 }
 .swal2-popup{
     width:16em!important;
+}
+.swal2-title {
+    font-size: 14px !important;
 }

labs/Teacher/TeacherExt/wwwroot/js/update.js

@@ -42,7 +42,7 @@ $('#cancelModifyRequest').click(function () {
     });
 });
 ////////////////////////////////////////////////////////////////////////////////
-//批准申请修改
+//退回
 $('#super').click(function () {
     var form = $(this).parents('form');
     var msg = '确认' + $(this).text() + '？';
@@ -55,6 +55,13 @@ $('#super').click(function () {
 //审核成功
 $('#admin1').click(function () {
     var form = $(this).parents('form');
+    if (form.find("input[name$='Checked']").filter(':visible').not(':checked').length > 0) {
+        Swal.fire({
+            position: 'bottom',
+            text: '请审核全部待审核项',
+            confirmButtonText: '确定'});
+        return;
+    }
     var msg = '确认' + $(this).text() + '？';
     submit(msg, function () {
         $('#Comment').val('');
@@ -65,6 +72,14 @@ $('#admin1').click(function () {
 //审核失败
 $('#admin2').click(function () {
     var form = $(this).parents('form');
+    if (!$('#Comment').val()) {
+        Swal.fire({
+            position: 'bottom',
+            text: '请填写审核失败原因',
+            confirmButtonText: '确定'
+        });
+        return;
+    }
     var msg = '确认' + $(this).text() + '？';
     submit(msg, function () {
         $('#CheckStatus').val('审核失败');