Merge branch 'cleanup-forms-fix' into cleanup

resources/views/app/patient/prescriptions/lab-form.blade.php

@@ -42,9 +42,14 @@
                     </div>
                 </div>
                 <div class="col-6 pl-2 border-left">
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="text-secondary mr-3">ICDs</span>
-                        <a href="#" v-on:click.prevent="addICD(item)">Add ICD</a>
+                    <div class="d-flex align-items-baseline justify-content-between w-100 mb-1">
+                        <div class="d-flex">
+                          <span class="text-secondary mr-3">ICDs</span>
+                          <a href="#" v-on:click.prevent="addICD(item)">Add ICD</a>
+                        </div>
+                        <a href="#" v-if="currentPrescription_LAB.clinicalDetailJson.items.length > 1" v-on:click.prevent="removeTestSet(item)">
+                            <i class="fa fa-times-circle text-danger on-hover-opaque"></i>
+                        </a>
                     </div>
                     <div v-for="(icd, icdIndex) in item.icds" class="d-flex align-items-baseline mb-1">
                         <input type="text" class="min-width-unset form-control form-control-sm width-100px mr-2"

resources/views/app/patient/prescriptions/list.blade.php

@@ -868,6 +868,10 @@ GROUP BY erx_category");
                             ]
                         });
                     },
+                    removeTestSet: function(_item, _new = false) {
+                      var index = this[(_new ? 'new' : 'current') + 'Prescription_' + this.currentPrescriptionType].clinicalDetailJson.items.indexOf(_item);
+                      this[(_new ? 'new' : 'current') + 'Prescription_' + this.currentPrescriptionType].clinicalDetailJson.items.splice(index, 1);
+                    },
                     addTest: function(_item) {
                         for (let i = 0; i < _item.tests.length; i++) {
                             if(!_item.tests[i].desc) {