You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(96) |
Dec
(18) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(67) |
Feb
(17) |
Mar
(240) |
Apr
(287) |
May
(332) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Piotr K. <pks...@us...> - 2004-08-10 09:55:24
|
Update of /cvsroot/jhive/jhive/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4791 Modified Files: build.xml Log Message: Poprawiony skrypt budowania Index: build.xml =================================================================== RCS file: /cvsroot/jhive/jhive/Src/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** build.xml 20 May 2004 10:10:55 -0000 1.19 --- build.xml 10 Aug 2004 09:55:00 -0000 1.20 *************** *** 1,5 **** <project name="jhive" basedir="./" default="all"> - <!-- Local system paths --> <property name="distpath.project" value="."/> --- 1,4 ---- *************** *** 17,32 **** <include name="*.jar"/> </fileset> - <fileset dir="Lib/struts"> - <include name="*.jar"/> - </fileset> - <fileset dir="Lib/hibernate"> - <include name="*.jar"/> - </fileset> - <pathelement path ="Tmp/WEB-INF/lib/commons-beanutils.jar"/> - <pathelement path ="Tmp/WEB-INF/lib/commons-lang.jar"/> - <pathelement path ="Tmp/WEB-INF/lib/struts.jar"/> - <pathelement path ="Tmp/WEB-INF/lib/weblogic.jar"/> - <pathelement path ="Tmp/WEB-INF/lib/log4j-1.2.8.jar"/> - <pathelement path ="Tmp/WEB-INF/lib/javax.servlet.jar"/> <pathelement path ="Tmp/WEB-INF/classes"/> </path> --- 16,19 ---- *************** *** 38,97 **** <!-- Copy any resource or configuration files --> ! <target name="resources"> <delete dir="Tmp"/> ! <mkdir dir="Tmp"/> <copy todir="Tmp" includeEmptyDirs="no"> ! <fileset dir="Jsp"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF"/> <copy todir="Tmp/WEB-INF" includeEmptyDirs="no"> ! <fileset dir="Meta"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/lib"/> <copy todir="Tmp/WEB-INF/lib" includeEmptyDirs="no"> ! <fileset dir="Lib"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/src"/> <copy todir="Tmp/WEB-INF/src" includeEmptyDirs="no"> ! <fileset dir="Code/java"> ! <patternset> ! <include name="**/*"/> ! <exclude name="**/hibernate.cfg.xml" /> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/classes"/> <copy todir="Tmp/WEB-INF/classes" includeEmptyDirs="no"> ! <fileset dir="Tmp/WEB-INF/src"> ! <patternset> ! <include name="**/*.conf"/> ! <include name="**/*.properties"/> ! <include name="**/*.xml"/> ! </patternset> ! </fileset> </copy> <copy file="Code/java/net/sf/jhive/hibernate.cfg.xml" todir="Tmp/"/> - <copy file="Code/java/net/sf/jhive/hibernate-bea.cfg.xml" tofile="Tmp/WEB-INF/classes/hibernate.cfg.xml"/> - - <mkdir dir="Tmp/META-INF"/> - <copy todir="Tmp/META-INF/"> - <fileset dir="Code/java/net/sf/jhive/logic/ejb/META-INF"/> - </copy> ! </target> --- 25,78 ---- <!-- Copy any resource or configuration files --> ! <target name="resources"> <delete dir="Tmp"/> ! <mkdir dir="Tmp"/> <copy todir="Tmp" includeEmptyDirs="no"> ! <fileset dir="Jsp"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF"/> <copy todir="Tmp/WEB-INF" includeEmptyDirs="no"> ! <fileset dir="Meta"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/lib"/> <copy todir="Tmp/WEB-INF/lib" includeEmptyDirs="no"> ! <fileset dir="Lib"> ! <patternset> ! <include name="**/*"/> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/src"/> <copy todir="Tmp/WEB-INF/src" includeEmptyDirs="no"> ! <fileset dir="Code/java"> ! <patternset> ! <include name="**/*"/> ! <exclude name="**/hibernate.cfg.xml" /> ! </patternset> ! </fileset> </copy> <mkdir dir="Tmp/WEB-INF/classes"/> <copy todir="Tmp/WEB-INF/classes" includeEmptyDirs="no"> ! <fileset dir="Tmp/WEB-INF/src"> ! <patternset> ! <include name="**/*.conf"/> ! <include name="**/*.properties"/> ! <include name="**/*.xml"/> ! </patternset> ! </fileset> </copy> <copy file="Code/java/net/sf/jhive/hibernate.cfg.xml" todir="Tmp/"/> ! </target> *************** *** 105,129 **** <!-- Remove classes directory for clean Tmp directory --> ! <target name="cleantmp" ! description="Prepare for clean Tmp"> ! <delete dir="Tmp"/> </target> <!-- Remove classes directory for clean build --> ! <target name="clean" ! description="Prepare for clean build"> ! <delete dir="Tmp"/> ! <delete file="logicManager.jar"/> ! <delete file="jhive.jar"/> ! <delete file="jhive.war"/> </target> <!-- Build Javadoc documentation --> ! <target name="javadoc" ! description="Generate JavaDoc API docs"> ! <delete dir="Tmp/WEB-INF/doc/api"/> ! <mkdir dir="Tmp/WEB-INF/doc/api"/> ! <javadoc sourcepath="Tmp/WEB-INF/src" ! destdir="Tmp/WEB-INF/doc/api" classpath="${servlet.jar}" packagenames="*" --- 86,106 ---- <!-- Remove classes directory for clean Tmp directory --> ! <target name="cleantmp" description="Prepare for clean Tmp"> ! <delete dir="Tmp"/> </target> <!-- Remove classes directory for clean build --> ! <target name="clean" description="Prepare for clean build"> ! <delete dir="Tmp"/> ! <delete file="jhive.jar"/> ! <delete file="jhive.war"/> </target> <!-- Build Javadoc documentation --> ! <target name="javadoc" description="Generate JavaDoc API docs"> ! <delete dir="Tmp/WEB-INF/doc/api"/> ! <mkdir dir="Tmp/WEB-INF/doc/api"/> ! <javadoc sourcepath="Tmp/WEB-INF/src" ! destdir="Tmp/WEB-INF/doc/api" classpath="${servlet.jar}" packagenames="*" *************** *** 134,138 **** doctitle="<h1>${project.title} Documentation (Version ${project.version})</h1>" bottom="Copyright © 2004"> ! <classpath refid="compile.classpath"/> </javadoc> </target> --- 111,115 ---- doctitle="<h1>${project.title} Documentation (Version ${project.version})</h1>" bottom="Copyright © 2004"> ! <classpath refid="compile.classpath"/> </javadoc> </target> *************** *** 140,185 **** <!-- Build entire project --> ! <target name="project" depends="clean,prepare,compile"/> <!-- nie ma javadoc --> <!-- Create binary distribution --> ! <target name="dist" ! description="Create binary distribution"> ! ! <!-- <javadoc docletpath="/usr/share/bea/weblogic81/server/lib/ejbgen.jar" ! doclet="weblogic.tools.ejbgen.EJBGen" ! sourcefiles="Tmp/WEB-INF/src/net/sf/jhive/logic/ejb/LogicManagerBean.java"> ! <classpath refid="compile.classpath"/> ! </javadoc>--> ! ! <!-- <ejbjar srcdir="Tmp/WEB-INF/src" ! descriptordir="Tmp/META-INF/"> ! <weblogic destdir="."> ! <classpath refid="compile.classpath"/> ! </weblogic> ! <include name="Tmp/WEB-INF/clases/net/sf/jhive/logic/ejb/*"/> ! <include name="Tmp/WEB-INF/src/net/sf/jhive/logic/ejb/*"/> ! <include name="**/*-ejb-jar.xml"/> ! <exclude name="**/*weblogic*.xml"/> ! </ejbjar>--> ! ! <jar ! jarfile="${distpath.project}/logicManager.jar" ! basedir="Tmp/WEB-INF/classes" ! includes="net/sf/jhive/logic/ejb/*, ../../META-INF/ejb-jar.xml"> ! </jar> ! ! <jar ! jarfile="${distpath.project}/${project.distname}.jar" ! basedir="Tmp/WEB-INF/classes" ! excludes="net/sf/jhive/logic/ejb/**"/> ! ! <war ! basedir="Tmp/" ! warfile="${distpath.project}/${project.distname}.war" ! webxml="Tmp/WEB-INF/web.xml"> ! <exclude name="${distpath.project}/${project.distname}.war"/> ! </war> ! </target> --- 117,134 ---- <!-- Build entire project --> ! <target name="project" depends="clean,prepare,compile,javadoc"/> <!-- Create binary distribution --> ! <target name="dist" description="Create binary distribution"> ! <jar ! jarfile="${distpath.project}/${project.distname}.jar" ! basedir="Tmp/WEB-INF/classes"/> ! <war ! basedir="Tmp/" ! warfile="${distpath.project}/${project.distname}.war" ! webxml="Tmp/WEB-INF/web.xml"> ! <exclude name="${distpath.project}/${project.distname}.war"/> ! </war> </target> |
From: Piotr K. <pks...@us...> - 2004-08-10 09:51:25
|
Update of /cvsroot/jhive/jhive/Doc/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4141 Modified Files: UserManual.tex Log Message: Poprawiony opis kompilacji Index: UserManual.tex =================================================================== RCS file: /cvsroot/jhive/jhive/Doc/Misc/UserManual.tex,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UserManual.tex 17 May 2004 15:44:55 -0000 1.7 --- UserManual.tex 10 Aug 2004 09:51:09 -0000 1.8 *************** *** 42,47 **** \begin{itemize} \item Linux operating system, ! \item postgresql (www.postgresql.org) version 7.4.1 or higher, %??? ! \item jboss (www.jboss.org) version 3.2.3. \end{itemize} %%\subsection{Installation} --- 42,47 ---- \begin{itemize} \item Linux operating system, ! \item Postgresql (www.postgresql.org) version 7.4.1 or higher, %??? ! \item JBoss (www.jboss.org) version 3.2.3. \end{itemize} %%\subsection{Installation} *************** *** 58,98 **** %\end{itemize} \subsection{Building from source package} ! To build from source package you must have hibernate (www.hibernate.org) and ! Jakarta struts (jakarta.apache.org).\\ \\ \noindent In other to install Jhive you have to: \begin{enumerate} ! \item Create directory to build jhive in. \item Change directory to build directory. ! \item Unpack jhive sources in build directory. ! \item Run jhive.sh script (as postgres). ! \item Copy the following jar files into directory Lib: \begin{enumerate} %spisane ode mnie z lib - mozna sprawdzic kiedys, czy wszystko jest potrzebne ! \item ant-1.5.2.jar (hibernate/lib) ! \item cglib-2.0-rc2.jar (hibernate/lib) ! \item commons-logging-1.0.3.jar (hibernate/lib) ! \item dom4j-1.4.jar (hibernate/lib) ! \item ehcache-0.6.jar (hibernate/lib) ! \item hibernate2.jar (hibernate/lib) ! \item junit-3.8.1.jar (hibernate/lib) ! \item odmg-3.0.jar (hibernate/lib) ! \item xalan-2.4.0.jar (hibernate/lib) ! \item commons-beanutils.jar (struts/lib) ! \item commont-collection.jar (struts/lib) ! \item commons-lang.jar (struts/lib) ! \item struts.jar (struts/lib) ! \item postgresql.jar % -- tego nie wiem skad trzeba wziac \end{enumerate} ! \item Run ant all.%albo co \item Copy file jhive.war into directory JBOSS\_HOME/server/default/deploy. ! \item Copy the following files into JBOSS\_HOME/server/default/lib. %czyzby? - ! %nie przypominam sobie zebym kiedykolwiek musiala to robic \end{enumerate} \subsection{Installation from precompiled package} - ????%!!!!!!!!!!!!!! todo fixme!!!!!!!!!!!!!! \begin{enumerate} \item Copy file jhive.war into directory JBOSS\_HOME/server/default/deploy. \end{enumerate} \subsection{Accessing Jhive} --- 58,106 ---- %\end{itemize} \subsection{Building from source package} ! To build from source package you must have Hibernate (www.hibernate.org), ! Apache Struts and Log4j (jakarta.apache.org), JUnit (www.junit.org).\\ \\ \noindent In other to install Jhive you have to: \begin{enumerate} ! \item Create directory to build Jhive in. \item Change directory to build directory. ! \item Unpack Jhive sources in build directory. ! \item Run jhive.sh script (as user postgres). ! \item Copy the following jar files into directory Src/Lib: \begin{enumerate} %spisane ode mnie z lib - mozna sprawdzic kiedys, czy wszystko jest potrzebne ! \item commons-beanutils.jar (Struts) ! \item commons-lang.jar (Struts) ! \item hibernate2.jar (Hibernate) ! \item javax.servlet.jar (JBoss) ! \item junit-3.8.1.jar (JUnit) ! \item log4j-1.2.8.jar (Log4j) ! \item struts.jar (Struts) \end{enumerate} ! \item Run ant (in Src directory).%albo co \item Copy file jhive.war into directory JBOSS\_HOME/server/default/deploy. ! \item Copy the following files into JBOSS\_HOME/server/default/deploy. ! \begin{enumerate} ! \item cglib-full-2.0.2.jar (Hibernate) ! \item hibernate2.jar (Hibernate) ! \item dom4j-1.4.jar (Hibernate) ! \item odmg-3.0.jar (Hibernate) ! \item ehcache-0.9.jar (Hibernate) ! \item postgresql.jar (PostgreSQL) ! \end{enumerate} \end{enumerate} \subsection{Installation from precompiled package} \begin{enumerate} \item Copy file jhive.war into directory JBOSS\_HOME/server/default/deploy. + \item Copy the following files into JBOSS\_HOME/server/default/deploy. + \begin{enumerate} + \item cglib-full-2.0.2.jar (Hibernate) + \item hibernate2.jar (Hibernate) + \item dom4j-1.4.jar (Hibernate) + \item odmg-3.0.jar (Hibernate) + \item ehcache-0.9.jar (Hibernate) + \item postgresql.jar (PostgreSQL) + \end{enumerate} \end{enumerate} \subsection{Accessing Jhive} *************** *** 100,107 **** Your Jhive is now installed. To access Jhive: \begin{enumerate} ! \item If your Jboss is not running yet -- start it. Wait for Jboss to start. \item In your browser address bar type http://$<$jboss-url$>$/jhive. $<$jboss-url$>$ ! stands for address of your jboss server. See jboss documentation (www.jboss.org) for details. \end{enumerate} --- 108,115 ---- Your Jhive is now installed. To access Jhive: \begin{enumerate} ! \item If your JBoss is not running yet -- start it. Wait for JBoss to start. \item In your browser address bar type http://$<$jboss-url$>$/jhive. $<$jboss-url$>$ ! stands for address of your JBoss server. See JBoss documentation (www.jboss.org) for details. \end{enumerate} |
From: Piotr K. <pks...@us...> - 2004-06-16 20:25:00
|
Update of /cvsroot/jhive/jhive/Src/Jsp/messages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11017/Src/Jsp/messages Modified Files: messageViewOneBody.jsp Log Message: Fixes Index: messageViewOneBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/messages/messageViewOneBody.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** messageViewOneBody.jsp 27 Apr 2004 09:25:54 -0000 1.4 --- messageViewOneBody.jsp 16 Jun 2004 20:24:51 -0000 1.5 *************** *** 5,8 **** --- 5,10 ---- <html:errors/> + <h3 align="center"><bean:message key="jhive.message"/></h3> + <table align=center border=0> |
From: Piotr K. <pks...@us...> - 2004-06-16 20:25:00
|
Update of /cvsroot/jhive/jhive/Src/Jsp/tasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11017/Src/Jsp/tasks Modified Files: taskViewOneBody.jsp Log Message: Fixes Index: taskViewOneBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/tasks/taskViewOneBody.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** taskViewOneBody.jsp 4 May 2004 09:10:05 -0000 1.5 --- taskViewOneBody.jsp 16 Jun 2004 20:24:51 -0000 1.6 *************** *** 5,8 **** --- 5,10 ---- <html:errors/> + <h3 align="center"><bean:message key="jhive.task"/></h3> + <table align=center border=0> |
From: Piotr K. <pks...@us...> - 2004-06-16 20:24:59
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11017/Src/Code/java/net/sf/jhive Modified Files: ApplicationResources.properties Log Message: Fixes Index: ApplicationResources.properties =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/ApplicationResources.properties,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** ApplicationResources.properties 21 May 2004 05:13:21 -0000 1.51 --- ApplicationResources.properties 16 Jun 2004 20:24:50 -0000 1.52 *************** *** 140,143 **** --- 140,144 ---- # Tasks + jhive.task=Task jhive.task.heading=Your Tasks jhive.task.smb_heading=Somebody Tasks *************** *** 179,182 **** --- 180,184 ---- # Events + jhive.event=Event jhive.event.vcal_heading=Follow the link below to download Vcalendar file jhive.event.vcal_link=Vcalendar file *************** *** 208,211 **** --- 210,214 ---- #Messages + jhive.message=Message jhive.message.heading=Your Messages jhive.message.id=Id |
From: Piotr K. <pks...@us...> - 2004-06-16 20:24:59
|
Update of /cvsroot/jhive/jhive/Src/Jsp/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11017/Src/Jsp/events Modified Files: eventAddSmbBody.jsp eventViewOneBody.jsp Log Message: Fixes Index: eventViewOneBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/events/eventViewOneBody.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** eventViewOneBody.jsp 4 May 2004 09:10:05 -0000 1.9 --- eventViewOneBody.jsp 16 Jun 2004 20:24:50 -0000 1.10 *************** *** 5,8 **** --- 5,10 ---- <html:errors/> + <h3 align="center"><bean:message key="jhive.event"/></h3> + <table align=center border=0> Index: eventAddSmbBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/events/eventAddSmbBody.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** eventAddSmbBody.jsp 4 May 2004 08:26:21 -0000 1.6 --- eventAddSmbBody.jsp 16 Jun 2004 20:24:50 -0000 1.7 *************** *** 178,181 **** --- 178,186 ---- <tr> + <td bgcolor=#00008B><b><font color=#FFFFFF>*<bean:message key="jhive.event.period"/>:</b></td> + <td><html:text property="period" size="60"/></td> + </tr> + + <tr> <td colspan=2><table align=center border=0><tr> <td align="right"><html:submit><bean:message key="jhive.button.submit"/></html:submit></td> |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-25 07:45:47
|
Update of /cvsroot/jhive/jhive/Src/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4528/Src/documentation Added Files: release_notes.pdf Log Message: Synchronizacja --- NEW FILE: release_notes.pdf --- %PDF-1.4 3 0 obj << /Length 1704 /Filter /FlateDecode >> stream xÚXKÚF¾ûWP¾DTY zãÄUÞ*;.WI¼zI,¡üçÓ_w$XÖñ fzúùõCü¼~ñã[9ó#/³õnæ¡·Z&³ÕbåùA<[g:þÜõéÙyWÏÃÀéÛfî¾·}1÷¦ÿ½¾6¾Æ1Ø,fnz è,_p©Ûk·Äl;ÍNÖDv}Ǽ9 ;dzé2T ~â )¸Û¯âq$N>¡³'!K À©øåi:!ª9jóCwL]ã¼7Ä®/ZéVèN8$åH± %ðñWt"6õû\éyëßíµBzů¨%gºlVd&¦$Û6z¦\¤õTô{<--ãÃÜ V"oÛMßÈjؤsÏ.ªéçû «Z+éc"ûYü¶àuDð_`ª%ôå»,¼MYÊUbC¼$&ôRf{s´]{¡ä ó¯|äËq +-ü*¹õð28ÑZñ&(·¸³×ÈMÁL{ë[\ieýkáGb=vwr:Kì ¨¦e¹§J£,pxl%& p ¿ýÔRë7CTV0t$ª¯ä ;K·n¦æO+4µ¼òÏÑúft½ÊÜß<«åmê³Bok÷÷{¾-÷Å"R}î;Cê ¦aÜxv.íëR¥·¸©|;¹ÛqgYKÜPóåUö/P!²Ùÿ¶â¼ðÄɵÂBÍ ÿÐ é¡È6º½}k2«jeÚMbÆÈû¦oîÆï|âèìÜHÈ[#x©µádVÑekSI@Õ,,=Ûã¾Ð¸¶a(Áªå|'e ÃùxîAd²*Ëê<× Òé¬Ú§æ\Ö(qè5hµÕÄ |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-25 07:45:43
|
Update of /cvsroot/jhive/jhive/Src/Jsp/calendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4528/Src/Jsp/calendar Modified Files: weekBody.jsp dayBody.jsp monthBody.jsp Log Message: Synchronizacja Index: dayBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/dayBody.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dayBody.jsp 21 May 2004 13:58:43 -0000 1.5 --- dayBody.jsp 25 May 2004 07:45:33 -0000 1.6 *************** *** 50,53 **** --- 50,54 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 61,64 **** --- 62,66 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 71,74 **** --- 73,77 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 81,84 **** --- 84,88 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 91,94 **** --- 95,99 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 101,104 **** --- 106,110 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 111,114 **** --- 117,121 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 121,124 **** --- 128,132 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 131,134 **** --- 139,143 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 141,144 **** --- 150,154 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 151,154 **** --- 161,165 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 161,164 **** --- 172,176 ---- </html:link> </logic:iterate> + </td> </tr> *************** *** 171,174 **** --- 183,187 ---- </html:link> </logic:iterate> + </td> </tr> Index: weekBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/weekBody.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weekBody.jsp 21 May 2004 05:13:22 -0000 1.1 --- weekBody.jsp 25 May 2004 07:45:33 -0000 1.2 *************** *** 51,54 **** --- 51,55 ---- </html:link><br> </logic:iterate> + </td> *************** *** 59,62 **** --- 60,64 ---- </html:link><br> </logic:iterate> + </td> </tr> *************** *** 87,90 **** --- 89,93 ---- </html:link><br> </logic:iterate> + </td> <td> *************** *** 94,97 **** --- 97,101 ---- </html:link><br> </logic:iterate> + </td> </tr> *************** *** 122,125 **** --- 126,130 ---- </html:link><br> </logic:iterate> + </td> <td> *************** *** 129,132 **** --- 134,138 ---- </html:link><br> </logic:iterate> + </td> </tr> *************** *** 149,152 **** --- 155,159 ---- </html:link><br> </logic:iterate> + </td> </tr> Index: monthBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/monthBody.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monthBody.jsp 21 May 2004 05:13:22 -0000 1.2 --- monthBody.jsp 25 May 2004 07:45:33 -0000 1.3 *************** *** 48,52 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList1" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList2" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList2" paramProperty="link"> --- 48,52 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList1" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList2" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList2" paramProperty="link"> *************** *** 54,58 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList2" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList3" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList3" paramProperty="link"> --- 54,58 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList2" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList3" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList3" paramProperty="link"> *************** *** 60,64 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList3" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList4" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList4" paramProperty="link"> --- 60,64 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList3" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList4" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList4" paramProperty="link"> *************** *** 66,70 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList4" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList5" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList5" paramProperty="link"> --- 66,70 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList4" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList5" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList5" paramProperty="link"> *************** *** 72,76 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList5" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList6" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList6" paramProperty="link"> --- 72,76 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList5" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList6" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList6" paramProperty="link"> *************** *** 78,82 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList6" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList7" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList7" paramProperty="link"> --- 78,82 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList6" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList7" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList7" paramProperty="link"> *************** *** 84,88 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList7" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 84,88 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList7" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> *************** *** 93,97 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList8" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList9" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList9" paramProperty="link"> --- 93,97 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList8" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList9" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList9" paramProperty="link"> *************** *** 99,103 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList9" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList10" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList10" paramProperty="link"> --- 99,103 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList9" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList10" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList10" paramProperty="link"> *************** *** 105,109 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList10" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList11" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList11" paramProperty="link"> --- 105,109 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList10" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList11" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList11" paramProperty="link"> *************** *** 111,115 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList11" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList12" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList12" paramProperty="link"> --- 111,115 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList11" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList12" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList12" paramProperty="link"> *************** *** 117,121 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList12" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList13" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList13" paramProperty="link"> --- 117,121 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList12" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList13" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList13" paramProperty="link"> *************** *** 123,127 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList13" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList14" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList14" paramProperty="link"> --- 123,127 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList13" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList14" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList14" paramProperty="link"> *************** *** 129,133 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList14" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 129,133 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList14" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> *************** *** 138,142 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList15" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList16" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList16" paramProperty="link"> --- 138,142 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList15" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList16" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList16" paramProperty="link"> *************** *** 144,148 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList16" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList17" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList17" paramProperty="link"> --- 144,148 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList16" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList17" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList17" paramProperty="link"> *************** *** 150,154 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList17" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList18" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList18" paramProperty="link"> --- 150,154 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList17" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList18" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList18" paramProperty="link"> *************** *** 156,160 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList18" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList19" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList19" paramProperty="link"> --- 156,160 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList18" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList19" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList19" paramProperty="link"> *************** *** 162,166 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList19" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList20" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList20" paramProperty="link"> --- 162,166 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList19" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList20" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList20" paramProperty="link"> *************** *** 168,172 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList20" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList21" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList21" paramProperty="link"> --- 168,172 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList20" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList21" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList21" paramProperty="link"> *************** *** 174,178 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList21" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 174,178 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList21" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> *************** *** 183,187 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList22" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList23" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList23" paramProperty="link"> --- 183,187 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList22" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList23" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList23" paramProperty="link"> *************** *** 189,193 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList23" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList24" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList24" paramProperty="link"> --- 189,193 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList23" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList24" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList24" paramProperty="link"> *************** *** 195,199 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList24" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList25" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList25" paramProperty="link"> --- 195,199 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList24" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList25" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList25" paramProperty="link"> *************** *** 201,205 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList25" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList26" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList26" paramProperty="link"> --- 201,205 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList25" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList26" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList26" paramProperty="link"> *************** *** 207,211 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList26" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList27" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList27" paramProperty="link"> --- 207,211 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList26" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList27" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList27" paramProperty="link"> *************** *** 213,217 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList27" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList28" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList28" paramProperty="link"> --- 213,217 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList27" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList28" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList28" paramProperty="link"> *************** *** 219,223 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList28" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 219,223 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList28" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> *************** *** 228,232 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList29" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList30" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList30" paramProperty="link"> --- 228,232 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList29" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList30" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList30" paramProperty="link"> *************** *** 234,238 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList30" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList31" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList31" paramProperty="link"> --- 234,238 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList30" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList31" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList31" paramProperty="link"> *************** *** 240,244 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList31" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList32" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList32" paramProperty="link"> --- 240,244 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList31" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList32" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList32" paramProperty="link"> *************** *** 246,250 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList32" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList33" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList33" paramProperty="link"> --- 246,250 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList32" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList33" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList33" paramProperty="link"> *************** *** 252,256 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList33" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList34" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList34" paramProperty="link"> --- 252,256 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList33" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList34" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList34" paramProperty="link"> *************** *** 258,262 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList34" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList35" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList35" paramProperty="link"> --- 258,262 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList34" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList35" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList35" paramProperty="link"> *************** *** 264,268 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList35" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 264,268 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList35" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> *************** *** 273,277 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList36" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList37" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList37" paramProperty="link"> --- 273,277 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList36" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList37" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList37" paramProperty="link"> *************** *** 279,283 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList37" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList38" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList38" paramProperty="link"> --- 279,283 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList37" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList38" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList38" paramProperty="link"> *************** *** 285,289 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList38" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList39" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList39" paramProperty="link"> --- 285,289 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList38" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList39" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList39" paramProperty="link"> *************** *** 291,295 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList39" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList40" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList40" paramProperty="link"> --- 291,295 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList39" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList40" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList40" paramProperty="link"> *************** *** 297,301 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList40" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList41" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList41" paramProperty="link"> --- 297,301 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList40" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList41" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList41" paramProperty="link"> *************** *** 303,307 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList41" property="value" filter="true"/>]</font> ! </logic:notEqual></td> <td align="center"><logic:notEqual name="monthList42" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList42" paramProperty="link"> --- 303,307 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList41" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> <td align="center"><logic:notEqual name="monthList42" property="label" value=""> <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList42" paramProperty="link"> *************** *** 309,313 **** </html:link> <font size=-1 color="red">[<bean:write name="monthList42" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- 309,313 ---- </html:link> <font size=-1 color="red">[<bean:write name="monthList42" property="value" filter="true"/>]</font> ! </logic:notEqual> </td> </tr> |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 14:18:38
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30118/Src/Code/java/net/sf/jhive/logic/events Modified Files: EventManager.java Log Message: Dostosowanie do kalendarza dziennego. Index: EventManager.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events/EventManager.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** EventManager.java 21 May 2004 12:34:48 -0000 1.29 --- EventManager.java 21 May 2004 14:18:26 -0000 1.30 *************** *** 1020,1025 **** public List getEventsForHour(Date dayAndHour, AllUser who ) throws EventManagerException { - return getEventsForDay(dayAndHour,who); - /* try { long hour = 3600 * 1000; --- 1020,1023 ---- *************** *** 1052,1056 **** e.printStackTrace(); throw new EventManagerException(e.getClass().toString()); ! }*/ } --- 1050,1054 ---- e.printStackTrace(); throw new EventManagerException(e.getClass().toString()); ! } } |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 14:18:34
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30118/Src/Code/java/net/sf/jhive/struts/events Modified Files: EventAddAction.java Log Message: Dostosowanie do kalendarza dziennego. Index: EventAddAction.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/events/EventAddAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** EventAddAction.java 20 May 2004 10:18:33 -0000 1.17 --- EventAddAction.java 21 May 2004 14:18:26 -0000 1.18 *************** *** 116,119 **** --- 116,120 ---- if (!errors.isEmpty()) { saveErrors(request, errors); + PropertyUtils.setSimpleProperty(form, "cyclic", ""); return (mapping.getInputForward()); } *************** *** 123,127 **** cal.set(Integer.parseInt(final_year), ! // miesi±ce zaczynaj± siê od 0 Integer.parseInt(final_month) - 1, Integer.parseInt(final_day), --- 124,128 ---- cal.set(Integer.parseInt(final_year), ! // miesi�ce zaczynaj� si� od 0 Integer.parseInt(final_month) - 1, Integer.parseInt(final_day), *************** *** 132,136 **** cal.set(Integer.parseInt(c_final_year), ! // miesi±ce zaczynaj± siê od 0 Integer.parseInt(c_final_month) - 1, Integer.parseInt(c_final_day), --- 133,137 ---- cal.set(Integer.parseInt(c_final_year), ! // miesi�ce zaczynaj� si� od 0 Integer.parseInt(c_final_month) - 1, Integer.parseInt(c_final_day), *************** *** 152,156 **** --- 153,159 ---- ActionErrors.GLOBAL_ERROR, new ActionError("error.event.zero_period")); + saveErrors(request, errors); + PropertyUtils.setSimpleProperty(form, "cyclic", ""); return (mapping.getInputForward()); } *************** *** 192,195 **** --- 195,199 ---- // Forward control to the specified success URI + return (mapping.findForward("eventViewOwn")); |
From: Piotr K. <pks...@us...> - 2004-05-21 13:58:54
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/calendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26152/Src/Code/java/net/sf/jhive/struts/calendar Modified Files: DayViewPrepareAction.java Log Message: calendar view Index: DayViewPrepareAction.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/calendar/DayViewPrepareAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DayViewPrepareAction.java 21 May 2004 05:13:22 -0000 1.4 --- DayViewPrepareAction.java 21 May 2004 13:58:43 -0000 1.5 *************** *** 56,60 **** try { ! EventListBean eventList = new EventListBean(); EventBean[] eventArray; List events; --- 56,60 ---- try { ! EventListBean[] eventList = new EventListBean[13]; EventBean[] eventArray; List events; *************** *** 76,80 **** } ! /* for(int j = 8; j <= 20; j++) { data.setHours(j); i = 0; --- 76,80 ---- } ! for(int j = 8; j <= 20; j++) { data.setHours(j); i = 0; *************** *** 88,96 **** i++; } ! eventList.setEventList(eventArray); ! request.setAttribute("dayList" + j, eventList); } ! */ ! i = 0; events = manager.getEventsForDay(data, manager.getUser(username).getAllUser()); --- 88,97 ---- i++; } ! eventList[j-8] = new EventListBean(); ! eventList[j-8].setEventList(eventArray); ! request.setAttribute("dayList" + j, eventList[j-8]); } ! ! /* i = 0; events = manager.getEventsForDay(data, manager.getUser(username).getAllUser()); *************** *** 103,107 **** eventList.setEventList(eventArray); request.setAttribute("dayList", eventList); ! String wyswData = Integer.toString(data.getDate()) + " - " + Integer.toString(data.getMonth() + 1) + " - " + --- 104,108 ---- eventList.setEventList(eventArray); request.setAttribute("dayList", eventList); ! */ String wyswData = Integer.toString(data.getDate()) + " - " + Integer.toString(data.getMonth() + 1) + " - " + |
From: Piotr K. <pks...@us...> - 2004-05-21 13:58:54
|
Update of /cvsroot/jhive/jhive/Src/Jsp/calendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26152/Src/Jsp/calendar Modified Files: dayBody.jsp Log Message: calendar view Index: dayBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/dayBody.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dayBody.jsp 21 May 2004 05:13:22 -0000 1.4 --- dayBody.jsp 21 May 2004 13:58:43 -0000 1.5 *************** *** 27,36 **** <table border align=center width=50% cellpadding=3> <tr> ! <td bgcolor=00008B align=center width=50%><font color=FFFFFF><b> <bean:write name="dateBean" property="value" filter="true"/> </b></font></td> </tr> ! <logic:iterate id="dayBean" name="dayList" property="eventList"> <tr> <td> --- 27,36 ---- <table border align=center width=50% cellpadding=3> <tr> ! <td bgcolor=00008B align=center width=50% colspan=2><font color=FFFFFF><b> <bean:write name="dateBean" property="value" filter="true"/> </b></font></td> </tr> ! <%--<logic:iterate id="dayBean" name="dayList" property="eventList"> <tr> <td> *************** *** 40,46 **** </td> </tr> ! </logic:iterate> ! <%--<tr> <td width="5%">8:00</td> <td> --- 40,46 ---- </td> </tr> ! </logic:iterate>--%> ! <tr> <td width="5%">8:00</td> <td> *************** *** 172,176 **** </logic:iterate> </td> ! </tr>--%> </table> --- 172,176 ---- </logic:iterate> </td> ! </tr> </table> |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 13:55:49
|
Update of /cvsroot/jhive/jhive/Src/Know In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25439/Src/Know Modified Files: postgres.txt Log Message: . Index: postgres.txt =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Know/postgres.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** postgres.txt 10 Mar 2004 07:15:43 -0000 1.6 --- postgres.txt 21 May 2004 13:55:27 -0000 1.7 *************** *** 37,39 **** psql -U jhive jhive < create_base.sql psql -U jhive jhive < create_sequences.sql ! psql -U jhive jhive < create_data.sql \ No newline at end of file --- 37,39 ---- psql -U jhive jhive < create_base.sql psql -U jhive jhive < create_sequences.sql ! psql -U jhive jhive < create_data.sql |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 12:34:57
|
Update of /cvsroot/jhive/jhive/Src/Code/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7687/Src/Code/sql Modified Files: create_base.sql Log Message: TIMESTAMP Index: create_base.sql =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/sql/create_base.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** create_base.sql 13 Mar 2004 19:05:20 -0000 1.4 --- create_base.sql 21 May 2004 12:34:47 -0000 1.5 *************** *** 111,119 **** id BIGINT PRIMARY KEY, author BIGINT NOT NULL REFERENCES all_users, ! creation_date DATE, description VARCHAR, group_id BIGINT NOT NULL REFERENCES groups, ! lasting_date DATE, ! notification_time DATE, priority INTEGER, title VARCHAR, --- 111,119 ---- id BIGINT PRIMARY KEY, author BIGINT NOT NULL REFERENCES all_users, ! creation_date TIMESTAMP NOT NULL, description VARCHAR, group_id BIGINT NOT NULL REFERENCES groups, ! lasting_date TIMESTAMP NOT NULL, ! notification_time TIMESTAMP, priority INTEGER, title VARCHAR, *************** *** 132,136 **** -- $Log$ ! -- Revision 1.4 2004/03/13 19:05:20 oszer ! -- Events, some cleaning in previous stuff. -- --- 132,136 ---- -- $Log$ ! -- Revision 1.5 2004/05/21 12:34:47 apsalar ! -- TIMESTAMP -- |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 12:34:57
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7687/Src/Code/java/net/sf/jhive/logic/events Modified Files: EventManager.java Log Message: TIMESTAMP Index: EventManager.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events/EventManager.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** EventManager.java 20 May 2004 23:56:33 -0000 1.28 --- EventManager.java 21 May 2004 12:34:48 -0000 1.29 *************** *** 131,134 **** --- 131,135 ---- Event event; try { + creationDate.setMinutes(7); Session sess = HibernateUtil.currentSession(); Set assignedEvents = new TreeSet(); |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 12:34:56
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/hibernate/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7687/Src/Code/java/net/sf/jhive/hibernate/model Modified Files: Event.hbm.xml Log Message: TIMESTAMP Index: Event.hbm.xml =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/hibernate/model/Event.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Event.hbm.xml 30 Mar 2004 22:53:42 -0000 1.2 --- Event.hbm.xml 21 May 2004 12:34:47 -0000 1.3 *************** *** 29,35 **** <property name="creationDate" ! type="java.sql.Date" column="creation_date" ! length="4" /> <property --- 29,35 ---- <property name="creationDate" ! type="java.sql.Timestamp" column="creation_date" ! length="8" /> <property *************** *** 40,52 **** <property name="lastingDate" ! type="java.sql.Date" column="lasting_date" ! length="4" /> <property name="notificationTime" ! type="java.sql.Date" column="notification_time" ! length="4" /> <property --- 40,52 ---- <property name="lastingDate" ! type="java.sql.Timestamp" column="lasting_date" ! length="8" /> <property name="notificationTime" ! type="java.sql.Timestamp" column="notification_time" ! length="8" /> <property |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 12:34:55
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/dao In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7687/Src/Code/java/net/sf/jhive/logic/dao Removed Files: package.html Log Message: TIMESTAMP --- package.html DELETED --- |
From: Aleksandra Kamińs. <ap...@us...> - 2004-05-21 12:34:55
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7687/Src/Code/java/net/sf/jhive/struts/events Modified Files: EventViewOneAction.java Log Message: TIMESTAMP Index: EventViewOneAction.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/events/EventViewOneAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EventViewOneAction.java 20 May 2004 10:18:33 -0000 1.7 --- EventViewOneAction.java 21 May 2004 12:34:31 -0000 1.8 *************** *** 61,64 **** --- 61,66 ---- Event event = manager.getEvent(eventId); + logger.info("Data eventu: "+event.getCreationDate().getMinutes()); + EventBean eventBean = new EventBean(event); |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:31
|
Update of /cvsroot/jhive/jhive/Src/Meta In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Meta Modified Files: struts-config.xml Log Message: calendar view Index: struts-config.xml =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Meta/struts-config.xml,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** struts-config.xml 20 May 2004 18:43:59 -0000 1.62 --- struts-config.xml 21 May 2004 05:13:22 -0000 1.63 *************** *** 323,327 **** --- 323,338 ---- </action> + <action path="/calendar/monthView" + type="net.sf.jhive.struts.calendar.MonthViewPrepareAction"> + <forward name="ok" + path="/calendar/month.jsp"/> + </action> + <action path="/calendar/weekView" + type="net.sf.jhive.struts.calendar.WeekViewPrepareAction"> + <forward name="ok" + path="/calendar/week.jsp"/> + </action> + <!-- Events --> <action path="/events/eventViewOwn" |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:31
|
Update of /cvsroot/jhive/jhive/Src/Jsp/calendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Jsp/calendar Modified Files: monthBody.jsp dayBody.jsp Added Files: weekBody.jsp week.jsp Log Message: calendar view Index: dayBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/dayBody.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dayBody.jsp 20 May 2004 20:50:37 -0000 1.3 --- dayBody.jsp 21 May 2004 05:13:22 -0000 1.4 *************** *** 5,9 **** <html:errors/> ! <table align=center width=80%> <tr> <td align="left"> --- 5,9 ---- <html:errors/> ! <table align=center width=50%> <tr> <td align="left"> *************** *** 25,36 **** </table> ! <table border align=center width=80% cellpadding=3> <tr> ! <td bgcolor=00008B align=center width=50% colspan=2><font color=FFFFFF><b> <bean:write name="dateBean" property="value" filter="true"/> </b></font></td> </tr> ! <tr> <td width="5%">8:00</td> <td> --- 25,46 ---- </table> ! <table border align=center width=50% cellpadding=3> <tr> ! <td bgcolor=00008B align=center width=50%><font color=FFFFFF><b> <bean:write name="dateBean" property="value" filter="true"/> </b></font></td> </tr> ! <logic:iterate id="dayBean" name="dayList" property="eventList"> ! <tr> ! <td> ! <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean" paramProperty="id"> ! <bean:write name="dayBean" property="title" filter="true"/> ! </html:link> ! </td> ! </tr> ! </logic:iterate> ! ! <%--<tr> <td width="5%">8:00</td> <td> *************** *** 162,166 **** </logic:iterate> </td> ! </tr> </table> --- 172,176 ---- </logic:iterate> </td> ! </tr>--%> </table> --- NEW FILE: weekBody.jsp --- <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <html:errors/> <table align=center width=80%> <tr> <td align="left"> <html:link page="/calendar/weekView.do" paramId="data" paramName="prev" paramProperty="value"> <bean:message key="jhive.calendar.prev"/> </html:link> </td> <td align="center"> <html:link page="/calendar/weekView.do"> <bean:message key="jhive.calendar.today"/> </html:link> </td> <td align="right"> <html:link page="/calendar/weekView.do" paramId="data" paramName="next" paramProperty="value"> <bean:message key="jhive.calendar.next"/> </html:link> </td> </tr> </table> <table border align=center width=80% cellpadding=3> <tr> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data1" paramProperty="value">--> <b>Monday, <bean:write name="data1" property="label" filter="true"/> <!--</html:link>--> </font> </td> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data4" paramProperty="value">--> <b>Thursday, <bean:write name="data4" property="label" filter="true"/> <!--</html:link>--> </font> </td> </tr> <tr> <td> <logic:iterate id="dayBean1" name="dayList1" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean1" paramProperty="id"> <bean:write name="dayBean1" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> <td> <logic:iterate id="dayBean4" name="dayList4" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean4" paramProperty="id"> <bean:write name="dayBean4" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> </tr> <tr> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data2" paramProperty="value">--> <b>Tuesday, <bean:write name="data2" property="label" filter="true"/> <!--</html:link>--> </font> </td> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data5" paramProperty="value">--> <b>Friday, <bean:write name="data5" property="label" filter="true"/> <!--</html:link>--> </font> </td> </tr> <tr> <td> <logic:iterate id="dayBean2" name="dayList2" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean2" paramProperty="id"> <bean:write name="dayBean2" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> <td> <logic:iterate id="dayBean5" name="dayList5" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean5" paramProperty="id"> <bean:write name="dayBean5" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> </tr> <tr> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data3" paramProperty="value">--> <b>Wednesday, <bean:write name="data3" property="label" filter="true"/> <!--</html:link>--> </font> </td> <td bgcolor=00008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data6" paramProperty="value">--> <b>Saturday, <bean:write name="data6" property="label" filter="true"/> <!--</html:link>--> </font> </td> </tr> <tr> <td rowspan=3> <logic:iterate id="dayBean3" name="dayList3" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean3" paramProperty="id"> <bean:write name="dayBean3" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> <td> <logic:iterate id="dayBean6" name="dayList6" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean6" paramProperty="id"> <bean:write name="dayBean6" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> </tr> <tr> <td bgcolor=000008B align=center width=50%> <font color=FFFFFF> <!--<html:link page="/calendar/dayView.do" paramId="data" paramName="data7" paramProperty="value">--> <b>Sunday, <bean:write name="data7" property="label" filter="true"/> <!--</html:link>--> </font> </td> </tr> <tr> <td> <logic:iterate id="dayBean7" name="dayList7" property="eventList"> <html:link page="/events/eventViewOne.do" paramId="id" paramName="dayBean7" paramProperty="id"> <bean:write name="dayBean7" property="title" filter="true"/> </html:link><br> </logic:iterate> </td> </tr> </table> Index: monthBody.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/calendar/monthBody.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** monthBody.jsp 20 May 2004 18:43:57 -0000 1.1 --- monthBody.jsp 21 May 2004 05:13:22 -0000 1.2 *************** *** 5,9 **** <html:errors/><html> ! <table align=center width=50% cellpadding=3> <tr bgcolor=00008B align=center> <td width=14%><font color=FFFFFF><b>Mon</font></td> --- 5,35 ---- <html:errors/><html> ! <table align=center width=50%> ! <tr> ! <td align="left"> ! <html:link page="/calendar/monthView.do" paramId="data" paramName="prev" paramProperty="value"> ! <bean:message key="jhive.calendar.prev"/> ! </html:link> ! </td> ! <td align="center"> ! <html:link page="/calendar/monthView.do"> ! <bean:message key="jhive.calendar.today"/> ! </html:link> ! </td> ! <td align="right"> ! <html:link page="/calendar/monthView.do" paramId="data" paramName="next" paramProperty="value"> ! <bean:message key="jhive.calendar.next"/> ! </html:link> ! </td> ! </tr> ! </table> ! ! <table border align=center width=50% cellpadding=3> ! <tr> ! <td bgcolor=00008B align=center width=50% colspan=7><font color=FFFFFF><b> ! <bean:write name="dateBean" property="value" filter="true"/> ! </b></font></td> ! </tr> ! <tr bgcolor=00008B align=center> <td width=14%><font color=FFFFFF><b>Mon</font></td> *************** *** 17,27 **** <tr> ! <td><a href=><font size=-2>1</font></a></td> ! <td><a href=><font size=-2>2</font></a></td> ! <td><a href=><font size=-2>3</font></a></td> ! <td><a href=><font size=-2>4</font></a></td> ! <td><a href=><font size=-2>5</font></a></td> ! <td><a href=><font size=-2>6</font></a></td> ! <td><a href=><font size=-2>7</font></a></td> </tr> --- 43,313 ---- <tr> ! <td align="center"><logic:notEqual name="monthList1" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList1" paramProperty="link"> ! <bean:write name="monthList1" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList1" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList2" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList2" paramProperty="link"> ! <bean:write name="monthList2" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList2" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList3" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList3" paramProperty="link"> ! <bean:write name="monthList3" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList3" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList4" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList4" paramProperty="link"> ! <bean:write name="monthList4" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList4" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList5" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList5" paramProperty="link"> ! <bean:write name="monthList5" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList5" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList6" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList6" paramProperty="link"> ! <bean:write name="monthList6" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList6" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList7" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList7" paramProperty="link"> ! <bean:write name="monthList7" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList7" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! </tr> ! ! <tr> ! <td align="center"><logic:notEqual name="monthList8" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList8" paramProperty="link"> ! <bean:write name="monthList8" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList8" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList9" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList9" paramProperty="link"> ! <bean:write name="monthList9" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList9" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList10" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList10" paramProperty="link"> ! <bean:write name="monthList10" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList10" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList11" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList11" paramProperty="link"> ! <bean:write name="monthList11" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList11" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList12" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList12" paramProperty="link"> ! <bean:write name="monthList12" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList12" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList13" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList13" paramProperty="link"> ! <bean:write name="monthList13" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList13" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList14" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList14" paramProperty="link"> ! <bean:write name="monthList14" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList14" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! </tr> ! ! <tr> ! <td align="center"><logic:notEqual name="monthList15" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList15" paramProperty="link"> ! <bean:write name="monthList15" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList15" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList16" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList16" paramProperty="link"> ! <bean:write name="monthList16" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList16" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList17" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList17" paramProperty="link"> ! <bean:write name="monthList17" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList17" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList18" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList18" paramProperty="link"> ! <bean:write name="monthList18" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList18" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList19" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList19" paramProperty="link"> ! <bean:write name="monthList19" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList19" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList20" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList20" paramProperty="link"> ! <bean:write name="monthList20" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList20" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList21" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList21" paramProperty="link"> ! <bean:write name="monthList21" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList21" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! </tr> ! ! <tr> ! <td align="center"><logic:notEqual name="monthList22" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList22" paramProperty="link"> ! <bean:write name="monthList22" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList22" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList23" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList23" paramProperty="link"> ! <bean:write name="monthList23" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList23" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList24" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList24" paramProperty="link"> ! <bean:write name="monthList24" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList24" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList25" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList25" paramProperty="link"> ! <bean:write name="monthList25" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList25" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList26" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList26" paramProperty="link"> ! <bean:write name="monthList26" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList26" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList27" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList27" paramProperty="link"> ! <bean:write name="monthList27" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList27" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList28" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList28" paramProperty="link"> ! <bean:write name="monthList28" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList28" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! </tr> ! ! <tr> ! <td align="center"><logic:notEqual name="monthList29" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList29" paramProperty="link"> ! <bean:write name="monthList29" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList29" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList30" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList30" paramProperty="link"> ! <bean:write name="monthList30" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList30" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList31" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList31" paramProperty="link"> ! <bean:write name="monthList31" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList31" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList32" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList32" paramProperty="link"> ! <bean:write name="monthList32" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList32" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList33" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList33" paramProperty="link"> ! <bean:write name="monthList33" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList33" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList34" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList34" paramProperty="link"> ! <bean:write name="monthList34" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList34" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList35" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList35" paramProperty="link"> ! <bean:write name="monthList35" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList35" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! </tr> ! ! <tr> ! <td align="center"><logic:notEqual name="monthList36" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList36" paramProperty="link"> ! <bean:write name="monthList36" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList36" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList37" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList37" paramProperty="link"> ! <bean:write name="monthList37" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList37" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList38" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList38" paramProperty="link"> ! <bean:write name="monthList38" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList38" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList39" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList39" paramProperty="link"> ! <bean:write name="monthList39" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList39" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList40" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList40" paramProperty="link"> ! <bean:write name="monthList40" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList40" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList41" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList41" paramProperty="link"> ! <bean:write name="monthList41" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList41" property="value" filter="true"/>]</font> ! </logic:notEqual></td> ! <td align="center"><logic:notEqual name="monthList42" property="label" value=""> ! <html:link page="/calendar/dayView.do" paramId="data" paramName="monthList42" paramProperty="link"> ! <bean:write name="monthList42" property="label" filter="true"/> ! </html:link> ! <font size=-1 color="red">[<bean:write name="monthList42" property="value" filter="true"/>]</font> ! </logic:notEqual></td> </tr> --- NEW FILE: week.jsp --- <%@ page contentType="text/html; charset=UTF-8" language="java" %> <%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> <%@ taglib uri="/WEB-INF/struts-app.tld" prefix="app" %> <app:checkLogon/> <tiles:insert template="/common/layouts/classicLayout.jsp" flush="true"> <tiles:put name="title" value="Jhive - week view" /> <tiles:put name="body" value="/calendar/weekBody.jsp" /> </tiles:insert> |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:31
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/calendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Code/java/net/sf/jhive/struts/calendar Modified Files: MonthViewPrepareAction.java DayViewPrepareAction.java Added Files: WeekViewPrepareAction.java Log Message: calendar view --- NEW FILE: WeekViewPrepareAction.java --- package net.sf.jhive.struts.calendar; import java.util.*; import net.sf.jhive.struts.beans.EventBean; import net.sf.jhive.struts.beans.EventListBean; import org.apache.struts.util.LabelValueBean; import org.apache.commons.beanutils.PropertyUtils; import net.sf.jhive.logic.dao.LogicManager; import net.sf.jhive.model.Event; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.log4j.Logger; import net.sf.jhive.struts.general.LogonAction; /** * Implementation of <strong>Action</strong> that processes request * for week view action * * @author pksiazek */ public final class WeekViewPrepareAction extends Action { /** * The <code>Logger</code> instance for this application. */ static Logger logger = Logger.getLogger(LogonAction.class); /** * Process request for event list. Invokes appropriate logic getter methods and * adds created eventList bean to request scope. * Return an <code>ActionForward</code> instance describing where and how * control should be forwarded, or <code>null</code> if the response has * already been completed. * * @param mapping The ActionMapping used to select this instance * @param form The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * * @exception Exception if business logic throws an exception */ public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { try { EventListBean[] eventList = new EventListBean[7]; EventBean[] eventArray; List events; Iterator iterator; int i; LogicManager manager = new LogicManager(); HttpSession session = request.getSession(); if(session == null || session.getAttribute("USER_KEY") == null) return(mapping.findForward("logon")); Integer username = (Integer) session.getAttribute("USER_KEY"); String dataS = request.getParameter("data"); Date data = new Date(); if(dataS != null) { logger.info("data: " + dataS); data.setTime(Long.parseLong(dataS)); } Date dataO = (Date) data.clone(); int dzien = data.getDay(); if(dzien == 0) dzien = 7; dzien--; data.setDate(data.getDate() - dzien); for(int j=1; j<8; j++) { i = 0; events = manager.getEventsForDay(data, manager.getUser(username).getAllUser()); iterator = events.iterator(); eventArray = new EventBean[events.size()]; while (iterator.hasNext()) { eventArray[i] = new EventBean((Event) iterator.next()); i++; } logger.info("lsta:" + i +"," + j); eventList[j-1] = new EventListBean(); eventList[j-1].setEventList(eventArray); request.setAttribute("dayList" + j, eventList[j-1]); String wyswData = Integer.toString(data.getDate()) + " - " + Integer.toString(data.getMonth() + 1) + " - " + Integer.toString(data.getYear() + 1900); request.setAttribute("data" + j, new LabelValueBean(wyswData, Long.toString(data.getTime()))); data.setDate(data.getDate() + 1); } dataO.setDate(dataO.getDate() - 7); request.setAttribute("prev", new LabelValueBean("data", Long.toString(dataO.getTime()))); dataO.setDate(dataO.getDate() + 14); request.setAttribute("next", new LabelValueBean("data", Long.toString(dataO.getTime()))); return (mapping.findForward("ok")); } catch (Exception e) { request.setAttribute("exception", e.toString()); return (mapping.findForward("exception")); } } } Index: DayViewPrepareAction.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/calendar/DayViewPrepareAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DayViewPrepareAction.java 20 May 2004 20:50:38 -0000 1.3 --- DayViewPrepareAction.java 21 May 2004 05:13:22 -0000 1.4 *************** *** 54,58 **** HttpServletResponse response) throws Exception { ! // try { EventListBean eventList = new EventListBean(); --- 54,58 ---- HttpServletResponse response) throws Exception { ! try { EventListBean eventList = new EventListBean(); *************** *** 76,80 **** } ! for(int j = 8; j <= 20; j++) { data.setHours(j); i = 0; --- 76,80 ---- } ! /* for(int j = 8; j <= 20; j++) { data.setHours(j); i = 0; *************** *** 91,96 **** request.setAttribute("dayList" + j, eventList); } - request.setAttribute("dateBean", new LabelValueBean("data", data.toString())); data.setDate(data.getDate() - 1); request.setAttribute("prev", new LabelValueBean("data", Long.toString(data.getTime()))); --- 91,113 ---- request.setAttribute("dayList" + j, eventList); } + */ + i = 0; + events = manager.getEventsForDay(data, + manager.getUser(username).getAllUser()); + iterator = events.iterator(); + eventArray = new EventBean[events.size()]; + while (iterator.hasNext()) { + eventArray[i] = new EventBean((Event) iterator.next()); + i++; + } + eventList.setEventList(eventArray); + request.setAttribute("dayList", eventList); + + String wyswData = Integer.toString(data.getDate()) + " - " + + Integer.toString(data.getMonth() + 1) + " - " + + Integer.toString(data.getYear() + 1900); + + request.setAttribute("dateBean", new LabelValueBean("data", wyswData)); data.setDate(data.getDate() - 1); request.setAttribute("prev", new LabelValueBean("data", Long.toString(data.getTime()))); *************** *** 100,107 **** return (mapping.findForward("ok")); ! // } catch (Exception e) { ! // request.setAttribute("exception", e.toString()); ! // return (mapping.findForward("exception")); ! // } } } --- 117,124 ---- return (mapping.findForward("ok")); ! } catch (Exception e) { ! request.setAttribute("exception", e.toString()); ! return (mapping.findForward("exception")); ! } } } Index: MonthViewPrepareAction.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/calendar/MonthViewPrepareAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MonthViewPrepareAction.java 20 May 2004 18:44:00 -0000 1.1 --- MonthViewPrepareAction.java 21 May 2004 05:13:22 -0000 1.2 *************** *** 4,9 **** import net.sf.jhive.struts.beans.EventBean; import net.sf.jhive.struts.beans.EventListBean; ! import org.apache.struts.util.LabelValueBean; import net.sf.jhive.logic.dao.LogicManager; import net.sf.jhive.model.Event; --- 4,10 ---- import net.sf.jhive.struts.beans.EventBean; import net.sf.jhive.struts.beans.EventListBean; ! import net.sf.jhive.struts.beans.MonthViewBean; import net.sf.jhive.logic.dao.LogicManager; + import org.apache.struts.util.LabelValueBean; import net.sf.jhive.model.Event; *************** *** 53,57 **** HttpServletResponse response) throws Exception { ! try { EventListBean eventList = new EventListBean(); --- 54,58 ---- HttpServletResponse response) throws Exception { ! // try { EventListBean eventList = new EventListBean(); *************** *** 59,63 **** List events; Iterator iterator; - int i = 0; int dzien; --- 60,63 ---- *************** *** 69,73 **** Integer username = (Integer) session.getAttribute("USER_KEY"); ! Date data = new Date(request.getParameter("data")); data.setDate(1); --- 69,79 ---- Integer username = (Integer) session.getAttribute("USER_KEY"); ! String dataS = request.getParameter("data"); ! Date data = new Date(); ! if(dataS != null) { ! data.setTime(Long.parseLong(dataS)); ! logger.info("data: " + data); ! } ! Date dataO = (Date) data.clone(); data.setDate(1); *************** *** 75,93 **** if(dzien == 0) dzien = 7; do { request.setAttribute("monthList" + dzien, ! new LabelValueBean(new Integer(data.getDate()).toString(), "cos")); dzien++; data.setDate(data.getDate() + 1); } while(data.getDate() != 1); ! request.setAttribute("dateBean", new LabelValueBean("data", data.toString())); return (mapping.findForward("ok")); ! } catch (Exception e) { ! request.setAttribute("exception", e.toString()); ! return (mapping.findForward("exception")); ! } } } --- 81,112 ---- if(dzien == 0) dzien = 7; + for(int i = 0; i < 43; i++) + request.setAttribute("monthList" + i, new MonthViewBean("", "", "")); + do { request.setAttribute("monthList" + dzien, ! new MonthViewBean(new Integer(data.getDate()).toString(), ! Integer.toString(manager.numberOfEventsForDay(data, manager.getUser(username).getAllUser())), ! Long.toString(data.getTime()))); dzien++; data.setDate(data.getDate() + 1); } while(data.getDate() != 1); ! String wyswData = Integer.toString(dataO.getMonth() + 1) + " - " + ! Integer.toString(dataO.getYear() + 1900); ! request.setAttribute("dateBean", new LabelValueBean("data", wyswData)); + + dataO.setMonth(dataO.getMonth() + 1); + request.setAttribute("next", new LabelValueBean("data", Long.toString(dataO.getTime()))); + dataO.setMonth(dataO.getMonth() - 2); + request.setAttribute("prev", new LabelValueBean("data", Long.toString(dataO.getTime()))); + return (mapping.findForward("ok")); ! // } catch (Exception e) { ! // request.setAttribute("exception", e.toString()); ! // return (mapping.findForward("exception")); ! // } } } |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:30
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/struts/beans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Code/java/net/sf/jhive/struts/beans Added Files: MonthViewBean.java Log Message: calendar view --- NEW FILE: MonthViewBean.java --- package net.sf.jhive.struts.beans; /** * Implementation of <strong>Bean</strong> that keep * monthView * * @author pksiazek */ public class MonthViewBean { /** A label of the day */ private String label; /** A value of the day */ private String value; /** A link of the day */ private String link; /** Public constructor * @todo I probably don't need it */ public MonthViewBean() { label = null; value = null; link = null; } /** * Enhaced constructor */ public MonthViewBean(String labelA, String valueA, String linkA) { label = labelA; value = valueA; link = linkA; } /** * @return */ public String getLabel() { return label; } /** * @return */ public String getLink() { return link; } /** * @return */ public String getValue() { return value; } /** * @param string */ public void setLabel(String string) { label = string; } /** * @param string */ public void setLink(String string) { link = string; } /** * @param string */ public void setValue(String string) { value = string; } }; |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:30
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Code/java/net/sf/jhive Modified Files: ApplicationResources.properties Log Message: calendar view Index: ApplicationResources.properties =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/ApplicationResources.properties,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** ApplicationResources.properties 20 May 2004 20:50:36 -0000 1.50 --- ApplicationResources.properties 21 May 2004 05:13:21 -0000 1.51 *************** *** 176,180 **** jhive.calendar.prev=Prev jhive.calendar.next=Next ! jhive.calendar.today=Today # Events --- 176,180 ---- jhive.calendar.prev=Prev jhive.calendar.next=Next ! jhive.calendar.today=Now # Events |
From: Piotr K. <pks...@us...> - 2004-05-21 05:13:29
|
Update of /cvsroot/jhive/jhive/Src/Jsp/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/Src/Jsp/common Modified Files: menu.jsp Log Message: calendar view Index: menu.jsp =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Jsp/common/menu.jsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** menu.jsp 20 May 2004 18:43:57 -0000 1.24 --- menu.jsp 21 May 2004 05:13:20 -0000 1.25 *************** *** 11,14 **** --- 11,22 ---- </html:link><br> + <html:link page="/calendar/weekView.do"> + <font color=#00008B>WEEK - <bean:message key="jhive.menu.calendar.view"/> + </html:link><br> + + <html:link page="/calendar/monthView.do"> + <font color=#00008B>MONTH - <bean:message key="jhive.menu.calendar.view"/> + </html:link><br> + <html:link page="/events/eventViewOwn.do"> <font color=#00008B><bean:message key="jhive.menu.calendar.view"/> |
From: Andrzej O. <os...@us...> - 2004-05-20 23:56:45
|
Update of /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10381/Src/Code/java/net/sf/jhive/logic/events Modified Files: EventManager.java Log Message: :( Index: EventManager.java =================================================================== RCS file: /cvsroot/jhive/jhive/Src/Code/java/net/sf/jhive/logic/events/EventManager.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** EventManager.java 20 May 2004 23:30:49 -0000 1.27 --- EventManager.java 20 May 2004 23:56:33 -0000 1.28 *************** *** 1019,1022 **** --- 1019,1024 ---- public List getEventsForHour(Date dayAndHour, AllUser who ) throws EventManagerException { + return getEventsForDay(dayAndHour,who); + /* try { long hour = 3600 * 1000; *************** *** 1049,1053 **** e.printStackTrace(); throw new EventManagerException(e.getClass().toString()); ! } } --- 1051,1055 ---- e.printStackTrace(); throw new EventManagerException(e.getClass().toString()); ! }*/ } |