Added full country name to short link stats (#36)

* Added full country name to the short link stats

pygmyui/iso2full.py

@@ -0,0 +1,255 @@
+
+"""
+    Conversion from country ISO codes to their full name
+    
+"""
+iso2full = {"AF":"Afghanistan",
+"AX":"Aland Islands",
+"AL":"Albania",
+"DZ":"Algeria",
+"AS":"American Samoa",
+"AD":"Andorra",
+"AO":"Angola",
+"AI":"Anguilla",
+"AQ":"Antarctica",
+"AG":"Antigua and Barbuda",
+"AR":"Argentina",
+"AM":"Armenia",
+"AW":"Aruba",
+"AU":"Australia",
+"AT":"Austria",
+"AZ":"Azerbaijan",
+"BS":"Bahamas",
+"BH":"Bahrain",
+"BD":"Bangladesh",
+"BB":"Barbados",
+"BY":"Belarus",
+"BE":"Belgium",
+"BZ":"Belize",
+"BJ":"Benin",
+"BM":"Bermuda",
+"BT":"Bhutan",
+"BO":"Bolivia, Plurinational State of",
+"BQ":"Bonaire, Sint Eustatius and Saba",
+"BA":"Bosnia and Herzegovina",
+"BW":"Botswana",
+"BV":"Bouvet Island",
+"BR":"Brazil",
+"IO":"British Indian Ocean Territory",
+"BN":"Brunei Darussalam",
+"BG":"Bulgaria",
+"BF":"Burkina Faso",
+"BI":"Burundi",
+"KH":"Cambodia",
+"CM":"Cameroon",
+"CA":"Canada",
+"CV":"Cape Verde",
+"KY":"Cayman Islands",
+"CF":"Central African Republic",
+"TD":"Chad",
+"CL":"Chile",
+"CN":"China",
+"CX":"Christmas Island",
+"CC":"Cocos (Keeling) Islands",
+"CO":"Colombia",
+"KM":"Comoros",
+"CG":"Congo",
+"CD":"Congo, The Democratic Republic of the",
+"CK":"Cook Islands",
+"CR":"Costa Rica",
+"CI":"Côte d'Ivoire",
+"HR":"Croatia",
+"CU":"Cuba",
+"CW":"Curaçao",
+"CY":"Cyprus",
+"CZ":"Czech Republic",
+"DK":"Denmark",
+"DJ":"Djibouti",
+"DM":"Dominica",
+"DO":"Dominican Republic",
+"EC":"Ecuador",
+"EG":"Egypt",
+"SV":"El Salvador",
+"GQ":"Equatorial Guinea",
+"ER":"Eritrea",
+"EE":"Estonia",
+"ET":"Ethiopia",
+"FK":"Falkland Islands (Malvinas)",
+"FO":"Faroe Islands",
+"FJ":"Fiji",
+"FI":"Finland",
+"FR":"France",
+"GF":"French Guiana",
+"PF":"French Polynesia",
+"TF":"French Southern Territories",
+"GA":"Gabon",
+"GM":"Gambia",
+"GE":"Georgia",
+"DE":"Germany",
+"GH":"Ghana",
+"GI":"Gibraltar",
+"GR":"Greece",
+"GL":"Greenland",
+"GD":"Grenada",
+"GP":"Guadeloupe",
+"GU":"Guam",
+"GT":"Guatemala",
+"GG":"Guernsey",
+"GN":"Guinea",
+"GW":"Guinea-Bissau",
+"GY":"Guyana",
+"HT":"Haiti",
+"HM":"Heard Island and McDonald Islands",
+"VA":"Holy See (Vatican City State)",
+"HN":"Honduras",
+"HK":"Hong Kong",
+"HU":"Hungary",
+"IS":"Iceland",
+"IN":"India",
+"ID":"Indonesia",
+"IR":"Iran, Islamic Republic of",
+"IQ":"Iraq",
+"IE":"Ireland",
+"IM":"Isle of Man",
+"IL":"Israel",
+"IT":"Italy",
+"JM":"Jamaica",
+"JP":"Japan",
+"JE":"Jersey",
+"JO":"Jordan",
+"KZ":"Kazakhstan",
+"KE":"Kenya",
+"KI":"Kiribati",
+"KP":"Korea, Democratic People's Republic of",
+"KR":"Korea, Republic of",
+"KW":"Kuwait",
+"KG":"Kyrgyzstan",
+"LA":"Lao People's Democratic Republic",
+"LV":"Latvia",
+"LB":"Lebanon",
+"LS":"Lesotho",
+"LR":"Liberia",
+"LY":"Libya",
+"LI":"Liechtenstein",
+"LT":"Lithuania",
+"LU":"Luxembourg",
+"MO":"Macao",
+"MK":"Macedonia, Republic of",
+"MG":"Madagascar",
+"MW":"Malawi",
+"MY":"Malaysia",
+"MV":"Maldives",
+"ML":"Mali",
+"MT":"Malta",
+"MH":"Marshall Islands",
+"MQ":"Martinique",
+"MR":"Mauritania",
+"MU":"Mauritius",
+"YT":"Mayotte",
+"MX":"Mexico",
+"FM":"Micronesia, Federated States of",
+"MD":"Moldova, Republic of",
+"MC":"Monaco",
+"MN":"Mongolia",
+"ME":"Montenegro",
+"MS":"Montserrat",
+"MA":"Morocco",
+"MZ":"Mozambique",
+"MM":"Myanmar",
+"NA":"Namibia",
+"NR":"Nauru",
+"NP":"Nepal",
+"NL":"Netherlands",
+"NC":"New Caledonia",
+"NZ":"New Zealand",
+"NI":"Nicaragua",
+"NE":"Niger",
+"NG":"Nigeria",
+"NU":"Niue",
+"NF":"Norfolk Island",
+"MP":"Northern Mariana Islands",
+"NO":"Norway",
+"OM":"Oman",
+"PK":"Pakistan",
+"PW":"Palau",
+"PS":"Palestinian Territory, Occupied",
+"PA":"Panama",
+"PG":"Papua New Guinea",
+"PY":"Paraguay",
+"PE":"Peru",
+"PH":"Philippines",
+"PN":"Pitcairn",
+"PL":"Poland",
+"PT":"Portugal",
+"PR":"Puerto Rico",
+"QA":"Qatar",
+"RE":"Réunion",
+"RO":"Romania",
+"RU":"Russian Federation",
+"RW":"Rwanda",
+"BL":"Saint Barthélemy",
+"SH":"Saint Helena, Ascension and Tristan da Cunha",
+"KN":"Saint Kitts and Nevis",
+"LC":"Saint Lucia",
+"MF":"Saint Martin (French part)",
+"PM":"Saint Pierre and Miquelon",
+"VC":"Saint Vincent and the Grenadines",
+"WS":"Samoa",
+"SM":"San Marino",
+"ST":"Sao Tome and Principe",
+"SA":"Saudi Arabia",
+"SN":"Senegal",
+"RS":"Serbia",
+"SC":"Seychelles",
+"SL":"Sierra Leone",
+"SG":"Singapore",
+"SX":"Sint Maarten (Dutch part)",
+"SK":"Slovakia",
+"SI":"Slovenia",
+"SB":"Solomon Islands",
+"SO":"Somalia",
+"ZA":"South Africa",
+"GS":"South Georgia and the South Sandwich Islands",
+"ES":"Spain",
+"LK":"Sri Lanka",
+"SD":"Sudan",
+"SR":"Suriname",
+"SS":"South Sudan",
+"SJ":"Svalbard and Jan Mayen",
+"SZ":"Swaziland",
+"SE":"Sweden",
+"CH":"Switzerland",
+"SY":"Syrian Arab Republic",
+"TW":"Taiwan, Province of China",
+"TJ":"Tajikistan",
+"TZ":"Tanzania, United Republic of",
+"TH":"Thailand",
+"TL":"Timor-Leste",
+"TG":"Togo",
+"TK":"Tokelau",
+"TO":"Tonga",
+"TT":"Trinidad and Tobago",
+"TN":"Tunisia",
+"TR":"Turkey",
+"TM":"Turkmenistan",
+"TC":"Turks and Caicos Islands",
+"TV":"Tuvalu",
+"UG":"Uganda",
+"UA":"Ukraine",
+"AE":"United Arab Emirates",
+"GB":"United Kingdom",
+"US":"United States",
+"UM":"United States Minor Outlying Islands",
+"UY":"Uruguay",
+"UZ":"Uzbekistan",
+"VU":"Vanuatu",
+"VE":"Venezuela, Bolivarian Republic of",
+"VN":"Viet Nam",
+"VG":"Virgin Islands, British",
+"VI":"Virgin Islands, U.S.",
+"WF":"Wallis and Futuna",
+"EH":"Western Sahara",
+"YE":"Yemen",
+"ZM":"Zambia",
+"ZW":"Zimbabwe",
+"others":"unknown"}

pygmyui/pygmy/views.py

@@ -9,7 +9,7 @@
 from restclient.errors import ObjectNotFound, UnAuthorized, LinkExpired, \
     InvalidInput
 from restclient.error_msg import *
-
+from iso2full import iso2full
 
 # TODO: [IMP] middleware to return 500 page when internal error occurs.
 AUTH_COOKIE_NAME = settings.AUTH_COOKIE_NAME
@@ -112,15 +112,21 @@ def short_link_stats(request, code):
     pygmy_client = pygmy_client_object(settings, request)
     if request.method == 'GET':
         try:
-            clickmeta = pygmy_client.link_stats(code)
+            clickmeta = pygmy_client.link_stats(code)   
             clickmeta['country_stats'] = sorted(
                 clickmeta['country_stats'].items(),
                 key=operator.itemgetter(1),
                 reverse=True)
+
+            stats =[(country,iso2full.get(country,"unknown"),hits) for (country,
+                                                hits) in clickmeta['country_stats']]
+            clickmeta['country_stats'] = stats
+
             clickmeta['referrer'] = sorted(
                 clickmeta['referrer'].items(),
                 key=operator.itemgetter(1),
                 reverse=True)
+
             context = dict(clickmeta=clickmeta)
         except (ObjectNotFound, LinkExpired) as e:
             return render(request, '404.html',

pygmyui/templates/pygmy/link_stats.html

@@ -21,14 +21,14 @@
 <table class="table table-bordered">
     <thead>
         <tr>
-            <th class="col-md-9"><span title="Country">Country</span></th>
+            <th class="col-md-9"><span title="Country">Country(code)</span></th>
             <th><span title="Link Hits">Hits</span></th>
         </tr>
     </thead>
     <tbody>
-    {% for country_code, country_hits in clickmeta.country_stats %}
+    {% for country_code, country, country_hits in clickmeta.country_stats %}
         <tr>
-            <td>{{country_code}}</td>
+            <td>{{country}}({{country_code}})</td>
             <td>{{country_hits}}</td>
         </tr>
     {% endfor %}
@@ -44,7 +44,7 @@
         </tr>
     </thead>
     <tbody>
-    {% for referrer, referrer_hits in clickmeta.referrer %}
+    {% for referrer,referrer_hits in clickmeta.referrer %}
         <tr>
             <td>{{referrer}}</td>
             <td>{{referrer_hits}}</td>