Skip to content

Commit 63dfce8

Browse files
Luke TuiteLuke Tuite
authored andcommitted
Added SWC table to models, SWC file ingesting
1 parent fd78dc8 commit 63dfce8

File tree

5 files changed

+281
-5
lines changed

5 files changed

+281
-5
lines changed

ingest/migrations/0015_swc.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Generated by Django 3.2.18 on 2023-05-25 16:34
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('ingest', '0014_metadataversion'),
11+
]
12+
13+
operations = [
14+
migrations.CreateModel(
15+
name='SWC',
16+
fields=[
17+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
18+
('tracingFile', models.CharField(blank=True, max_length=256, null=True)),
19+
('sourceData', models.CharField(blank=True, max_length=256, null=True)),
20+
('sourceDataSample', models.CharField(blank=True, max_length=256, null=True)),
21+
('sourceDataSubmission', models.CharField(blank=True, max_length=256, null=True)),
22+
('coordinates', models.CharField(blank=True, max_length=256, null=True)),
23+
('coordinatesRegistration', models.CharField(blank=True, max_length=256, null=True)),
24+
('brainRegion', models.CharField(blank=True, max_length=256, null=True)),
25+
('brainRegionAtlas', models.CharField(blank=True, max_length=256, null=True)),
26+
('brainRegionAtlasName', models.CharField(blank=True, max_length=256, null=True)),
27+
('brainRegionAxonalProjection', models.CharField(blank=True, max_length=256, null=True)),
28+
('brainRegionDendriticProjection', models.CharField(blank=True, max_length=256, null=True)),
29+
('neuronType', models.CharField(blank=True, max_length=256, null=True)),
30+
('segmentTags', models.CharField(blank=True, max_length=256, null=True)),
31+
('proofreadingLevel', models.CharField(blank=True, max_length=256, null=True)),
32+
('notes', models.TextField()),
33+
('data_set', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ingest.dataset')),
34+
('sheet', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ingest.sheet')),
35+
],
36+
),
37+
]

ingest/models.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,4 +432,21 @@ class MetadataVersion(models.Model):
432432
dataset_status= models.CharField(max_length=256, blank=True, null=True)
433433
event = models.ForeignKey(EventsLog, on_delete=models.SET_NULL, blank=True, null=True)
434434

435-
435+
class SWC(models.Model):
436+
tracingFile = models.CharField(max_length=256, blank=True, null=True)
437+
sourceData = models.CharField(max_length=256, blank=True, null=True)
438+
sourceDataSample = models.CharField(max_length=256, blank=True, null=True)
439+
sourceDataSubmission = models.CharField(max_length=256, blank=True, null=True)
440+
coordinates = models.CharField(max_length=256, blank=True, null=True)
441+
coordinatesRegistration = models.CharField(max_length=256, blank=True, null=True)
442+
brainRegion = models.CharField(max_length=256, blank=True, null=True)
443+
brainRegionAtlas = models.CharField(max_length=256, blank=True, null=True)
444+
brainRegionAtlasName = models.CharField(max_length=256, blank=True, null=True)
445+
brainRegionAxonalProjection = models.CharField(max_length=256, blank=True, null=True)
446+
brainRegionDendriticProjection = models.CharField(max_length=256, blank=True, null=True)
447+
neuronType = models.CharField(max_length=256, blank=True, null=True)
448+
segmentTags = models.CharField(max_length=256, blank=True, null=True)
449+
proofreadingLevel = models.CharField(max_length=256, blank=True, null=True)
450+
notes = models.TextField()
451+
data_set = models.ForeignKey(Dataset, on_delete=models.SET_NULL, blank=True, null=True)
452+
sheet = models.ForeignKey(Sheet, on_delete=models.SET_NULL, blank=True, null=True)

ingest/templates/ingest/descriptive_metadata_upload.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ <h3>Step 3 of 3: Upload metadata for associated submission</h3>
7070
let radio2 = document.getElementById('ingest_method_2');
7171
let radio3 = document.getElementById('ingest_method_3');
7272
let radio4 = document.getElementById('ingest_method_4');
73+
let radio5 = document.getElementById('ingest_method_5');
7374

7475
$(radio1).on('change', () => {
7576
if (radio1.checked == true) {
@@ -99,5 +100,12 @@ <h3>Step 3 of 3: Upload metadata for associated submission</h3>
99100
}
100101
});
101102

103+
$(radio5).on('change', () => {
104+
if (radio5.checked == true) {
105+
uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
106+
console.log('upload button is enabled');
107+
}
108+
});
109+
102110
</script>
103111
{% endblock %}

ingest/templates/ingest/metadata_questions.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,12 @@ <h3>Step 2 of 3: What does your data look like?</h3>
4141
</p>
4242
</td>
4343
</tr>
44+
<tr>
45+
<td>
46+
<input type="radio" id="ingest_method_5" name="ingest_method" value="ingest_5">
47+
</td>
48+
<td>
49+
<p>5. SWC (description TBD)</p>
50+
</td>
51+
</tr>
4452
</table>

0 commit comments

Comments
 (0)