Merge pull request #166 from stanfordnmbl/dev

Filter frequency

mcserver/migrations/0029_analysisfunction_info.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2024-02-16 09:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mcserver', '0028_user_institutional_use'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='analysisfunction',
+            name='info',
+            field=models.TextField(blank=True, default='', verbose_name='Info'),
+        ),
+    ]

mcserver/models.py

@@ -342,6 +342,8 @@ class AnalysisFunction(models.Model):
     description = models.CharField('Description', max_length=255)
     url = models.CharField('Url', max_length=255)
 
+    info = models.TextField('Info', blank=True, default='')
+
     is_active = models.BooleanField('Active', default=True)
     only_for_users = models.ManyToManyField(
         User,

mcserver/serializers.py

@@ -232,7 +232,7 @@ def to_representation(self, instance):
 class AnalysisFunctionSerializer(serializers.ModelSerializer):
     class Meta:
         model = AnalysisFunction
-        fields = ('id', 'title', 'description')
+        fields = ('id', 'title', 'description', 'info')
 
 
 class AnalysisResultSerializer(serializers.ModelSerializer):

mcserver/views.py

@@ -985,6 +985,11 @@ def set_metadata(self, request, pk):
                 if not session.meta["settings"]:
                     session.meta["settings"] = {}
                 session.meta["settings"]["augmentermodel"] = request.GET.get("settings_augmenter_model", "")
+
+            if "settings_filter_frequency" in request.GET:
+                if not session.meta["settings"]:
+                    session.meta["settings"] = {}
+                session.meta["settings"]["filterfrequency"] = request.GET.get("settings_filter_frequency", "")
 
             if "cb_square" in request.GET:
                 session.meta["checkerboard"] = {