From f8bb4c1ace06fa1d6b937f3cc92e0fcc83126871 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 17 Sep 2019 22:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E5=AF=BC=E5=87=BA=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/export.py | 2 +- safesite/exportemp/px.docx | Bin 17188 -> 17805 bytes safesite/exportemp/~$px.docx | Bin 0 -> 162 bytes .../migrations/0265_auto_20190917_1716.py | 19 ++++++++++++++++++ safesite/models.py | 2 ++ safesite/templates/abtrain.html | 2 +- safesite/templates/traindetail.html | 8 +++++++- safesite/views.py | 14 ++++++++++--- 8 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 safesite/exportemp/~$px.docx create mode 100644 safesite/migrations/0265_auto_20190917_1716.py diff --git a/safesite/export.py b/safesite/export.py index 0851038f..078dc144 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -80,7 +80,7 @@ def exportdoc(a,id): elif a=='px': trainid = id a = Train.objects.filter(trainid=trainid) - x = a.values('trainid','trainnum','state','trainplace','starttime','trainname','traintype__dickeyname','teacher','submituser__name','submittime','trainlevel__dicname','traincontent__dickeyname','manlevel__dickeyname','detailcontent','participantnum','knownum','duration','material')[0] + x = a.values('trainid','trainnum','state','trainplace','starttime','trainname','traintype__dickeyname','teacher','submituser__name','submittime','trainlevel__dicname','traincontent__dickeyname','manlevel__dickeyname','detailcontent','participantnum','knownum','duration','material','pxxg','examtest__num','examtest__name')[0] for key in x: if x[key] == None: x[key] = '' diff --git a/safesite/exportemp/px.docx b/safesite/exportemp/px.docx index 5f3ec9180c0b474a6bab263edadbc8f2d061dba1..db36d13f3ad635d655b0c58c280a7c3632455605 100644 GIT binary patch delta 6208 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 P2mDF~f*vRN@1Fkw>shz} delta 5556 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 diff --git a/safesite/exportemp/~$px.docx b/safesite/exportemp/~$px.docx new file mode 100644 index 0000000000000000000000000000000000000000..fcd42e3fa9819ae3c2e99e74ae57ff52b9d59275 GIT binary patch literal 162 xcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oc1^`8%3f%wz literal 0 HcmV?d00001 diff --git a/safesite/migrations/0265_auto_20190917_1716.py b/safesite/migrations/0265_auto_20190917_1716.py new file mode 100644 index 00000000..77d2e743 --- /dev/null +++ b/safesite/migrations/0265_auto_20190917_1716.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1.5 on 2019-09-17 17:16 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0264_auto_20190909_0916'), + ] + + operations = [ + migrations.AddField( + model_name='train', + name='examtest', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest'), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 5afec4ce..0510a3b6 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -42,6 +42,7 @@ class Area(models.Model): deletemark = models.IntegerField(default='1') usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE) risklevel = models.CharField(max_length=50,null=True,blank=True)#风险等级 + qrcode = models.CharField(max_length=200,blank=True,null=True)#区域二维码 class User(models.Model): userid = models.AutoField(primary_key=True) @@ -628,6 +629,7 @@ class Train(models.Model):#培训表 pxxg = models.CharField(max_length=1000,null=True,blank=True) material = models.CharField(max_length=1000,null=True,blank=True) checkqr = models.CharField(max_length=200,blank=True,null=True) + examtest = models.ForeignKey(ExamTest,on_delete=models.CASCADE,null=True,blank=True) class Trainuser(models.Model):#培训人员记录 train = models.ForeignKey(Train, on_delete=models.CASCADE) diff --git a/safesite/templates/abtrain.html b/safesite/templates/abtrain.html index b9ce2c11..27c68d1f 100644 --- a/safesite/templates/abtrain.html +++ b/safesite/templates/abtrain.html @@ -67,7 +67,7 @@