Browse Source

updated claims resolver

root 4 years ago
parent
commit
bdf8cd8eae

+ 2 - 1
composer.json

@@ -14,10 +14,11 @@
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.5",
+        "html2text/html2text": "^4.3",
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
         "picqer/php-barcode-generator": "^2.1",
-        "soundasleep/html2text": "~1.1"
+        "soundasleep/html2text": "^1.1"
     },
     "require-dev": {
         "facade/ignition": "^2.0",

+ 88 - 1
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b3ab65614142566c8d26d23d075f42fd",
+    "content-hash": "e7cde7c8677189cd07a9aa7de4f54c20",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -837,6 +837,43 @@
             ],
             "time": "2019-07-01T23:21:34+00:00"
         },
+        {
+            "name": "html2text/html2text",
+            "version": "4.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mtibben/html2text.git",
+                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mtibben/html2text/zipball/61ad68e934066a6f8df29a3d23a6460536d0855c",
+                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance",
+                "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Html2Text\\": [
+                        "src/",
+                        "test/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Converts HTML to formatted plain text",
+            "time": "2020-04-16T23:44:31+00:00"
+        },
         {
             "name": "laravel/framework",
             "version": "v7.17.2",
@@ -2237,6 +2274,56 @@
             },
             "time": "2020-06-01T09:10:00+00:00"
         },
+        {
+            "name": "soundasleep/html2text",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/soundasleep/html2text.git",
+                "reference": "3243a7107878a61685d2eccf99918d6479e039fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/soundasleep/html2text/zipball/3243a7107878a61685d2eccf99918d6479e039fc",
+                "reference": "3243a7107878a61685d2eccf99918d6479e039fc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.0",
+                "soundasleep/component-tests": "~0.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Soundasleep\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jevon Wright",
+                    "homepage": "https://jevon.org",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A PHP script to convert HTML into a plain text format",
+            "homepage": "https://github.com/soundasleep/html2text",
+            "keywords": [
+                "email",
+                "html",
+                "php",
+                "text"
+            ],
+            "time": "2019-02-15T01:44:54+00:00"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v6.2.3",

+ 2 - 1
package.json

@@ -23,6 +23,7 @@
         "bootstrap": "^4.5.0",
         "jquery": "^3.5.1",
         "popper": "^1.0.1",
-        "popper.js": "^1.16.1"
+        "popper.js": "^1.16.1",
+        "soundasleep/html2text": "~1.1"
     }
 }

BIN
resources/views/app/patient/.claims-resolver.blade.php.swo


BIN
resources/views/app/patient/.claims-resolver.blade.php.swp


+ 2 - 3
resources/views/app/patient/claims-resolver.blade.php

@@ -1,7 +1,6 @@
 @extends ('layouts.patient')
 <?php
 // include the Diff class
-
 ?>
 
 @section('inner-content')
@@ -81,8 +80,8 @@
                 $content = ob_get_clean();
                 $lastContent = isset($loopLastContentByHcp[$note->hcpPro->id]) ? $loopLastContentByHcp[$note->hcpPro->id] : "";
 
-                $contentText = null;
-                $lastContentText = null;
+                $contentText = html2Text($content);
+                $lastContentText = html2Text($lastContent);
 
         ?>
         <tr>