Rename the software project field to avoid name clash with topic

# We can't easily cope with "software_project" as both a field (level 2)
# and as a topic (level 3) name, so rename the field to fix this.

Author: jsharkey13

src/app/services/constants.ts

@@ -358,7 +358,7 @@ export enum TAG_ID {
     functionalProgramming = "functional_programming",
     objectOrientedProgramming = "object_oriented_programming",
     proceduralProgramming = "procedural_programming",
-    softwareProjectProgramming = "software_project_programming",
+    computingPracticalProject = "computing_practical_project",
 
     // GCSE to A level transition topics
     gcseBooleanLogic = "gcse_boolean_logic",
@@ -412,7 +412,7 @@ export enum TAG_ID {
     stringManipulation = "string_manipulation",
     guis = "guis",
     softwareEngineeringPrinciples = "software_engineering_principles",
-    // Software project topics
+    // Computing practical project topics
     softwareProject = "software_project",
 }
 

src/app/services/tags.ts

@@ -29,7 +29,7 @@ const baseTags: BaseTag[] = [
     {id: TAG_ID.functionalProgramming, title: "Functional programming", parent: TAG_ID.programming},
     {id: TAG_ID.objectOrientedProgramming, title: "Object-oriented programming", parent: TAG_ID.programming},
     {id: TAG_ID.proceduralProgramming, title: "Procedural programming", parent: TAG_ID.programming},
-    {id: TAG_ID.softwareProjectProgramming, title: "Software project", parent: TAG_ID.programming},
+    {id: TAG_ID.computingPracticalProject, title: "Computing practical project", parent: TAG_ID.programming},
 
     // GCSE to A level transition topics
     {id: TAG_ID.gcseBooleanLogic, title: "Boolean logic", parent: TAG_ID.gcseToALevel},
@@ -84,7 +84,7 @@ const baseTags: BaseTag[] = [
     {id: TAG_ID.guis, title: "GUIs", parent: TAG_ID.proceduralProgramming, comingSoon: 'Jan 2020'},
     {id: TAG_ID.softwareEngineeringPrinciples, title: "Software engineering principles", parent: TAG_ID.proceduralProgramming, comingSoon: 'Apr 2020'},
     // Software project topics
-    {id: TAG_ID.softwareProject, title: "Software project", parent: TAG_ID.softwareProjectProgramming, new: true},
+    {id: TAG_ID.softwareProject, title: "Software project", parent: TAG_ID.computingPracticalProject, new: true},
 ];
 
 const getBaseTagById = (id: TAG_ID) => {