Merge branch '86-multiple-kegg-gene-list' into 'dev'

fix listing when more than one kegg (or eggnog)

Closes #86

See merge request !57

frontend/src/components/listing/simpleexpand/simpleexpand.html

@@ -31,7 +31,7 @@
                   </v-tooltip>
                 </v-list-tile-content>
                 <v-list-tile-action v-if="item.url">
-                  <v-tooltip right>
+                  <v-tooltip top>
                     <template v-slot:activator="{ on }">
                       <v-tooltip top v-if='item.fetch'>
                         <template v-slot:activator="{ on }">

frontend/src/views/about/about.html

@@ -15,10 +15,6 @@
         <v-card class="blue-grey lighten-5 elevation-2 ma-4">
           <v-card-text class="text-xs-justify">
             <v-container class="pa-0">
-              <p>
-                This work is lead by the <a href="https://research.pasteur.fr/en/department/computational-biology/">Metagenomics Signature group</a>
-                at <a href="https://research.pasteur.fr/en">Institut Pasteur</a> and is part of the InSPIRe project.
-              </p>
               Our main motivation is to provide a support for all the analysis that are based on gene catalogs.
             </v-container>
           </v-card-text>
@@ -48,6 +44,28 @@
           </v-card-text>
         </v-card>
       </v-timeline-item>
+      <v-timeline-item
+        color="primary lighten-2"
+        small
+      >
+        <template v-slot:opposite>
+          <span class="subheading">Acknowledgements</span>
+        </template>
+        <v-card class="blue-grey lighten-5 ma-0 elevation-2 ma-4">
+          <v-card-text class="text-xs-justify">
+            <v-container class="pa-0">
+              <p>
+                This work is lead by the <a href="https://research.pasteur.fr/en/department/computational-biology/">Metagenomics Signature group</a>
+                at <a href="https://research.pasteur.fr/en">Institut Pasteur</a> and is part of the InSPIRe project.
+              </p>
+              <p>
+                This work is funded by <a target="_blank" href="https://www.bpifrance.fr/">bpifrance</a> and <a href="https://research.pasteur.fr/en">Institut Pasteur</a>.
+              </p>
+              We thank the IT department of Institut Pasteur, in particular S. Fournier, T. Menard and D. Coulon for providing access to the Kubernetes cluster as well as GitLab.
+            </v-container>
+          </v-card-text>
+        </v-card>
+      </v-timeline-item>
       <v-timeline-item
         color="secondary"
         large

frontend/src/views/genes/genes.html

@@ -212,14 +212,20 @@
             </v-btn>
           </td>
           <td class="text-xs">
-            {{ props.item.kegg }}
-            <v-btn :href="props.item.kegg_url" icon flat small target="_blank" class="kegg--text mt-1 ml-0" v-if="props.item.kegg">
-            <v-icon small>
-              open_in_new
-            </v-icon>
-            </v-btn>
+            <template v-for="(kegg_item, kegg_index) in props.item.keggs">
+              {{ kegg_item.kegg_id }}
+              <v-btn :href="kegg_item.kegg_url" icon flat small target="_blank" class="kegg--text mt-1 ml-0" v-if="kegg_item.kegg_id">
+              <v-icon small>
+                open_in_new
+              </v-icon>
+              </v-btn>
+            </template>
+          </td>
+          <td class="text-xs">
+            <template v-for="(eggnog_item, eggnog_index) in props.item.eggnogs">
+              {{ eggnog_item.eggnog_id }}
+            </template>
           </td>
-          <td class="text-xs">{{ props.item.eggnog }}</td>
           <td class="text-xs">{{ props.item.source }}</td>
           </template>
         </v-data-table>

frontend/src/views/genes/genes.js

@@ -139,12 +139,18 @@ export default {
             }
             if (item.functions) {
               const { functions } = item;
+              item.keggs = [];
+              item.eggnogs = [];
               functions.forEach((fun, ind) => {
                 if (fun.source === 'kegg') {
-                  item.kegg_url = keggUrl + fun.function_id;
-                  item.kegg = fun.function_id;
+                  item.keggs.push({
+                    kegg_url: keggUrl + fun.function_id,
+                    kegg_id: fun.function_id
+                  })
                 } else if (fun.source === 'eggnog') {
-                  item.eggnog = fun.function_id;
+                  item.eggnogs.push({
+                    eggnog_id: fun.function_id
+                  })
                 }
               });
             }