Changeset 1309

Show
Ignore:
Timestamp:
03/27/07 11:07:12
Author:
johnsa
Message:

admin client: clock widget now works in 12 hour mode

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/resources/bwClock.js

    r1229 r1309  
    3434} 
    3535 
    36 function bwClockUpdateDateTimeForm(valType,val) { 
     36function bwClockUpdateDateTimeForm(valType,val,hour24) { 
    3737  // valType: "hour" or "minute" 
    3838  // val: hour or minute value as integer 
     39  // hour24: true (24hr clock) or false (12hr clock + am/pm)  
    3940  if (bwClockRequestedType) { 
    4041    try { 
    …… 
    4849      } else { 
    4950        var fieldName = bwClockRequestedType + ".hour" 
    50         window.document.eventForm[fieldName].value = val; 
    51         if (val < 10) { 
    52           val = "0" + val; // pad the value for display 
     51        if (hour24) { 
     52          window.document.eventForm[fieldName].value = val; 
     53          if (val < 10) { 
     54            val = "0" + val; // pad the value for display 
     55          } 
     56          bwClockHour = val; 
     57        } else { 
     58          var hour12 = val; 
     59          if (hour12 > 12) { 
     60            hour12 -= 12; 
     61          } else if (hour12 == 12) { 
     62            hour12 = 0; // noon and midnight are both represented by '0' in 12hr mode 
     63          } 
     64          window.document.eventForm[fieldName].value = hour12; 
     65          if (val < 10) { 
     66            val = "0" + val; // pad the value for display 
     67          } 
     68          bwClockHour = val; 
     69          // now set the am/pm field 
     70          fieldName = bwClockRequestedType + ".ampm"; 
     71          window.document.eventForm[fieldName].value = bwClockGetAmPm(bwClockHour); 
    5372        } 
    54         bwClockHour = val; 
    5573      } 
    5674      if (bwClockHour && bwClockMinute) { 
    …… 
    83101  hour24 = parseInt(hour24,10); 
    84102  if (hour24 < 12) { 
    85     return 'a.m.'; 
     103    return 'am'; 
    86104  } else { 
    87     return 'p.m.'; 
     105    return 'pm'; 
    88106  } 
    89107}