Revision: 4489
Author: seba.wagner
Date: Sun Oct 30 07:28:15 2011
Log: Update issue 1498
add re-factored code to trunk to change label of appointment remidner
http://code.google.com/p/openmeetings/source/detail?r=4489
Modified:
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Wed Oct 12
10:34:29 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Sun Oct 30
07:28:15 2011
@@ -1699,7 +1699,7 @@
<value><u>Download as TIF</u></value>
</string>
<string id="565" name="calendarLabel">
- <value>Reminder</value>
+ <value>Notification type</value>
</string>
<string id="566" name="calendarLabel">
<value>Category</value>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sun Oct 30 07:27:20 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sun Oct 30 07:28:15 2011
@@ -51,27 +51,6 @@
@Autowired
private MeetingMemberLogic meetingMemberLogic;
- public static void main(String... args) {
-
- Calendar calInitial = Calendar.getInstance();
- int offsetInitial = calInitial.get(Calendar.ZONE_OFFSET)
- + calInitial.get(Calendar.DST_OFFSET);
-
- long current = System.currentTimeMillis();
-
- // Check right time
- Date utcTimeNow = new Date(current - offsetInitial);
-
- System.out.println("UTC current " + current);
- System.out.println("UTC offsetInitial " + offsetInitial);
-
- System.out.println("UTC now " + utcTimeNow);
- System.out.println("Date System.currentTimeMillis() " + new
Date(current));
- System.out.println("Date current " + new Date());
-
-
- }
-
public List<Appointment> getAppointmentByRange(Long userId, Date
starttime,
Date endtime) {
try {
@@ -146,34 +125,6 @@
log.debug("Appointmentlogic.saveAppointment");
- // create a Room
- // Long room_id = roommanagement.addRoom(
- // 3, // Userlevel
- // appointmentName, // name
- // roomType, // RoomType
- // "", // Comment
- // new Long(8), // Number of participants
- // true, // public
- // null, // Organisations
- // 270, // Video Width
- // 280, // Video height
- // 2, // Video X
- // 2, // Video Y
- // 400, // Modeartionpanel X
- // true, // Whiteboard
- // 276, // Whiteboard x
- // 2, // Whiteboard y
- // 592, // WB height
- // 660, // WB width
- // true, // Show Files Panel
- // 2, // Files X
- // 284, // Files Y
- // 310, // Files height
- // 270, // Files width
- // true, // Appointment
- // false, // Demo Room => Meeting Timer
- // null); // Meeting Timer time in seconds
-
// TODO:Add this user as the default Moderator of the Room
Long room_id = roommanagement.addRoom(3, // Userlevel
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Wed Aug 31 10:27:24 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Sun Oct 30 07:28:15 2011
@@ -167,10 +167,10 @@
message += labelid1156.getValue() + invitorName +
"<br/>";
- if (point.getRemind().getTypId() == 1) {
- log.debug("no reminder required");
- } else if (point.getRemind().getTypId() == 2) {
- log.debug("Reminder for Appointment : simple
email");
+ // point.getRemind().getTypId() == 1 will not receive
emails
+
+ if (point.getRemind().getTypId() == 2) {
+ log.debug("Invitation for Appointment : simple
email");
Invitations invitation = invitationManagement
.addInvitationLink(
@@ -201,8 +201,8 @@
} else if (point.getRemind().getTypId() == 3) {
log.debug("Reminder for Appointment : iCal
mail");
- System.out.println("5" + starttime);
- System.out.println("6" + endtime);
+ log.debug("5" + starttime);
+ log.debug("6" + endtime);
invitationId = invitationManagement
.addInvitationIcalLink(
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Fri Oct 21 11:33:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Oct 30 07:28:15 2011
@@ -720,7 +720,7 @@
try {
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "none", "no reminder");
+ "do not send notification", "no
reminder");
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
"simple email", "simple email
notification");
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
Sun Sep 18 07:58:10 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
Sun Oct 30 07:28:15 2011
@@ -96,7 +96,7 @@
String appointmentLocation, String
appointmentDescription,
Date appointmentstart, Date appointmentend, Boolean
isDaily,
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
- Long categoryId, Long remind, List<?> mmClient, Long
roomType,
+ Long categoryId, Long remind, List mmClient, Long
roomType,
String baseUrl, Long language_id) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " +
baseUrl);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
