Changeset 1501


Ignore:
Timestamp:
Jan 17, 2012, 9:07:10 AM (10 years ago)
Author:
Martin Svensson
Message:

References #339 Changed the report's header.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/samplereportgenerator.jsp

    r1500 r1501  
    220220        tempDate.setDate(tempDate.getDate()+7);
    221221      }
    222       headerText += 'weeks';
     222      headerText += 'week';
    223223    }
    224224    else if (viewType == 'MONTH')
    225225    {
    226226      numCols = (endDate.getFullYear()-startDate.getFullYear())*12 + endDate.getMonth()-startDate.getMonth()+1;
    227       headerText += 'months';
     227      headerText += 'month';
    228228    }
    229229    else if (viewType == 'QUARTER')
     
    233233      numCols += Math.floor(endDate.getMonth()/3)+1;
    234234      if((endDate.getFullYear() - startDate.getFullYear()) > 1) numCols += 4 * (endDate.getFullYear() - startDate.getFullYear()-1);
    235       headerText += 'quarters';
     235      headerText += 'quarter';
    236236    }
    237237    else
    238238    {
    239239      numCols = endDate.getFullYear() - startDate.getFullYear() + 1;
    240       headerText += 'years';
     240      headerText += 'year';
    241241    }
    242242    sitesCombined = Array(numCols);
    243243     
    244244    // Set table header
    245     headerText += ' (' + startDate.getFullYear()+'-';
     245    headerText += ' (between ' + startDate.getFullYear()+'-';
    246246    if ((startDate.getMonth()+1) < 10) headerText += '0' + (startDate.getMonth()+1);
    247247    else headerText += (startDate.getMonth()+1);
     
    249249    if (startDate.getDate() < 10) headerText += '0' + startDate.getDate();
    250250    else headerText += startDate.getDate();
    251     headerText += ' through ';
     251    headerText += ' and ';
    252252    headerText += endDate.getFullYear()+'-';
    253253    if ((endDate.getMonth()+1) < 10) headerText += '0' + (endDate.getMonth()+1);
Note: See TracChangeset for help on using the changeset viewer.