Quellcode durchsuchen

Allergy suggest - show allergen type in suggestions

Vijayakrishnan vor 3 Jahren
Ursprung
Commit
28fd5e88c4
2 geänderte Dateien mit 11 neuen und 2 gelöschten Zeilen
  1. 3 2
      app/Http/Controllers/FDBPGController.php
  2. 8 0
      public/js/stag-suggest.js

+ 3 - 2
app/Http/Controllers/FDBPGController.php

@@ -245,8 +245,9 @@ ORDER BY r1.dam_concept_id_desc
         $term = $request->input('term') ? trim($request->input('term')) : '';
         if (empty($term)) return '';
         $matches = DB::connection('pgsql_fdb')->select("
-SELECT r1.dam_concept_id, r1.dam_concept_id_typ, r1.dam_concept_id_desc as text
-FROM rdamca0_concept r1
+SELECT r1.dam_concept_id, r1.dam_concept_id_typ, r1.dam_concept_id_desc as text,
+r2.dam_concept_id_typ_desc as sub_text
+FROM rdamca0_concept r1 join rdamcd0_picklist_con_typ_desc r2 on r1.dam_concept_id_typ = r2.dam_concept_id_typ
 WHERE (r1.dam_concept_id_desc ILIKE :term)
 ORDER BY r1.dam_concept_id_desc
 ",

+ 8 - 0
public/js/stag-suggest.js

@@ -53,6 +53,14 @@
                             }
                             item.data('suggest-data', _data.data[i]);
                             item.html(_data.data[i].text);
+                            if(_data.data[i].sub_text) {
+                                item.append($('<span/>')
+                                    .addClass('ml-1 text-sm text-secondary')
+                                    .append('(')
+                                    .append(_data.data[i].sub_text)
+                                    .append(')')
+                                );
+                            }
                             if(_data.data[i].tooltip) {
                                 item.attr('title', _data.data[i].tooltip);
                             }