diff --git a/safesite/templates/abtrain.html b/safesite/templates/abtrain.html
index 48b55749..db2e46d4 100644
--- a/safesite/templates/abtrain.html
+++ b/safesite/templates/abtrain.html
@@ -50,7 +50,7 @@
' + x.split('_').pop() + '');
+ if(x){
+ $("#fileol").append('
' + x.split('_').pop() + '');
+ }
+
}
diff --git a/safesite/views.py b/safesite/views.py
index 70c26d39..1bde2399 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1792,17 +1792,25 @@ def adddrill(req):
def accesstrain(req):
userid = req.session.get('userid')
trainid = req.GET.get('trainid')
- detailcontent = req.POST.get('detailcontent')
+ detailcontent = req.POST.get('detailcontent', None)
pxxg = req.POST.get('pxxg')
knownum = req.POST.get('knownum')
- duration = req.POST.get('duration')
- upfile = req.POST.get('upfile')
- a = Train.objects.filter(trainid=trainid)
- a.update(detailcontent=detailcontent, knownum=knownum,
- material=upfile, state=1, duration=duration, pxxg=pxxg)
+ duration = req.POST.get('duration', None)
+ upfile = req.POST.get('upfile', None)
+ a = Train.objects.get(trainid=trainid)
+ if detailcontent:
+ a.detailcontent = detailcontent
+ a.knownum = knownum
+ if upfile:
+ a.material = upfile
+ if duration:
+ a.duration = duration
+ a.pxxg = pxxg
+ a.state = 1
+ a.save()
companyid = getcompany(userid)
# 绑定考试
- if req.POST.get('examtest'):
+ if req.POST.get('examtest',None):
a.update(examtest=ExamTest.objects.get(id=req.POST.get('examtest')))
for i in Trainuser.objects.filter(train__trainid=trainid):
objs = ExamTestDetail.objects.filter(
@@ -3112,17 +3120,17 @@ def pxhandle(req):
partid=companyid), deletemark=1).order_by('-modifytime')
total = a.count()
startnum, endnum = fenye(req)
- a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
+ a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid', 'trainplan__year', 'trainplan__month', 'trainplan__purpose')
return HttpResponse(transjson(total, a), content_type="application/json")
elif req.GET.get('a') == 'listtodo':
userid = req.session['userid']
companyid = getcompany(userid)
a = Train.objects.filter(usecomp=Partment.objects.get(
- partid=companyid), deletemark=1, state=0, submituser__userid=userid).order_by('-modifytime')
+ partid=companyid), deletemark=1, submituser__userid=userid).order_by('-modifytime')
total = a.count()
startnum, endnum = fenye(req)
- a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
+ a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid')
return HttpResponse(transjson(total, a), content_type="application/json")
elif req.GET.get('a') == 'listcj':
@@ -3132,7 +3140,7 @@ def pxhandle(req):
userid=userid), train__deletemark=1).order_by('-train__modifytime')
total = a.count()
startnum, endnum = fenye(req)
- a = a[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
+ a = a.order_by('-starttime')[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
'train__starttime', 'train__trainname', 'checked', 'train__teacher', 'train__lecturer__name')
return HttpResponse(transjson(total, a), content_type="application/json")
elif req.GET.get('a') == 'dqdnum':