diff --git a/groups/migrations/0001_initial.py b/groups/migrations/0001_initial.py index 5da27209..904a0432 100644 --- a/groups/migrations/0001_initial.py +++ b/groups/migrations/0001_initial.py @@ -8,7 +8,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('safesite', '0269_auto_20190919_1409'), ] operations = [ diff --git a/safesite/migrations/0268_merge_20190919_1423.py b/safesite/migrations/0268_merge_20190919_1423.py new file mode 100644 index 00000000..e03d23ed --- /dev/null +++ b/safesite/migrations/0268_merge_20190919_1423.py @@ -0,0 +1,14 @@ +# Generated by Django 2.1.5 on 2019-09-19 14:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0267_auto_20190917_1543'), + ('safesite', '0265_auto_20190917_1716'), + ] + + operations = [ + ] diff --git a/safesite/migrations/0269_auto_20190919_1423.py b/safesite/migrations/0269_auto_20190919_1423.py new file mode 100644 index 00000000..897971a2 --- /dev/null +++ b/safesite/migrations/0269_auto_20190919_1423.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.5 on 2019-09-19 14:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0268_merge_20190919_1423'), + ] + + operations = [ + migrations.AddField( + model_name='observe', + name='lookers', + field=models.ManyToManyField(related_name='gcrs', to='safesite.User'), + ), + ] diff --git a/safesite/templates/observe.html b/safesite/templates/observe.html index 997550e3..12dbfe57 100644 --- a/safesite/templates/observe.html +++ b/safesite/templates/observe.html @@ -101,7 +101,7 @@ { field: 'lookplace', title: '观察地点', width: 150 }, { field: 'actname', title: '作业名称', width: 200 }, { field: 'looktime', title: '观察时间', width: 200 }, - { field: 'looker__name', title: '观察人', width: 200 }, + { field: 'looker__name', title: '观察记录人', width: 200 }, { field: 'lookeder', title: '被观察对象', width: 200 }, { field: 'otherunsafe', title: '过程和交流记录', width: 300 }, ]] diff --git a/safesite/templates/observedetail.html b/safesite/templates/observedetail.html index 68e05d24..1bbf1cf5 100644 --- a/safesite/templates/observedetail.html +++ b/safesite/templates/observedetail.html @@ -14,7 +14,10 @@