concern-developers Mailing List for osbl
Brought to you by:
hengels,
leonchiver
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(62) |
Dec
(15) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(67) |
Feb
(20) |
Mar
(3) |
Apr
(12) |
May
(4) |
Jun
(1) |
Jul
(6) |
Aug
(6) |
Sep
(3) |
Oct
(7) |
Nov
(2) |
Dec
|
2005 |
Jan
|
Feb
|
Mar
(4) |
Apr
(5) |
May
(105) |
Jun
(87) |
Jul
(125) |
Aug
(201) |
Sep
(122) |
Oct
(194) |
Nov
(192) |
Dec
(169) |
2006 |
Jan
(45) |
Feb
(18) |
Mar
(27) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2007 |
Jan
|
Feb
|
Mar
(3) |
Apr
(30) |
May
(55) |
Jun
(121) |
Jul
(71) |
Aug
(12) |
Sep
(32) |
Oct
(75) |
Nov
(98) |
Dec
(78) |
2008 |
Jan
(46) |
Feb
(80) |
Mar
(90) |
Apr
(49) |
May
(46) |
Jun
(41) |
Jul
(61) |
Aug
(157) |
Sep
(97) |
Oct
(173) |
Nov
(239) |
Dec
(206) |
2009 |
Jan
(143) |
Feb
(140) |
Mar
(247) |
Apr
(80) |
May
(77) |
Jun
(107) |
Jul
(101) |
Aug
(133) |
Sep
(96) |
Oct
(73) |
Nov
(72) |
Dec
(44) |
2010 |
Jan
(135) |
Feb
(105) |
Mar
(167) |
Apr
(111) |
May
(41) |
Jun
(76) |
Jul
(56) |
Aug
(23) |
Sep
(17) |
Oct
(9) |
Nov
(32) |
Dec
(8) |
2011 |
Jan
(27) |
Feb
(73) |
Mar
(62) |
Apr
(1) |
May
(31) |
Jun
(4) |
Jul
(13) |
Aug
(24) |
Sep
(12) |
Oct
(33) |
Nov
(59) |
Dec
(33) |
2012 |
Jan
(78) |
Feb
(74) |
Mar
(57) |
Apr
(18) |
May
(33) |
Jun
(15) |
Jul
(27) |
Aug
(13) |
Sep
(21) |
Oct
(33) |
Nov
(44) |
Dec
(34) |
2013 |
Jan
(43) |
Feb
(1) |
Mar
(4) |
Apr
(2) |
May
(2) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(7) |
Nov
(6) |
Dec
(1) |
2014 |
Jan
(8) |
Feb
|
Mar
(4) |
Apr
|
May
(9) |
Jun
(2) |
Jul
(3) |
Aug
(2) |
Sep
|
Oct
(1) |
Nov
(4) |
Dec
(3) |
2015 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <leo...@us...> - 2015-04-17 09:25:26
|
Revision: 5758 http://sourceforge.net/p/concern/code/5758 Author: leonchiver Date: 2015-04-17 09:25:23 +0000 (Fri, 17 Apr 2015) Log Message: ----------- bugfixing Modified Paths: -------------- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java 2015-04-16 14:30:48 UTC (rev 5757) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java 2015-04-17 09:25:23 UTC (rev 5758) @@ -42,9 +42,9 @@ public Collection<? extends TimeRange> produceFor(Date from, Date until) { - List<TimeRange> timeRanges = new ArrayList<TimeRange>(); + List<TimeRange> timeRanges = new ArrayList<>(); for (TimeProducer timeProducer : timeProducers) { -// timeRanges.addAll(timeProducer.produceFor(from, until)); + timeRanges.addAll(timeProducer.produceFor(from, until)); } return timeRanges; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2015-04-16 14:30:50
|
Revision: 5757 http://sourceforge.net/p/concern/code/5757 Author: leonchiver Date: 2015-04-16 14:30:48 +0000 (Thu, 16 Apr 2015) Log Message: ----------- bugfix presence ending on the same day it starts Modified Paths: -------------- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java trunk/osbl/ssc/src/java/org/osbl/ssc/logic/WeeklyTimeProducer.java Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java 2015-02-03 14:13:52 UTC (rev 5756) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/logic/CompositeTimeProducer.java 2015-04-16 14:30:48 UTC (rev 5757) @@ -44,7 +44,7 @@ public Collection<? extends TimeRange> produceFor(Date from, Date until) { List<TimeRange> timeRanges = new ArrayList<TimeRange>(); for (TimeProducer timeProducer : timeProducers) { - timeRanges.addAll(timeProducer.produceFor(from, until)); +// timeRanges.addAll(timeProducer.produceFor(from, until)); } return timeRanges; } Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/logic/WeeklyTimeProducer.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/WeeklyTimeProducer.java 2015-02-03 14:13:52 UTC (rev 5756) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/logic/WeeklyTimeProducer.java 2015-04-16 14:30:48 UTC (rev 5757) @@ -34,112 +34,112 @@ @XmlRootElement public class WeeklyTimeProducer implements TimeProducer { - private Date startDate; + private Date startDate; - private Date endDate; + private Date endDate; - private Date startTime; + private Date startTime; - private Date endTime; + private Date endTime; - private Integer nth = 1; + private Integer nth = 1; - private Set<WeekDay> days = EnumSet.noneOf(WeekDay.class); + private Set<WeekDay> days = EnumSet.noneOf(WeekDay.class); - private Integer count = 1; + private Integer count = 1; @XmlAttribute(required = true) @XmlJavaTypeAdapter(TimeAdapter.class) - public Date getStartTime() { - return startTime; - } + public Date getStartTime() { + return startTime; + } - public void setStartTime(Date startTime) { - this.startTime = startTime; - } + public void setStartTime(Date startTime) { + this.startTime = startTime; + } - public void setEndTime(Date endTime) { - this.endTime = endTime; - } + public void setEndTime(Date endTime) { + this.endTime = endTime; + } @XmlAttribute(required = true) @XmlJavaTypeAdapter(TimeAdapter.class) - public Date getEndTime() { - return endTime; - } + public Date getEndTime() { + return endTime; + } - @XmlAttribute(required = true) - public Integer getNth() { - return nth == null ? 1 : nth; - } + @XmlAttribute(required = true) + public Integer getNth() { + return nth == null ? 1 : nth; + } - public void setNth(Integer nth) { - this.nth = nth; - } + public void setNth(Integer nth) { + this.nth = nth; + } @XmlAttribute(required = true) - public Set<WeekDay> getDays() { - return days; - } + public Set<WeekDay> getDays() { + return days; + } - public void setDays(Set<WeekDay> days) { - this.days = days; - } + public void setDays(Set<WeekDay> days) { + this.days = days; + } - public void setDays(WeekDay... days) { - if (days == null || days.length == 0) { - throw new IllegalArgumentException("At least one day must be set"); - } - this.days = EnumSet.copyOf(Arrays.asList(days)); - } + public void setDays(WeekDay... days) { + if (days == null || days.length == 0) { + throw new IllegalArgumentException("At least one day must be set"); + } + this.days = EnumSet.copyOf(Arrays.asList(days)); + } - public void setStartDate(Date startDate) { - this.startDate = startDate; - } + public void setStartDate(Date startDate) { + this.startDate = startDate; + } - public void setEndDate(Date endDate) { - this.endDate = endDate; - } + public void setEndDate(Date endDate) { + this.endDate = endDate; + } @XmlAttribute(required = true) @XmlJavaTypeAdapter(DateAdapter.class) - public Date getStartDate() { - return startDate; - } + public Date getStartDate() { + return startDate; + } @XmlAttribute(required = true) @XmlJavaTypeAdapter(DateAdapter.class) - public Date getEndDate() { - return endDate; - } + public Date getEndDate() { + return endDate; + } - public Integer getCount() { - return count; - } + public Integer getCount() { + return count; + } - public void setCount(Integer count) { - this.count = count; - } + public void setCount(Integer count) { + this.count = count; + } - public Collection<? extends TimeRange> produceFor(Date from, Date until) { - - if (endDate != null) { - if (endDate.before(from)) { - return Collections.emptyList(); - } - } - if (startDate != null) { - if (startDate.after(until)) { - return Collections.emptyList(); - } - } - if (from == null) { - throw new IllegalArgumentException("From cannot be null"); - } - if (until == null) { - throw new IllegalArgumentException("Until cannot be null"); - } - Date loopStart = from; + @Override + public Collection<? extends TimeRange> produceFor(Date from, Date until) { + if (endDate != null) { + if (endDate.before(from)) { + return Collections.emptyList(); + } + } + if (startDate != null) { + if (startDate.after(until)) { + return Collections.emptyList(); + } + } + if (from == null) { + throw new IllegalArgumentException("From cannot be null"); + } + if (until == null) { + throw new IllegalArgumentException("Until cannot be null"); + } + Date loopStart = from; Date startDateByFrom = startDate; if (startDate != null && getNth() > 1) { Calendar c = Calendar.getInstance(); @@ -154,56 +154,52 @@ if (startDateByFrom != null) { loopStart = startDateByFrom; } - Date loopEnd = until; - if (endDate != null && endDate.before(until)) { - loopEnd = endDate; - } + Date loopEnd = until; + if (endDate != null && endDate.before(until)) { + loopEnd = endDate; + } + Calendar cal = Calendar.getInstance(); + cal.setTime(loopStart); + int startWeekDay = cal.get(Calendar.DAY_OF_WEEK); + boolean firstWeekDay = true; + List<TimeRange> ranges = new ArrayList<>(); + while (cal.getTimeInMillis() <= loopEnd.getTime()) { + WeekDay weekDay = getWeekDay(cal.get(Calendar.DAY_OF_WEEK)); + if (!firstWeekDay && weekDay.getCalendarDay() == startWeekDay && getNth() > 1) { + cal.add(Calendar.WEEK_OF_MONTH, getNth() - 1); + firstWeekDay = true; + continue; + } + firstWeekDay = false; + if (days.contains(weekDay)) { + Date rangeStart = DateUtils.combineDateAndTime(cal.getTime(), startTime); + Date rangeEnd = DateUtils.combineDateAndTime(cal.getTime(), endTime); + TimeRange tr = new TimeRange(rangeStart.getTime(), rangeEnd.getTime()); + ranges.addAll(Collections.nCopies(count, tr)); + } + cal.add(Calendar.DAY_OF_MONTH, 1); + } + return ranges; + } - Calendar cal = Calendar.getInstance(); - cal.setTime(loopStart); - int startWeekDay = cal.get(Calendar.DAY_OF_WEEK); - boolean firstWeekDay = true; - List<TimeRange> ranges = new ArrayList<TimeRange>(); - - while (cal.getTime().before(loopEnd)) { - - WeekDay weekDay = getWeekDay(cal.get(Calendar.DAY_OF_WEEK)); - if (!firstWeekDay && weekDay.getCalendarDay() == startWeekDay && getNth() > 1) { - cal.add(Calendar.WEEK_OF_MONTH, getNth() - 1); - firstWeekDay = true; - continue; - } - firstWeekDay = false; - if (days.contains(weekDay)) { - Date rangeStart = DateUtils.combineDateAndTime(cal.getTime(), startTime); - Date rangeEnd = DateUtils.combineDateAndTime(cal.getTime(), endTime); - TimeRange tr = new TimeRange(rangeStart.getTime(), rangeEnd.getTime()); - ranges.addAll(Collections.nCopies(count, tr)); - } - cal.add(Calendar.DAY_OF_MONTH, 1); - } - return ranges; - } - - private WeekDay getWeekDay(int calendarDay) { - switch (calendarDay) { - case Calendar.MONDAY: - return WeekDay.MONDAY; - case Calendar.TUESDAY: - return WeekDay.TUESDAY; - case Calendar.WEDNESDAY: - return WeekDay.WEDNESDAY; - case Calendar.THURSDAY: - return WeekDay.THURSDAY; - case Calendar.FRIDAY: - return WeekDay.FRIDAY; - case Calendar.SATURDAY: - return WeekDay.SATURDAY; - case Calendar.SUNDAY: - return WeekDay.SUNDAY; - default: - throw new IllegalArgumentException("Invalid week day: " + calendarDay); - - } - } + private WeekDay getWeekDay(int calendarDay) { + switch (calendarDay) { + case Calendar.MONDAY: + return WeekDay.MONDAY; + case Calendar.TUESDAY: + return WeekDay.TUESDAY; + case Calendar.WEDNESDAY: + return WeekDay.WEDNESDAY; + case Calendar.THURSDAY: + return WeekDay.THURSDAY; + case Calendar.FRIDAY: + return WeekDay.FRIDAY; + case Calendar.SATURDAY: + return WeekDay.SATURDAY; + case Calendar.SUNDAY: + return WeekDay.SUNDAY; + default: + throw new IllegalArgumentException("Invalid week day: " + calendarDay); + } + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2015-02-03 14:14:00
|
Revision: 5756 http://sourceforge.net/p/concern/code/5756 Author: leonchiver Date: 2015-02-03 14:13:52 +0000 (Tue, 03 Feb 2015) Log Message: ----------- include css from de-fr in build Modified Paths: -------------- branches/de-fr-stable-release/osbl-shell/build.xml Modified: branches/de-fr-stable-release/osbl-shell/build.xml =================================================================== --- branches/de-fr-stable-release/osbl-shell/build.xml 2015-02-02 18:26:20 UTC (rev 5755) +++ branches/de-fr-stable-release/osbl-shell/build.xml 2015-02-03 14:13:52 UTC (rev 5756) @@ -391,7 +391,7 @@ <fileset dir="../de-fr/src/web"> <include name="*.js"/> <include name="*.jsp"/> - <include name="css"/> + <include name="*.css"/> </fileset> </copy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2015-02-02 18:26:22
|
Revision: 5755 http://sourceforge.net/p/concern/code/5755 Author: leonchiver Date: 2015-02-02 18:26:20 +0000 (Mon, 02 Feb 2015) Log Message: ----------- export not as a service Modified Paths: -------------- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2015-01-27 08:26:48 UTC (rev 5754) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2015-02-02 18:26:20 UTC (rev 5755) @@ -104,7 +104,7 @@ public StaticResource getResource() throws IOException { TimeTrackingLogic logic = ServiceProvider.service(TimeTrackingLogic.class); List<ProjectTimeEntry> entries = logic.loadProjectTime(exportOptions.getFrom(), exportOptions.getUntil()); - ProjectTimeExport export = ServiceProvider.service(ProjectTimeExport.class); + ProjectTimeExport export = new CATSExport(); File f = export.export(entries, true); return new FileResource(f); } @@ -326,7 +326,7 @@ try { HibernateEnvironment.getInstance().beginTransaction(); - ProjectTimeExport projectTimeExport = ServiceProvider.getInstance().getService(ProjectTimeExport.class); + ProjectTimeExport projectTimeExport = new CATSExport(); File file = projectTimeExport.export(entries, false); FileResource resource = new FileResource(file); Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2015-01-27 08:26:48 UTC (rev 5754) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2015-02-02 18:26:20 UTC (rev 5755) @@ -36,7 +36,7 @@ public class CATSExport implements ProjectTimeExport { private static final Log LOGGER = LogFactory.getLog(CATSExport.class); - private BeanMetaProvider beanMetaProvider; + private BeanMetaProvider beanMetaProvider = (BeanMetaProvider) ServiceProvider.getInstance().getService("StaticBeanMetaProvider"); private BeanMeta beanMeta; private IdentityLogic identityLogic = ServiceProvider.getInstance().getService(IdentityLogic.class); @@ -48,7 +48,7 @@ public File export(List<ProjectTimeEntry> entries, boolean extended) throws IOException { CatsExporter exporter = new CatsExporter(); File file = File.createTempFile("cats", ".csv"); - BeanMeta beanMeta = createExportMeta(extended); + beanMeta = createExportMeta(extended); Set<Map<String, String>> keys = new HashSet<Map<String, String>>(); for (ProjectTimeEntry projectTimeEntry : entries) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2015-01-27 08:26:51
|
Revision: 5754 http://sourceforge.net/p/concern/code/5754 Author: leonchiver Date: 2015-01-27 08:26:48 +0000 (Tue, 27 Jan 2015) Log Message: ----------- bug fixes Modified Paths: -------------- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-12-19 07:00:14 UTC (rev 5753) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2015-01-27 08:26:48 UTC (rev 5754) @@ -39,6 +39,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import org.jboss.logging.Logger; import org.osbl.UserSession; import org.osbl.client.SessionActionProvider; import org.osbl.client.wings.FormDialog; @@ -324,6 +325,7 @@ } try { + HibernateEnvironment.getInstance().beginTransaction(); ProjectTimeExport projectTimeExport = ServiceProvider.getInstance().getService(ProjectTimeExport.class); File file = projectTimeExport.export(entries, false); @@ -340,7 +342,6 @@ String message = Client.getInstance().getResourceProvider().getMessage(Period.class.getName() + ".messages.exportProjectTimes"); getEnvironment().setStatusMessage(new Client.Message(Client.Message.TYPE_INFO, message)); - HibernateEnvironment.getInstance().beginTransaction(); for (Object object : event.getTargets()) { GetCommand getCmd = (GetCommand) persistence.createCommand("get"); getCmd.setType(Period.class); @@ -357,6 +358,7 @@ getForm().setObject(getForm().getObject()); } } catch (Exception e) { + Logger.getLogger(PeriodEditor.class).error("Error exporting CATS", e); } finally { HibernateEnvironment.getInstance().endTransaction(); } Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2014-12-19 07:00:14 UTC (rev 5753) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2015-01-27 08:26:48 UTC (rev 5754) @@ -94,7 +94,7 @@ // EmpfKundenauftrag (null) // EmpfKundAuft-Pos (null) // Leistungsart (activity) - BeanMeta createExportMeta(boolean extendedLine) { + BeanMeta createExportMeta(final boolean extendedLine) { final VariationBeanMetaProvider provider = new VariationBeanMetaProvider(beanMetaProvider); if (beanMeta == null) { beanMeta = provider.addModifier(new InlineModifier(extendedLine ? ExtendedExportLine.class : ExportLine.class) { @@ -110,11 +110,17 @@ property("personnelNumber").setLabel("Personalnummer"); property("employeeCostCenter").setLabel("Senderkostenstelle"); property("costCenter").setLabel("Empfängerkostenstelle"); - property("costCenterName").setLabel("Name-Empfängerkostenstelle"); + if (extendedLine) { + property("costCenterName").setLabel("Name-Empfängerkostenstelle"); + } property("wbsElement").setLabel("Empfänger-PSP"); - property("wbsElementName").setLabel("Name-Empfänger-PSP"); + if (extendedLine) { + property("wbsElementName").setLabel("Name-Empfänger-PSP"); + } property("order").setLabel("Empfängerauftrag"); - property("orderName").setLabel("Name-Empfängerauftrag"); + if (extendedLine) { + property("orderName").setLabel("Name-Empfängerauftrag"); + } property("empty1").setLabel("Stundenart"); property("time").setLabel("Stunden"); property("empty2").setLabel("Beginn-Uhrzeit"); @@ -129,11 +135,19 @@ property("empty10").setLabel("Leistungsnummer"); property("empty11").setLabel("Sparte"); // Priorities - setPriority( - "date", "personnelNumber", "employeeCostCenter", - "costCenter", "costCenterName", "wbsElement", "wbsElementName", "order", "orderName", "empty1", "time", "empty2", "empty3", - "empty4", "empty5", "activity", "empty6", "empty7", - "empty8", "empty9", "empty10", "empty11"); + if (extendedLine) { + setPriority( + "date", "personnelNumber", "employeeCostCenter", + "costCenter", "costCenterName", "wbsElement", "wbsElementName", "order", "orderName", "empty1", "time", "empty2", "empty3", + "empty4", "empty5", "activity", "empty6", "empty7", + "empty8", "empty9", "empty10", "empty11"); + } else { + setPriority( + "date", "personnelNumber", "employeeCostCenter", + "costCenter", "wbsElement", "order", "empty1", "time", "empty2", "empty3", + "empty4", "empty5", "activity", "empty6", "empty7", + "empty8", "empty9", "empty10", "empty11"); + } } }).getBeanMeta(extendedLine ? ExtendedExportLine.class : ExportLine.class); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-12-19 07:00:22
|
Revision: 5753 http://sourceforge.net/p/concern/code/5753 Author: leonchiver Date: 2014-12-19 07:00:14 +0000 (Fri, 19 Dec 2014) Log Message: ----------- login with new mandator combobox Modified Paths: -------------- branches/de-fr-stable-release/osbl-shell/build.xml branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/ProjectTimeEntryList.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ProjectTimeExport.java branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql Added Paths: ----------- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ExtendedExportLine.java Modified: branches/de-fr-stable-release/osbl-shell/build.xml =================================================================== --- branches/de-fr-stable-release/osbl-shell/build.xml 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/osbl-shell/build.xml 2014-12-19 07:00:14 UTC (rev 5753) @@ -374,7 +374,7 @@ <exclude name="WEB-INF/context.xml"/> </fileset> </copy> - + <copy todir="${jboss.app}/${webapp}" verbose="true" overwrite="true"> <fileset dir="build/web"> <include name="**/*.jsp"/> @@ -387,7 +387,15 @@ <filterset refid="properties.filter"/> <filterset refid="files.filter"/> </copy> + <copy todir="${jboss.app}/${webapp}" overwrite="true" verbose="true"> + <fileset dir="../de-fr/src/web"> + <include name="*.js"/> + <include name="*.jsp"/> + <include name="css"/> + </fileset> + </copy> + <antcall target="deploy-doc"/> <touch> Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-12-19 07:00:14 UTC (rev 5753) @@ -104,7 +104,7 @@ TimeTrackingLogic logic = ServiceProvider.service(TimeTrackingLogic.class); List<ProjectTimeEntry> entries = logic.loadProjectTime(exportOptions.getFrom(), exportOptions.getUntil()); ProjectTimeExport export = ServiceProvider.service(ProjectTimeExport.class); - File f = export.export(entries); + File f = export.export(entries, true); return new FileResource(f); } }); @@ -325,7 +325,7 @@ try { ProjectTimeExport projectTimeExport = ServiceProvider.getInstance().getService(ProjectTimeExport.class); - File file = projectTimeExport.export(entries); + File file = projectTimeExport.export(entries, false); FileResource resource = new FileResource(file); resource.setExternalizerFlags(resource.getExternalizerFlags() | ExternalizeManager.REQUEST); Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/ProjectTimeEntryList.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/ProjectTimeEntryList.java 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/ProjectTimeEntryList.java 2014-12-19 07:00:14 UTC (rev 5753) @@ -18,7 +18,6 @@ import org.conform.*; import org.conform.format.SpecialTimeFormat; import org.conform.modifier.InlineModifier; -import org.osbl.ServiceProvider; import org.osbl.UserSession; import org.osbl.persistence.*; import org.osbl.persistence.model.Entity; @@ -26,33 +25,16 @@ import org.osbl.util.CollectionUtil; import org.osbl.client.wings.form.*; import org.osbl.client.wings.shell.Client; -import org.osbl.waz.logic.ProjectTimeExport; -import org.osbl.waz.logic.TimeTrackingLogic; import org.osbl.waz.model.ProjectTimeEntry; import org.osbl.identity.model.Identity; -import org.wings.externalizer.ExternalizeManager; -import org.wings.resource.FileResource; -import org.wings.script.JavaScriptListener; -import org.wings.script.ScriptListener; -import org.wings.session.SessionManager; - -import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; import java.sql.Date; import java.util.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.conform.format.CallGetterFormat; -import org.osbl.client.wings.FormDialog; import org.osbl.client.wings.form.format.KeyDomainFormat; import org.osbl.client.wings.form.format.ObjetListKeyFormat; -import org.wings.Resource.HeaderEntry; -import org.wings.SDimension; -import org.wings.resource.HttpHeader; import org.wingx.table.EditableTableCellRenderer; -import org.wingx.table.SortableTableModel; import org.wingx.table.XTableModel; public class ProjectTimeEntryList @@ -184,53 +166,6 @@ return keys; } - /* - protected void initializeList() { - getEnvironment().addControl(new XButton(exportAction)); - } - */ - private class ExportAction extends AbstractAction { - - private ExportAction() { - putValue(Action.ACTION_COMMAND_KEY, ProjectTimeEntry.class.getName() + ".buttons.exportForCATS"); - } - - public void actionPerformed(ActionEvent e) { - String title = Client.getInstance().getResourceProvider().getMessage(ProjectTimeEntry.class.getName() + ".buttons.exportForCATS"); - final Export export = new Export(); - FormDialog dial = new FormDialog(Export.class); - dial.addOkButtonListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - TimeTrackingLogic timeTrackingLogic = ServiceProvider.getInstance().getService(TimeTrackingLogic.class); - List<ProjectTimeEntry> entries = timeTrackingLogic.loadProjectTime(export.getFrom(), export.getUntil()); - - try { - ProjectTimeExport projectTimeExport = ServiceProvider.getInstance().getService(ProjectTimeExport.class); - File file = projectTimeExport.export(entries); - - FileResource resource = new FileResource(file); - resource.setExternalizerFlags(resource.getExternalizerFlags() | ExternalizeManager.REQUEST); - - HttpHeader h = new HeaderEntry("Content-Disposition", "attachment; filename=cats.csv"); - resource.setHeaders(Collections.singleton(h)); - - final ScriptListener listener = new JavaScriptListener(null, null, "location.href='" + resource.getURL() + "'"); - SessionManager.getSession().getScriptManager().addScriptListener(listener); - - String message = Client.getInstance().getResourceProvider().getMessage(ProjectTimeEntry.class.getName() + ".messages.exported"); - getEnvironment().setStatusMessage(new Client.Message(Client.Message.TYPE_INFO, message)); - } catch (Exception ex) { - LOGGER.error("Unable to export to CSV", ex); - } - } - }); - - dial.setTitle(title); - dial.setPreferredSize(new SDimension(300, 150)); - dial.show(null, export, "from", "until"); - } - } - public static class Export { java.sql.Date from; Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/CATSExport.java 2014-12-19 07:00:14 UTC (rev 5753) @@ -13,7 +13,6 @@ * * See AGPL for the complete license. */ - package org.osbl.waz.logic; import org.osbl.waz.model.ProjectTimeEntry; @@ -34,9 +33,8 @@ import org.osbl.conform.impex.Exporter; import org.osbl.persistence.Keys; -public class CATSExport implements ProjectTimeExport -{ - +public class CATSExport implements ProjectTimeExport { + private static final Log LOGGER = LogFactory.getLog(CATSExport.class); private BeanMetaProvider beanMetaProvider; private BeanMeta beanMeta; @@ -47,14 +45,15 @@ this.beanMetaProvider = beanMetaProvider; } - public File export(List<ProjectTimeEntry> entries) throws IOException { + public File export(List<ProjectTimeEntry> entries, boolean extended) throws IOException { CatsExporter exporter = new CatsExporter(); File file = File.createTempFile("cats", ".csv"); - BeanMeta beanMeta = createExportMeta(); + BeanMeta beanMeta = createExportMeta(extended); Set<Map<String, String>> keys = new HashSet<Map<String, String>>(); - for (ProjectTimeEntry projectTimeEntry : entries) + for (ProjectTimeEntry projectTimeEntry : entries) { keys.add(projectTimeEntry.getEmployee()); + } Map<Map<String, String>, Concrete> concretes = loadReferredObjects(keys); @@ -65,21 +64,22 @@ LOGGER.warn("Skipping " + Keys.toString(entry.getEmployee()) + " as the employee does not exist anymore."); continue; } - lines.add(new ExportLine(entry, (Employee)employee)); + lines.add(extended ? new ExtendedExportLine(entry, (Employee) employee) : new ExportLine(entry, (Employee) employee)); } exporter.write(beanMeta, lines, new FileOutputStream(file)); return file; } - protected Map<Map<String,String>, Concrete> loadReferredObjects(Set<Map<String, String>> keys) { + protected Map<Map<String, String>, Concrete> loadReferredObjects(Set<Map<String, String>> keys) { if (keys.isEmpty()) { return Collections.emptyMap(); } - Map<Map<String,String>, Concrete> map = new HashMap<Map<String, String>, Concrete>(); - for (Map<String, String> key : keys) + Map<Map<String, String>, Concrete> map = new HashMap<Map<String, String>, Concrete>(); + for (Map<String, String> key : keys) { map.put(key, identityLogic.concrete(key, Employee.class)); + } return map; } @@ -94,11 +94,10 @@ // EmpfKundenauftrag (null) // EmpfKundAuft-Pos (null) // Leistungsart (activity) - - BeanMeta createExportMeta() { + BeanMeta createExportMeta(boolean extendedLine) { final VariationBeanMetaProvider provider = new VariationBeanMetaProvider(beanMetaProvider); - if (beanMeta == null) - beanMeta = provider.addModifier(new InlineModifier(ExportLine.class) { + if (beanMeta == null) { + beanMeta = provider.addModifier(new InlineModifier(extendedLine ? ExtendedExportLine.class : ExportLine.class) { protected void configure() { property("date").setFormat(new DateFormat("dd.MM.yyyy")); property("costCenter").setFormat(new PropertyFormat("code")); @@ -111,8 +110,11 @@ property("personnelNumber").setLabel("Personalnummer"); property("employeeCostCenter").setLabel("Senderkostenstelle"); property("costCenter").setLabel("Empfängerkostenstelle"); + property("costCenterName").setLabel("Name-Empfängerkostenstelle"); property("wbsElement").setLabel("Empfänger-PSP"); + property("wbsElementName").setLabel("Name-Empfänger-PSP"); property("order").setLabel("Empfängerauftrag"); + property("orderName").setLabel("Name-Empfängerauftrag"); property("empty1").setLabel("Stundenart"); property("time").setLabel("Stunden"); property("empty2").setLabel("Beginn-Uhrzeit"); @@ -129,12 +131,13 @@ // Priorities setPriority( "date", "personnelNumber", "employeeCostCenter", - "costCenter", "wbsElement", "order", "empty1", "time", "empty2", "empty3", + "costCenter", "costCenterName", "wbsElement", "wbsElementName", "order", "orderName", "empty1", "time", "empty2", "empty3", "empty4", "empty5", "activity", "empty6", "empty7", "empty8", "empty9", "empty10", "empty11"); } - }).getBeanMeta(ExportLine.class); - beanMeta.setAttribute(Exporter.SHOW_HEADER, Boolean.TRUE); + }).getBeanMeta(extendedLine ? ExtendedExportLine.class : ExportLine.class); + } + beanMeta.setAttribute(Exporter.SHOW_HEADER, Boolean.TRUE); return beanMeta; } @@ -156,6 +159,7 @@ } private static class ExportTimeFormat extends AbstractFormat { + public String format(Object value) { Integer minutes = (Integer) value; Float time = (float) minutes / 60f; @@ -192,6 +196,5 @@ getWriter().append('\t'); } - } } Copied: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ExtendedExportLine.java (from rev 5103, branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ExportLine.java) =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ExtendedExportLine.java (rev 0) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ExtendedExportLine.java 2014-12-19 07:00:14 UTC (rev 5753) @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2005 - 2009 Wilken GmbH + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General + * Public License for more details. + * + * See AGPL for the complete license. + */ + +package org.osbl.waz.logic; + +import org.osbl.waz.model.CostCenter; +import org.osbl.waz.model.Employee; +import org.osbl.waz.model.Order; +import org.osbl.waz.model.ProjectTimeEntry; +import org.osbl.waz.model.WBSElement; + +public class ExtendedExportLine extends ExportLine { + + public ExtendedExportLine(ProjectTimeEntry projectTimeEntry, Employee employee) { + super(projectTimeEntry, employee); + } + + public String getOrderName() { + Order order = getOrder(); + if (order == null) { + return ""; + } + return order.getName(); + } + + public String getWbsElementName() { + WBSElement wbsElement = getWbsElement(); + if (wbsElement == null) { + return ""; + } + return wbsElement.getName(); + } + + public String getCostCenterName() { + CostCenter costCenter = getCostCenter(); + if (costCenter == null) { + return ""; + } + return costCenter.getName(); + } +} + \ No newline at end of file Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ProjectTimeExport.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ProjectTimeExport.java 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/logic/ProjectTimeExport.java 2014-12-19 07:00:14 UTC (rev 5753) @@ -31,5 +31,5 @@ */ public interface ProjectTimeExport { - File export(List<ProjectTimeEntry> entries) throws IOException; + File export(List<ProjectTimeEntry> entries, boolean extended) throws IOException; } Modified: branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql =================================================================== --- branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql 2014-12-15 09:09:37 UTC (rev 5752) +++ branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql 2014-12-19 07:00:14 UTC (rev 5753) @@ -5,4 +5,4 @@ or (p1.from_ <= p2.from_ and p1.until >= p2.until) or (p1.until >= p2.from_ and p1.until <= p2.until)) and p1.id <> p2.id and p1.employee_key = p2.employee_key) -order by p1.key_mandator, p1.employee_key, p1.from_; \ No newline at end of file +order by p1.key_mandator, p1.em1ployee_key, p1.from_; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-12-15 09:09:40
|
Revision: 5752 http://sourceforge.net/p/concern/code/5752 Author: leonchiver Date: 2014-12-15 09:09:37 +0000 (Mon, 15 Dec 2014) Log Message: ----------- overlapping periods sql Added Paths: ----------- branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql Added: branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql =================================================================== --- branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql (rev 0) +++ branches/de-fr-stable-release/waz/src/sql/overlapping-periods.sql.sql 2014-12-15 09:09:37 UTC (rev 5752) @@ -0,0 +1,8 @@ +select id, key_mandator, employee_key, from_, until from defr_period p1 +where exists +(select * from defr_period p2 where p1.key_mandator = p2.key_mandator +and ((p1.from_ >= p2.from_ and p1.from_ <= p2.until) +or (p1.from_ <= p2.from_ and p1.until >= p2.until) +or (p1.until >= p2.from_ and p1.until <= p2.until)) +and p1.id <> p2.id and p1.employee_key = p2.employee_key) +order by p1.key_mandator, p1.employee_key, p1.from_; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-12-03 11:54:22
|
Revision: 5751 http://sourceforge.net/p/concern/code/5751 Author: leonchiver Date: 2014-12-03 11:54:15 +0000 (Wed, 03 Dec 2014) Log Message: ----------- index stuff Modified Paths: -------------- branches/pneuhage-stable-release/osbl/src/java/org/osbl/client/wings/form/action/ListPrintAction.java Modified: branches/pneuhage-stable-release/osbl/src/java/org/osbl/client/wings/form/action/ListPrintAction.java =================================================================== --- branches/pneuhage-stable-release/osbl/src/java/org/osbl/client/wings/form/action/ListPrintAction.java 2014-11-28 08:24:11 UTC (rev 5750) +++ branches/pneuhage-stable-release/osbl/src/java/org/osbl/client/wings/form/action/ListPrintAction.java 2014-12-03 11:54:15 UTC (rev 5751) @@ -108,7 +108,7 @@ } for (int i = 0; i < model.getRowCount(); i++) { for (int j = 0; j < indices.size(); j++) { - Object val = model.getValueAt(i, indices.get(j)); + Object val = model.getValueAt(i, model.getColumnModel().getColumn(indices.get(j)).getModelIndex()); Phrase phrase = new Phrase(renderColumn(model.getRows().get(i), val, (String) model.getColumnModel().getColumn(indices.get(j)).getIdentifier()), normalFont); PdfPCell cell = new PdfPCell(phrase); table.addCell(cell); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-11-28 08:24:18
|
Revision: 5750 http://sourceforge.net/p/concern/code/5750 Author: leonchiver Date: 2014-11-28 08:24:11 +0000 (Fri, 28 Nov 2014) Log Message: ----------- 15 months Modified Paths: -------------- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/AppointmentsApplication.java trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/SchedulingApplication.java Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/AppointmentsApplication.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/AppointmentsApplication.java 2014-11-28 08:16:45 UTC (rev 5749) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/AppointmentsApplication.java 2014-11-28 08:24:11 UTC (rev 5750) @@ -56,7 +56,7 @@ return environment; } Date monday = DateUtils.monday(DateUtils.currentDate()); - Date lastDay = DateUtils.add(monday, java.util.Calendar.MONTH, 12); + Date lastDay = DateUtils.add(monday, java.util.Calendar.MONTH, 15); schedulingModel = createScheldulingModel(monday, lastDay); schedulingModel.setDate(monday); final String title = Client.getMessage("org.osbl.ssc.actions.ownAppointments"); Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/SchedulingApplication.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/SchedulingApplication.java 2014-11-28 08:16:45 UTC (rev 5749) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/scheduling/SchedulingApplication.java 2014-11-28 08:24:11 UTC (rev 5750) @@ -106,7 +106,7 @@ } environment = new DelegateEnvironment(SchedulingApplication.class.getName(), true); Date monday = DateUtils.monday(DateUtils.currentDate()); - Date lastDay = DateUtils.add(monday, java.util.Calendar.MONTH, 12); + Date lastDay = DateUtils.add(monday, java.util.Calendar.MONTH, 15); schedulingModel = createScheldulingModel(monday, lastDay); servicesTool = new ServicesTool(); schedulingPanel = new SchedulingPanel(schedulingModel) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-11-28 08:16:54
|
Revision: 5749 http://sourceforge.net/p/concern/code/5749 Author: leonchiver Date: 2014-11-28 08:16:45 +0000 (Fri, 28 Nov 2014) Log Message: ----------- old calendar colors Modified Paths: -------------- trunk/osbl/ssc/src/web/ssc-calendar.css Modified: trunk/osbl/ssc/src/web/ssc-calendar.css =================================================================== --- trunk/osbl/ssc/src/web/ssc-calendar.css 2014-11-03 09:16:08 UTC (rev 5748) +++ trunk/osbl/ssc/src/web/ssc-calendar.css 2014-11-28 08:16:45 UTC (rev 5749) @@ -1,194 +1,194 @@ -.appointment span, .appointment_form span { - display: inline-block; - width: 90px; - overflow: hidden; -} - -.occupiedAppointment, .occupiedAppointment_form, .occupiedAppointment_form_disabled { - background: url("icon/background_stripes.gif"); - color: #AAAAAA !important; - font-size: 10px; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - cursor: default !important; -} - -.asapAppointment, .asapAppointment_form { - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - background: #7AA715; - font-size: 10px; - color: white !important; -} - -.appointment, .appointmentLegend, .appointment_form { - background: #FD7400 !important; - border-bottom: 1px solid #AAAAAA; - border-right: 1px solid #AAAAAA !important; - font-size: 10px; - color: #333 !important; -} - -.appointment:hover, .appointment_form:hover, .freeTimeSlot:hover, -.freeTimeSlot_form:hover, .onlineTimeSlot:hover, .onlineTimeSlot_form:hover, -.notAvailableTimeSlot:hover, .notAvailableTimeSlot_form:hover - { - background: #106080 !important; - color: white !important; -} - -.pauseAppointment, .pauseAppointmentLegend, .pauseAppointment_form { - background: #555555 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: white !important; - font-size: 10px !important; - cursor: default !important; -} - -.freeTimeSlot, .freeTimeSlotLegend, .freeTimeSlot_form { - background: #c9d88b !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: white !important; - font-size: 10px; -} - -.onlineTimeSlot, .onlineTimeSlotLegend, .onlineTimeSlot_form { - background: #9fbba3 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.blockedTimeSlot, .blockedTimeSlotLegend, .blockedTimeSlot_form { - background: #c5c6c6 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} -.adminAppointment, .adminAppointmentLegend, .adminAppointment_form { - background: #aad2f2 !important; - border-bottom: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.ownAppointment, .ownAppointmentLegend, .ownAppointment_form { - background: #ffb037 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.onlineScheduledAppointment, .onlineScheduledAppointment_form, .onlineScheduledAppointmentLegend { - background: #197d94 !important; - font-size: 10px !important; - color: white !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; -} - -.hourAxis td { - color: red !important; -} - -.hourAxis { - margin-top: -1px; -} - -.timeLineAxis { - background-color: transparent !important; - border-bottom: none !important; -} - -.timeLineAxis td { - text-align: right; - padding-right: 2px; - padding-top: 2px; - vertical-align: top; -} - -.timeLineAxis td, .timeLineTitle, .timeLineTitle_form { - background-color: transparent !important; - border-right: 1px solid #AAAAAA !important; - border-top: 1px solid #AAAAAA !important; - border-bottom: none !important; - color: #333333 !important; - font-size: 10px !important; - font-weight: bold !important; -} - -.timeLineTitle, .timeLineTitle_form { - border-bottom: 1px solid #AAAAAA !important; -} - -.appointmentsTimeTable .timeLineTitle { - cursor: pointer !important; -} - -.timeLineTitle td span, .timeLineTitle_form td span { - display: inline-block; - margin-left: 5px; - overflow: hidden; - width: 90px !important; -} - -.timeLineTitle.firstInLayout_form { - border-left: solid 1px #AAAAAA; - margin-left: -1px !important; - width: 101px !important; -} - -#hourAxis { - margin-top: -1px; -} - -.timeLineTitle.timeLineFooter, .timeLineTitle.timeLineFooter_form { - border-top: none !important; -} - -.smallAppointment, .smallAppointment_form, .smallAppointment span, .smallAppointment_form span { - line-height: 0px !important; -} - -.processedAppointment, .processedAppointmentLegend, .processedAppointment_form { - background: #ffdf6e !important; - color: black !important; - font-size: 10px; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; -} - -.selectedAppointment, .selectedAppointmentLegend, .selectedAppointment_form { - background: #157fa9 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: white !important; - font-size: 10px !important; - cursor: default !important; -} - -.calendarLegend { - padding: 2px; - border-bottom: none !important; - border-right: none !important; -}L - -.notAvailableTimeSlot, .notAvailableTimeSlot_form, .notAvailableTimeSlotLegend { - background: #dddddd !important; - cursor: pointer; - font-size: 10px !important; -} - -.holidayAppointment, .holidayAppointmentLegend, .holidayAppointment_form { - background: #ebebeb !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: black !important; -} - +.appointment span, .appointment_form span { + display: inline-block; + width: 90px; + overflow: hidden; +} + +.occupiedAppointment, .occupiedAppointment_form, .occupiedAppointment_form_disabled { + background: url("icon/background_stripes.gif"); + color: #AAAAAA !important; + font-size: 10px; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + cursor: default !important; +} + +.asapAppointment, .asapAppointment_form { + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + background: #7AA715; + font-size: 10px; + color: white !important; +} + +.appointment, .appointmentLegend, .appointment_form { + background: #FD7400 !important; + border-bottom: 1px solid #AAAAAA; + border-right: 1px solid #AAAAAA !important; + font-size: 10px; + color: #333 !important; +} + +.appointment:hover, .appointment_form:hover, .freeTimeSlot:hover, +.freeTimeSlot_form:hover, .onlineTimeSlot:hover, .onlineTimeSlot_form:hover, +.notAvailableTimeSlot:hover, .notAvailableTimeSlot_form:hover + { + background: #106080 !important; + color: white !important; +} + +.pauseAppointment, .pauseAppointmentLegend, .pauseAppointment_form { + background: #555555 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: white !important; + font-size: 10px !important; + cursor: default !important; +} + +.freeTimeSlot, .freeTimeSlotLegend, .freeTimeSlot_form { + background: #BEDB39 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: black !important; + font-size: 10px; +} + +.onlineTimeSlot, .onlineTimeSlotLegend, .onlineTimeSlot_form { + background: #168039 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.blockedTimeSlot, .blockedTimeSlotLegend, .blockedTimeSlot_form { + background: #555555 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} +.adminAppointment, .adminAppointmentLegend, .adminAppointment_form { + background: #ee0000 !important; + border-bottom: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.ownAppointment, .ownAppointmentLegend, .ownAppointment_form { + background: #a41434 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.onlineScheduledAppointment, .onlineScheduledAppointment_form, .onlineScheduledAppointmentLegend { + background: #EE5A00 !important; + font-size: 10px !important; + color: white !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; +} + +.hourAxis td { + color: red !important; +} + +.hourAxis { + margin-top: -1px; +} + +.timeLineAxis { + background-color: transparent !important; + border-bottom: none !important; +} + +.timeLineAxis td { + text-align: right; + padding-right: 2px; + padding-top: 2px; + vertical-align: top; +} + +.timeLineAxis td, .timeLineTitle, .timeLineTitle_form { + background-color: transparent !important; + border-right: 1px solid #AAAAAA !important; + border-top: 1px solid #AAAAAA !important; + border-bottom: none !important; + color: #333333 !important; + font-size: 10px !important; + font-weight: bold !important; +} + +.timeLineTitle, .timeLineTitle_form { + border-bottom: 1px solid #AAAAAA !important; +} + +.appointmentsTimeTable .timeLineTitle { + cursor: pointer !important; +} + +.timeLineTitle td span, .timeLineTitle_form td span { + display: inline-block; + margin-left: 5px; + overflow: hidden; + width: 90px !important; +} + +.timeLineTitle.firstInLayout_form { + border-left: solid 1px #AAAAAA; + margin-left: -1px !important; + width: 101px !important; +} + +#hourAxis { + margin-top: -1px; +} + +.timeLineTitle.timeLineFooter, .timeLineTitle.timeLineFooter_form { + border-top: none !important; +} + +.smallAppointment, .smallAppointment_form, .smallAppointment span, .smallAppointment_form span { + line-height: 0px !important; +} + +.processedAppointment, .processedAppointmentLegend, .processedAppointment_form { + background: #8ACBBA !important; + color: black !important; + font-size: 10px; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; +} + +.selectedAppointment, .selectedAppointmentLegend, .selectedAppointment_form { + background: #157fa9 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: white !important; + font-size: 10px !important; + cursor: default !important; +} + +.calendarLegend { + padding: 2px; + border-bottom: none !important; + border-right: none !important; +}L + +.notAvailableTimeSlot, .notAvailableTimeSlot_form, .notAvailableTimeSlotLegend { + background: #dddddd !important; + cursor: pointer; + font-size: 10px !important; +} + +.holidayAppointment, .holidayAppointmentLegend, .holidayAppointment_form { + background: #888888 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-11-03 09:16:15
|
Revision: 5748 http://sourceforge.net/p/concern/code/5748 Author: leonchiver Date: 2014-11-03 09:16:08 +0000 (Mon, 03 Nov 2014) Log Message: ----------- new css Modified Paths: -------------- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-11-03 09:07:42 UTC (rev 5747) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-11-03 09:16:08 UTC (rev 5748) @@ -71,7 +71,6 @@ property("name").setLabel(localize("name")); property("scheduled").setLabel(localize("scheduled")); property("state").setLabel(localize("state")); - property("name").setAttribute(DefaultBeanData.PROPERTY_DATA_CLASS, ); } }).getBeanMeta(Booking.class); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-11-03 09:07:59
|
Revision: 5747 http://sourceforge.net/p/concern/code/5747 Author: leonchiver Date: 2014-11-03 09:07:42 +0000 (Mon, 03 Nov 2014) Log Message: ----------- new css Modified Paths: -------------- trunk/osbl/osbl/src/java/org/osbl/client/wings/form/GenericObjectList.java trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java trunk/osbl/ssc/src/web/ssc-calendar.css Modified: trunk/osbl/osbl/src/java/org/osbl/client/wings/form/GenericObjectList.java =================================================================== --- trunk/osbl/osbl/src/java/org/osbl/client/wings/form/GenericObjectList.java 2014-10-20 15:32:17 UTC (rev 5746) +++ trunk/osbl/osbl/src/java/org/osbl/client/wings/form/GenericObjectList.java 2014-11-03 09:07:42 UTC (rev 5747) @@ -163,7 +163,9 @@ */ @Override public void refresh() { - model.refresh(); + if (model != null) { + model.refresh(); + } } Object current; Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-10-20 15:32:17 UTC (rev 5746) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-11-03 09:07:42 UTC (rev 5747) @@ -71,6 +71,7 @@ property("name").setLabel(localize("name")); property("scheduled").setLabel(localize("scheduled")); property("state").setLabel(localize("state")); + property("name").setAttribute(DefaultBeanData.PROPERTY_DATA_CLASS, ); } }).getBeanMeta(Booking.class); } @@ -315,4 +316,27 @@ return super.getTableCellRendererComponent(table, value, isSelected, row, column); } } + + public static class NamePropertyData extends AbstractPropertyData { + + public NamePropertyData(AbstractBeanData beanData, PropertyMeta propertyMeta) { + super(beanData, propertyMeta); + } + + @Override + protected void doSetValue(Object value) { + } + + @Override + protected Object doGetValue() { + return ((Booking) getBeanData()).getFormattedName(); + } + + @Override + public Data getRelationData() { + return null; + } + + } + } Modified: trunk/osbl/ssc/src/web/ssc-calendar.css =================================================================== --- trunk/osbl/ssc/src/web/ssc-calendar.css 2014-10-20 15:32:17 UTC (rev 5746) +++ trunk/osbl/ssc/src/web/ssc-calendar.css 2014-11-03 09:07:42 UTC (rev 5747) @@ -1,194 +1,194 @@ -.appointment span, .appointment_form span { - display: inline-block; - width: 90px; - overflow: hidden; -} - -.occupiedAppointment, .occupiedAppointment_form, .occupiedAppointment_form_disabled { - background: url("icon/background_stripes.gif"); - color: #AAAAAA !important; - font-size: 10px; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - cursor: default !important; -} - -.asapAppointment, .asapAppointment_form { - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - background: #7AA715; - font-size: 10px; - color: white !important; -} - -.appointment, .appointmentLegend, .appointment_form { - background: #FD7400 !important; - border-bottom: 1px solid #AAAAAA; - border-right: 1px solid #AAAAAA !important; - font-size: 10px; - color: #333 !important; -} - -.appointment:hover, .appointment_form:hover, .freeTimeSlot:hover, -.freeTimeSlot_form:hover, .onlineTimeSlot:hover, .onlineTimeSlot_form:hover, -.notAvailableTimeSlot:hover, .notAvailableTimeSlot_form:hover - { - background: #106080 !important; - color: white !important; -} - -.pauseAppointment, .pauseAppointmentLegend, .pauseAppointment_form { - background: #555555 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: white !important; - font-size: 10px !important; - cursor: default !important; -} - -.freeTimeSlot, .freeTimeSlotLegend, .freeTimeSlot_form { - background: #BEDB39 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: black !important; - font-size: 10px; -} - -.onlineTimeSlot, .onlineTimeSlotLegend, .onlineTimeSlot_form { - background: #168039 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.blockedTimeSlot, .blockedTimeSlotLegend, .blockedTimeSlot_form { - background: #555555 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} -.adminAppointment, .adminAppointmentLegend, .adminAppointment_form { - background: #ee0000 !important; - border-bottom: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.ownAppointment, .ownAppointmentLegend, .ownAppointment_form { - background: #a41434 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - -.onlineScheduledAppointment, .onlineScheduledAppointment_form, .onlineScheduledAppointmentLegend { - background: #EE5A00 !important; - font-size: 10px !important; - color: white !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; -} - -.hourAxis td { - color: red !important; -} - -.hourAxis { - margin-top: -1px; -} - -.timeLineAxis { - background-color: transparent !important; - border-bottom: none !important; -} - -.timeLineAxis td { - text-align: right; - padding-right: 2px; - padding-top: 2px; - vertical-align: top; -} - -.timeLineAxis td, .timeLineTitle, .timeLineTitle_form { - background-color: transparent !important; - border-right: 1px solid #AAAAAA !important; - border-top: 1px solid #AAAAAA !important; - border-bottom: none !important; - color: #333333 !important; - font-size: 10px !important; - font-weight: bold !important; -} - -.timeLineTitle, .timeLineTitle_form { - border-bottom: 1px solid #AAAAAA !important; -} - -.appointmentsTimeTable .timeLineTitle { - cursor: pointer !important; -} - -.timeLineTitle td span, .timeLineTitle_form td span { - display: inline-block; - margin-left: 5px; - overflow: hidden; - width: 90px !important; -} - -.timeLineTitle.firstInLayout_form { - border-left: solid 1px #AAAAAA; - margin-left: -1px !important; - width: 101px !important; -} - -#hourAxis { - margin-top: -1px; -} - -.timeLineTitle.timeLineFooter, .timeLineTitle.timeLineFooter_form { - border-top: none !important; -} - -.smallAppointment, .smallAppointment_form, .smallAppointment span, .smallAppointment_form span { - line-height: 0px !important; -} - -.processedAppointment, .processedAppointmentLegend, .processedAppointment_form { - background: #8ACBBA !important; - color: black !important; - font-size: 10px; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; -} - -.selectedAppointment, .selectedAppointmentLegend, .selectedAppointment_form { - background: #157fa9 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - color: white !important; - font-size: 10px !important; - cursor: default !important; -} - -.calendarLegend { - padding: 2px; - border-bottom: none !important; - border-right: none !important; -}L - -.notAvailableTimeSlot, .notAvailableTimeSlot_form, .notAvailableTimeSlotLegend { - background: #dddddd !important; - cursor: pointer; - font-size: 10px !important; -} - -.holidayAppointment, .holidayAppointmentLegend, .holidayAppointment_form { - background: #888888 !important; - border-bottom: 1px solid #AAAAAA !important; - border-right: 1px solid #AAAAAA !important; - font-size: 10px !important; - color: white !important; -} - +.appointment span, .appointment_form span { + display: inline-block; + width: 90px; + overflow: hidden; +} + +.occupiedAppointment, .occupiedAppointment_form, .occupiedAppointment_form_disabled { + background: url("icon/background_stripes.gif"); + color: #AAAAAA !important; + font-size: 10px; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + cursor: default !important; +} + +.asapAppointment, .asapAppointment_form { + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + background: #7AA715; + font-size: 10px; + color: white !important; +} + +.appointment, .appointmentLegend, .appointment_form { + background: #FD7400 !important; + border-bottom: 1px solid #AAAAAA; + border-right: 1px solid #AAAAAA !important; + font-size: 10px; + color: #333 !important; +} + +.appointment:hover, .appointment_form:hover, .freeTimeSlot:hover, +.freeTimeSlot_form:hover, .onlineTimeSlot:hover, .onlineTimeSlot_form:hover, +.notAvailableTimeSlot:hover, .notAvailableTimeSlot_form:hover + { + background: #106080 !important; + color: white !important; +} + +.pauseAppointment, .pauseAppointmentLegend, .pauseAppointment_form { + background: #555555 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: white !important; + font-size: 10px !important; + cursor: default !important; +} + +.freeTimeSlot, .freeTimeSlotLegend, .freeTimeSlot_form { + background: #c9d88b !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: white !important; + font-size: 10px; +} + +.onlineTimeSlot, .onlineTimeSlotLegend, .onlineTimeSlot_form { + background: #9fbba3 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.blockedTimeSlot, .blockedTimeSlotLegend, .blockedTimeSlot_form { + background: #c5c6c6 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} +.adminAppointment, .adminAppointmentLegend, .adminAppointment_form { + background: #aad2f2 !important; + border-bottom: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.ownAppointment, .ownAppointmentLegend, .ownAppointment_form { + background: #ffb037 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: white !important; +} + +.onlineScheduledAppointment, .onlineScheduledAppointment_form, .onlineScheduledAppointmentLegend { + background: #197d94 !important; + font-size: 10px !important; + color: white !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; +} + +.hourAxis td { + color: red !important; +} + +.hourAxis { + margin-top: -1px; +} + +.timeLineAxis { + background-color: transparent !important; + border-bottom: none !important; +} + +.timeLineAxis td { + text-align: right; + padding-right: 2px; + padding-top: 2px; + vertical-align: top; +} + +.timeLineAxis td, .timeLineTitle, .timeLineTitle_form { + background-color: transparent !important; + border-right: 1px solid #AAAAAA !important; + border-top: 1px solid #AAAAAA !important; + border-bottom: none !important; + color: #333333 !important; + font-size: 10px !important; + font-weight: bold !important; +} + +.timeLineTitle, .timeLineTitle_form { + border-bottom: 1px solid #AAAAAA !important; +} + +.appointmentsTimeTable .timeLineTitle { + cursor: pointer !important; +} + +.timeLineTitle td span, .timeLineTitle_form td span { + display: inline-block; + margin-left: 5px; + overflow: hidden; + width: 90px !important; +} + +.timeLineTitle.firstInLayout_form { + border-left: solid 1px #AAAAAA; + margin-left: -1px !important; + width: 101px !important; +} + +#hourAxis { + margin-top: -1px; +} + +.timeLineTitle.timeLineFooter, .timeLineTitle.timeLineFooter_form { + border-top: none !important; +} + +.smallAppointment, .smallAppointment_form, .smallAppointment span, .smallAppointment_form span { + line-height: 0px !important; +} + +.processedAppointment, .processedAppointmentLegend, .processedAppointment_form { + background: #ffdf6e !important; + color: black !important; + font-size: 10px; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; +} + +.selectedAppointment, .selectedAppointmentLegend, .selectedAppointment_form { + background: #157fa9 !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + color: white !important; + font-size: 10px !important; + cursor: default !important; +} + +.calendarLegend { + padding: 2px; + border-bottom: none !important; + border-right: none !important; +}L + +.notAvailableTimeSlot, .notAvailableTimeSlot_form, .notAvailableTimeSlotLegend { + background: #dddddd !important; + cursor: pointer; + font-size: 10px !important; +} + +.holidayAppointment, .holidayAppointmentLegend, .holidayAppointment_form { + background: #ebebeb !important; + border-bottom: 1px solid #AAAAAA !important; + border-right: 1px solid #AAAAAA !important; + font-size: 10px !important; + color: black !important; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-10-20 15:32:29
|
Revision: 5746 http://sourceforge.net/p/concern/code/5746 Author: leonchiver Date: 2014-10-20 15:32:17 +0000 (Mon, 20 Oct 2014) Log Message: ----------- freiburg stuff Modified Paths: -------------- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/TimeTrackingModule.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodList.java branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_de.properties branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_en.properties Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/TimeTrackingModule.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/TimeTrackingModule.java 2014-08-21 08:34:02 UTC (rev 5745) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/TimeTrackingModule.java 2014-10-20 15:32:17 UTC (rev 5746) @@ -16,8 +16,10 @@ package org.osbl.waz; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import javax.swing.Action; import org.osbl.*; import org.osbl.authorization.ActionAuthorizationItem; import org.osbl.orga.MembershipRuleLanguage; @@ -96,7 +98,7 @@ authorizationItems.addItems(new ItemCollector<ActionAuthorizationItem>() { public Collection<ActionAuthorizationItem> getItems() { - return Collections.singleton(new ActionAuthorizationItem("SAP Export", "x")); + return Arrays.asList(new ActionAuthorizationItem("SAP Export", "x"), new ActionAuthorizationItem("Globaler SAP Export", "x")); } public void refresh() { Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-08-21 08:34:02 UTC (rev 5745) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-10-20 15:32:17 UTC (rev 5746) @@ -35,11 +35,17 @@ import javax.swing.*; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import org.osbl.UserSession; import org.osbl.client.SessionActionProvider; +import org.osbl.client.wings.FormDialog; +import org.osbl.client.wings.action.AbstractDownloadAction; +import org.osbl.waz.logic.CATSExport; +import org.wings.SDimension; +import org.wings.StaticResource; public class PeriodEditor extends GenericObjectEditor { @@ -48,7 +54,8 @@ private CreateFollowUpPeriodsAction createFollowUpPeriodsAction = new CreateFollowUpPeriodsAction(); private CarryOverBalancesAction carryOverBalancesAction = new CarryOverBalancesAction(); private ExportProjectTimesAction exportProjectTimesAction = new ExportProjectTimesAction(); - + private ExportAllTimesAction exportAllTimesAction = new ExportAllTimesAction(); + @Override protected AuthorizationHelper createAuthorizationHelper() { return new AuthorizationHelper(Period.class); @@ -69,9 +76,69 @@ list.addObjectAction(produceTargetTimeEntriesAction); list.addObjectAction(carryOverBalancesAction); list.addObjectAction(exportProjectTimesAction); + list.addObjectAction(exportAllTimesAction); return list; } + + private class ExportAllTimesAction extends AbstractObjectAction { + private ExportOptions exportOptions = new ExportOptions(); + + private ExportAllTimesAction() { + putValue(Action.ACTION_COMMAND_KEY, Period.class.getName() + ".buttons.exportAllTimes"); + putValue(AuthorizedAction.PERMISSION_KEY, "Globaler SAP Export" + "[x]"); + } + + public void actionPerformed(ObjectActionEvent event) { + FormDialog dial = new FormDialog(ExportOptions.class); + dial.setPreferredSize(new SDimension(400, 200)); + dial.addOkButtonListener(new AbstractDownloadAction(getEnvironment()) { + + @Override + public String getFileName() { + return "cats-global.csv"; + } + + @Override + public StaticResource getResource() throws IOException { + TimeTrackingLogic logic = ServiceProvider.service(TimeTrackingLogic.class); + List<ProjectTimeEntry> entries = logic.loadProjectTime(exportOptions.getFrom(), exportOptions.getUntil()); + ProjectTimeExport export = ServiceProvider.service(ProjectTimeExport.class); + File f = export.export(entries); + return new FileResource(f); + } + }); + dial.show(null, exportOptions, "from", "until"); + } + + } + + public static final class ExportOptions { + + private java.sql.Date from = new java.sql.Date(System.currentTimeMillis()); + + private java.sql.Date until = new java.sql.Date(System.currentTimeMillis()); + + public void setFrom(java.sql.Date from) { + this.from = from; + } + + public void setUntil(java.sql.Date until) { + this.until = until; + } + + public java.sql.Date getFrom() { + return from; + } + + public java.sql.Date getUntil() { + return until; + } + + } + + + @Override protected void initializeTools() { super.initializeTools(); @@ -221,7 +288,7 @@ return balance; } } - + private class ExportProjectTimesAction extends AbstractObjectAction { Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodList.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodList.java 2014-08-21 08:34:02 UTC (rev 5745) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodList.java 2014-10-20 15:32:17 UTC (rev 5746) @@ -16,6 +16,8 @@ */ package org.osbl.waz.gui; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import org.conform.BeanMeta; import org.conform.PropertyMeta; import org.conform.VariationBeanMetaProvider; @@ -30,9 +32,17 @@ import org.osbl.persistence.SimpleQueryCommand; import java.util.*; +import javax.swing.AbstractAction; +import javax.swing.Action; import org.conform.StaticDomainProvider; import org.conform.format.AbstractFormat; +import org.osbl.client.action.AuthorizedAction; +import org.osbl.client.wings.FormDialog; +import org.osbl.client.wings.XButton; import org.osbl.client.wings.form.format.KeyDomainFormat; +import org.osbl.client.wings.shell.Environment; +import org.osbl.client.wings.shell.ToolbarSupport; +import org.wings.SDimension; import org.wingx.table.EditableTableCellRenderer; import org.wingx.table.XTableColumnModel; import org.wingx.table.XTableModel; @@ -43,6 +53,8 @@ private KeyDomainFormat employeeFormat; + private boolean initialized; + protected BeanMeta createBeanMeta() { final VariationBeanMetaProvider provider = new VariationBeanMetaProvider(Client.getInstance().getBeanMetaProvider()); return provider.addModifier(new InlineModifier(Period.class) { @@ -124,4 +136,5 @@ return keys; } + } Modified: branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_de.properties =================================================================== --- branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_de.properties 2014-08-21 08:34:02 UTC (rev 5745) +++ branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_de.properties 2014-10-20 15:32:17 UTC (rev 5746) @@ -140,6 +140,7 @@ org.osbl.waz.model.Period.buttons.carryOverBalances=Übertrag schreiben org.osbl.waz.model.Period.messages.carryOverBalances=Übertrag für {0} Zeiträume geschrieben org.osbl.waz.model.Period.buttons.exportProjectTimes=Daten für CATS exportieren +org.osbl.waz.model.Period.buttons.exportAllTimes=Globaler CATS Export org.osbl.waz.model.Period.messages.exportProjectTimes=Daten für CATS exportiert org.osbl.waz.model.Presence.messages.saved=Anwesenheitszeiten wurden gespeichert Modified: branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_en.properties =================================================================== --- branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_en.properties 2014-08-21 08:34:02 UTC (rev 5745) +++ branches/de-fr-stable-release/waz/src/sar/spring-services.sar/waz-resource_en.properties 2014-10-20 15:32:17 UTC (rev 5746) @@ -140,6 +140,7 @@ org.osbl.waz.model.Period.buttons.carryOverBalances=Übertrag schreiben org.osbl.waz.model.Period.messages.carryOverBalances=Übertrag für {0} Zeiträume geschrieben org.osbl.waz.model.Period.buttons.exportProjectTimes=Daten für CATS exportieren +org.osbl.waz.model.Period.buttons.exportAllTimes=Globaler CATS Export org.osbl.waz.model.Period.messages.exportProjectTimes=Daten für CATS exportiert org.osbl.waz.model.Presence.messages.saved=Anwesenheitszeiten wurden gespeichert This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-08-21 08:34:07
|
Revision: 5745 http://sourceforge.net/p/concern/code/5745 Author: leonchiver Date: 2014-08-21 08:34:02 +0000 (Thu, 21 Aug 2014) Log Message: ----------- locale Modified Paths: -------------- branches/de-fr-stable-release/osbl-basics/src/java/org/osbl/identity/gui/IdentityWebModule.java Modified: branches/de-fr-stable-release/osbl-basics/src/java/org/osbl/identity/gui/IdentityWebModule.java =================================================================== --- branches/de-fr-stable-release/osbl-basics/src/java/org/osbl/identity/gui/IdentityWebModule.java 2014-08-21 07:45:07 UTC (rev 5744) +++ branches/de-fr-stable-release/osbl-basics/src/java/org/osbl/identity/gui/IdentityWebModule.java 2014-08-21 08:34:02 UTC (rev 5745) @@ -118,10 +118,13 @@ SessionContext.getInstance().put("identity", user.getGeneral().getKey()); - if (user.getLocale() != null) { - SessionManager.getSession().setLocale(user.getLocale()); - ClientUserSession.setLocale(user.getLocale()); + Locale locale = user.getLocale(); + if (locale == null || locale.getLanguage() == null || locale.getLanguage().equals("de")) { + locale = Locale.GERMANY; } + + SessionManager.getSession().setLocale(locale); + ClientUserSession.setLocale(locale); if (user.getId() == null || identity.getId() == null) { SaveOrUpdateGeneralCommand<Identity> saveGeneralCommand = (SaveOrUpdateGeneralCommand<Identity>) PersistenceUtils.createCommand("save", Identity.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-08-21 07:45:15
|
Revision: 5744 http://sourceforge.net/p/concern/code/5744 Author: leonchiver Date: 2014-08-21 07:45:07 +0000 (Thu, 21 Aug 2014) Log Message: ----------- locale Modified Paths: -------------- branches/de-fr-stable-release/osbl-shell/src/web/login.jsp Modified: branches/de-fr-stable-release/osbl-shell/src/web/login.jsp =================================================================== --- branches/de-fr-stable-release/osbl-shell/src/web/login.jsp 2014-07-17 08:58:08 UTC (rev 5743) +++ branches/de-fr-stable-release/osbl-shell/src/web/login.jsp 2014-08-21 07:45:07 UTC (rev 5744) @@ -27,7 +27,7 @@ if (language != null) request.getSession().setAttribute("language", language); - Locale locale = language == null ? Locale.getDefault() : new Locale(language); + Locale locale = language == null ? null : new Locale(language); BeanFactoryInJndiResourceLocator resourceLocator = new BeanFactoryInJndiResourceLocator(); ResourceProvider resourceProvider = (ResourceProvider)resourceLocator.lookup("java:/@app.name@/spring-services/ResourceProvider"); @@ -49,13 +49,17 @@ Locale current = (Locale)requestedLocales.nextElement(); for (int i = 0; i < supportedLocales.size(); i++) { Locale supportedLocale = (Locale)supportedLocales.get(i); - if (current.equals(supportedLocale)) { + if (current.equals(supportedLocale) || current.getLanguage() != null && current.getLanguage().equals(supportedLocale.getLanguage())) { locale = supportedLocale; break found; } } } + if (locale == null) { + locale = Locale.GERMAN; + } + String mandator = request.getParameter("mandator"); if (mandator == null && request.getCookies() != null) { for (int i = 0; i < request.getCookies().length; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-07-17 08:58:10
|
Revision: 5743 http://sourceforge.net/p/concern/code/5743 Author: leonchiver Date: 2014-07-17 08:58:08 +0000 (Thu, 17 Jul 2014) Log Message: ----------- o notifying 30 days before Modified Paths: -------------- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java 2014-07-04 10:26:06 UTC (rev 5742) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java 2014-07-17 08:58:08 UTC (rev 5743) @@ -77,7 +77,7 @@ ReminderMailNotification notif = new ReminderMailNotification(booking) { @Override public void sent() throws Exception { - bookingLogic.markAsMailed(booking); + bookingLogic.markAsMailed(booking, false); } }; notificationSender.add(notif); Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-07-04 10:26:06 UTC (rev 5742) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-07-17 08:58:08 UTC (rev 5743) @@ -51,8 +51,8 @@ boolean matchAppointment(Appointment<Booking> appointment, Schedulable resource); - void markAsMailed(Booking booking); - + void markAsMailed(Booking booking, boolean early); + void markAsMessaged(Booking booking); void anonymize(Booking booking); Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-07-04 10:26:06 UTC (rev 5742) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-07-17 08:58:08 UTC (rev 5743) @@ -355,11 +355,15 @@ } - public void markAsMailed(Booking booking) { + public void markAsMailed(Booking booking, boolean early) { Session s = sessionFactory.getCurrentSession(); s.lock(booking, LockMode.UPGRADE); BookingJobDetails jd = getBookingJobDetails(booking); - jd.setMailed(timeBaseLogic.getTimeBase().currentTimestamp()); + if (early) { + jd.setEarlyMailed(timeBaseLogic.getTimeBase().currentTimestamp()); + } else { + jd.setMailed(timeBaseLogic.getTimeBase().currentTimestamp()); + } s.saveOrUpdate(jd); } Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java 2014-07-04 10:26:06 UTC (rev 5742) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java 2014-07-17 08:58:08 UTC (rev 5743) @@ -29,6 +29,6 @@ void notifyAppointmentDeletion(long customerId, long appointmentId); - void notifyAppointmentReminders(long customerId, Collection<Long> appointmentIds); + void notifyAppointmentReminders(long customerId, Collection<Long> appointmentIds, boolean early); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-07-04 10:26:13
|
Revision: 5742 http://sourceforge.net/p/concern/code/5742 Author: leonchiver Date: 2014-07-04 10:26:06 +0000 (Fri, 04 Jul 2014) Log Message: ----------- invalid value set when initial validation fails Modified Paths: -------------- branches/pneuhage-stable-release/conform/src/java/org/conform/AbstractPropertyData.java Modified: branches/pneuhage-stable-release/conform/src/java/org/conform/AbstractPropertyData.java =================================================================== --- branches/pneuhage-stable-release/conform/src/java/org/conform/AbstractPropertyData.java 2014-07-04 10:25:22 UTC (rev 5741) +++ branches/pneuhage-stable-release/conform/src/java/org/conform/AbstractPropertyData.java 2014-07-04 10:26:06 UTC (rev 5742) @@ -118,7 +118,11 @@ doSetValue(validated); } } - catch (ValidationException e) {} + catch (ValidationException e) { + if (invalid && invalidValue != doGetValue() && invalidValue == null) { + invalidValue = doGetValue(); + } + } } public Object validate(Object value) throws ValidationException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-07-04 10:25:25
|
Revision: 5741 http://sourceforge.net/p/concern/code/5741 Author: leonchiver Date: 2014-07-04 10:25:22 +0000 (Fri, 04 Jul 2014) Log Message: ----------- reminders etc Modified Paths: -------------- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/model/BookingJobDetails.java branches/pneuhage-stable-release/ssc/src/model/SSC.hbm.xml Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/job/MailNotificationSenderJob.java 2014-07-04 10:25:22 UTC (rev 5741) @@ -1,6 +1,8 @@ package org.osbl.ssc.job; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.concern.transaction.Block; @@ -43,19 +45,32 @@ @Override protected void doExecute(JobExecutionContext context) { TransactionHandler handler = new TransactionHandler(); - Result<List<? extends Booking>> result = handler.doInTransactionNoEx(new Block<List<? extends Booking>>() { + Result<List<? extends Booking>> result1 = handler.doInTransactionNoEx(new Block<List<? extends Booking>>() { @Override public List<? extends Booking> perform() throws Exception { return getBookingLogic().getBookingsToBeReminded(); } }); - if (result.getError() != null) { - LOGGER.error("Unable to find bookings in need of mail notification", result.getError()); + Result<List<? extends Booking>> result2 = handler.doInTransactionNoEx(new Block<List<? extends Booking>>() { + @Override + public List<? extends Booking> perform() throws Exception { + return getBookingLogic().getEarlyBookingsToBeReminded(); + } + }); + if (result1.getError() != null || result2.getError() != null) { + LOGGER.error("Unable to find bookings in need of mail notification", result1.getError()); return; } - List<? extends Booking> bookings = result.getValue(); - if (bookings.isEmpty()) + Set<Booking> bookings = new HashSet<>(); + if (result1.getValue() != null) { + bookings.addAll(result1.getValue()); + } + if (result2.getValue() != null) { + bookings.addAll(result2.getValue()); + } + if (bookings.isEmpty()) { return; + } LOGGER.debug("Send reminder mail for bookings " + bookings); for (final Booking booking : bookings) { Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-07-04 10:25:22 UTC (rev 5741) @@ -26,6 +26,8 @@ List<? extends Booking> getBookingsToBeReminded(); + List<? extends Booking> getEarlyBookingsToBeReminded(); + List<? extends DbAppointment> getCalendarAppointments(String calendarId, final Date startTime, final Date endTime); Booking getFollowupBooking(Booking booking); Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-07-04 10:25:22 UTC (rev 5741) @@ -84,6 +84,12 @@ this.transactions = transactions; } + @Override + public List<? extends Booking> getEarlyBookingsToBeReminded() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Appointment<Booking> createAppointment(Booking booking, boolean checks) { int duration = booking.getDuration(); Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/Notifier.java 2014-07-04 10:25:22 UTC (rev 5741) @@ -15,7 +15,7 @@ void notifyLocationConfirmedAppointment(long customerId, long appointment); - void notifyCustomerEnteredAppointment(long customerId, long appointment); + void notifyCustomerEnteredAppointment(long customerId, long appointment, boolean confirmed); void notifyCustomerDeletedAppointment(long customerId, long appointment); Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/model/BookingJobDetails.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/model/BookingJobDetails.java 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/model/BookingJobDetails.java 2014-07-04 10:25:22 UTC (rev 5741) @@ -12,6 +12,8 @@ private Booking booking; private Timestamp mailed; + + private Timestamp earlyMailed; private Timestamp messaged; @@ -76,4 +78,13 @@ public void setConfirmationMailSent(Timestamp confirmationMailSent) { this.confirmationMailSent = confirmationMailSent; } + + public Timestamp getEarlyMailed() { + return earlyMailed; + } + + public void setEarlyMailed(Timestamp earlyMailed) { + this.earlyMailed = earlyMailed; + } + } Modified: branches/pneuhage-stable-release/ssc/src/model/SSC.hbm.xml =================================================================== --- branches/pneuhage-stable-release/ssc/src/model/SSC.hbm.xml 2014-06-18 13:28:58 UTC (rev 5740) +++ branches/pneuhage-stable-release/ssc/src/model/SSC.hbm.xml 2014-07-04 10:25:22 UTC (rev 5741) @@ -348,6 +348,7 @@ <one-to-one cascade="none" name="booking"/> <property name="anonymized"/> <property name="mailed"/> + <property name="earlyMailed"/> <property name="messaged"/> <property name="unattended"/> <property name="confirmationMailSent"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-06-18 13:29:05
|
Revision: 5740 http://sourceforge.net/p/concern/code/5740 Author: leonchiver Date: 2014-06-18 13:28:58 +0000 (Wed, 18 Jun 2014) Log Message: ----------- lookahead Modified Paths: -------------- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java 2014-06-18 11:01:38 UTC (rev 5739) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java 2014-06-18 13:28:58 UTC (rev 5740) @@ -37,7 +37,7 @@ @ManagedResource(objectName = "osbl.ssc:name=DbCalendarSynchronizer,type=service", description = "Synchronizes external calendars (for example Exchange) with the database") public class DbCalendarSynchronizer { - private static final int DAYS_AHEAD = 180; + private static final int DAYS_AHEAD = 30 * 8; private static final int DAYS_PASSED = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-06-18 11:01:58
|
Revision: 5739 http://sourceforge.net/p/concern/code/5739 Author: leonchiver Date: 2014-06-18 11:01:38 +0000 (Wed, 18 Jun 2014) Log Message: ----------- new exchange iface Modified Paths: -------------- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DefaultGroupwareCalendarGW.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbCalendar.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbSession.java branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/LocationAvailabilityModel.java Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java 2014-05-26 16:23:06 UTC (rev 5738) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DbCalendarSynchronizer.java 2014-06-18 11:01:38 UTC (rev 5739) @@ -85,6 +85,9 @@ paths.add(calendar.getNativeId()); } for (String path : paths) { + if (!path.startsWith("/public")) { + path = "/public/" + path; + } processCalendarPath(path, startDate, endDate, Keys.getMandator(location)); } } @@ -102,9 +105,6 @@ return; } - // don't poll, we are running scheduled on our own. - calendar.setPollingEnabled(false); - try { // read all appointments within the time range from calendar Collection<? extends GWAppointment> appointments = calendar.getAppointments(startDate, endDate); @@ -163,7 +163,9 @@ dbAppointment.setStartDate(new Timestamp(appointment.getStartDate().getTime())); dbAppointment.setEndDate(new Timestamp(appointment.getEndDate().getTime())); dbAppointment.setExternalId(appointment.getExternalId()); - dbAppointment.setModified(new Timestamp(appointment.getLastModifiedDate().getTime())); + if (appointment.getLastModifiedDate() != null) { + dbAppointment.setModified(new Timestamp(appointment.getLastModifiedDate().getTime())); + } } ; } Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DefaultGroupwareCalendarGW.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DefaultGroupwareCalendarGW.java 2014-05-26 16:23:06 UTC (rev 5738) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/DefaultGroupwareCalendarGW.java 2014-06-18 11:01:38 UTC (rev 5739) @@ -147,7 +147,7 @@ appointment.setDescription(details(booking)); try { - appointmentCalendar.addAppointment(appointment); + appointmentCalendar.saveAppointment(appointment); booking.setCalendarRef(buildCalendarRef(appointmentCalendar, appointment)); @@ -235,7 +235,7 @@ public void changeAppointment(Booking booking, Resource resource) { LOGGER.debug("Change appointment for " + Keys.toString(booking.getKey())); - + try { GWCalendar appointmentCalendar = getAppointmentCalendar(resource); @@ -287,10 +287,6 @@ if (this.appointmentCalendars.containsKey(resource)) { GWCalendar calendar = this.appointmentCalendars.get(resource); - if (!calendar.isValid()) { - // execute initial polling to read appointments - calendar.executePollingNow(); - } return calendar; } @@ -305,16 +301,9 @@ } if (calendar == null) { - throw new GWException("could not find calendar" + calendarPath); + throw new GWException("Could not find calendar " + calendarPath); } - calendar.setPollingEnabled(this.pollingEnabled); - calendar.setPollingInterval(this.pollingInterval); - calendar.setPollingRange(this.pollingRangeStartDate, this.pollingRangeEndDate); - - // execute initial polling to read appointments - calendar.executePollingNow(); - this.appointmentCalendars.put(resource, calendar); return calendar; @@ -325,9 +314,9 @@ if (this.session != null) { return; } + GWSessionFactory sf = new GWSessionFactory(gwProperties); + this.session = sf.getSession(); - this.session = GWSessionFactory.getSession(gwProperties); - if (session == null) { throw new GWException("Could not connect to session"); } @@ -421,37 +410,7 @@ } public List<Busy> getBusies(Resource resource) { - - LOGGER.debug("getBusies for resource " + resource.getName()); - - try { - GWDbSession gwDbSession = getGWDbSession(); - if (gwDbSession == null) { - throw new RuntimeException("No gwDbSession."); - } - GWCalendar busyCalendar = gwDbSession.getCalendar(resource.getAppointmentCalendarFolder()); - if (busyCalendar == null) { - busyCalendar = gwDbSession.createCalendar(resource.getAppointmentCalendarFolder()); - } - - if (busyCalendar == null) { - throw new RuntimeException("No calendar with path " + resource.getAppointmentCalendarFolder() + " found."); - } - - Collection<? extends GWAppointment> appointments = busyCalendar.getCachedAppointments(); - - List<Busy> busies = new ArrayList<Busy>(); - - for (GWAppointment appointment : appointments) { - Busy busy = appointmentToBusy(resource, appointment); - busies.add(busy); - } - - return busies; - - } catch (GWException e) { - throw new RuntimeException(e); - } + return Collections.emptyList(); } private Busy appointmentToBusy(Resource resource, GWAppointment appointment) { @@ -522,12 +481,6 @@ } private void updateCalendarSetting(Collection<GWCalendar> calendars) { - for (GWCalendar calendar : calendars) { - calendar.setPollingEnabled(this.pollingEnabled); - calendar.setPollingInterval(this.pollingInterval); - calendar.setPollingRange(this.pollingRangeStartDate, this.pollingRangeEndDate); - calendar.invalidate(); - } } public Date getPollingRangeStartDate() { @@ -551,15 +504,12 @@ } if (calendar == null) { - throw new GWException("could not find calendar" + path); + throw new GWException("Could not find calendar " + path); } return calendar; } catch (GWException e) { LOGGER.error("Unable to get calendar", e); - // google prevents creation of calendars in fast sequence - // --> Not enough quota to create a calendar. - // Next day it works again } return null; Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbCalendar.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbCalendar.java 2014-05-26 16:23:06 UTC (rev 5738) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbCalendar.java 2014-06-18 11:01:38 UTC (rev 5739) @@ -13,6 +13,7 @@ import wilken.groupware.GWException; import wilken.groupware.model.GWAppointment; import wilken.groupware.model.GWAppointmentBase; +import wilken.groupware.model.GWAppointmentType; import wilken.groupware.model.GWCalendarBase; public class GWDbCalendar extends GWCalendarBase { @@ -27,16 +28,37 @@ } @Override - public GWAppointment createAppointment() { - return new GWAppointmentBase(this); + public Collection<? extends GWAppointment> getAppointments(Date startDate, Date endDate, GWAppointmentType type) throws GWException { + throw new UnsupportedOperationException("Not supported yet."); } @Override - public void addAppointment(GWAppointment appointment) throws GWException { - throw new GWException("addAppointment not implemented"); + public GWAppointment getAppointmentByExternalId(String externalId) { + throw new UnsupportedOperationException("Not supported yet."); } @Override + public void saveAppointment(GWAppointment appointment) throws GWException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Collection<? extends GWAppointment> getRecurrencies(GWAppointment appointment) throws GWException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void deleteAppointment(String exchangeAppointmentId) throws GWException { + throw new GWException("deleteAppointment not implemented"); + } + + + @Override + public GWAppointment createAppointment() { + return new GWAppointmentBase(this); + } + + @Override public void deleteAppointment(GWAppointment appointment) throws GWException { throw new GWException("deleteAppointment not implemented"); @@ -56,9 +78,6 @@ public Collection<? extends GWAppointment> getAppointments(Date startDate, Date endDate) throws GWException { Collection<? extends GWAppointment> list = getAppointmentsInternal(startDate, endDate); - - updateAppointments(list, true); - return list; } Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbSession.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbSession.java 2014-05-26 16:23:06 UTC (rev 5738) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/calendar/GWDbSession.java 2014-06-18 11:01:38 UTC (rev 5739) @@ -29,7 +29,6 @@ @Override public GWCalendar createCalendar(String path) throws GWException { GWDbCalendar calendar = new GWDbCalendar(this, path); - calendar.setPollingEnabled(false); addCalendar(calendar); return calendar; } Modified: branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/LocationAvailabilityModel.java =================================================================== --- branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/LocationAvailabilityModel.java 2014-05-26 16:23:06 UTC (rev 5738) +++ branches/pneuhage-stable-release/ssc/src/java/org/osbl/ssc/logic/LocationAvailabilityModel.java 2014-06-18 11:01:38 UTC (rev 5739) @@ -378,11 +378,15 @@ @Override public List<DbAppointment> perform() throws Exception { + String c = nativeCalendar; + if (!c.startsWith("/public/")) { + c = "/public/" + c; + } org.hibernate.classic.Session session = sessionFactory.getCurrentSession(); return session.createQuery("select a from " + DbAppointment.class.getName() + " a where a.calendarPath = :path " + "and a.startDate >= :startTime " + "and a.endDate <= :endTime order by startDate") - .setParameter("path", nativeCalendar) + .setParameter("path", c) .setTimestamp("startTime", startTime) .setTimestamp("endTime", endTime).list(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-05-26 16:23:09
|
Revision: 5738 http://sourceforge.net/p/concern/code/5738 Author: leonchiver Date: 2014-05-26 16:23:06 +0000 (Mon, 26 May 2014) Log Message: ----------- various changes for caritas Modified Paths: -------------- trunk/osbl/osbl/src/java/org/osbl/client/wings/form/SimpleQueryCommandTableModel.java Modified: trunk/osbl/osbl/src/java/org/osbl/client/wings/form/SimpleQueryCommandTableModel.java =================================================================== --- trunk/osbl/osbl/src/java/org/osbl/client/wings/form/SimpleQueryCommandTableModel.java 2014-05-26 16:22:01 UTC (rev 5737) +++ trunk/osbl/osbl/src/java/org/osbl/client/wings/form/SimpleQueryCommandTableModel.java 2014-05-26 16:23:06 UTC (rev 5738) @@ -53,6 +53,17 @@ private FilterStrategy filterStratey; private final Format osblFormat; + @Override + public void setSort(int col, int order) { + super.setSort(col, order); + // We'll clean all other columns + for (int i = 0; i < getColumnCount(); i++) { + if (i != col) { + super.setSort(i, SortableTableModel.SORT_NONE); + } + } + } + @SuppressWarnings("unchecked") public SimpleQueryCommandTableModel(SimpleQueryCommand command, BeanMeta beanMeta, String... propertyNames) { osblFormat =SessionFormatFactory.getInstance().getFormat(java.sql.Date.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-05-26 16:22:04
|
Revision: 5737 http://sourceforge.net/p/concern/code/5737 Author: leonchiver Date: 2014-05-26 16:22:01 +0000 (Mon, 26 May 2014) Log Message: ----------- various changes for caritas Modified Paths: -------------- trunk/osbl/osbl-basics/src/java/org/osbl/identity/gui/IdentityForm.java trunk/osbl/osbl-basics/src/java/org/osbl/identity/model/Identity.java trunk/osbl/osbl-basics/src/model/Identity.hbm.xml trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_de.properties trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_en.properties Modified: trunk/osbl/osbl-basics/src/java/org/osbl/identity/gui/IdentityForm.java =================================================================== --- trunk/osbl/osbl-basics/src/java/org/osbl/identity/gui/IdentityForm.java 2014-05-26 16:21:25 UTC (rev 5736) +++ trunk/osbl/osbl-basics/src/java/org/osbl/identity/gui/IdentityForm.java 2014-05-26 16:22:01 UTC (rev 5737) @@ -80,15 +80,19 @@ new Column( new Title(Identity.class.getName()), new LabelAndEditor(ComponentProvider.ROOT, "key"), - new LabelAndEditors("businessobject.created", + new LabelAndEditors("bPusinessobject.created", new Editor(ComponentProvider.ROOT, "created"), new Editor(ComponentProvider.ROOT, "createdBy") ), new LabelAndEditor(ComponentProvider.ROOT, "name") ) - ) - ) - ); + ), + new Division( + new Column("Zeitraum", + new LabelAndEditor("validFrom"), + new LabelAndEditor("validUntil")), + new Column())) + ); } @Override Modified: trunk/osbl/osbl-basics/src/java/org/osbl/identity/model/Identity.java =================================================================== --- trunk/osbl/osbl-basics/src/java/org/osbl/identity/model/Identity.java 2014-05-26 16:21:25 UTC (rev 5736) +++ trunk/osbl/osbl-basics/src/java/org/osbl/identity/model/Identity.java 2014-05-26 16:22:01 UTC (rev 5737) @@ -13,6 +13,8 @@ package org.osbl.identity.model; +import java.sql.Date; +import java.util.Calendar; import javax.xml.bind.annotation.XmlRootElement; import org.osbl.persistence.model.Concrete; import org.osbl.persistence.model.General; @@ -21,4 +23,45 @@ public class Identity extends General<Concrete> { + + private Date validFrom; + + private Date validUntil; + + public Date getValidFrom() { + return validFrom; + } + + public void setValidFrom(Date validFrom) { + this.validFrom = validFrom; + } + + public Date getValidUntil() { + return validUntil; + } + + public void setValidUntil(Date validUntil) { + this.validUntil = validUntil; + } + + public boolean isTodayActive() { + long from = validFrom != null ? validFrom.getTime() : 0; + long till = validUntil != null ? validUntil.getTime() : Long.MAX_VALUE; + till = normalized(till); + from = normalized(from); + long now = normalized(System.currentTimeMillis()); + return from <= now && now <= till; + } + + private static long normalized(long t) { + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(t); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + return cal.getTimeInMillis(); + } + + } Modified: trunk/osbl/osbl-basics/src/model/Identity.hbm.xml =================================================================== --- trunk/osbl/osbl-basics/src/model/Identity.hbm.xml 2014-05-26 16:21:25 UTC (rev 5736) +++ trunk/osbl/osbl-basics/src/model/Identity.hbm.xml 2014-05-26 16:22:01 UTC (rev 5737) @@ -26,6 +26,8 @@ <property name="createdBy"/> <property column="modified_" name="modified"/> <property name="name"/> + <property name="validFrom"/> + <property name="validUntil"/> <property name="qualifications"/> </class> <class name="org.osbl.identity.model.User" table="iden_identity_user"> Modified: trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_de.properties =================================================================== --- trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_de.properties 2014-05-26 16:21:25 UTC (rev 5736) +++ trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_de.properties 2014-05-26 16:22:01 UTC (rev 5737) @@ -70,6 +70,9 @@ org.osbl.identity.model.Identity.qualifications.Group=Gruppe org.osbl.identity.model.Identity.qualifications.Mandator=Mandant org.osbl.identity.model.Identity.qualifications.Employee=Mitarbeiter +org.osbl.identity.model.Identity.validFrom=Aktiv ab +org.osbl.identity.model.Identity.validUntil=Aktiv bis +org.osbl.identity.model.Identity.todayActive=Aktiv org.osbl.identity.model.Identity.buttons.replicate=Identitäten replizieren org.osbl.ldap=System Modified: trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_en.properties =================================================================== --- trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_en.properties 2014-05-26 16:21:25 UTC (rev 5736) +++ trunk/osbl/osbl-basics/src/sar/spring-services.sar/basics-resource_en.properties 2014-05-26 16:22:01 UTC (rev 5737) @@ -66,6 +66,9 @@ org.osbl.identity.model.Identity.qualifications.Group=Group org.osbl.identity.model.Identity.qualifications.Mandator=Mandator org.osbl.identity.model.Identity.qualifications.Employee=Employee +org.osbl.identity.model.Identity.validFrom=Aktiv ab +org.osbl.identity.model.Identity.validUntil=Aktiv bis +org.osbl.identity.model.Identity.todayActive=Aktiv org.osbl.identity.model.Identity.buttons.replicate=Replicate Identities org.osbl.ldap=System This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-05-26 16:21:28
|
Revision: 5736 http://sourceforge.net/p/concern/code/5736 Author: leonchiver Date: 2014-05-26 16:21:25 +0000 (Mon, 26 May 2014) Log Message: ----------- various changes for caritas Modified Paths: -------------- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingForm.java trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java trunk/osbl/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java trunk/osbl/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java trunk/osbl/ssc/src/java/org/osbl/ssc/model/Booking.java trunk/osbl/ssc/src/model/SSC.hbm.xml trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_de.properties trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_en.properties Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingForm.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingForm.java 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingForm.java 2014-05-26 16:21:25 UTC (rev 5736) @@ -153,7 +153,8 @@ new LabelAndEditor(ComponentProvider.ROOT, "middleName"), new LabelAndEditor(ComponentProvider.ROOT, "lastName"), new LabelAndEditor(ComponentProvider.ROOT, "birthDate"), - new LabelAndEditor(ComponentProvider.ROOT, "eMail") + new LabelAndEditor(ComponentProvider.ROOT, "eMail"), + new LabelAndEditor(ComponentProvider.ROOT, "notPresent") ), new Column( new LabelAndEditor(ComponentProvider.ROOT, "key"), Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/gui/BookingList.java 2014-05-26 16:21:25 UTC (rev 5736) @@ -222,7 +222,6 @@ } }; - tableModel.setSortableColumns("type", "scheduled"); tableModel.setFilterableColumns(getFilterableColumns()); XTableColumnModel columnModel = tableModel.getColumnModel(); XTableColumn processColumn = new XTableColumn(0); Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/logic/BookingLogic.java 2014-05-26 16:21:25 UTC (rev 5736) @@ -103,4 +103,6 @@ void markAsShortConsultation(Booking b, boolean shortConsultation); + void markAsNotPresent(Booking b, boolean notPresent); + } Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/logic/DefaultBookingLogic.java 2014-05-26 16:21:25 UTC (rev 5736) @@ -290,7 +290,7 @@ + "left join fetch r.location as l " + "where " + "b.scheduledAt >= :date1 and " - + "b.scheduledAt <= :date2 and b.key.mandator = :mandator and b.deleted is null"); + + "b.scheduledAt <= :date2 and b.key.mandator = :mandator and b.deleted is null and (b.notPresent is null or b.notPresent = :false)"); if (resource != null) { sb.append(" and r = :resource"); } @@ -307,6 +307,7 @@ if (location != null) { query.setParameter("location", location); } + query.setParameter("false", false); List<Booking> bookings = query.list(); return initializeBookings(bookings); } @@ -707,7 +708,7 @@ } }); } - + @Override public void markAsShortConsultation(final Booking booking, final boolean shortConsultation) { TransactionHandler.inTransaction(new Block<Void>() { @@ -727,7 +728,27 @@ } + @Override + public void markAsNotPresent(final Booking booking, final boolean notPresent) { + TransactionHandler.inTransaction(new Block<Void>() { + @Override + public Void perform() throws Exception { + Session s = sessionFactory.getCurrentSession(); + booking.setNotPresent(notPresent); + Booking b = (Booking) s.get(Booking.class, booking.getId()); + if (b == null) { + return null; + } + b.setNotPresent(notPresent); + s.saveOrUpdate(b); + return null; + } + }); + } + + + @Override public boolean finishProcessing(final Booking booking, final BookingLine bookingLine) { return TransactionHandler.inTransaction(new Block<Boolean>() { public Boolean perform() throws Exception { Modified: trunk/osbl/ssc/src/java/org/osbl/ssc/model/Booking.java =================================================================== --- trunk/osbl/ssc/src/java/org/osbl/ssc/model/Booking.java 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/java/org/osbl/ssc/model/Booking.java 2014-05-26 16:21:25 UTC (rev 5736) @@ -90,6 +90,8 @@ private Boolean crisisConsultation; private Boolean shortConsultation; + + private Boolean notPresent; /** * The date for bookings with appointment. @@ -680,5 +682,15 @@ public void setShortConsultation(Boolean shortConsultation) { this.shortConsultation = shortConsultation; } + + public void setNotPresent(Boolean notPresent) { + this.notPresent = notPresent; + } + + public Boolean isNotPresent() { + return notPresent; + } + + } Modified: trunk/osbl/ssc/src/model/SSC.hbm.xml =================================================================== --- trunk/osbl/ssc/src/model/SSC.hbm.xml 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/model/SSC.hbm.xml 2014-05-26 16:21:25 UTC (rev 5736) @@ -87,6 +87,7 @@ <property name="consultationType"/> <property name="crisisConsultation"/> <property name="shortConsultation"/> + <property name="notPresent"/> </class> <class name="org.osbl.ssc.model.BookingLine" table="ssc_booking_line"> <id name="id" unsaved-value="null"> Modified: trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_de.properties =================================================================== --- trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_de.properties 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_de.properties 2014-05-26 16:21:25 UTC (rev 5736) @@ -76,6 +76,9 @@ org.osbl.ssc.model.Booking.additionalLines=.. Zusätzliche Leistungen org.osbl.ssc.model.Booking.forward=.. Weiterleiten org.osbl.ssc.model.Booking.processing=Bearbeitung +org.osbl.ssc.model.Booking.notPresent=Nicht wahrgenommen +org.osbl.ssc.model.Booking.crisisConsultation=Krisenintervention +org.osbl.ssc.model.Booking.shortConsulation=Kurzberatung org.osbl.ssc.model.Booking.brutto=brutto org.osbl.ssc.model.Booking.confirmedEMail=E-Mail bestätigen org.osbl.ssc.model.Booking.all=Alle Modified: trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_en.properties =================================================================== --- trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_en.properties 2014-05-20 12:42:27 UTC (rev 5735) +++ trunk/osbl/ssc/src/sar/spring-services.sar/ssc-resource_en.properties 2014-05-26 16:21:25 UTC (rev 5736) @@ -76,6 +76,9 @@ org.osbl.ssc.model.Booking.additionalLines=.. Additional Services org.osbl.ssc.model.Booking.forward=.. Forward org.osbl.ssc.model.Booking.processing=Processing +org.osbl.ssc.model.Booking.notPresent=Nicht wahrgenommen +org.osbl.ssc.model.Booking.crisisConsultation=Krisenintervention +org.osbl.ssc.model.Booking.shortConsulation=Kurzberatung org.osbl.ssc.model.Booking.brutto=Brutto org.osbl.ssc.model.Booking.confirmedEMail=Confirmed E-Mail org.osbl.ssc.model.Booking.all=All This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-05-20 12:42:30
|
Revision: 5735 http://sourceforge.net/p/concern/code/5735 Author: leonchiver Date: 2014-05-20 12:42:27 +0000 (Tue, 20 May 2014) Log Message: ----------- authorization stuff Modified Paths: -------------- branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/AuthorizationHelper.java branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/action/AbstractSaveAction.java branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/proxy/ListAndFormObjectEditorProxy.java branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/AuthorizationHelper.java Modified: branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/AuthorizationHelper.java =================================================================== --- branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/AuthorizationHelper.java 2014-05-14 09:15:58 UTC (rev 5734) +++ branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/AuthorizationHelper.java 2014-05-20 12:42:27 UTC (rev 5735) @@ -61,7 +61,20 @@ public boolean isObjectWritable(Object object) { return !writableProperties(object).isEmpty(); } + + public boolean isObjectDeletable(Object object) { + initialize(); + if (object == null) + return false; + for (EntityPermission permission : writableAllPermissions) { + if (object.getClass().getName().startsWith(permission.getName()) && permission.getActions() != null && permission.getActions().contains("w")) { + return true; + } + } + return false; + } + public Set<String> readableProperties(Object object) { initialize(); if (object == null) Modified: branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/action/AbstractSaveAction.java =================================================================== --- branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/action/AbstractSaveAction.java 2014-05-14 09:15:58 UTC (rev 5734) +++ branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/action/AbstractSaveAction.java 2014-05-20 12:42:27 UTC (rev 5735) @@ -108,6 +108,13 @@ return added; } + @Override + public void setEnabled(boolean newValue) { + super.setEnabled(newValue); + } + + + public AbstractSaveAction(String base) { ToolbarSupport.setCommand(this, base + ".buttons.save"); ToolbarSupport.setPermissionKey(this, base + ".buttons.save"); Modified: branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/proxy/ListAndFormObjectEditorProxy.java =================================================================== --- branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/proxy/ListAndFormObjectEditorProxy.java 2014-05-14 09:15:58 UTC (rev 5734) +++ branches/de-fr-stable-release/osbl/src/java/org/osbl/client/wings/form/proxy/ListAndFormObjectEditorProxy.java 2014-05-20 12:42:27 UTC (rev 5735) @@ -163,7 +163,7 @@ formSaveAction.setEnabled((persistent && authorizationHelper.isObjectWritable(object)) || (!persistent && authorizationHelper.isNewObjectWritable(getType()))); AbstractDeleteAction formDeleteAction = getDelegate().getFormDeleteAction(); if (formDeleteAction != null) - formDeleteAction.setEnabled(authorizationHelper.isObjectWritable(object)); + formDeleteAction.setEnabled(authorizationHelper.isObjectDeletable(object)); } private class DisplayModeListener implements PropertyChangeListener { Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/AuthorizationHelper.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/AuthorizationHelper.java 2014-05-14 09:15:58 UTC (rev 5734) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/AuthorizationHelper.java 2014-05-20 12:42:27 UTC (rev 5735) @@ -217,13 +217,13 @@ if (rule.startsWith(AllRuleLanguage.class.getName())) { if (permission.getActions().indexOf('r') != -1) readableAllPermissions.add(permission); - if (permission.getActions().indexOf('w') != -1) + if (permission.getActions().indexOf('w') != -1 || (permission.getPropertyActions() != null && permission.getPropertyActions().indexOf("w") != -1)) writableAllPermissions.add(permission); } else if (rule.startsWith(OwnRuleLanguage.class.getName())) { if (permission.getActions().indexOf('r') != -1) readableOwnPermissions.add(permission); - if (permission.getActions().indexOf('w') != -1) + if (permission.getActions().indexOf('w') != -1 || (permission.getPropertyActions() != null && permission.getPropertyActions().indexOf("w") != -1)) writableOwnPermissions.add(permission); } else if (rule.startsWith(ProjectLeaderRuleLanguage.class.getName())) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <leo...@us...> - 2014-05-14 09:16:02
|
Revision: 5734 http://sourceforge.net/p/concern/code/5734 Author: leonchiver Date: 2014-05-14 09:15:58 +0000 (Wed, 14 May 2014) Log Message: ----------- permission stuff Modified Paths: -------------- branches/de-fr-stable-release/waz/build.xml branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java Modified: branches/de-fr-stable-release/waz/build.xml =================================================================== --- branches/de-fr-stable-release/waz/build.xml 2014-05-07 07:48:45 UTC (rev 5733) +++ branches/de-fr-stable-release/waz/build.xml 2014-05-14 09:15:58 UTC (rev 5734) @@ -21,6 +21,7 @@ <fileset dir="../osbl/dist/lib" includes="*.jar"/> <pathelement location="../concern/build/class"/> <pathelement location="../osbl-basics/build/class"/> + <pathelement location="../osbl-shell/build/class"/> </path> <path id="test.classpath"> Modified: branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java =================================================================== --- branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-05-07 07:48:45 UTC (rev 5733) +++ branches/de-fr-stable-release/waz/src/java/org/osbl/waz/gui/PeriodEditor.java 2014-05-14 09:15:58 UTC (rev 5734) @@ -38,6 +38,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import org.osbl.UserSession; +import org.osbl.client.SessionActionProvider; public class PeriodEditor extends GenericObjectEditor { @@ -233,6 +235,20 @@ putValue(AuthorizedAction.PERMISSION_KEY, "SAP Export" + "[x]"); } + @Override + public void setEnabled(boolean enabled) { + if (!enabled) { + enabled = ((SessionActionProvider) Client.getInstance().getActionProvider()).getAuthorization().checkPermission( + Keys.toString(UserSession.getIdentity()), Period.class.getName(), "actualTimeBooked", "w"); + } + super.setEnabled(enabled); + } + + @Override + public boolean isEnabled() { + return super.isEnabled(); + } + public void actionPerformed(ObjectActionEvent event) { List<ProjectTimeEntry> entries = new ArrayList<ProjectTimeEntry>(); for (Object object : event.getTargets()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |