Merge pull request jrlegrand#79 from jrlegrand/batch-reviews

Batch reviews

Author: jrlegrand

frontend/webpack.config.js

@@ -59,7 +59,7 @@ module.exports = {
     config: JSON.stringify({
         apiUrl: 'https://api.parserx.io'
         //apiUrl: 'http://139.144.27.208'
-        //apiUrl: 'http://192.168.1.20:8005'
+        //apiUrl: 'http://192.168.1.20:8003'
         //apiUrl: 'http://192.168.1.14:8005'
     })
   }

parsers/frequency.py

@@ -234,6 +234,5 @@ def normalize_match(self, match):
 	FrequencyInTheX(),
 	FrequencyAtBedtime(),
 	FrequencyOneTime(),
-	# NOTE: removing this parser for DRX implementation - may consider adding back
-	FrequencyAsDirected(),
+	# FrequencyAsDirected(), # NOTE: removing this parser for DRX implementation - may consider adding back
 ]

parsers/route.py

@@ -164,8 +164,8 @@ def normalize_match(self, match):
     InhalationRouteParser(),
     RouteParser(),
     TopicalRouteParser(),
-    # InferredOralRouteParser(), # turned off for VUMC - TODO: need to create customer "settings"
-    # InferredInhalationRouteParser(), # turned off for VUMC - TODO: need to create customer "settings"
+    InferredOralRouteParser(), # turned off for VUMC - TODO: need to create customer "settings"
+    InferredInhalationRouteParser(), # turned off for VUMC - TODO: need to create customer "settings"
     MiscellaneousRouteParser(),
 ]
 

parsers/sig.py

@@ -23,8 +23,8 @@ class SigParser(Parser):
         'additional_info': additional_info.parsers,
     }
     # TODO: make this match_keys assignment more elegant
-    #match_keys = ['original_sig_text'] + ['sig_text', 'sig_readable'] + method.parsers[0].match_keys + dose.parsers[0].match_keys + strength.parsers[0].match_keys + route.parsers[0].match_keys + frequency.parsers[0].match_keys + when.parsers[0].match_keys + duration.parsers[0].match_keys + indication.parsers[0].match_keys + max.parsers[0].match_keys + additional_info.parsers[0].match_keys
-    match_keys = ['original_sig_text'] + ['sig_text', 'sig_readable', 'max_dose_per_day'] + method.parsers[0].match_keys + dose.parsers[0].match_keys + strength.parsers[0].match_keys + route.parsers[0].match_keys + frequency.parsers[0].match_keys + when.parsers[0].match_keys + duration.parsers[0].match_keys + indication.parsers[0].match_keys + max.parsers[0].match_keys + additional_info.parsers[0].match_keys
+    #match_keys = ['original_sig_text'] + ['sig_text', 'sig_readable', 'max_dose_per_day'] + method.parsers[0].match_keys + dose.parsers[0].match_keys + strength.parsers[0].match_keys + route.parsers[0].match_keys + frequency.parsers[0].match_keys + when.parsers[0].match_keys + duration.parsers[0].match_keys + indication.parsers[0].match_keys + max.parsers[0].match_keys + additional_info.parsers[0].match_keys
+    match_keys = ['sig_text', 'sig_readable', 'max_dose_per_day'] + method.parsers[0].match_keys + dose.parsers[0].match_keys + strength.parsers[0].match_keys + route.parsers[0].match_keys + frequency.parsers[0].match_keys + when.parsers[0].match_keys + duration.parsers[0].match_keys + indication.parsers[0].match_keys + max.parsers[0].match_keys + additional_info.parsers[0].match_keys
     parser_type = 'sig'
 
     def get_normalized_sig_text(self, sig_text):
@@ -267,7 +267,7 @@ def print_progress_bar (iteration, total, prefix = 'progress:', suffix = 'comple
         print()
 
 #print(SigParser().infer(ndc='68788640709'))
-parsed_sigs = SigParser().parse_sig_csv()
+#parsed_sigs = SigParser().parse_sig_csv()
 #SigParser().parse('TAKE 1 CAPSULE BY MOUTH IN THE MORNING AND 1 CAPSULE AT NOON AND 1 CAPSULE IN THE EVENING AND 1 CAPSULE BEFORE BEDTIME')
 #parsed_sigs = SigParser().parse_validate_sig_csv()
 #print(parsed_sigs)

sig/migrations/0022_sigreviewed_sig_corrected.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2022-12-14 05:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sig', '0021_alter_sigparsed_indication_text'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sigreviewed',
+            name='sig_corrected',
+            field=models.TextField(null=True),
+        ),
+    ]

sig/models.py

@@ -122,6 +122,8 @@ class SigReviewed(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     # overall sig correct
     sig_correct = models.BooleanField(null=True)
+    # in the case of automatic feedback, the corrected sig from the user
+    sig_corrected = models.TextField(null=True)
     # status of individual sig components if overall sig not correct
     method_status = models.CharField(choices=STATUS_CHOICES, null=True, max_length=10)
     dose_status = models.CharField(choices=STATUS_CHOICES, null=True, max_length=10)

sig/serializers.py

@@ -11,7 +11,7 @@ class SigReviewedSerializer(serializers.ModelSerializer):
     class Meta:
         # NOTE: this is how we only show reviews that were completed by the currently logged in user
         model = SigReviewed
-        fields = ['id', 'created', 'sig_parsed', 'owner', 'sig_correct', 'method_status', 'dose_status', 'strength_status', 'route_status', 'frequency_status', 'duration_status', 'indication_status', 'themes', 'notes']
+        fields = ['id', 'created', 'sig_parsed', 'owner', 'sig_correct', 'sig_corrected', 'method_status', 'dose_status', 'strength_status', 'route_status', 'frequency_status', 'duration_status', 'indication_status', 'themes', 'notes']
 
 class SigParsedSerializer(serializers.ModelSerializer):
     sig_reviewed = SigReviewedSerializer(many=True, read_only=True)

sig/views.py

@@ -140,7 +140,11 @@ def create(self, request, *args, **kwargs):
         self.perform_create(serializer)
         headers = self.get_success_headers(serializer.data)
         print(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+        return Response(
+                serializer.data, 
+                status=status.HTTP_201_CREATED, 
+                headers=headers
+        )
 
         # TODO: if sig has no sig_parsed with a sig_reviewed, return most recent parsed_sig with a disclaimer
         # TODO: if sig has at least one sig_parsed...
@@ -176,7 +180,11 @@ def create(self, request, *args, **kwargs):
         self.perform_create(serializer)
         headers = self.get_success_headers(serializer.data)
         #print(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+        return Response(
+                serializer.data, 
+                status=status.HTTP_201_CREATED, 
+                headers=headers
+        )
 
         # TODO: if sig has no sig_parsed with a sig_reviewed, return most recent parsed_sig with a disclaimer
         # TODO: if sig has at least one sig_parsed...
@@ -195,6 +203,20 @@ class SigReviewedViewSet(viewsets.ModelViewSet):
     serializer_class = SigReviewedSerializer
     permission_classes = [IsAdminUser, IsOwnerOrReadOnly]
 
+    def create(self, request, *args, **kwargs):
+        data = request.data
+        many = isinstance(data, list)
+        print (data, many)
+        serializer = self.get_serializer(data=data, many=many)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+        headers = self.get_success_headers(serializer.data)
+        return Response(
+                serializer.data,
+                status=status.HTTP_201_CREATED,
+                headers=headers
+        )
+
 class UserViewSet(viewsets.ReadOnlyModelViewSet):
     """
     This viewset automatically provides `list` and `detail` actions.