issues fixed in progrees report

gnowledge · Apr 16, 2018 · 5326e99 · 5326e99
1 parent 1443c7e
commit 5326e99
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/js/meta_info.js b/gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/js/meta_info.js
@@ -1,24 +1,24 @@
-    var header_logo_dataURL;
-    function toDataUrl(url, callback) {
-        var xhr = new XMLHttpRequest();
-        xhr.onload = function() {
-            var reader = new FileReader();
-            reader.onloadend = function() {
-                callback(reader.result);
-            }
-            reader.readAsDataURL(xhr.response);
-        };
-        xhr.open('GET', url);
-        xhr.responseType = 'blob';
-        xhr.send();
-    }
+var header_logo_dataURL;
+function toDataUrl(url, callback) {
+    var xhr = new XMLHttpRequest();
+    xhr.onload = function() {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+            callback(reader.result);
+        }
+        reader.readAsDataURL(xhr.response);
+    };
+    xhr.open('GET', url);
+    xhr.responseType = 'blob';
+    xhr.send();
+}
+
+toDataUrl('/static/ndf/images/Clix-logo.png', function(myBase64) {
+    header_logo_dataURL = myBase64; // myBase64 is the base64 string
+});
 
-    toDataUrl('/static/ndf/images/Clix-logo.png', function(myBase64) {
-        header_logo_dataURL = myBase64; // myBase64 is the base64 string
-    });
-
 
 function get_current_datetime_val(){
     var date = new Date();
-    return date.toDateString() + date.toLocaleTimeString()
+    return date.toDateString() + " " + date.toLocaleTimeString()
 }
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/admin_course_analytics.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/admin_course_analytics.html
@@ -62,12 +62,7 @@
   </div>
 </div>
 
-
 <script type="text/javascript">
-
-
-
-
       // Admin analytics view
       $(document).ready(function() {
           var datetime_val = get_current_datetime_val()

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html
@@ -20,8 +20,8 @@
 <script src="/static/ndf/bower_components/html2canvas/build/html2canvas.js"></script>
 <script src="/static/ndf/bower_components/pdfmake/build/vfs_fonts.js"></script>
 {% check_is_gstaff group_id request.user as gstaff_access %}
-<a class=" download-progress-report" style="padding-left: 38px"><i class="fi-archive"></i> Download </a><br/>
-<div class="user-analytics-data" id="user-pr-report">
+<a class=" download-progress-report-{{group_id|slugify}}-{{request.user.pk}}" style="padding-left: 38px"><i class="fi-archive"></i> Download </a><br/>
+<div class="user-analytics-data" id="user-pr-report-{{group_id|slugify}}-{{request.user.pk}}">
   <div class="pre-analytics-msg-div text-center hide">
      {% trans "Your analytics is loading. Please wait." %} 
   </div>
@@ -419,9 +419,9 @@ <h4 class='units_progress_stmt'>{{level2_progress_stmt}}</h4>
 
     })
 
-    $(document).on('click',".download-progress-report",function(){
+    $(document).on('click',".download-progress-report-{{group_id|slugify}}-{{request.user.pk}}",function(){
       var datetime_val = get_current_datetime_val()
-      html2canvas(document.getElementById('user-pr-report'), {
+      html2canvas(document.getElementById('user-pr-report-{{group_id|slugify}}-{{request.user.pk}}'), {
             onrendered: function (canvas) {
                 var data = canvas.toDataURL();
                 var docDefinition = {