Revision: 2571
Author: seba.wagner
Date: Mon Nov 2 05:18:26 2009
Log: Make Calendar load from database
http://code.google.com/p/openmeetings/source/detail?r=2571
Modified:
/trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/calendardata/vcal_2009-11-01.xml
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx Tue Oct 27
02:06:34 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx Mon Nov 2
05:18:26 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<canvas debug="true" width="100%" height="100%">
+<canvas debug="true" width="100%" height="100%" title="OpenMeetings">
<debug fontsize="11" oninit="Debug.showInternalProperties = true" />
<!--
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
Mon Nov 2 04:34:03 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
Mon Nov 2 05:18:26 2009
@@ -115,10 +115,10 @@
<comment value=""/>
<notes value=""/>
<location value=""/>
- <attendees value=""/>
+ <attendees />
<start year="" month="" day="" hour="" minute="" />
<end year="" month="" day="" hour="" minute="" />
- <category value=""/>
+ <category value="1"/>
<uid value=""/>
</event>
</dataset>
@@ -130,10 +130,10 @@
<comment value=""/>
<notes value=""/>
<location value=""/>
- <attendees value=""/>
+ <attendees />
<start year="" month="" day="" hour="" minute="" />
<end year="" month="" day="" hour="" minute="" />
- <category value=""/>
+ <category value="1"/>
<uid value=""/>
</event>
</dataset>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/calendardata/vcal_2009-11-01.xml
Mon Nov 2 04:34:03 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/calendardata/vcal_2009-11-01.xml
Mon Nov 2 05:18:26 2009
@@ -5,26 +5,16 @@
-->
<vcalendar>
<year2009>
- <month11>
- <day2>
- <event>
- <summary value="My Appointement" />
- <comment value="Description" />
- <start year="2009" month="11" day="2"
hour="12" minute="14"/>
- <end year="2009" month="11" day="2"
hour="15" minute="14"/>
- <category value="1" />
- <uid value="1" />
- </event>
- <event>
- <summary>rteste</summary>
- <comment>asdasd</comment>
- <start year="2009" month="11" day="2"
hour="16" minute="38"/>
- <end year="2009" month="11" day="2"
hour="17" minute="39"/>
- <category>1</category>
- <uid>2</uid>
- </event>
- </day2>
- <day4>
+ <month11>
+ <day14>
+ <event>
+ <summary value="Gym workout"/>
+ <comment value="gym"/>
+ <start year="2009" month="11" day="14" hour="16"
minute="30"/>
+ <end year="2009" month="11" day="14" hour="17"
minute="30"/>
+ <category/>
+ <uid/>
+ </event>
<event>
<summary value="photo shoot"/>
<comment value="photo shoot"/>
@@ -32,16 +22,92 @@
<end year="2009" month="11" day="14" hour="10"
minute="12"/>
<category/>
<uid/>
- </event>
- <event>
- <summary>asdqwe</summary>
- <comment>des</comment>
- <start year="2009" month="11" day="4"
hour="12" minute="39"/>
- <end year="2009" month="11" day="4"
hour="15" minute="39"/>
- <category>1</category>
- <uid>3</uid>
- </event>
- </day4>
- </month11>
+ </event>
+ </day14>
+ <day2>
+ <event>
+ <summary value="Speech at the MOMA"/>
+ <comment value="A test event"/>
+ <start year="2009" month="11" day="2" hour="8"
minute="30"/>
+ <end year="2009" month="11" day="2" hour="10"
minute="30"/>
+ <category/>
+ <uid/>
+ </event>
+ </day2>
+ <day6>
+ <event>
+ <summary value="Ribbon Cutting Ceremony"/>
+ <comment value="Another meeting"/>
+ <start year="2009" month="11" day="6" hour="3"
minute="30"/>
+ <end year="2009" month="11" day="6" hour="5"
minute="30"/>
+ <category/>
+ <uid/>
+ </event>
+ <event>
+ <summary value="Governor's Luncheon"/>
+ <comment value="Lunch with Arnold"/>
+ <start year="2009" month="11" day="6" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="6" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ </day6>
+ <day30>
+ <event>
+ <summary value="Pick-up Movie DVDs"/>
+ <comment value="Pick-up movies"/>
+ <start year="2009" month="11" day="30" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="30" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ <event>
+ <summary value="Another example event"/>
+ <comment value="Another example event"/>
+ <start year="2009" month="11" day="30" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="30" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ </day30>
+ <day12>
+ <event>
+ <summary value="Run Heartache Hill"/>
+ <comment value="Good evening"/>
+ <start year="2009" month="11" day="12" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="12" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ </day12>
+ <day1>
+ <event>
+ <summary value="Swim English Channel"/>
+ <comment value="Another example event"/>
+ <start year="2009" month="11" day="1" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="1" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ </day1>
+ <day18>
+ <event>
+ <summary value="Climb Mount Everest"/>
+ <comment value="How we do it back home"/>
+ <start year="2009" month="11" day="18" hour="3"
minute="30"/>
+ <end year="2009" month="11" day="18" hour="5"
minute="30"/>
+ <category/>
+ <uid/>
+ </event>
+ <event>
+ <summary value="Sail across Pacific"/>
+ <comment value="Conference"/>
+ <start year="2009" month="11" day="18" hour="12"
minute="12"/>
+ <end year="2009" month="11" day="18" hour="13"
minute="12"/>
+ <category/>
+ <uid/>
+ </event>
+ </day18>
+ </month11>
</year2009>
</vcalendar>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
Mon Nov 2 04:34:03 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
Mon Nov 2 05:18:26 2009
@@ -16,6 +16,8 @@
<method name="getEventColor" args="cat">
+ if ($debug) Debug.write("getEventColor ",cat);
+
setAttribute('hiColor',gColorTable[cat].bright);
setAttribute('bkgndColor',gColorTable[cat].bkgnd);
@@ -85,11 +87,11 @@
</datapath>
<setter name="text" args="h">
<![CDATA[
- h = Number( h );
- var ap = h < 12 ? 'a' : 'p';
- if ( h > 12) h-=12;
- else if ( h==0 ) h='12';
- super.setAttribute('text', h + ap );
+ h = Number( h );
+ var ap = h < 12 ? 'a' : 'p';
+ if ( h > 12) h-=12;
+ else if ( h==0 ) h='12';
+ super.setAttribute('text', h + ap );
]]>
</setter>
</text>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
Mon Nov 2 02:08:52 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
Mon Nov 2 05:18:26 2009
@@ -94,6 +94,9 @@
<![CDATA[
var s = ""
if ( attrs && attrs.month != "" ){
+
+ //if ($debug) Debug.write("applyData",attrs);
+
s = canvas.calMonths[ attrs.month-1 ]
+ " " +
attrs.day + ", " +
attrs.year;
@@ -255,7 +258,7 @@
<!-- fixed size input text is best for large multiline
text,
so it is good to declare with values for width/height -->
<inputtextbox name="txt" x="10" y="10" multiline="true"
pixellock="true"
- width="175" height="280" datapath="notes/@value"
visible="true"/>
+ width="175" height="280" datapath="comment/@value"
visible="true"/>
</infoTab>
<infoTab name="location" label="Location" pixellock="true">
@@ -263,8 +266,23 @@
width="175" height="280" datapath="location/@value"
visible="true"/>
</infoTab>
<infoTab name="attendees" label="Attendees" pixellock="true">
+
+ <simplelayout axis="y" />
+
+ <view datapath="attendees/attendee/">
+ <view>
+ <simplelayout axis="x" />
+ <text resize="true" datapath="firstname/@value"
/>
+ <text resize="true" datapath="lastname/@value"
/>
+ <text text="(" />
+ <text resize="true" datapath="email/@value" />
+ <text text=")" />
+ </view>
+ </view>
+ <!--
<inputtextbox name="txt" x="10" y="10" multiline="true"
pixellock="true"
width="175" height="280" datapath="attendees/@value"
visible="true"/>
+ -->
</infoTab>
</basetabslider>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
Mon Nov 2 02:08:52 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
Mon Nov 2 05:18:26 2009
@@ -526,7 +526,7 @@
<selectionmanager name="daySelectionMgr" />
- </view>
+ </view>
<!-- This is the beveled treatment for the selected day, plus the
button
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
Mon Oct 26 08:27:13 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
Mon Nov 2 05:18:26 2009
@@ -51,9 +51,9 @@
return meetingMember;
} catch (HibernateException ex) {
- log.error("[getMeetingMemberById]: " + ex);
+ log.error("[getMeetingMemberById]: " , ex);
} catch (Exception ex2) {
- log.error("[getMeetingMemberById]: " + ex2);
+ log.error("[getMeetingMemberById]: " , ex2);
}
return null;
}
@@ -79,9 +79,9 @@
return listmeetingMember;
} catch (HibernateException ex) {
- log.error("[getMeetingMemberByAppointmentId]: " + ex);
+ log.error("[getMeetingMemberByAppointmentId]: " , ex);
} catch (Exception ex2) {
- log.error("[getMeetingMemberByAppointmentId]: " + ex2);
+ log.error("[getMeetingMemberByAppointmentId]: " , ex2);
}
return null;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
Mon Nov 2 04:34:03 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
Mon Nov 2 05:18:26 2009
@@ -22,6 +22,7 @@
import org.openmeetings.app.data.calendar.management.AppointmentLogic;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.hibernate.beans.calendar.Appointment;
+import org.openmeetings.app.hibernate.beans.calendar.MeetingMember;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -68,15 +69,8 @@
endtime.set(Calendar.SECOND, 0);
endtime.set(Calendar.YEAR,
Integer.parseInt(yearStr));
- System.out.println("starttime "+starttime);
- System.out.println("endtime "+endtime);
- System.out.println("getTimeInMillis s "+new
Date(starttime.getTimeInMillis()));
- System.out.println("getTimeInMillis e "+new
Date(endtime.getTimeInMillis()));
-
List<Appointment> appointements =
AppointmentLogic.getInstance().getAppointmentByRange(Long.parseLong(userStr),
new Date(starttime.getTimeInMillis()), new Date(endtime.getTimeInMillis()));
- System.out.println("Num of Appointements
"+appointements.size());
-
Document document =
DocumentHelper.createDocument();
document.setXMLEncoding("UTF-8");
document.addComment(
@@ -117,14 +111,14 @@
Element start =
event.addElement("start");
start.addAttribute("year",
""+(appointment.getAppointmentStarttime().getYear()+1900));
-
start.addAttribute("month",
""+appointment.getAppointmentStarttime().getMonth()+1);
+
start.addAttribute("month",
""+(appointment.getAppointmentStarttime().getMonth()+1));
start.addAttribute("day", ""+appointment.getAppointmentStarttime().getDate());
start.addAttribute("hour", ""+appointment.getAppointmentStarttime().getHours());
start.addAttribute("minute",
""+appointment.getAppointmentStarttime().getMinutes());
Element end =
event.addElement("end");
end.addAttribute("year",
""+(appointment.getAppointmentEndtime().getYear()+1900));
-
end.addAttribute("month", ""+appointment.getAppointmentEndtime().getMonth()+1);
+
end.addAttribute("month",
""+(appointment.getAppointmentEndtime().getMonth()+1));
end.addAttribute("day", ""+appointment.getAppointmentEndtime().getDate());
end.addAttribute("hour", ""+appointment.getAppointmentEndtime().getHours());
end.addAttribute("minute", ""+appointment.getAppointmentEndtime().getMinutes());
@@ -134,13 +128,31 @@
Element uid =
event.addElement("uid");
uid.addAttribute("value",""+appointment.getAppointmentId());
+
+ Element attendees =
event.addElement("attendees");
+
+ for (MeetingMember
meetingMember : appointment.getMeetingMember()) {
+
+ Element attendee =
attendees.addElement("attendee");
+
+ Element email =
attendee.addElement("email");
+
email.addAttribute("value", meetingMember.getEmail());
+
+ Element memberId =
attendee.addElement("memberId");
+
memberId.addAttribute("value", ""+meetingMember.getMeetingMemberId());
+
+ Element firstname =
attendee.addElement("firstname");memberId.addAttribute("value",
""+meetingMember.getMeetingMemberId());
+
firstname.addAttribute("value", meetingMember.getFirstname());
+
+ Element lastname =
attendee.addElement("lastname");
+
lastname.addAttribute("value", meetingMember.getLastname());
+
+ }
}
}
- String requestedFile = "users.xml";
-
httpServletResponse.reset();
httpServletResponse.resetBuffer();
OutputStream out =
httpServletResponse.getOutputStream();
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
