Skip to content

Commit e1a7ef1

Browse files
ropelewsropelews
committed
added doi field to ingest_dataset, removed old metadata templates
1 parent bf9d61c commit e1a7ef1

File tree

5 files changed

+401
-62
lines changed

5 files changed

+401
-62
lines changed

‎ingest/admin.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ class SheetAdmin(admin.ModelAdmin):
101101
class EventsLogAdmin(admin.ModelAdmin):
102102
list_display = ("collection_id", "notes", "event_type","timestamp")
103103
list_filter = ('event_type','timestamp')
104+
#def add_event(self, request, from_url='', extra_context=None):
105+
# source = FeedPost.objects.get(id=source_id)
106+
# if source_id != None:
107+
# source = FeedPost.objects.get(id=source_id)
108+
# g = request.GET.copy()
109+
# g.update({
110+
# 'project_id' = source.project_id,
111+
# })
112+
# request.GET = g
113+
#return super(EventsLogAdmin, self).add_event(request, from_url, extra_context)
104114
@admin.register(ProjectPeople)
105115
class ProjectPeople(admin.ModelAdmin):
106116
list_display = ("id", "project_id", "people_id", "is_po", "is_po", "doi_role")

‎ingest/migrations/0011_auto_20220602_1409.py‎

Lines changed: 328 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,328 @@
1+
# Generated by Django 3.2.13 on 2022-06-02 14:09
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('ingest', '0010_delete_projectfunders'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='dataset',
15+
name='doi',
16+
field=models.CharField(blank=True, max_length=256),
17+
),
18+
migrations.AlterField(
19+
model_name='contributor',
20+
name='nameidentifier',
21+
field=models.CharField(blank=True, max_length=256),
22+
),
23+
migrations.AlterField(
24+
model_name='contributor',
25+
name='nameidentifierscheme',
26+
field=models.CharField(blank=True, max_length=256),
27+
),
28+
migrations.AlterField(
29+
model_name='dataset',
30+
name='dataset_image',
31+
field=models.CharField(blank=True, max_length=256),
32+
),
33+
migrations.AlterField(
34+
model_name='dataset',
35+
name='generalmodality',
36+
field=models.CharField(blank=True, max_length=256),
37+
),
38+
migrations.AlterField(
39+
model_name='dataset',
40+
name='methods',
41+
field=models.CharField(blank=True, max_length=256),
42+
),
43+
migrations.AlterField(
44+
model_name='dataset',
45+
name='other',
46+
field=models.CharField(blank=True, max_length=256),
47+
),
48+
migrations.AlterField(
49+
model_name='dataset',
50+
name='socialmedia',
51+
field=models.CharField(blank=True, max_length=256),
52+
),
53+
migrations.AlterField(
54+
model_name='dataset',
55+
name='subject',
56+
field=models.CharField(blank=True, max_length=256),
57+
),
58+
migrations.AlterField(
59+
model_name='dataset',
60+
name='subjectscheme',
61+
field=models.CharField(blank=True, max_length=256),
62+
),
63+
migrations.AlterField(
64+
model_name='dataset',
65+
name='technicalinfo',
66+
field=models.CharField(blank=True, max_length=256),
67+
),
68+
migrations.AlterField(
69+
model_name='dataset',
70+
name='technique',
71+
field=models.CharField(blank=True, max_length=256),
72+
),
73+
migrations.AlterField(
74+
model_name='funder',
75+
name='award_number',
76+
field=models.CharField(blank=True, max_length=256),
77+
),
78+
migrations.AlterField(
79+
model_name='funder',
80+
name='award_title',
81+
field=models.CharField(blank=True, max_length=256),
82+
),
83+
migrations.AlterField(
84+
model_name='funder',
85+
name='funding_reference_identifier',
86+
field=models.CharField(blank=True, max_length=256),
87+
),
88+
migrations.AlterField(
89+
model_name='funder',
90+
name='funding_reference_identifier_type',
91+
field=models.CharField(blank=True, max_length=256),
92+
),
93+
migrations.AlterField(
94+
model_name='image',
95+
name='channels',
96+
field=models.CharField(blank=True, max_length=256),
97+
),
98+
migrations.AlterField(
99+
model_name='image',
100+
name='dimensionorder',
101+
field=models.CharField(blank=True, max_length=256),
102+
),
103+
migrations.AlterField(
104+
model_name='image',
105+
name='files',
106+
field=models.CharField(blank=True, max_length=256),
107+
),
108+
migrations.AlterField(
109+
model_name='image',
110+
name='flurophore',
111+
field=models.CharField(blank=True, max_length=256),
112+
),
113+
migrations.AlterField(
114+
model_name='image',
115+
name='gbytes',
116+
field=models.CharField(blank=True, max_length=256),
117+
),
118+
migrations.AlterField(
119+
model_name='image',
120+
name='landmarkname',
121+
field=models.CharField(blank=True, max_length=256),
122+
),
123+
migrations.AlterField(
124+
model_name='image',
125+
name='landmarkx',
126+
field=models.CharField(blank=True, max_length=256),
127+
),
128+
migrations.AlterField(
129+
model_name='image',
130+
name='landmarky',
131+
field=models.CharField(blank=True, max_length=256),
132+
),
133+
migrations.AlterField(
134+
model_name='image',
135+
name='landmarkz',
136+
field=models.CharField(blank=True, max_length=256),
137+
),
138+
migrations.AlterField(
139+
model_name='image',
140+
name='obliquexdim1',
141+
field=models.CharField(blank=True, max_length=256),
142+
),
143+
migrations.AlterField(
144+
model_name='image',
145+
name='obliquexdim2',
146+
field=models.CharField(blank=True, max_length=256),
147+
),
148+
migrations.AlterField(
149+
model_name='image',
150+
name='obliquexdim3',
151+
field=models.CharField(blank=True, max_length=256),
152+
),
153+
migrations.AlterField(
154+
model_name='image',
155+
name='obliqueydim1',
156+
field=models.CharField(blank=True, max_length=256),
157+
),
158+
migrations.AlterField(
159+
model_name='image',
160+
name='obliqueydim2',
161+
field=models.CharField(blank=True, max_length=256),
162+
),
163+
migrations.AlterField(
164+
model_name='image',
165+
name='obliqueydim3',
166+
field=models.CharField(blank=True, max_length=256),
167+
),
168+
migrations.AlterField(
169+
model_name='image',
170+
name='obliquezdim1',
171+
field=models.CharField(blank=True, max_length=256),
172+
),
173+
migrations.AlterField(
174+
model_name='image',
175+
name='obliquezdim2',
176+
field=models.CharField(blank=True, max_length=256),
177+
),
178+
migrations.AlterField(
179+
model_name='image',
180+
name='obliquezdim3',
181+
field=models.CharField(blank=True, max_length=256),
182+
),
183+
migrations.AlterField(
184+
model_name='image',
185+
name='representation',
186+
field=models.CharField(blank=True, max_length=256),
187+
),
188+
migrations.AlterField(
189+
model_name='image',
190+
name='slices',
191+
field=models.CharField(blank=True, max_length=256),
192+
),
193+
migrations.AlterField(
194+
model_name='image',
195+
name='stepsizet',
196+
field=models.CharField(blank=True, max_length=256),
197+
),
198+
migrations.AlterField(
199+
model_name='image',
200+
name='stepsizez',
201+
field=models.CharField(blank=True, max_length=256),
202+
),
203+
migrations.AlterField(
204+
model_name='image',
205+
name='xsize',
206+
field=models.CharField(blank=True, max_length=256),
207+
),
208+
migrations.AlterField(
209+
model_name='image',
210+
name='ysize',
211+
field=models.CharField(blank=True, max_length=256),
212+
),
213+
migrations.AlterField(
214+
model_name='image',
215+
name='z',
216+
field=models.CharField(blank=True, max_length=256),
217+
),
218+
migrations.AlterField(
219+
model_name='image',
220+
name='zsize',
221+
field=models.CharField(blank=True, max_length=256),
222+
),
223+
migrations.AlterField(
224+
model_name='instrument',
225+
name='detectionwavelength',
226+
field=models.CharField(blank=True, max_length=256),
227+
),
228+
migrations.AlterField(
229+
model_name='instrument',
230+
name='detectormodel',
231+
field=models.CharField(blank=True, max_length=256),
232+
),
233+
migrations.AlterField(
234+
model_name='instrument',
235+
name='detectortype',
236+
field=models.CharField(blank=True, max_length=256),
237+
),
238+
migrations.AlterField(
239+
model_name='instrument',
240+
name='illuminationtypes',
241+
field=models.CharField(blank=True, max_length=256),
242+
),
243+
migrations.AlterField(
244+
model_name='instrument',
245+
name='illuminationwavelength',
246+
field=models.CharField(blank=True, max_length=256),
247+
),
248+
migrations.AlterField(
249+
model_name='instrument',
250+
name='objectiveimmersion',
251+
field=models.CharField(blank=True, max_length=256),
252+
),
253+
migrations.AlterField(
254+
model_name='instrument',
255+
name='objectivemagnification',
256+
field=models.CharField(blank=True, max_length=256),
257+
),
258+
migrations.AlterField(
259+
model_name='instrument',
260+
name='objectivena',
261+
field=models.CharField(blank=True, max_length=256),
262+
),
263+
migrations.AlterField(
264+
model_name='instrument',
265+
name='objectivename',
266+
field=models.CharField(blank=True, max_length=256),
267+
),
268+
migrations.AlterField(
269+
model_name='instrument',
270+
name='sampletemperature',
271+
field=models.CharField(blank=True, max_length=256),
272+
),
273+
migrations.AlterField(
274+
model_name='publication',
275+
name='citation',
276+
field=models.CharField(blank=True, max_length=256),
277+
),
278+
migrations.AlterField(
279+
model_name='publication',
280+
name='pmcid',
281+
field=models.CharField(blank=True, max_length=256),
282+
),
283+
migrations.AlterField(
284+
model_name='publication',
285+
name='relatedidentifier',
286+
field=models.CharField(blank=True, max_length=256),
287+
),
288+
migrations.AlterField(
289+
model_name='publication',
290+
name='relatedidentifiertype',
291+
field=models.CharField(blank=True, max_length=256),
292+
),
293+
migrations.AlterField(
294+
model_name='publication',
295+
name='relationtype',
296+
field=models.CharField(blank=True, max_length=256),
297+
),
298+
migrations.AlterField(
299+
model_name='specimen',
300+
name='atlas',
301+
field=models.CharField(blank=True, max_length=256),
302+
),
303+
migrations.AlterField(
304+
model_name='specimen',
305+
name='genotype',
306+
field=models.CharField(blank=True, max_length=256),
307+
),
308+
migrations.AlterField(
309+
model_name='specimen',
310+
name='localid',
311+
field=models.CharField(blank=True, max_length=256),
312+
),
313+
migrations.AlterField(
314+
model_name='specimen',
315+
name='locations',
316+
field=models.CharField(blank=True, max_length=256),
317+
),
318+
migrations.AlterField(
319+
model_name='specimen',
320+
name='organlocalid',
321+
field=models.CharField(blank=True, max_length=256),
322+
),
323+
migrations.AlterField(
324+
model_name='specimen',
325+
name='organname',
326+
field=models.CharField(blank=True, max_length=256),
327+
),
328+
]

‎ingest/migrations/__pycache__/0009_auto_20220426_1546.cpython-310.pyc‎

0 Bytes
Binary file not shown.

‎ingest/migrations/__pycache__/0010_delete_projectfunders.cpython-310.pyc‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)