RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1132] Adding more selectable colours for calendar exception types

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-08-30 13:51:56 +02:00
parent 50645aa21d
commit c819e577be
4 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
View file

@ -28,9 +28,15 @@ import static org.navalplanner.business.i18n.I18nHelper._;
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
public enum CalendarExceptionTypeColor {
DEFAULT(_("red (default)"), "red", "lightcoral"),
GREEN(_("green"), "green", "lightgreen"),
BLUE(_("blue"), "blue", "lightblue");
DEFAULT(_("red (default)"), "#FF3333", "#FF9999"),
GREEN(_("green"),"#2ee62e", "#8ae68a"),
BLUE(_("blue"), "#3333FF", "#9999FF"),
CYAN(_("cyan"), "#33FFFF", "#99FFFF"),
MAGENTA(_("magenta"), "#FF33FF", "#FF99FF"),
YELLOW(_("yellow"), "#e6e62e", "#e6e6a1"),
BLACK(_("black"), "#333333", "#999999"),
ORANGE(_("orange"), "#ffb733", "#ffdb99"),
PURPLE(_("purple"), "#801a80", "#b38eb3");
private final String name;
private final String colorOwnException;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
View file

@ -30,5 +30,5 @@ import org.navalplanner.business.calendars.entities.CalendarExceptionTypeColor;
*/
@XmlEnum
public enum CalendarExceptionTypeColorDTO {
DEFAULT, RED, GREEN, BLUE;
DEFAULT, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, BLACK, ORANGE, PURPLE;
}

36
navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
View file

@ -44,24 +44,36 @@ public class CalendarExceptionTypeColorConverter {
CalendarExceptionTypeColorDTO.RED,
CalendarExceptionTypeColor.DEFAULT);
calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.DEFAULT,
addEquivalence(CalendarExceptionTypeColor.DEFAULT,
CalendarExceptionTypeColorDTO.DEFAULT);
calendarExceptionTypeColorFromDTO.put(
CalendarExceptionTypeColorDTO.DEFAULT,
CalendarExceptionTypeColor.DEFAULT);
calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.GREEN,
addEquivalence(CalendarExceptionTypeColor.GREEN,
CalendarExceptionTypeColorDTO.GREEN);
calendarExceptionTypeColorFromDTO.put(
CalendarExceptionTypeColorDTO.GREEN,
CalendarExceptionTypeColor.GREEN);
calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.BLUE,
addEquivalence(CalendarExceptionTypeColor.BLUE,
CalendarExceptionTypeColorDTO.BLUE);
calendarExceptionTypeColorFromDTO.put(
CalendarExceptionTypeColorDTO.BLUE,
CalendarExceptionTypeColor.BLUE);
addEquivalence(CalendarExceptionTypeColor.MAGENTA,
CalendarExceptionTypeColorDTO.MAGENTA);
addEquivalence(CalendarExceptionTypeColor.CYAN,
CalendarExceptionTypeColorDTO.CYAN);
addEquivalence(CalendarExceptionTypeColor.YELLOW,
CalendarExceptionTypeColorDTO.YELLOW);
addEquivalence(CalendarExceptionTypeColor.ORANGE,
CalendarExceptionTypeColorDTO.ORANGE);
addEquivalence(CalendarExceptionTypeColor.BLACK,
CalendarExceptionTypeColorDTO.BLACK);
}
private static void addEquivalence(CalendarExceptionTypeColor origin,
CalendarExceptionTypeColorDTO destination) {
calendarExceptionTypeColorToDTO.put(origin, destination);
calendarExceptionTypeColorFromDTO.put(destination, origin);
}
public final static CalendarExceptionTypeColorDTO toDTO(

1
navalplanner-webapp/src/main/webapp/calendars/calendars.zul
View file

@ -20,7 +20,6 @@
-->
<?page title="${i18n:_('NavalPlan: Calendars')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>