From aaba22304bbc3a5de24b8be46ba375bcd7269bb9 Mon Sep 17 00:00:00 2001
From: Jailson Dias <jcd2@cin.ufpe.br>
Date: Fri, 28 Apr 2017 22:56:05 -0300
Subject: [PATCH] organizando os dados em duas tabelas e com a quantidade de registros em webpage

---
 webpage/templates/webpages/relatorios.html | 72 +++++++++++++++++++++++++++---------------------------------------------
 webpage/views.py                           | 24 ++++++------------------
 2 files changed, 33 insertions(+), 63 deletions(-)

diff --git a/webpage/templates/webpages/relatorios.html b/webpage/templates/webpages/relatorios.html
index 110ab08..90e6d09 100644
--- a/webpage/templates/webpages/relatorios.html
+++ b/webpage/templates/webpages/relatorios.html
@@ -21,14 +21,6 @@
                     json_history["data"][i][2],json_history["data"][i][3]]);
     }
 
-
-    var array_did = [];
-    {%for data_json in json_did.data%}
-        array_did.push(["{{data_json.0}}","{{data_json.1}}","{{data_json.2}}",{% if data_json.3 is not None %}new Date('{{data_json.3.isoformat}}'){% else%}null{% endif %}]);
-    {% endfor%}
-    var json_did = {"data":array_did};
-    var column_did = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'},{"string":'{% trans "Action" %}'},{"date":'{% trans "Date of Action" %}'}];
-
     var array_n_did = [];
     {%for data_json in json_n_did.data%}
         array_n_did.push(["{{data_json.0}}","{{data_json.1}}"]);
@@ -82,17 +74,12 @@
                     putpagination(json_n_did["data"]);
 
                } else if (col == "{{did_table}}" && text("#title-table") != "{{did_table}}"){
-                   if (length("#link-history") <= 0){
-                       add(element,"#view-table",true);
-                   }
-                   altertitle("{{did_table}}");
                    search = [];
-                   for (var i in json_did["data"]){
-                       search.push([json_did["data"][i][0],json_did["data"][i][1],
-                                   json_did["data"][i][2],json_did["data"][i][3]]);
+                   for (var i in json_history["data"]){
+                       search.push([json_history["data"][i][0],json_history["data"][i][1],
+                                   json_history["data"][i][2],json_history["data"][i][3]]);
                    }
-                   drawTable(column_did,pagination(json_did["data"],1),true,3);
-                   putpagination(json_did["data"]);
+                   searcher(col, true);
                }
            }
           chart.setSelection([])
@@ -125,7 +112,7 @@
 
           var table = new google.visualization.Table(document.getElementById('table_div'));
 
-          table.draw(data_table, {showRowNumber: true, width: '100%', height: '100%'});
+          table.draw(data_table, {allowHtml: true, cssClassNames : {tableRow: 'text-center',tableCell: 'text-center', headerCell: 'text-center'},showRowNumber: true, width: '100%', height: '100%'});
       }
     </script>
 {% endblock%}
@@ -193,7 +180,7 @@
                     <ul class="list-inline nav-justified">
                         <li>
                             <ul id="view-table" class="list-inline text-right">
-                                <li><h3 id="title-table">{{history_table}}</h3></li>
+                                <li><h3 id="title-table"></h3></li>
                             </ul>
                         </li>
                         <li>
@@ -219,6 +206,7 @@
     </div>
 
     <script type="text/javascript">
+        $("#title-table").text(search.length + " {% trans 'record(s)' %}");
         function putpagination(data = json_history["data"]){
             var len = Math.ceil(data.length / 20);
             $(".pagination").empty();
@@ -257,51 +245,49 @@
         }
         function backhistory(){
             drawTable(column_history,json_history["data"],true,3);
-            $("#title-table").text("{{history_table}}");
             $("#link-history").remove();
             search = [];
             for (var i in json_history["data"]){
                 search.push([json_history["data"][i][0],json_history["data"][i][1],
                             json_history["data"][i][2],json_history["data"][i][3]]);
             }
+            $("#title-table").text(search.length + " {% trans 'record(s)' %}");
             putpagination(json_history["data"]);
         }
-        // $("#search-input").on("keyup",function(){
-        //     console.log($("#search-input").val());
-        // });
+
+
         $("#search-input").on("keyup",function(){
             search = [];
             var text = $("#search-input").val();
+            searcher(text);
+        });
+
+        function searcher(text, load_histoty = false){
+            if (load_histoty){
+                $("#link-history").remove();
+            }
             var data = [];
-            if ($("#title-table").text() == "{{n_did_table}}"){
+            if ($("#title-table").text() == "{{n_did_table}}" && !load_histoty){
                 data = $.map(json_n_did["data"], function (obj) {
                           return $.extend(true, {}, obj);
                       });
-            } else if ($("#title-table").text() == "{{did_table}}") {
-                data = $.map(json_did["data"], function (obj) {
-                          return $.extend(true, {}, obj);
-                      });
             } else {
                 data = $.map(json_history["data"], function (obj) {
                       return $.extend(true, {}, obj);
                   });
             }
-            if ($("#title-table").text() != "{{n_did_table}}"){
+            if (load_histoty || $("#title-table").text() != "{{n_did_table}}"){
                 for (var i in data){
                     data[i][3] = moment(data[i][3]).format("DD/MM/YYYY HH:mm");
                 }
             }
-            if ($("#title-table").text() != "{{n_did_table}}"){
+            if (load_histoty || $("#title-table").text() != "{{n_did_table}}"){
                 for (var i in data){
                     if (data[i][0].toLowerCase().includes(text.toLowerCase())
                         || data[i][1].toLowerCase().includes(text.toLowerCase())
                         || data[i][2].toLowerCase().includes(text.toLowerCase())
                         || data[i][3].toLowerCase().includes(text.toLowerCase())){
-                            if ($("#title-table").text() == "{{did_table}}"){
-                                search.push(json_did["data"][i]);
-                            } else {
-                                search.push(json_history["data"][i]);
-                            }
+                            search.push(json_history["data"][i]);
                         }
                 }
             }
@@ -313,16 +299,16 @@
                         }
                 }
             }
-            // console.log(search,"busca");
-            if (($("#title-table").text() == "{{did_table}}")){
-                drawTable(column_did,pagination(search,1),true,3);
-            } else if (($("#title-table").text() == "{{n_did_table}}")){
+            if (!load_histoty && ($("#title-table").text() == "{{n_did_table}}")){
                 drawTable(column_n_did,pagination(search,1),false);
             } else {
                 drawTable(column_history,pagination(search,1),true,3);
             }
+            if (load_histoty || ($("#title-table").text() != "{{n_did_table}}")){
+                $("#title-table").text(search.length + " {% trans 'record(s)' %}");
+            }
             putpagination(search);
-        });
+        }
 
         function pagination(data,pag){
             var len = data.length;
@@ -330,16 +316,12 @@
             var end = (pag * 20 < len) ? pag * 20:len;
             var search = data.slice(first,end);
             return search;
-            // $(".pagination > .disabled").css("color","red");
         }
         function clickPagination(pag){
             $(".pagination > li").last().remove();
             $(".pagination > li").first().remove();
 
-            // console.log(search,"texto");
-            if (($("#title-table").text() == "{{did_table}}")){
-                drawTable(column_did,pagination(search,pag),true,3);
-            } else if (($("#title-table").text() == "{{n_did_table}}")){
+            if (($("#title-table").text() == "{{n_did_table}}")){
                 drawTable(column_n_did,pagination(search,pag),false);
             } else {
                 drawTable(column_history,pagination(search,pag),true,3);
diff --git a/webpage/views.py b/webpage/views.py
index ec1e9b5..d8fb452 100644
--- a/webpage/views.py
+++ b/webpage/views.py
@@ -475,27 +475,15 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
         alunos = webpage.students.all()
 
         vis_ou = Log.objects.filter(context__contains={'webpage_id':webpage.id},resource="webpage",action="view",user_email__in=(aluno.email for aluno in alunos), datetime__range=(start_date,end_date + datetime.timedelta(minutes = 1)))
-        did,n_did,history = str(_("Users who viewed")),str(_("Users who did not viewed")),str(_("Historic"))
+        did,n_did,history = str(_("Realized")),str(_("Unrealized")),str(_("Historic"))
         re = []
-        data_did, data_n_did,data_history = [],[],[]
-        json_did, json_n_did, json_history = {},{},{}
-        # column = []
-        # column.append([str(_("User")),"string"])
-        # column.append([str(_("Group")),"string"])
+        data_n_did,data_history = [],[]
+        json_n_did, json_history = {},{}
 
         from django.db.models import Count, Max
         views_user = vis_ou.values("user_email").annotate(views=Count("user_email"))
         date_last = vis_ou.values("user_email").annotate(last=Max("datetime"))
-        # column.append([str(_("Number of views")),"string"])
-        # column.append([str(_("Date of last view")),"date"])
-        for i in range(0,len(views_user)):
-            data_did.append([str(alunos.get(email=views_user[i].get("user_email"))),
-                ", ".join([str(x) for x in webpage.topic.subject.group_subject.filter(participants__email=views_user[i].get("user_email"))]),
-                views_user[i].get("views"),date_last.get(user_email=views_user[i].get("user_email")).get("last")])
-        json_did["data"] = data_did
-
-        # column.append([str(_("Action")),"string"])
-        # column.append([str(_("Date of action")),"date"])
+
         for log_al in vis_ou.order_by("datetime"):
             data_history.append([str(alunos.get(email=log_al.user_email)),
             ", ".join([str(x) for x in webpage.topic.subject.group_subject.filter(participants__email=log_al.user_email)]),
@@ -503,12 +491,12 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
             json_history["data"] = data_history
 
         not_view = alunos.exclude(email__in=[log.user_email for log in vis_ou.distinct("user_email")])
+
         for alun in not_view:
-            data_n_did.append([str(alun),", ".join([str(x) for x in webpage.topic.subject.group_subject.filter(participants__email=alun.email)])])
+            data_n_did.append([str(alun),", ".join([str(x) for x in webpage.topic.subject.group_subject.filter(participants__email=alun.email)]),str(_('View'))])
         json_n_did["data"] = data_n_did
 
 
-        context["json_did"] = json_did
         context["json_n_did"] = json_n_did
         context["json_history"] = json_history
         c_visualizou = vis_ou.distinct("user_email").count()
--
libgit2 0.21.2