Merge pull request #506 from fjelltopp/development

End of contract Mdagascar master deployment
fjelltopp · Dec 18, 2018 · c18c6ab · c18c6ab
2 parents 9b89093 + e83f4a8
commit c18c6ab
Show file tree

Hide file tree

Showing 34 changed files with 2,991 additions and 1,057 deletions.
diff --git a/.snyk b/.snyk
@@ -99,3 +99,26 @@ patch:
         patched: '2018-05-04T14:48:52.390Z'
     - gulp-add-src > vinyl-fs > glob-watcher > gaze > globule > glob > minimatch:
         patched: '2018-05-04T14:48:52.390Z'
+  'npm:tunnel-agent:20170305':
+    - gulp-imagemin > imagemin-mozjpeg > mozjpeg > bin-build > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - imagemin-pngquant > pngquant-bin > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - imagemin-jpegoptim > jpegoptim-bin > bin-build > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - imagemin-optipng > optipng-bin > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - imagemin-jpegoptim > jpegoptim-bin > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - imagemin-optipng > optipng-bin > bin-build > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - gulp-imagemin > imagemin-mozjpeg > mozjpeg > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - gulp-imagemin > imagemin-optipng > optipng-bin > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - gulp-imagemin > imagemin-gifsicle > gifsicle > bin-build > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - gulp-imagemin > imagemin-optipng > optipng-bin > bin-build > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
+    - gulp-imagemin > imagemin-gifsicle > gifsicle > bin-wrapper > download > caw > tunnel-agent:
+        patched: '2018-10-24T03:32:22.601Z'
diff --git a/country_config/null_config.py b/country_config/null_config.py
@@ -11,7 +11,8 @@
     "reports": [['registered'], ['demo']],
     "settings": [['personal'], ['demo']],
     "report_emails": [['emails'], ['demo']],
-    "fault-report": [['registered'], ['rms']]
+    "fault-report": [['registered'], ['demo']],
+    "admin": [['admin'], ['demo']],
 }
 
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -133,6 +133,13 @@ gulp.task('copyFlags', function() {
     .pipe(vfs.dest('meerkat_frontend/static/img/flags'));
 });
 
+gulp.task('copyFavicon', function() {
+    return gulp.src([
+        'meerkat_frontend/src/favicon.ico'
+    ])
+    .pipe(vfs.dest('meerkat_frontend/static/'));
+});
+
 gulp.task('copyMapMarkers', function() {
 	return gulp.src([
         'bower_components/mapbox.js/images/**/*',
@@ -165,7 +172,11 @@ gulp.task('img-opt', function(){
 
 gulp.task(
     'img',
-    gulp.series(gulp.parallel('copyFlags', 'copyMapMarkers'), 'img-opt')
+    gulp.series(gulp.parallel(
+      'copyFlags',
+      'copyMapMarkers',
+      'copyFavicon'
+    ), 'img-opt')
 );
 
 //COPY OTHER FILES

diff --git a/meerkat_frontend/apiData/report_testing/epi_monitoring.json b/meerkat_frontend/apiData/report_testing/epi_monitoring.json
@@ -117,7 +117,7 @@
             "category": [
                 "cd_tab",
                 "Intestinal infectious diseases",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -147,7 +147,7 @@
             "category": [
                 "cd_tab",
                 "Viral infections of the central nervous system",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -177,7 +177,7 @@
             "category": [
                 "cd_tab",
                 "Viral infections of the central nervous system",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -265,7 +265,7 @@
             "category": [
                 "cd_tab",
                 "Viral infections characterized by skin and mucous membrane lesions",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -324,7 +324,7 @@
             "category": [
                 "cd_tab",
                 "Influenza and pneumonia",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -413,7 +413,7 @@
                 "cd_tab",
                 "Malnutrition",
                 "epi_monitoring",
-                "afro"
+                "oms"
             ],
             "classification": null,
             "classification_casedef": "Suspected",
@@ -442,7 +442,7 @@
             "category": [
                 "cd_tab",
                 "Malnutrition",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -472,7 +472,7 @@
             "category": [
                 "cd_tab",
                 "Acute upper respiratory infections",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -531,7 +531,7 @@
             "category": [
                 "cd_tab",
                 "Injury of unspecified body region",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -590,7 +590,7 @@
             "category": [
                 "cd_tab",
                 "Intestinal infectious diseases",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -678,7 +678,7 @@
             "category": [
                 "cd_tab",
                 "Certain zoonotic bacterial diseases",
-                "afro",
+                "oms",
                 "epi_monitoring"
             ],
             "classification": null,
@@ -765,7 +765,7 @@
             "case_def": "",
             "category": [
                 "tot_mortality",
-                "afro"
+                "oms"
             ],
             "classification": null,
             "classification_casedef": "",

diff --git a/meerkat_frontend/src/favicon.ico b/meerkat_frontend/src/favicon.ico
diff --git a/meerkat_frontend/src/faviconFjelltopp.ico b/meerkat_frontend/src/faviconFjelltopp.ico
diff --git a/meerkat_frontend/src/files/pages/completeness.html b/meerkat_frontend/src/files/pages/completeness.html
@@ -58,7 +58,7 @@
                 <div class="chartBox__heading pointer" onclick='toggleMatrix();return false;'>
                     <p id="box_5_heading" style="display: inline"> </p>
                     <div class="box__type-selector pull-right">
-                        <a href="" onclick="event.stopImmediatePropagation();$('#completeness-matrix').tableExport({type:'xls', fileName: 'completeness_matrix'});return false;" class="csv">
+                        <a href="" onclick="event.stopImmediatePropagation();$('#completeness-matrix table').tableExport({type:'xls', fileName: 'completeness_matrix'});return false;" class="csv">
                         </a>
                     </div>
                 </div>
@@ -88,7 +88,7 @@
         <div class="chartBox__heading pointer" onclick='toggleAllClinics();return false;'>
             <p id="box_4_heading" style="display: inline"> </p>
             <div class="box__type-selector pull-right">
-                <a href="" onclick="event.stopImmediatePropagation();$('#all-clinics-table').tableExport({type:'xls', fileName: 'clinic_completeness'});return false;" class="csv">
+                <a href="" onclick="event.stopImmediatePropagation();$('#all-clinics-table table').tableExport({type:'xls', fileName: 'clinic_completeness'});return false;" class="csv">
                 </a>
             </div>
         </div>