Hx sections - custom items functionality upgrade

app/Models/Pro.php

@@ -151,7 +151,10 @@ class Pro extends Model
     }
 
     public function canvasCustomItems($_key) {
-        return ClientCanvasDataCustomItem::where('key', $_key)->where('pro_id', $this->id)->get();
+        return ClientCanvasDataCustomItem::where('key', $_key)
+            ->where('pro_id', $this->id)
+            ->orderBy('label')
+            ->get();
     }
 
 

resources/views/app/patient/segment-templates/history_social/edit.blade.php

@@ -167,6 +167,11 @@ for ($i = 0; $i < count($fields); $i++) {
                 }
             }
 
+            // sort by label
+            model.customFields.sort(function (a, b) {
+                return a.label.localeCompare(b.label);
+            });
+
             new Vue({
                 el: '#edit-univ_history_social-container',
                 delimiters: ["@{{","}}"],
@@ -198,7 +203,12 @@ for ($i = 0; $i < count($fields); $i++) {
                             if(_data && _data.success) {
                                 hideMoeFormMask();
                                 $('[custom-item-form]').hide();
-                                $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                // $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                self.customFields.push({
+                                    label: _label,
+                                    value: '',
+                                    comments: '',
+                                });
                             }
                             else {
                                 toastr.error(_data.message);

resources/views/app/patient/segment-templates/history_surgical/edit.blade.php

@@ -167,6 +167,11 @@ for ($i = 0; $i < count($fields); $i++) {
                 }
             }
 
+            // sort by label
+            model.customFields.sort(function (a, b) {
+                return a.label.localeCompare(b.label);
+            });
+
             new Vue({
                 el: '#edit-univ_history_surgical-container',
                 delimiters: ["@{{","}}"],
@@ -198,7 +203,12 @@ for ($i = 0; $i < count($fields); $i++) {
                             if(_data && _data.success) {
                                 hideMoeFormMask();
                                 $('[custom-item-form]').hide();
-                                $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                // $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                self.customFields.push({
+                                    label: _label,
+                                    value: '',
+                                    comments: '',
+                                });
                             }
                             else {
                                 toastr.error(_data.message);

resources/views/app/patient/segment-templates/past_medical_history/edit.blade.php

@@ -207,6 +207,11 @@ for ($i = 0; $i < count($fields); $i++) {
                 }
             }
 
+            // sort by label
+            model.customFields.sort(function (a, b) {
+                return a.label.localeCompare(b.label);
+            });
+
             new Vue({
                 el: '#edit-univ_history_past_medical-container',
                 delimiters: ["@{{","}}"],
@@ -238,7 +243,12 @@ for ($i = 0; $i < count($fields); $i++) {
                             if(_data && _data.success) {
                                 hideMoeFormMask();
                                 $('[custom-item-form]').hide();
-                                $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                // $('.custom-items-container').closest('.visit-segment').find('.refresh-segment').trigger('click');
+                                self.customFields.push({
+                                    label: _label,
+                                    value: '',
+                                    comments: '',
+                                });
                             }
                             else {
                                 toastr.error(_data.message);