Bug fixes

TelerikAcademy · Aug 26, 2015 · 4495375 · 4495375
1 parent 115a248
commit 4495375
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Source/Client/Showcase.Client.App/Content/main.css b/Source/Client/Showcase.Client.App/Content/main.css
@@ -510,7 +510,6 @@ li.token-input-selected-token-showcase span {
     border-radius: 4px;
     padding: 2px 20px !important;
     font-weight: bold !important;
-    /*opacity: 0.7 !important;*/
 }
 
 .break-word {

diff --git a/Source/Client/Showcase.Client.App/app/statistics-page/pie-chart-directive.js b/Source/Client/Showcase.Client.App/app/statistics-page/pie-chart-directive.js
@@ -17,6 +17,8 @@
                     "#99cc66", "#FF5A5E", "#5AD3D1", "#FFC870", "#9933cc", "#9FA1E3", "#BED435", ""
                 ];
 
+                var tagIds = {};
+
                 scope.$watch('stats', function (stats) {
                     if (stats && stats.length && stats.length > 0) {
                         var data = [];
@@ -28,6 +30,8 @@
                                 color: colors[i],
                                 highlight: highlights[i]
                             });
+
+                            tagIds[stats[i].tag] = stats[i].tagId;
                         }
 
                         var options = {
@@ -68,7 +72,7 @@
                             var activePoints = chart.getSegmentsAtEvent(evt);
                             if (activePoints[0]) {
                                 var url = '/projects/search';
-                                $location.path(url).search('tag', activePoints[0].label);
+                                $location.path(url).search('tag', tagIds[activePoints[0].label]);
                                 scope.$apply();
                             }
                         });

diff --git a/Source/Client/Showcase.Client.App/app/user-profile-page/user-profile-projects-directive.html b/Source/Client/Showcase.Client.App/app/user-profile-page/user-profile-projects-directive.html
@@ -31,7 +31,7 @@ <h4 class="margin-bottom-0"><a href="/projects/{{project.id}}/{{project.titleUrl
             </p>
             <div class="margin-bottom-10">
                 <span ng-repeat="collaborator in project.collaborators" class="font-size-09em display-inline-block">
-                    <a href="/users/{{collaborator.username}}" class="margin-bottom-2 margin-right-10"><img width="24" height="24" class="margin-right-5 img-thumbnail" ng-src="{{collaborator.avatarUrl}}" />{{collaborator.username}}</a>
+                    <a href="/users/{{collaborator.userName}}" class="margin-bottom-2 margin-right-10"><img width="24" height="24" class="margin-right-5 img-thumbnail" ng-src="{{collaborator.avatarUrl}}" />{{collaborator.userName}}</a>
                 </span>
             </div>
             <div class="margin-top-0 font-size-09em">

diff --git a/Source/Server/Showcase.Server.DataTransferModels/Statistics/CountByTagModel.cs b/Source/Server/Showcase.Server.DataTransferModels/Statistics/CountByTagModel.cs
@@ -12,6 +12,8 @@ public class CountByTagModel : IHaveCustomMappings
     {
         public string Tag { get; set; }
 
+        public int TagId { get; set; }
+
         public int Count { get; set; }
 
         public bool IsUserSubmitted { get; set; }
@@ -21,6 +23,7 @@ public void CreateMappings(IConfiguration configuration)
             configuration.CreateMap<Tag, CountByTagModel>()
                 .ForMember(m => m.IsUserSubmitted, opt => opt.MapFrom(t => t.Type == TagType.UserSubmitted))
                 .ForMember(m => m.Tag, opt => opt.MapFrom(t => t.Name))
+                .ForMember(m => m.TagId, opt => opt.MapFrom(t => t.Id))
                 .ForMember(m => m.Count, opt => opt.MapFrom(t => t.Projects.Count()));
         }
     }