DMC/scipro
7
0
Fork 0
Code Issues 25 Pull Requests 4 Actions Projects 1 Wiki Activity

task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
Conversation 6 Commits 104 Files Changed 129 +7 -7
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d21601044c - Show all commits

2
core/src/main/java/se/su/dsv/scipro/checklist/ChecklistAnswerEnum.java
View File

@ -4,6 +4,6 @@ public enum ChecklistAnswerEnum {
RED, RED,
GREEN, GREEN,
YELLOW, YELLOW,
NOT_APLICABLE, NOT_APPLICABLE,
NO_ANSWER NO_ANSWER
} }

2
view/src/main/java/se/su/dsv/scipro/checklists/AnswerPanel.java
View File

@ -27,7 +27,7 @@ public abstract class AnswerPanel extends Panel {
ANSWER_IMAGES.put(ChecklistAnswerEnum.GREEN, "images/icons/bullet_ball_glass_green.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.GREEN, "images/icons/bullet_ball_glass_green.png");
ANSWER_IMAGES.put(ChecklistAnswerEnum.YELLOW, "images/icons/bullet_ball_glass_yellow.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.YELLOW, "images/icons/bullet_ball_glass_yellow.png");
ANSWER_IMAGES.put(ChecklistAnswerEnum.RED, "images/icons/bullet_ball_glass_red.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.RED, "images/icons/bullet_ball_glass_red.png");
ANSWER_IMAGES.put(ChecklistAnswerEnum.NOT_APLICABLE, "images/icons/bullet_ball_glass_grey.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.NOT_APPLICABLE, "images/icons/bullet_ball_glass_grey.png");
} }
public static final String CLICK_ICON = "images/icons/bullet_ball_glass_click.png"; public static final String CLICK_ICON = "images/icons/bullet_ball_glass_click.png";

2
view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java
View File

@ -55,7 +55,7 @@ public class ChecklistOverviewPanel extends GenericPanel<Project> {
ChecklistAnswerEnum.GREEN, ChecklistAnswerEnum.GREEN,
ChecklistAnswerEnum.YELLOW, ChecklistAnswerEnum.YELLOW,
ChecklistAnswerEnum.RED, ChecklistAnswerEnum.RED,
ChecklistAnswerEnum.NOT_APLICABLE); ChecklistAnswerEnum.NOT_APPLICABLE);
add(new ListView<>("answersBreakdown", answers) { add(new ListView<>("answersBreakdown", answers) {
@Override @Override
protected void populateItem(ListItem<ChecklistAnswerEnum> item) { protected void populateItem(ListItem<ChecklistAnswerEnum> item) {

2
view/src/main/java/se/su/dsv/scipro/checklists/TrafficLightPanel.java
View File

@ -54,7 +54,7 @@ public class TrafficLightPanel extends FormComponentPanel<ChecklistAnswerEnum> {
greenLink = new TrafficLightLink("greenLink", ChecklistAnswerEnum.GREEN, selectedGreen, greenImage); greenLink = new TrafficLightLink("greenLink", ChecklistAnswerEnum.GREEN, selectedGreen, greenImage);
redLink = new TrafficLightLink("redLink", ChecklistAnswerEnum.RED, selectedRed, redImage); redLink = new TrafficLightLink("redLink", ChecklistAnswerEnum.RED, selectedRed, redImage);
yellowLink = new TrafficLightLink("yellowLink", ChecklistAnswerEnum.YELLOW, selectedYellow, yellowImage); yellowLink = new TrafficLightLink("yellowLink", ChecklistAnswerEnum.YELLOW, selectedYellow, yellowImage);
noAnswerLink = new TrafficLightLink("noAnswerLink", ChecklistAnswerEnum.NOT_APLICABLE, selectedNotApplicable, noAnswerImage); noAnswerLink = new TrafficLightLink("noAnswerLink", ChecklistAnswerEnum.NOT_APPLICABLE, selectedNotApplicable, noAnswerImage);
add(greenLink); add(greenLink);
add(yellowLink); add(yellowLink);
add(redLink); add(redLink);

2
view/src/main/java/se/su/dsv/scipro/peer/DisplayQuestionPanel.java
View File

@ -38,7 +38,7 @@ public class DisplayQuestionPanel extends GenericPanel<Answer> {
return "images/icons/bullet_ball_glass_red.png"; return "images/icons/bullet_ball_glass_red.png";
case GREEN: case GREEN:
return "images/icons/bullet_ball_glass_green.png"; return "images/icons/bullet_ball_glass_green.png";
case NOT_APLICABLE: case NOT_APPLICABLE:
return "images/icons/bullet_ball_glass_grey.png"; return "images/icons/bullet_ball_glass_grey.png";
default: default:
throw new IllegalStateException("unknown answer"); throw new IllegalStateException("unknown answer");

2
view/src/test/java/se/su/dsv/scipro/checklists/TrafficLightPanelTest.java
View File

@ -25,7 +25,7 @@ public class TrafficLightPanelTest extends SciProTest {
@Test @Test
public void renders_not_applicable() { public void renders_not_applicable() {
startPanel(Model.of(ChecklistAnswerEnum.NOT_APLICABLE)); startPanel(Model.of(ChecklistAnswerEnum.NOT_APPLICABLE));
} }
@Test @Test

2
view/src/test/java/se/su/dsv/scipro/peer/DisplayQuestionPanelTest.java
View File

@ -28,7 +28,7 @@ public class DisplayQuestionPanelTest extends SciProTest {
@Test @Test
public void renders_with_not_applicable_answer() { public void renders_with_not_applicable_answer() {
startPanel(ChecklistAnswerEnum.NOT_APLICABLE, "motivation"); startPanel(ChecklistAnswerEnum.NOT_APPLICABLE, "motivation");
} }
@Test @Test