Changeset ca428d in indico

Timestamp:

11/12/09 17:56:33 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

4314aa

Parents:

931922

git-author:

Cesar Munoz Orena <cesar.munoz.orena@…> (11/11/09 09:37:51)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/12/09 17:56:33)

Message:

[IMPROVEMENT] Changes end/startDate automatically

In the roomBooking module, when the startDate is set to a higher value than the endDate
it automatically changes it to a valid date and viceversa.
Fixes #1

Location:

indico

Files:

• MaKaC/webinterface/tpls/RoomBookingPeriodForm.tpl (modified) (2 diffs)
• MaKaC/webinterface/tpls/RoomBookingSearch4Bookings.tpl (modified) (1 diff)
• htdocs/js/indico/Legacy/Util.js (modified) (1 diff)
• htdocs/js/indico/Legacy/validation.js (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/RoomBookingPeriodForm.tpl

@@ -47 +47 @@
         var startDate = IndicoUI.Widgets.Generic.dateField_sdate(false,null,['sDay', 'sMonth', 'sYear']);
         $E('sDatePlace').set(startDate);
-            
+ 
         var endDate = IndicoUI.Widgets.Generic.dateField_edate(false,null,['eDay', 'eMonth', 'eYear']); 
         $E('eDatePlace').set(endDate);
+
+        /* In case the date changes, we need to check whether the start date is greater than the end date,
+        and if it's so we need to change it */
+        startDate.observe(function(value) {            
+            if ( IndicoUtil.parseDate(startDate.get()) > IndicoUtil.parseDate(endDate.get()) ) {
+                endDate.set(startDate.get());   
+                endDate.dom.onchange();
+                set_repeatition_comment();
+            }
+        });
+        
+        endDate.observe(function(value) {
+            if ( IndicoUtil.parseDate(startDate.get()) > IndicoUtil.parseDate(endDate.get()) ) {
+                startDate.set(endDate.get());
+                startDate.dom.onchange();
+                set_repeatition_comment();
+            }
+        });
         
        <% if startDT.day != '': %>
@@ -65 +83 @@
                                             <td class="blacktext">
                                                 <span id="sDatePlace"></span>
-                                                <input type="hidden" value="<%= startDT.day %>" name="sDay" id="sDay" onchange="this.form.eDay.value=this.value;if ( validate_period( this.form ) ) { set_repeatition_comment() }"/>
-                                                <input type="hidden" value="<%= startDT.month %>" name="sMonth" id="sMonth" onchange="this.form.eMonth.value=this.value;if ( validate_period( this.form ) ) { set_repeatition_comment() }"/>
-                                                <input type="hidden" value="<%= startDT.year %>" name="sYear" id="sYear" onchange="this.form.eYear.value=this.value;if ( validate_period( this.form ) ) { set_repeatition_comment() }"/>
+                                                <input type="hidden" value="<%= startDT.day %>" name="sDay" id="sDay"/>
+                                                <input type="hidden" value="<%= startDT.month %>" name="sMonth" id="sMonth"/>
+                                                <input type="hidden" value="<%= startDT.year %>" name="sYear" id="sYear"/>
                                             </td>
                                           </tr>  

indico/MaKaC/webinterface/tpls/RoomBookingSearch4Bookings.tpl

@@ -77 +77 @@
         var endDate = IndicoUI.Widgets.Generic.dateField_edate(false,null,['eDay', 'eMonth', 'eYear']); 
         $E('eDatePlace').set(endDate);
+
+
+        /* In case the date changes, we need to check whether the start date is greater than the end date,
+        and if it's so we need to change it */
+        startDate.observe(function(value) {            
+            if ( IndicoUtil.parseDate(startDate.get()) > IndicoUtil.parseDate(endDate.get()) ) {
+                endDate.set(startDate.get());   
+                endDate.dom.onchange();
+            }
+        });
+        
+        endDate.observe(function(value) {
+            if ( IndicoUtil.parseDate(startDate.get()) > IndicoUtil.parseDate(endDate.get()) ) {
+                startDate.set(endDate.get());
+                startDate.dom.onchange();
+            }
+        });
         
        <% if today.day != '': %>

indico/htdocs/js/indico/Legacy/Util.js

@@ -251 +251 @@
         setDate(sdatetime, sdate);
         setTime(sdatetime, stime);
+
+        return sdatetime;
+    },
+
+    parseDate: function(strDate) {        
+
+        var sdatetime = new Date();
+        var sdate = parseDate(strDate);
+
+        if ( !sdate ) {
+            return null;
+        }
+
+        setTime(sdatetime, [0,0,0,0])
+        setDate(sdatetime, sdate);
 
         return sdatetime;

indico/htdocs/js/indico/Legacy/validation.js

@@ -141 +141 @@
 - allowPast : whether to allow dates in the past
 - what : what to validate: 0 - both dates and times, 1 - only dates, 2 - only times
+
 Controls must follow naming conventions:
 sDay, sMonth, sYear, sTime
@@ -177 +178 @@
             todayDate = new Date()
             todayDate.setHours( 0, 0, 0, 0 )
-            if ( sDate.valueOf() > eDate.valueOf() ||
-                            ( !allowPast && ( sDate.valueOf() < (todayDate).valueOf()) ) )
+            if ( !allowPast && ( sDate.valueOf() < (todayDate).valueOf()) )
             {
                 f1.eDay.className = f1.eMonth.className = f1.eYear.className = f1.edate.className = 'invalid'
                 f1.sDay.className = f1.sMonth.className = f1.sYear.className = f1.sdate.className = 'invalid'
                 isValid = false
-            }
+            }                  
         }
     }