shuber 2004/10/15 17:17:47 CEST
Modified files:
war/src/webapp/jsp validate_timesheet.jsp
validate_timesheet_day.jsp
Log:
JAHIA-196 : Webapps 4.0.5: various bugs
Corrected :
- Add a save button on the week view (else you loase each time your data)
- Solved problem with days appearing multiple times.
Revision Changes Path
1.3 +3 -3 timereporting/war/src/webapp/jsp/validate_timesheet.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/webapp/jsp/validate_timesheet.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +10 -12 timereporting/war/src/webapp/jsp/validate_timesheet_day.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/webapp/jsp/validate_timesheet_day.jsp.diff?r1=1.2&r2=1.3&f=h
Index: validate_timesheet.jsp
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/webapp/jsp/validate_timesheet.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validate_timesheet.jsp 22 Sep 2004 13:29:00 -0000 1.2
+++ validate_timesheet.jsp 15 Oct 2004 15:17:46 -0000 1.3
@@ -54,9 +54,9 @@
<a
href="javascript:trp<%=contextId%>_sendHeaderForm('select_sun','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Sun </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>-->
-<!--<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
-<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>-->
+<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
+<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<%if (action.equals("modify_expense")) { %>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
Index: validate_timesheet_day.jsp
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/webapp/jsp/validate_timesheet_day.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validate_timesheet_day.jsp 22 Sep 2004 13:29:00 -0000 1.2
+++ validate_timesheet_day.jsp 15 Oct 2004 15:17:46 -0000 1.3
@@ -322,9 +322,7 @@
<!--<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<a
href="javascript:trp<%=contextId%>_sendHeaderForm('select_mon','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Mon </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
-
-
-<!--<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
+<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<a
href="javascript:trp<%=contextId%>_sendHeaderForm('select_tue','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Tue </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
@@ -344,41 +342,41 @@
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">-->
-<!--<%if(currentDay.equals("monday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_mon','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<%if(currentDay.equals("monday")) { %>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_mon','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("tuesday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_tue','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_tue','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("wednesday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_wed','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_wed','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("thursday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_thu','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_thu','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("friday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_fri','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_fri','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("saturday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_sat','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_sat','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<%}
if(currentDay.equals("sunday")) { %>
-<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_sun','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenu"> Save All </a>
+<a
href="javascript:trp<%=contextId%>_checkExpenses('update_timesheet_sun','<%=expenseIndex.intValue()%>',
'<%=Tools.getTime()%>', 'saveTime')" class="waMenuHighlight"> Save All </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="13"></nobr>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
-<%}%> -->
+<%}%>
