Added support of previous date from getCategPerContrib

contributor_helper.py

@@ -310,24 +310,20 @@ class Contributor_helper:
     def getCategPerContribFromRedis(self, date):
         keyCateg = "CONTRIB_DAY"
         topNum = 0 # all
-        contrib_org = self.getZrange(keyCateg, date, topNum)
+        contrib_org = self.getTopContributorFromRedis(date)
-        data = []
+        for dic in contrib_org:
-        for org, pnts in contrib_org:
+            org = dic['org']
-            dic = {}
-            dic['rank'] = self.getTrueRank(pnts)
-            dic['orgRank'] = self.getOrgContributionRank(org)['final_rank']
-            dic['honorBadge'] = self.getOrgHonorBadges(org)
-            dic['logo_path'] = self.getOrgLogoFromMISP(org)
-            dic['org'] = org
-            dic['pnts'] = pnts
             for categ in self.categories_in_datatable:
-                keyname = 'CONTRIB_CATEG:'+util.getDateStrFormat(date)+':'+categ
-                categ_score = self.serv_redis_db.zscore(keyname, org)
-                if categ_score is None:
                     categ_score = 0
-                dic[categ] = categ_score
+                    for curDate in util.getMonthSpan(date):
-            data.append(dic)
+                        keyname = 'CONTRIB_CATEG:'+util.getDateStrFormat(curDate)+':'+categ
-        return data
+                        temp = self.serv_redis_db.zscore(keyname, org)
+                        if temp is None:
+                            temp = 0
+                        categ_score += temp
+                    dic[categ] = categ_score
+        return contrib_org
+
 
     def getAllOrgFromRedis(self):
         data = self.serv_redis_db.smembers('CONTRIB_ALL_ORG')

static/js/contrib.js

@@ -82,6 +82,7 @@ optionDatatable_fame.scrollY = '45vh';
 var optionDatatable_Categ = {
     responsive: true,
     searching: true,
+    "order": [[ 0, "desc" ]],
     scrollY:        '38vh',
     "scrollX": true,
     scrollCollapse: true,