From 2237c4780059c7fa9f9a96e54ae34ce6330c1261 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Tue, 22 Dec 2020 22:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=9F=A5=E8=AF=A2=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/models.py               |  4 ++--
 safesite/tasks.py                |  5 +++++
 safesite/templates/examtest.html | 31 +++++++++++++++++++++++++++++++
 safesite/views.py                |  9 +++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/safesite/models.py b/safesite/models.py
index 2a6b9f94..fd0f0ff3 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -793,9 +793,9 @@ class TrainPlan(models.Model):
     purpose = models.TextField('培训目的')
     year = models.IntegerField('年份', default=2021)
     month = models.IntegerField('月份', default=1)
-    manager = models.ForeignKey(User, verbose_name="负责人")
+    manager = models.ForeignKey(User, verbose_name="负责人", on_delete=models.SET_NULL, null=True, blank=True)
     period = models.IntegerField('预计学时', default=0)
-    group = models.ForeignKey(Group,)
+    group = models.ForeignKey(Group, verbose_name='组', on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self) -> str:
         return str(self.year)+'年'+str(self.month)+'月计划'
diff --git a/safesite/tasks.py b/safesite/tasks.py
index 837bb91a..d30a566f 100644
--- a/safesite/tasks.py
+++ b/safesite/tasks.py
@@ -326,6 +326,11 @@ def sendGridtask2(**kwargs):
 def expireRiskacttask():
     RiskActTask.objects.filter(taskexpire__lte = datetime.datetime.now(), usable=1).update(usable=0)
 
+@shared_task
+def closeExamtest():
+    # 自动关闭到期的考试
+    ExamTest.objects.filter(state=1, endtime__lt = datetime.datetime.now()).update(state=0)
+
 @shared_task
 def checktask():
     nowtime = datetime.datetime.now()
diff --git a/safesite/templates/examtest.html b/safesite/templates/examtest.html
index ad359fec..d20f972b 100644
--- a/safesite/templates/examtest.html
+++ b/safesite/templates/examtest.html
@@ -1,5 +1,23 @@
 <table id="kstable" style="width:auto;height:100%;"></table>
 <div id="kstablebar" style="padding:4px;height:auto">
+    <div>
+        <form id='searchksff'>
+        <label>考试状态</label>
+        <select name='state' style='width:150px' class="easyui-combobox">
+            <option value="">请选择</option>
+            <option value="open">进行中</option>
+            <option value="close">已关闭</option>
+        </select>
+        <label>开始时间</label>
+        <a class="easyui-datebox" name="starttime1"></a>
+        <label>-</label>
+        <a class="easyui-datebox" name="starttime2"></a>
+        <a class="easyui-textbox" name="search" data-options="prompt:'考试名或试卷名'"></a>
+    
+        <a  onclick="kssearch()" class="easyui-linkbutton">查询</a>
+        <a onclick="ksreset()" class="easyui-linkbutton">重置</a>
+    </form>
+    </div>
     <div>
         {% load myfilter %}
         {% if request|has_permission:'b_examtest_add1' %}
@@ -27,6 +45,19 @@
     function addks(obj){
         opendg('发布考试','html/examtest/add')
     }
+    function kssearch() {
+        var querydata = $('#searchksff').serializeJSON();
+        querydata['a'] = 'listall'
+        $('#kstable').datagrid('load', querydata);
+    }
+    function ksreset() {
+        $('#searchksff').form('clear')
+        $('#kstable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#kstable').datagrid('load');
+
+    }
     function addks2(obj){
         opendg('发布考试','html/examtest/add2')
     }
diff --git a/safesite/views.py b/safesite/views.py
index e388aaed..07eb43d0 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -6115,6 +6115,15 @@ def apiexamtest(req):
                      ',').exclude(nousecomps__contains=','+companyid+',')
         state = req.GET.get('state',None)
         owner = req.GET.get('owner',None)
+        search = req.GET.get('search', None)
+        starttime1 = req.GET.get('starttime1', None)
+        starttime2 = req.GET.get('starttime2', None)
+        if search:
+            a = a.filter(Q(name__contains=search)|Q(exampaper__name=search))
+        if starttime1:
+            a = a.filter(starttime__gte=starttime1)
+        if starttime2:
+            a = a.filter(starttime__lte=starttime2)
         if state == 'open':
             a = a.filter(state=1)
         if state == 'close':