Author: sebb
Date: Sun Jul 6 13:52:57 2025
New Revision: 1927003
URL: http://svn.apache.org/viewvc?rev=1927003&view=rev
Log:
Allow for alternate reportingcycles.json format
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
comdev/reporter.apache.org/trunk/site/wizard/statistics.html
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js?rev=1927003&r1=1927002&r2=1927003&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Sun
Jul 6 13:52:57 2025
@@ -99,8 +99,16 @@ function getNextWed(rm) {
function getReportDate(json, pmc, dateOnly, agenda) {
let rm = json[pmc] // reporting months for the pmc
-
- let nextdate = getNextWed(rm)
+
+ let nextdate
+
+ let first = rm[0]
+ if (typeof(first) == 'number') { // reportingcycles.json has epoch
(seconds) at the start
+ rm = json[pmc].slice(1) // Drop the prefix
+ nextdate = new Date(first * 1000)
+ } else {
+ nextdate = getNextWed(rm)
+ }
if (agenda) return
"board_agenda_%s.txt".format(moment(nextdate).format('YYYY_MM_DD'));
if (dateOnly) {
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js?rev=1927003&r1=1927002&r2=1927003&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Sun Jul 6
13:52:57 2025
@@ -2011,8 +2011,16 @@ function getNextWed(rm) {
function getReportDate(json, pmc, dateOnly, agenda) {
let rm = json[pmc] // reporting months for the pmc
-
- let nextdate = getNextWed(rm)
+
+ let nextdate
+
+ let first = rm[0]
+ if (typeof(first) == 'number') { // reportingcycles.json has epoch
(seconds) at the start
+ rm = json[pmc].slice(1) // Drop the prefix
+ nextdate = new Date(first * 1000)
+ } else {
+ nextdate = getNextWed(rm)
+ }
if (agenda) return
"board_agenda_%s.txt".format(moment(nextdate).format('YYYY_MM_DD'));
if (dateOnly) {
Modified: comdev/reporter.apache.org/trunk/site/wizard/statistics.html
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/statistics.html?rev=1927003&r1=1927002&r2=1927003&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/statistics.html (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/statistics.html Sun Jul 6
13:52:57 2025
@@ -67,7 +67,7 @@
<script src="highlighter/highlighter.js" type="text/javascript"></script>
<script src="js/d3.js" type="text/javascript"></script>
<script src="js/c3.js" type="text/javascript"></script>
-<script src="js/wizard.js?1751807847" type="text/javascript"></script>
+<script src="js/wizard.js?1751809869" type="text/javascript"></script>
</body>
</html>
