[Ils-source] r1430 - in branches/1.6: . webapp

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 16:25:47 -0700 (Wed, 06 Apr 2016)
New Revision: 1430

Modified:
   branches/1.6/
   branches/1.6/webapp/report_recurrent_training.jsp
Log:
merged new report titles for recurrent training report



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429

Modified: branches/1.6/webapp/report_recurrent_training.jsp
===================================================================
--- branches/1.6/webapp/report_recurrent_training.jsp	2016-04-06 23:23:55 UTC (rev 1429)
+++ branches/1.6/webapp/report_recurrent_training.jsp	2016-04-06 23:25:47 UTC (rev 1430)
@@ -203,7 +203,7 @@
                               <th><a href="?sort=role"><t:t>Role</t:t></a></th>
                               <th><a href="?sort=course">Course Name</a></th>
                               <th><a href="?sort=due">Date Due</a></th>
-                              <th><a href="?sort=past">Days Past Due</a></th>
+                              <th><a href="?sort=past">Days Since Reassigned</a></th>
                             </tr>
 <%
     }
@@ -218,7 +218,7 @@
 	out.print("Emp ID,");
 %><t:t>Workgroup</t:t>,<%
 %><t:t>Role</t:t>,<%
-	out.print("Course Name,Date Due,Days Past Due\n");
+	out.print("Course Name,Date Due,Days Since Reassigned\n");
     }
     for (UserProfile up : userProfiles) {
 	 if (up.getValue("DAYSEXPIRED") == null) continue;
@@ -286,7 +286,7 @@
                               <th><a href="?sort=role"><t:t>Role</t:t></a></th>
                               <th><a href="?sort=course">Course Name</a></th>
                               <th><a href="?sort=due">Date Due</a></th>
-                              <th><a href="?sort=past">Days to Due Date</a></th>
+                              <th><a href="?sort=past">Days to Expiration</a></th>
                             </tr>
 <%
     }
@@ -297,7 +297,7 @@
 	out.print("Emp ID,");
 %><t:t>Workgroup</t:t>,<%
 %><t:t>Role</t:t>,<%
-	out.print("Course Name,Date Due,Days to Due Date\n");
+	out.print("Course Name,Date Due,Days to Expiration\n");
     }
 	if ("past".equals(sort)) {
             Collections.sort(userProfiles, new Comparator() {