CHanged legend order and adjusted category labels. Fixes issue #47.

nginx/covid_website/assets/js/cumulativePlot.js

@@ -58,28 +58,28 @@ function makeCumPlot(geojsonData, cumPlotDiv) {
     var classification = studyClass[i];
     switch(classification)
     {
-      case "drugs":
+      case "Drugs":
         FreqObjDrugs[num] = FreqObjDrugs[num] > 0 ? FreqObjDrugs[num] + 1 : 1;
         break;
-      case "diagnosis":
+      case "Diagnosis":
         FreqObjDiagnosis[num] = FreqObjDiagnosis[num] > 0 ? FreqObjDiagnosis[num] + 1 : 1;
         break;
-      case "vaccine":
+      case "Vaccines":
         FreqObjVaccines[num] = FreqObjVaccines[num] > 0 ? FreqObjVaccines[num] + 1 : 1;
         break;
-      case "ATMP":
+      case "Advanced theraphy medicinical products      ":
         FreqObjATMP[num] = FreqObjATMP[num] > 0 ? FreqObjATMP[num] + 1 : 1;
         break;
-      case "impact on the helpers":
+      case "Impact on helpers":
         FreqObjImpHelpers[num] = FreqObjImpHelpers[num] > 0 ? FreqObjImpHelpers[num] + 1 : 1;
         break;
-      case "management":
+      case "Therapeutic strategies":
         FreqObjTheraStrat[num] = FreqObjTheraStrat[num] > 0 ? FreqObjTheraStrat[num] + 1 : 1;
         break;
-      case "traditional chinese medicine":
+      case "Traditional Chinese medicine":
         FreqObjTradChin[num] = FreqObjTradChin[num] > 0 ? FreqObjTradChin[num] + 1 : 1;
         break;
-      case "understanding":
+      case "Disease understanding":
         FreqObjUnderstanding[num] = FreqObjUnderstanding[num] > 0 ? FreqObjUnderstanding[num] + 1 : 1;
         break;
 

nginx/covid_website/assets/js/trials-map.js

@@ -84,15 +84,15 @@ class TrialsMap {
    */
   setTaxonomiesColors() {
     this.studyCategoryColors = {
-      drugs : '#7FC97F',
-      vaccine: '#BEAED4',
-      ATMP: '#FDC086',
-      'impact on the helpers': '#FFFF99',
-      management: '#386CB0',
-      'traditional chinese medicine': '#F0027F',
-      diagnosis: '#1B9E77',
-      understanding: '#BF5B17',
-      other: '#666666'
+      Diagnosis: '#1B9E77',
+      'Disease understanding': '#BF5B17',
+      'Therapeutic strategies': '#386CB0',
+      Drugs : '#7FC97F',
+      'Advanced theraphy medicinical products': '#FDC086',
+      Vaccines: '#BEAED4',
+      'Traditional Chinese medicine': '#F0027F',
+      'Impact on helpers': '#FFFF99',
+      Other: '#666666'
     }
     this.studyTypeColors = {
       'Observational study': 'orange',