Merge pull request jrlegrand#67 from jrlegrand/max_adtl_info_frontend

Max adtl info frontend

Author: jrlegrand

frontend/src/_components/SigHighlighted.jsx

@@ -30,39 +30,49 @@ class SigHighlighted extends React.Component {
         const when = sig_parsed_components.when;
         const duration = sig_parsed_components.duration;
         const indication = sig_parsed_components.indication;
+        const max = sig_parsed_components.max;
+        const additional_info = sig_parsed_components.additional_info;
 
-        if (method.method_text_start != null && pos >= method.method_text_start && pos <= method.method_text_end) {
+        if (method.method_text_start != null && pos >= method.method_text_start && pos < method.method_text_end) {
             className.push('highlight-red');
         }
 
-        if (dose.dose_text_start != null && pos >= dose.dose_text_start && pos <= dose.dose_text_end) {
+        if (dose.dose_text_start != null && pos >= dose.dose_text_start && pos < dose.dose_text_end) {
             className.push('highlight-orange');
         }
 
-        if (strength.strength_text_start != null && pos >= strength.strength_text_start && pos <= strength.strength_text_end) {
+        if (strength.strength_text_start != null && pos >= strength.strength_text_start && pos < strength.strength_text_end) {
             className.push('highlight-orange');
         }
 
-        if (route.route_text_start != null && pos >= route.route_text_start && pos <= route.route_text_end) {
+        if (route.route_text_start != null && pos >= route.route_text_start && pos < route.route_text_end) {
             className.push('highlight-yellow');
         }
 
-        if (frequency.frequency_text_start != null && pos >= frequency.frequency_text_start && pos <= frequency.frequency_text_end) {
+        if (frequency.frequency_text_start != null && pos >= frequency.frequency_text_start && pos < frequency.frequency_text_end) {
             className.push('highlight-green');
         }
 
-        if (when.when_text_start != null && pos >= when.when_text_start && pos <= when.when_text_end) {
+        if (when.when_text_start != null && pos >= when.when_text_start && pos < when.when_text_end) {
             className.push('highlight-green');
         }
 
-        if (duration.duration_text_start != null && pos >= duration.duration_text_start && pos <= duration.duration_text_end) {
+        if (duration.duration_text_start != null && pos >= duration.duration_text_start && pos < duration.duration_text_end) {
             className.push('highlight-green');
         }
 
-        if (indication.indication_text_start != null && pos >= indication.indication_text_start && pos <= indication.indication_text_end) {
+        if (indication.indication_text_start != null && pos >= indication.indication_text_start && pos < indication.indication_text_end) {
             className.push('highlight-purple');
         }
 
+        if (max.max_text_start != null && pos >= max.max_text_start && pos < max.max_text_end) {
+            className.push('highlight-blue');
+        }
+
+        if (additional_info.additional_info_text_start != null && pos >= additional_info.additional_info_text_start && pos < additional_info.additional_info_text_end) {
+            className.push('highlight-cyan');
+        }
+
         className = className.join(' ');
 
         return className;
@@ -138,8 +148,26 @@ class SigHighlighted extends React.Component {
                 indication_text: sig_parsed.indication_text,
                 indication_text_start: sig_parsed.indication_text_start,
                 indication_text_end: sig_parsed.indication_text_end
-            }      
+            },
+            max: {
+                max_numerator_value: sig_parsed.max_numerator_value,
+                max_numerator_unit: sig_parsed.max_numerator_unit,
+                max_denominator_value: sig_parsed.max_denominator_value,
+                max_denominator_unit: sig_parsed.max_denominator_unit,
+                max_text_start: sig_parsed.max_text_start,
+                max_text_end: sig_parsed.max_text_end,
+                max_text: sig_parsed.max_text,
+                max_readable: sig_parsed.max_readable
+            },
+            additional_info: {
+                additional_info: sig_parsed.additional_info,
+                additional_info_text_start: sig_parsed.additional_info_text_start,
+                additional_info_text_end: sig_parsed.additional_info_text_end,
+                additional_info_text: sig_parsed.additional_info_text,
+                additional_info_readable: sig_parsed.additional_info_readable
+            }
         };
+        console.log('sig_parsed_components', sig_parsed_components);
         this.setState({ sig_parsed_components });
     }
 

frontend/src/_components/SigParsed.jsx

@@ -103,7 +103,24 @@ class SigParsed extends React.Component {
                 indication_text_start: sig_parsed.indication_text_start,
                 indication_text_end: sig_parsed.indication_text_end,
                 indication_readable: sig_parsed.indication_readable               
-            }      
+            },
+            max: {
+                max_numerator_value: sig_parsed.max_numerator_value,
+                max_numerator_unit: sig_parsed.max_numerator_unit,
+                max_denominator_value: sig_parsed.max_denominator_value,
+                max_denominator_unit: sig_parsed.max_denominator_unit,
+                max_text_start: sig_parsed.max_text_start,
+                max_text_end: sig_parsed.max_text_end,
+                max_text: sig_parsed.max_text,
+                max_readable: sig_parsed.max_readable
+            },
+            additional_info: {
+                additional_info: sig_parsed.additional_info,
+                additional_info_text_start: sig_parsed.additional_info_text_start,
+                additional_info_text_end: sig_parsed.additional_info_text_end,
+                additional_info_text: sig_parsed.additional_info_text,
+                additional_info_readable: sig_parsed.additional_info_readable
+            }
         };
 
         this.setState({ sig_parsed_components });
@@ -145,7 +162,7 @@ class SigParsed extends React.Component {
         const { sig_parsed, sig_reviewed, sig_parsed_components } = this.state;
         return (
             <Row>
-                <Col sm={12} md={9}>
+                <Col sm={12} md={10}>
                     <Table responsive borderless size="sm">
                         <thead> 
                             <tr>
@@ -170,6 +187,12 @@ class SigParsed extends React.Component {
                                 <th>
                                     indication
                                 </th>
+                                <th>
+                                    max
+                                </th>
+                                <th>
+                                    additional info
+                                </th>
                             </tr>
                         </thead>
                         <tbody>
@@ -191,6 +214,12 @@ class SigParsed extends React.Component {
                                 <td title={JSON.stringify(sig_parsed_components.indication, null, 2)}>
                                     {sig_parsed.indication_readable}
                                 </td>
+                                <td title={JSON.stringify(sig_parsed_components.max, null, 2)}>
+                                    {sig_parsed.max_readable}
+                                </td>
+                                <td title={JSON.stringify(sig_parsed_components.additional_info, null, 2)}>
+                                    {sig_parsed.additional_info_readable}
+                                </td>
                             </tr>
                             {sig_reviewed && !sig_reviewed.sig_correct &&
                             <tr>
@@ -204,7 +233,7 @@ class SigParsed extends React.Component {
                         </tbody>
                     </Table>   
                 </Col>
-                <Col sm={12} md={3}>
+                <Col sm={12} md={2}>
                     <SigReviewedOverall sig_reviewed={sig_reviewed} sig_parsed={sig_parsed} handleChange={this.handleReview} />
                 </Col>             
             </Row>

frontend/src/assets/css/parserx.css

@@ -116,6 +116,18 @@
     background: linear-gradient(180deg,rgba(255,255,255,0) 75%, #9C27B0 25%);
   }
 
+  .highlight-pink {
+    background: linear-gradient(180deg,rgba(255,255,255,0) 75%, #E91E63 25%);
+  }
+
+  .highlight-cyan {
+    background: linear-gradient(180deg,rgba(255,255,255,0) 75%, #00BCD4 25%);
+  }
+
+  .highlight-gray {
+    background: linear-gradient(180deg,rgba(255,255,255,0) 75%, #9E9E9E 25%);
+  }
+
   .red {
     color:#F44336
   }

frontend/webpack.config.js

@@ -57,9 +57,9 @@ module.exports = {
   externals: {
     // global app config object
     config: JSON.stringify({
-        apiUrl: 'https://api.parserx.io'
+        //apiUrl: 'https://api.parserx.io'
         //apiUrl: 'http://139.144.27.208'
-        //apiUrl: 'http://192.168.1.20:8005'
+        apiUrl: 'http://192.168.1.20:8005'
         //apiUrl: 'http://192.168.1.14:8005'
     })
   }

parsers/sig.py

@@ -24,7 +24,7 @@ class SigParser(Parser):
     }
     # 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 = ['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 = ['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):
@@ -39,17 +39,17 @@ def get_normalized_sig_text(self, sig_text):
         sig_text = ' '.join(sig_text.split())
         return sig_text
 
-    def get_readable(self, match_dict):
-        method = match_dict['method_readable'] if match_dict['method_readable'] else ''
-        dose = match_dict['dose_readable'] if match_dict['dose_readable'] else ''
-        strength = match_dict['strength_readable'] if match_dict['strength_readable'] else ''
-        route = match_dict['route_readable'] if match_dict['route_readable'] else ''
-        frequency = match_dict['frequency_readable'] if match_dict['frequency_readable'] else ''
-        when = match_dict['when_readable'] if match_dict['when_readable'] else ''
-        duration = match_dict['duration_readable'] if match_dict['duration_readable'] else ''
-        indication = match_dict['indication_readable'] if match_dict['indication_readable'] else ''
-        max = match_dict['max_readable'] if match_dict['max_readable'] else ''
-        additional_info = match_dict['additional_info_readable'] if match_dict['additional_info_readable'] else ''
+    def get_readable(self, match_dict, inferred_method=None, inferred_route=None):
+        method = match_dict['method_readable'] or inferred_method or ''
+        dose = match_dict['dose_readable'] or ''
+        strength = match_dict['strength_readable'] or ''
+        route = match_dict['route_readable'] or inferred_route or ''
+        frequency = match_dict['frequency_readable'] or ''
+        when = match_dict['when_readable'] or ''
+        duration = match_dict['duration_readable'] or ''
+        indication = match_dict['indication_readable'] or ''
+        max = match_dict['max_readable'] or ''
+        additional_info = match_dict['additional_info_readable'] or ''
 
         if dose != '' and strength != '':
             strength = '(' + strength + ')'
@@ -156,6 +156,7 @@ def infer(self, ndc=None, rxcui=None):
         inferred = dict.fromkeys(sig_elements)
         for sig_element in sig_elements:
             inferred[sig_element] = infer_sig_element(sig_element, ndc, rxcui)
+        #inferred['sig_readable'] = self.get_readable(match_dict)
         return inferred
 
     # parse a csv
@@ -265,7 +266,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()
 #parsed_sigs = SigParser().parse_validate_sig_csv()
 #print(parsed_sigs)
 

sig/migrations/0017_auto_20220808_1422.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.9 on 2022-08-08 14:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sig', '0016_sigparsed_max_dose_per_day'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sigparsed',
+            name='additional_info',
+            field=models.CharField(max_length=1000, null=True),
+        ),
+        migrations.AddField(
+            model_name='sigparsed',
+            name='additional_info_readable',
+            field=models.CharField(max_length=1000, null=True),
+        ),
+        migrations.AddField(
+            model_name='sigparsed',
+            name='additional_info_text',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sigparsed',
+            name='additional_info_text_end',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name='sigparsed',
+            name='additional_info_text_start',
+            field=models.IntegerField(null=True),
+        ),
+    ]

sig/models.py

@@ -102,7 +102,13 @@ class SigParsed(models.Model):
     max_readable = models.CharField(max_length=100, null=True)
     # max_dose_per_day
     max_dose_per_day = models.FloatField(null=True)
-
+    # additional_info
+    additional_info = models.CharField(max_length=1000, null=True)
+    additional_info_text_start = models.IntegerField(null=True)
+    additional_info_text_end = models.IntegerField(null=True)
+    additional_info_text = models.CharField(max_length=100, null=True)
+    additional_info_readable = models.CharField(max_length=1000, null=True)   
+  
     class Meta:
         ordering = ['-created']
 

sig/serializers.py

@@ -19,8 +19,8 @@ class SigParsedSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SigParsed
-        fields = ['id', 'sig_text', 'sig_readable', 'created', 'version', 'method', 'dose', 'dose_max', 'dose_unit', 'strength', 'strength_max', 'strength_unit', 'route', 'frequency', 'frequency_max', 'period', 'period_max', 'period_unit', 'time_duration', 'time_duration_unit', 'day_of_week', 'time_of_day', 'when', 'offset', 'bounds', 'count', 'duration', 'duration_max', 'duration_unit', 'as_needed', 'indication', 'sig_reviewed', 'sig_reviewed_status'
-        ,'method_text', 'method_text_start', 'method_text_end', 'method_readable', 'dose_text', 'dose_text_start', 'dose_text_end', 'dose_readable', 'strength_text', 'strength_text_start', 'strength_text_end', 'strength_readable', 'route_text', 'route_text_start', 'route_text_end', 'route_readable', 'frequency_text', 'frequency_text_start', 'frequency_text_end', 'frequency_readable', 'when_text', 'when_text_start', 'when_text_end', 'when_readable', 'duration_text', 'duration_text_start', 'duration_text_end', 'duration_readable', 'indication_text', 'indication_text_start', 'indication_text_end', 'indication_readable', 'max_numerator_value', 'max_numerator_unit', 'max_denominator_value', 'max_denominator_unit', 'max_text_start', 'max_text_end', 'max_text', 'max_readable', 'max_dose_per_day']
+        fields = ['id', 'sig_text', 'sig_readable', 'created', 'version', 'method', 'dose', 'dose_max', 'dose_unit', 'strength', 'strength_max', 'strength_unit', 'route', 'frequency', 'frequency_max', 'period', 'period_max', 'period_unit', 'time_duration', 'time_duration_unit', 'day_of_week', 'time_of_day', 'when', 'offset', 'bounds', 'count', 'duration', 'duration_max', 'duration_unit', 'as_needed', 'indication', 'max_numerator_value', 'max_numerator_unit', 'max_denominator_value', 'max_denominator_unit', 'additional_info', 'sig_reviewed', 'sig_reviewed_status'
+        ,'method_text', 'method_text_start', 'method_text_end', 'method_readable', 'dose_text', 'dose_text_start', 'dose_text_end', 'dose_readable', 'strength_text', 'strength_text_start', 'strength_text_end', 'strength_readable', 'route_text', 'route_text_start', 'route_text_end', 'route_readable', 'frequency_text', 'frequency_text_start', 'frequency_text_end', 'frequency_readable', 'when_text', 'when_text_start', 'when_text_end', 'when_readable', 'duration_text', 'duration_text_start', 'duration_text_end', 'duration_readable', 'indication_text', 'indication_text_start', 'indication_text_end', 'indication_readable', 'max_text_start', 'max_text_end', 'max_text', 'max_readable', 'max_dose_per_day', 'additional_info_text_start', 'additional_info_text_end', 'additional_info_text', 'additional_info_readable']
 
     def get_sig_reviewed_status(self, obj):
         if not hasattr(obj, 'id'):

sig/views.py

@@ -105,7 +105,6 @@ def create(self, request, *args, **kwargs):
 
     def get_sig_inferred(self, ndc=None, rxcui=None):
         sig_inferred_data = SigParser().infer(ndc, rxcui)
-        print(sig_inferred_data)
         return sig_inferred_data
 
     def replace_sig_parsed_optimal(self, sig):