change script template target group syntax (#21)

TVTower · Jul 20, 2024 · 5b88b7e · 5b88b7e
1 parent 89d71a0
commit 5b88b7e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/org.tvtower.db.ui/src/org/tvtower/db/ui/contentassist/DatabaseProposalProvider.java b/org.tvtower.db.ui/src/org/tvtower/db/ui/contentassist/DatabaseProposalProvider.java
@@ -493,12 +493,6 @@ public void completeProgrammeGroups_TargetGroup(EObject model, Assignment assign
 		flagProposal(Constants.targetgroup, acceptor, context);
 	}
 
-	@Override
-	public void completeProgrammeGroups_OptionalTargetGroup(EObject model, Assignment assignment,
-			ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		flagProposal(Constants.targetgroup, acceptor, context);
-	}
-
 	@Override
 	public void completeProgrammeGroups_ProPressureGroup(EObject model, Assignment assignment,
 			ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -658,6 +652,18 @@ public void completeScriptData_ScriptFlags(EObject model, Assignment assignment,
 		flagProposal(Constants.scriptFlag, acceptor, context);
 	}
 
+	@Override
+	public void completeScriptData_TargetGroup(EObject model, Assignment assignment, ContentAssistContext context,
+			ICompletionProposalAcceptor acceptor) {
+		flagProposal(Constants.targetgroup, acceptor, context);
+	}
+
+	@Override
+	public void completeScriptData_OptionalTargetGroup(EObject model, Assignment assignment,
+			ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		flagProposal(Constants.targetgroup, acceptor, context);
+	}
+
 	@Override
 	public void completeJobs_Job(EObject model, Assignment assignment, ContentAssistContext context,
 			ICompletionProposalAcceptor acceptor) {

diff --git a/org.tvtower.db/src/org/tvtower/db/Database.xtext b/org.tvtower.db/src/org/tvtower/db/Database.xtext
@@ -74,7 +74,6 @@ ScriptTemplate:
 		genres=ScriptGenres?&
 		jobs=Jobs?&
 		data=ScriptData?&
-		groups=ProgrammeGroups? &
 		availability=Availability?&
 		episodes=Episodes?&
 		studioSize=StudioSize?&
@@ -155,6 +154,8 @@ ScriptData:
 			('production_broadcast_limit''='broadcastLimit=STRING)?&
 			('production_broadcast_flags''='broadcastFlags=STRING)?&
 			('production_licence_flags''='licenceFlags=STRING)?&
+			('target_groups''='targetGroup=STRING )?&
+			('target_groups_optional''='optionalTargetGroup=STRING)?&
 			('available''='available=STRING)?
 		)
 	'/>'
@@ -731,7 +732,6 @@ ProgrammeGroups:
 	'<''groups' {ProgrammeGroups}
 		(
 			('target_groups''='targetGroup=STRING )?&
-			('target_groups_optional''='optionalTargetGroup=STRING)?&
 			('pro_pressure_groups''='proPressureGroup=STRING)?&
 			('contra_pressure_groups''='contraPressureGroup=STRING)?
 		)

diff --git a/org.tvtower.db/src/org/tvtower/db/constants/Constants.java b/org.tvtower.db/src/org/tvtower/db/constants/Constants.java
@@ -83,6 +83,8 @@ private static Map<EStructuralFeature, TVTHoverInfoCreator> createInfoMap() {
 				.put($.getScriptData_LicenceFlags(), licenceFlag).put($.getScriptData_ScriptFlags(), scriptFlag)
 				.put($.getScriptData_Live_date(), timeProvider).put($.getScriptData_BroadcastFlags(), broadcastFlag)
 				.put($.getScriptGenres_MainGenre(), programmGenre).put($.getScriptGenres_Subgenres(), programmGenre)
+				.put($.getScriptData_OptionalTargetGroup(), targetgroup)
+				.put($.getScriptData_TargetGroup(), targetgroup)
 
 				.put($.getProgrammeRole_Country(), country).put($.getProgrammeRole_Gender(), gender)
 
@@ -126,7 +128,6 @@ private static Map<EStructuralFeature, TVTHoverInfoCreator> createInfoMap() {
 				.put($.getProgrammeData_LicenceBroadcastFlags(), broadcastFlag)
 
 				.put($.getProgrammeGroups_TargetGroup(), targetgroup)
-				.put($.getProgrammeGroups_OptionalTargetGroup(), targetgroup)
 				.put($.getProgrammeGroups_ProPressureGroup(), pressuregroup)
 				.put($.getProgrammeGroups_ContraPressureGroup(), pressuregroup)
 

diff --git a/org.tvtower.db/src/org/tvtower/db/validation/CommonTagsValidator.java b/org.tvtower.db/src/org/tvtower/db/validation/CommonTagsValidator.java
@@ -312,8 +312,6 @@ public void checkGroupAttractivity(GroupAttractivity a) {
 	public void checkProgrammeGroups(ProgrammeGroups g) {
 		Constants.targetgroup.isValidFlag(g.getTargetGroup(), "target_groups", false)
 				.ifPresent(e -> error(e, $.getProgrammeGroups_TargetGroup()));
-		Constants.targetgroup.isValidFlag(g.getOptionalTargetGroup(), "target_groups_optional", false)
-				.ifPresent(e -> error(e, $.getProgrammeGroups_OptionalTargetGroup()));
 		Constants.pressuregroup.isValidFlag(g.getProPressureGroup(), "pro_pressure_groups", false)
 				.ifPresent(e -> error(e, $.getProgrammeGroups_ProPressureGroup()));
 		Constants.pressuregroup.isValidFlag(g.getContraPressureGroup(), "contra_pressure_groups", false)

diff --git a/org.tvtower.db/src/org/tvtower/db/validation/ProgrammeValidator.java b/org.tvtower.db/src/org/tvtower/db/validation/ProgrammeValidator.java
@@ -170,18 +170,6 @@ public void checkProgrammeRatings(ProgrammeRatings r) {
 				.ifPresent(e -> error(e, $.getProgrammeRatings_Outcome()));
 	}
 
-	@Check
-	public void checkProgrammeGroups(ProgrammeGroups g) {
-		Constants.targetgroup.isValidFlag(g.getTargetGroup(), "target_groups", false)
-				.ifPresent(e -> error(e, $.getProgrammeGroups_TargetGroup()));
-		Constants.targetgroup.isValidFlag(g.getOptionalTargetGroup(), "target_groups_optional", false)
-				.ifPresent(e -> error(e, $.getProgrammeGroups_OptionalTargetGroup()));
-		Constants.pressuregroup.isValidFlag(g.getProPressureGroup(), "pro_pressure_groups", false)
-				.ifPresent(e -> error(e, $.getProgrammeGroups_ProPressureGroup()));
-		Constants.pressuregroup.isValidFlag(g.getContraPressureGroup(), "contra_pressure_groups", false)
-				.ifPresent(e -> error(e, $.getProgrammeGroups_ContraPressureGroup()));
-	}
-
 	@Check
 	public void checkProgrammeStaff(Staff staff) {
 		int offset = getParentStaffCount(staff);

diff --git a/org.tvtower.db/src/org/tvtower/db/validation/ScriptValidator.java b/org.tvtower.db/src/org/tvtower/db/validation/ScriptValidator.java
@@ -202,6 +202,11 @@ public void checkScriptData(ScriptData d) {
 				.ifPresent(e -> error(e, $.getScriptData_OptionalProgrammeFlags()));
 		Constants.scriptFlag.isValidFlag(d.getScriptFlags(), "scriptflags", false)
 				.ifPresent(e -> error(e, $.getScriptData_ScriptFlags()));
+		Constants.targetgroup.isValidFlag(d.getTargetGroup(), "target_group", false)
+				.ifPresent(e -> error(e, $.getScriptData_TargetGroup()));
+		Constants.targetgroup.isValidFlag(d.getOptionalTargetGroup(), "target_group_optional", false)
+				.ifPresent(e -> error(e, $.getScriptData_OptionalTargetGroup()));
+
 
 		Constants.licenceFlag.isValidFlag(d.getLicenceFlags(), "production_licence_flags", false)
 				.ifPresent(e -> error(e, $.getScriptData_LicenceFlags()));