排考记录--安排时间

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs

@@ -55,6 +55,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 安排时间
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormTime()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/FormTime.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "考试记录表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    .child_delete {
+        padding: 6px 9px;
+    }
+</style>
+<div class="lr-form-wrap" id="form">
+    <a id="lr_add" class="btn" style="position: relative;"><i class="fa fa-plus"></i>&nbsp;</a>
+    <div id="content1">
+        @*<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">
+            <div class="lr-form-item-title">考试课程类型<font face="宋体">*</font></div>
+            <div id="ExamType" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">
+            <div class="lr-form-item-title">考试日期<font face="宋体">*</font></div>
+            <input id="ExamDate" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" data-dateFmt="yyyy-MM-dd" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ExamDate').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">
+            <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+            <input id="ExamTimeStart" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分,例如:09:00" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">
+            <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+            <input id="ExamTimeEnd" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分,例如:12:00" />
+        </div>*@
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/FormTime.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/FormTime.js

@@ -0,0 +1,248 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-04-14 18:12
+ * 描  述：考试记录表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+            page.addcontent();
+        },
+        bind: function () {
+            // 新增
+            $('#lr_add').on('click', function () {
+                page.addcontent();
+            });
+            // 删除
+            $('#form').on('click',
+                '.child_delete',
+                function () {
+                    var id = $(this).attr("id");
+                    //删除当前行
+                    $('#' + id).remove();
+                    arr.forEach(item => {
+                        if (item.iid == id) {
+                            //如果存在删除
+                            removeByValue(arr, 'iid', id);
+                        }
+                    });
+                    
+
+                    //重新排序并显示
+                    arr.sort(sortBy("Sort"));
+                    page.refreshRes();
+                });
+
+            //失去焦点，重新排序并显示
+            $('#form').on('blur',
+                '.sort',
+                function () {
+                    var id = $(this)[0].id;
+                    var parId = id.replace('Sort', '');
+                    arr.forEach(m => {
+                        if (m.iid == parId) {
+                            return m.Sort = $('#' + id).val();
+                        }
+                    });
+                    arr.sort(sortBy("Sort"));
+                    page.refreshRes();
+                });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetFormChildList?keyValue=' + keyValue, function (data) {
+                    $('#content1').html('');
+                    var html = '';
+                    if (data && data.length > 0) {
+                        for (var i = 0; i < data.length; i++) {
+                            var id = learun.newGuid();
+                            var html = '';
+                            html += '<div id="' + id + '">';
+                            html += '<div class="col-xs-6 lr-form-item" data-table="FormulaChild">';
+                            html += '<div class="lr-form-item-title"><a id="' + id + '" class="btn child_delete"><i class="fa fa-trash-o"></i>&nbsp;</a>计算项目<font face="宋体">*</font></div>';
+                            html += '<div id="pro' + id + '" class="project" isvalid="yes" checkexpession="NotNull"></div>';
+                            html += '</div>';
+                            html += '<div class="col-xs-6 lr-form-item" data-table="FormulaChild">';
+                            html += '<div class="lr-form-item-title">顺序<font face="宋体">*</font></div>';
+                            html += '<input id="Sort' + id + '" type="number" class="form-control sort" isvalid="yes" checkexpession="NotNull" value="' + data[i].Sort + '"/>';
+                            html += '</div>';
+                            html += '</div>';
+
+                            $('#content1').append(html);
+                            $('#pro' + id).lrselect({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_Desktop/FormulaMain/GetCalProject',
+                                param: { strWhere: "1=1 " },
+                                value: "id",
+                                text: "name",
+                                select:
+                                    function (item) {
+                                        if (item) {
+                                            var id = $(this).attr('id');
+                                            var parId = id.replace('pro', '');
+
+                                            arr.forEach(item => {
+                                                if (item.iid == parId) {
+                                                    //如果存在删除
+                                                    removeByValue(arr, 'iid', parId);
+                                                }
+                                            });
+                                            arr.push({ iid: parId, ProjectId: item.id, ProjectName: item.name, Sort: $('#Sort' + parId).val() });
+
+                                            arr.sort(sortBy("Sort"));
+                                            page.refreshRes();
+                                        }
+                                    }
+                            });
+
+                            $('#pro' + id).lrselectSet(data[i].ProjectId);
+                        }
+
+                    } else {
+                        page.addcontent();
+                    }
+                });
+            }
+        },
+        addcontent: function () {
+            var id = learun.newGuid();
+            var html = '';
+            html += '<div id="' + id + '">';
+            html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
+            html += '<div class="lr-form-item-title"><a id="' + id + '" class="btn child_delete"><i class="fa fa-trash-o"></i>&nbsp;</a>课程类型<font face="宋体">*</font></div>';
+            html += '<div id="ExamType' + id + '" isvalid="yes" checkexpession="NotNull"></div>';
+            html += '</div>';
+            html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
+            html += '<div class="lr-form-item-title">考试日期<font face="宋体">*</font></div>';
+            html += '<input id="ExamDate' + id + '" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" data-dateFmt="yyyy-MM-dd" onfocus="WdatePicker({ dateFmt:\'yyyy - MM - dd\',onpicked: function () { $(\'#ExamDate\').trigger(\'change\'); } })" />';
+            html += '</div>';
+            html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
+            html += '<div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>';
+            html +=
+                '<input id="ExamTimeStart' + id + '" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分,例如:09:00" />';
+            html += '</div>';
+
+            html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
+            html += '<div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>';
+            html +=
+                '<input id="ExamTimeEnd' + id + '" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分,例如:12:00" />';
+            html += '</div>';
+            html += '<div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlanTime">';
+            html += '</div>';
+
+            //html += '<div class="lr-form-item-title"><a id="' + id + '" class="btn child_delete"><i class="fa fa-trash-o"></i>&nbsp;</a>计算项目<font face="宋体">*</font></div>';
+            //html += '<div id="pro' + id + '" class="project" isvalid="yes" checkexpession="NotNull"></div>';
+
+            //html += '</div>';
+            //html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
+            //html += '<div class="lr-form-item-title">顺序<font face="宋体">*</font></div>';
+            //html += '<input id="Sort' + id + '" type="number" class="form-control sort" isvalid="yes" checkexpession="NotNull" />';
+
+            $('#content1').append(html);
+            $('#ExamType' + id).lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
+                param: { itemCode: 'ExamLessonType' },
+                value: 'F_ItemValue',
+                text: 'F_ItemName',
+                select:
+                    function (item) {
+                        if (item) {
+                            var id = $(this).attr('id');
+                            var parId = id.replace('pro', '');
+                            //arr.forEach(item => {
+                            //    if (item.iid == parId) {
+                            //        //如果存在删除
+                            //        removeByValue(arr, 'iid', parId);
+                            //    }
+                            //});
+                            //arr.push({ iid: parId, ProjectId: item.id, ProjectName: item.name, Sort: $('#Sort' + parId).val() });
+
+                            //arr.sort(sortBy("Sort"));
+                            //page.refreshRes();
+                        }
+                    }
+            });
+            //$('#pro' + id).lrselect({
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetCalProject',
+            //    param: { strWhere: "1=1 " },
+            //    value: "id",
+            //    text: "name",
+            //    select:
+            //        function (item) {
+            //            if (item) {
+            //                var id = $(this).attr('id');
+            //                var parId = id.replace('pro', '');
+            //                arr.forEach(item => {
+            //                    if (item.iid == parId) {
+            //                        //如果存在删除
+            //                        removeByValue(arr, 'iid', parId);
+            //                    }
+            //                });
+            //                arr.push({ iid: parId, ProjectId: item.id, ProjectName: item.name, Sort: $('#Sort' + parId).val() });
+
+            //                arr.sort(sortBy("Sort"));
+            //                page.refreshRes();
+            //            }
+            //        }
+            //});
+
+        },
+        refreshRes: function () {
+            //页面显示公式结果
+            var text = '';
+            arr.forEach(m => {
+                text += m.ProjectName;
+            });
+            $('#result').html(text);
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var strEntity = JSON.stringify($('body').lrGetFormData());
+
+        if (arr.length == 0) {
+            return learun.alert.warning('请选择计算项目！');
+        }
+        var postData = {
+            //mainEntity: strEntity,
+            strEntity: arr
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/SaveList?MainId=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+    //删除数组元素
+    function removeByValue(arr, attr, value) {
+        var index = 0;
+        for (var i in arr) {
+            if (arr[i][attr] == value) {
+                index = i;
+                break;
+            }
+        }
+        arr.splice(index, 1);
+    }
+
+    //数组排序
+    function sortBy(props) {
+        return function (a, b) {
+            return a[props] - b[props];
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml

@@ -47,10 +47,11 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_examtime" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;安排时间</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_generate"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 生成排考名单</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js

@@ -133,6 +133,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 安排时间
+            $('#lr_examtime').on('click', function () {
+                learun.layerForm({
+                    id: 'formtime',
+                    title: '安排时间',
+                    url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/FormTime',
+                    width: 850,
+                    height: 550,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
             //  安排考试
             $('#lr_planks').on('click',
                 function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1007,6 +1007,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\ClearForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\FormTime.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\GenerateForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Index.js" />
@@ -7841,6 +7842,7 @@
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\IndexSchool.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\FormElective.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormExamTime.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\FormTime.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs

@@ -0,0 +1,70 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-06-02 10:12
+    /// 描 述：考试记录安排时间表
+    /// </summary>
+    public class Exam_ExamPlanTimeEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// EPId
+        /// </summary>
+        [Column("EPID")]
+        public string EPId { get; set; }
+        /// <summary>
+        /// 考试日期
+        /// </summary>
+        [Column("EXAMDATE")]
+        public DateTime? ExamDate { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [Column("EXAMTIMESTART")]
+        public string ExamTimeStart { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [Column("EXAMTIMEEND")]
+        public string ExamTimeEnd { get; set; }
+        /// <summary>
+        /// 排考名称
+        /// </summary>
+        [Column("EXAMTYPE")]
+        public string ExamType { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -167,6 +167,7 @@
     <Compile Include="EducationalAdministration\Exam_ExamLesson\Exam_ExamLessonEntity.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamLesson\Exam_ExamLessonIBLL.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamLesson\Exam_ExamLessonService.cs" />
+    <Compile Include="EducationalAdministration\Exam_ExamPlanTime\Exam_ExamPlanTimeEntity.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamPlanClass\Exam_ExamPlanClassBLL.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamPlanClass\Exam_ExamPlanClassEntity.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamPlanClass\Exam_ExamPlanClassIBLL.cs" />