Merge pull request #3181 from TechnologyEnhancedLearning/Develop/Fixes/TD-5219-FixUngroupedCompetencies

TD-5219 Fixes downloading and uploading of ungrouped competencies

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -2419,20 +2419,20 @@ public IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int framework
             else
             {
                 return connection.Query<BulkCompetency>(
-                @"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
+                @"SELECT fc.ID, ISNULL(cg.Name, '') AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
                         SELECT ', ' + f.FlagName
                         FROM Flags AS f
                         INNER JOIN CompetencyFlags AS cf ON f.ID = cf.FlagID
                         WHERE cf.CompetencyID = c.ID
                         FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
                     FROM 
                          Competencies AS c INNER JOIN
-                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
-                         FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID INNER JOIN
+                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID LEFT JOIN
+                         FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID LEFT JOIN
                          CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
                     WHERE (fc.FrameworkID = @frameworkId)
                     GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
-                    ORDER BY fcg.Ordering, fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
                                 new { frameworkId }
                             );
             }
@@ -2442,10 +2442,10 @@ public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> framewor
         {
             return connection.Query<int>(
                 @"SELECT fc.ID
-                    FROM   FrameworkCompetencies AS fc INNER JOIN
+                    FROM   FrameworkCompetencies AS fc LEFT JOIN
                                  FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID
                     WHERE (fc.FrameworkID = @frameworkId) AND (fc.ID IN @frameworkCompetencyIds)
-                    ORDER BY fcg.Ordering, fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
                                 new { frameworkId, frameworkCompetencyIds }
                             ).ToList();
         }