enable getting filtered reports asyncronously

philippK-de · Sep 26, 2016 · 0eb2914 · 0eb2914
1 parent 23137d1
commit 0eb2914
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/include/js/views/timetrackerProject.js b/include/js/views/timetrackerProject.js
@@ -38,6 +38,41 @@ function filterTimetrackerView(event) {
     }
 }
 
+function getTimetrackerReport(project, format) {
+    var baseUrl;
+    if(format == "pdf") {
+        baseUrl = "managetimetracker.php?action=projectpdf&id=" + project;
+    }
+    else if(format == "xls")
+    {
+        baseUrl = "managetimetracker.php?action=projectxls&id=" + project;
+    }
+    //get the form fields for filtering
+    var startDate = cssId("start").value;
+    var endDate = cssId("end").value;
+    var user = cssId("usr").value;
+    var task = cssId("ttask").value;
+
+    //construct the GET parameters for the url
+    var queryUrl = "";
+    if (startDate != "") {
+        queryUrl += "&start=" + startDate;
+    }
+    if (endDate != "") {
+        queryUrl += "&end=" + endDate;
+    }
+    if (user > 0) {
+        queryUrl += "&usr=" + user;
+    }
+    if (task > 0) {
+        queryUrl += "&task=" + task;
+    }
+
+    //if a query was created, append it to the base url
+    baseUrl += queryUrl;
+    console.log(baseUrl);
+    window.location.replace(baseUrl);
+}
 var projectTimetracker = {
     el: "projectTimetracker",
     itemType: "timetracker",

diff --git a/include/js/views/timetrackerProject.min.js b/include/js/views/timetrackerProject.min.js
diff --git a/templates/standard/tracker_project.tpl b/templates/standard/tracker_project.tpl
@@ -26,9 +26,9 @@
 
                             <div class="export-in" style="width:46px;left: -46px;"> {*at one item*}
                                 <a class="pdf"
-                                   href="managetimetracker.php?action=projectpdf&amp;id={$project.ID}{if $start != "" and $end != ""}&amp;start={$start}&amp;end={$end}{/if}{if $usr > 0}&amp;usr={$usr}{/if}{if $task > 0}&amp;task={$task}{/if}{if $fproject|default > 0}&amp;project={$fproject|default}{/if}"><span>{#pdfexport#}</span></a>
+                                   href="javascript:getTimetrackerReport({$project.ID}, 'pdf');"><span>{#pdfexport#}</span></a>
                                 <a class="excel"
-                                   href="managetimetracker.php?action=projectxls&amp;id={$project.ID}{if $start != "" and $end != ""}&amp;start={$start}&amp;end={$end}{/if}{if $usr > 0}&amp;usr={$usr}{/if}{if $task > 0}&amp;task={$task}{/if}{if $fproject|default > 0}&amp;project={$fproject|default}{/if}"><span>{#excelexport#}</span></a>
+                                   href="javascript:getTimetrackerReport({$project.ID}, 'xls');"><span>{#excelexport#}</span></a>
                             </div>
                         </div>