Changeset 27309 for main/trunk/greenstone2/runtime-src/src/recpt/datelistbrowserclass.cpp

Timestamp:

2013-05-07T14:35:49+12:00 (11 years ago)

Author:

kjdon

Message:

when we have just started a new year, output the month even if it is the same as the last month output, otherwise it seems as though the first item in the list has no month

File:

• main/trunk/greenstone2/runtime-src/src/recpt/datelistbrowserclass.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/datelistbrowserclass.cpp

@@ -149 +149 @@
 
     textout << outconvert << "<tr valign=top>";
-
+    bool new_year = false;
     if (thisyear != "" && thisyear != lastyear) {
       textout << outconvert << "<td><span class=\"date_list_year\">" << thisyear << "</span></td>";
       lastyear = thisyear;
+      new_year = true;
     } else {
       textout << outconvert << "<td></td>";
     }
-    if (thismonth != "" && thismonth != lastmonth) {
+    if (thismonth != "" && (thismonth != lastmonth || new_year)) {
       textout << outconvert << disp << ("<td><span class=\"date_list_month\">_textmonth" + thismonth + "_</span></td>");
       lastmonth = thismonth;