You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by hu...@apache.org on 2019/12/16 10:10:11 UTC
svn commit: r1871640 - in /comdev/reporter.apache.org/trunk/site/wizard/js:
source/generators.js source/reportdate.js wizard-beta.js
Author: humbedooh
Date: Mon Dec 16 10:10:11 2019
New Revision: 1871640
URL: http://svn.apache.org/viewvc?rev=1871640&view=rev
Log:
Try with a "due date" on the front page instead of the meeting date, set to 48 hours prior for now.
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js?rev=1871640&r1=1871639&r2=1871640&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Mon Dec 16 10:10:11 2019
@@ -173,7 +173,7 @@ function splash(state, json, all) {
hdr.inject([
new HTML('td', {}, "Project:"),
new HTML('td', {}, "Chair:"),
- new HTML('td', {}, "Next report date:"),
+ new HTML('td', {}, "Next report due:"),
new HTML('td', {}, "Editor:"),
new HTML('td', {}, "Full statistics:"),
])
@@ -192,7 +192,7 @@ function splash(state, json, all) {
ccolor = '#195';
}
let tr = new HTML('tr');
- let rd = new HTML('td', {}, getReportDate(cycles, key, true));
+ let rd = new HTML('td', {}, getReportDate(cycles, key, "due"));
let elink = new HTML('td', {}, new HTML('a', {href: '?%s'.format(key)}, "Board report editor"));
let slink = new HTML('td', {}, new HTML('a', {href: 'statistics?%s'.format(key)}, "Full statistics for %s".format(tlpname)));
let title = new HTML('td', {}, new HTML('b', {}, tlpname));
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=1871640&r1=1871639&r2=1871640&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 Mon Dec 16 10:10:11 2019
@@ -91,7 +91,15 @@ function getReportDate(json, pmc, dateOn
nextdate = dates.shift();
}
if (agenda) return "board_agenda_%s.txt".format(moment(nextdate).format('YYYY_MM_DD'));
- if (dateOnly) return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ if (dateOnly) {
+ // agenda date or due date?
+ if (dateOnly == "due") {
+ nextdate.setDate(d.getDate() - 2); // Due 48 hours prior to board meeting.
+ return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ } else {
+ return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ }
+ }
let txt = "";
txt += "<b>Reporting schedule:</b> " + (json[pmc] ? formatRm(json[pmc]) : "Unknown(?)") + "<br>"
txt += "<b>Next report date: " + (nextdate ? nextdate.toDateString() : "Unknown(?)") + "</b>"
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js?rev=1871640&r1=1871639&r2=1871640&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Mon Dec 16 10:10:11 2019
@@ -1388,7 +1388,7 @@ function splash(state, json, all) {
hdr.inject([
new HTML('td', {}, "Project:"),
new HTML('td', {}, "Chair:"),
- new HTML('td', {}, "Next report date:"),
+ new HTML('td', {}, "Next report due:"),
new HTML('td', {}, "Editor:"),
new HTML('td', {}, "Full statistics:"),
])
@@ -1407,7 +1407,7 @@ function splash(state, json, all) {
ccolor = '#195';
}
let tr = new HTML('tr');
- let rd = new HTML('td', {}, getReportDate(cycles, key, true));
+ let rd = new HTML('td', {}, getReportDate(cycles, key, "due"));
let elink = new HTML('td', {}, new HTML('a', {href: '?%s'.format(key)}, "Board report editor"));
let slink = new HTML('td', {}, new HTML('a', {href: 'statistics?%s'.format(key)}, "Full statistics for %s".format(tlpname)));
let title = new HTML('td', {}, new HTML('b', {}, tlpname));
@@ -1990,7 +1990,15 @@ function getReportDate(json, pmc, dateOn
nextdate = dates.shift();
}
if (agenda) return "board_agenda_%s.txt".format(moment(nextdate).format('YYYY_MM_DD'));
- if (dateOnly) return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ if (dateOnly) {
+ // agenda date or due date?
+ if (dateOnly == "due") {
+ nextdate.setDate(d.getDate() - 2); // Due 48 hours prior to board meeting.
+ return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ } else {
+ return nextdate ? (nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ }
+ }
let txt = "";
txt += "<b>Reporting schedule:</b> " + (json[pmc] ? formatRm(json[pmc]) : "Unknown(?)") + "<br>"
txt += "<b>Next report date: " + (nextdate ? nextdate.toDateString() : "Unknown(?)") + "</b>"