[comdev-reporter] branch main created (now 34b1cb5)
This is an automated email from the ASF dual-hosted git repository. humbedooh pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/comdev-reporter.git at 34b1cb5 Create .asf.yaml This branch includes the following new commits: new 34b1cb5 Create .asf.yaml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[comdev-reporter] 01/01: Create .asf.yaml
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-reporter.git
commit 34b1cb5684fa38b6de20ba48a7333d6becfbcff2
Author: Daniel Gruno
AuthorDate: Thu Jun 29 11:04:58 2023 +0200
Create .asf.yaml
---
.asf.yaml | 33 +
1 file changed, 33 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000..7683c94
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,33 @@
+github:
+ description: "ASF board report helper for top-level projects"
+ homepage: https://community.apache.org
+ labels:
+- apache
+- community
+- comdev
+- reporting
+
+# Attempt to make the auto-generated github emails more easily readable in
email clients.
+ custom_subjects:
+new_pr: "[PR] {title} ({repository})"
+close_pr: "Re: [PR] {title} ({repository})"
+comment_pr: "Re: [PR] {title} ({repository})"
+diffcomment: "Re: [PR] {title} ({repository})"
+merge_pr: "Re: [PR] {title} ({repository})"
+new_issue: "[I] {title} ({repository})"
+comment_issue: "Re: [I] {title} ({repository})"
+close_issue: "Re: [I] {title} ({repository})"
+catchall: "[GH] {title} ({repository})"
+new_discussion: "[D] {title} ({repository})"
+edit_discussion: "Re: [D] {title} ({repository})"
+close_discussion: "Re: [D] {title} ({repository})"
+close_discussion_with_comment: "Re: [D] {title} ({repository})"
+reopen_discussion: "Re: [D] {title} ({repository})"
+new_comment_discussion: "Re: [D] {title} ({repository})"
+edit_comment_discussion: "Re: [D] {title} ({repository})"
+delete_comment_discussion: "Re: [D] {title} ({repository})"
+
+notifications:
+ commits: commits@community.apache.org
+ issues: d...@community.apache.org
+ pullrequests: d...@community.apache.org
svn commit: r1910059 - /comdev/reporter.apache.org/trunk/site/wizard/steps.json
Author: humbedooh
Date: Thu May 25 15:37:32 2023
New Revision: 1910059
URL: http://svn.apache.org/viewvc?rev=1910059=rev
Log:
typo
Modified:
comdev/reporter.apache.org/trunk/site/wizard/steps.json
Modified: comdev/reporter.apache.org/trunk/site/wizard/steps.json
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/steps.json?rev=1910059=1910058=1910059=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/steps.json (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/steps.json Thu May 25 15:37:32
2023
@@ -17,7 +17,7 @@
"description": "Project Status",
"help": "This section is intended for describing the current status
of the project, and any issues that may require board attention.
Project status:Please use the terminology outlined in this reporting guide to describe the current state of the
project. Your project status can be: New: a top-level project
that's just getting startedOngoing: With high, moderate or low
activity, which you may quantify if appropriateDormant: Not
much happening on the code, but at least 3 PMC members ready to engage if
neededAt risk: Not enough active PMC members, or a significant
number of contributors left the project, etc.Considering moving to the
Attic: a project that's about to move to the Attic, or discussing
thatIssues for the boardIf there are any specific
issues the board needs
to be aware of, please write them here. Otherwise, write \"There are no
issues requiring board attention.\"Issues could be: The project is
blocked by Infra on an issue.The project does not have sufficient
oversight from the PMC.There are concerning trademark
issues.",
"placeholder": "If issues, write them here, otherwise state that there
aren't any!",
-"generator": "generate_project_state",
+"generator": "generate_project_state"
},
{
"id": "basic",
svn commit: r1910058 - /comdev/reporter.apache.org/trunk/site/wizard/steps.json
Author: humbedooh
Date: Thu May 25 15:37:07 2023
New Revision: 1910058
URL: http://svn.apache.org/viewvc?rev=1910058=rev
Log:
Modify steps to include project status
Modified:
comdev/reporter.apache.org/trunk/site/wizard/steps.json
Modified: comdev/reporter.apache.org/trunk/site/wizard/steps.json
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/steps.json?rev=1910058=1910057=1910058=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/steps.json (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/steps.json Thu May 25 15:37:07
2023
@@ -12,11 +12,12 @@
"statsgenerator": "statistics_meta"
},
{
-"id": "issues",
+"id": "state",
"icon": "bell",
-"description": "Issues",
-"help": "If there are any specific issues the board needs to be
aware of, please write them here. Otherwise, write \"There are no issues
requiring board attention.\" Issues could be: The project is blocked by
Infra on an issue.The project does not have sufficient oversight from
the PMC.There are concerning trademark issues.",
-"placeholder": "If issues, write them here, otherwise state that there
aren't any!"
+"description": "Project Status",
+"help": "This section is intended for describing the current status
of the project, and any issues that may require board attention.
Project status:Please use the terminology outlined in this reporting guide to describe the current state of the
project. Your project status can be: New: a top-level project
that's just getting startedOngoing: With high, moderate or low
activity, which you may quantify if appropriateDormant: Not
much happening on the code, but at least 3 PMC members ready to engage if
neededAt risk: Not enough active PMC members, or a significant
number of contributors left the project, etc.Considering moving to the
Attic: a project that's about to move to the Attic, or discussing
thatIssues for the boardIf there are any specific
issues the board needs
to be aware of, please write them here. Otherwise, write \"There are no
issues requiring board attention.\"Issues could be: The project is
blocked by Infra on an issue.The project does not have sufficient
oversight from the PMC.There are concerning trademark
issues.",
+"placeholder": "If issues, write them here, otherwise state that there
aren't any!",
+"generator": "generate_project_state",
},
{
"id": "basic",
@@ -64,4 +65,4 @@
"noinput": true
}
]
-}
\ No newline at end of file
+}
svn commit: r1910057 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard.js
Author: humbedooh
Date: Thu May 25 15:36:42 2023
New Revision: 1910057
URL: http://svn.apache.org/viewvc?rev=1910057=rev
Log:
Prep for new combined status section
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.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=1910057=1910056=1910057=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Thu
May 25 15:36:42 2023
@@ -569,3 +569,10 @@ function show_examples(examples, title)
title = "Examples for %s:".format(title);
modal(out, title);
}
+
+// Project state and issues
+function generate_project_state() {
+ let state_text = `Current project status: ${PLACEHOLDER}\nIssues for the
board: ${PLACEHOLDER}\n`;
+ return state_text;
+}
+
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=1910057=1910056=1910057=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu May 25
15:36:42 2023
@@ -1784,6 +1784,13 @@ function show_examples(examples, title)
modal(out, title);
}
+// Project state and issues
+function generate_project_state() {
+ let state_text = `Current project status: ${PLACEHOLDER}\nIssues for the
board: ${PLACEHOLDER}\n`;
+ return state_text;
+}
+
+
/**
Fetched from source/init.js
[comdev-site] branch main updated: Subjects should be nested under github.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-site.git
The following commit(s) were added to refs/heads/main by this push:
new 7eb100c Subjects should be nested under github.
new e8da9d8 Merge pull request #123 from rbowen/fix-mlist-titles
7eb100c is described below
commit 7eb100c72ea614e1b61f97a23a2415e9118e0dd9
Author: Rich Bowen
AuthorDate: Wed May 17 12:59:08 2023 -0400
Subjects should be nested under github.
---
.asf.yaml | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index ab904a9..70a2239 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -8,24 +8,24 @@ github:
- hugo
# Attempt to make the auto-generated github emails more easily readable in
email clients.
-custom_subjects:
- new_pr: "[PR] {title} ({repository})"
- close_pr: "Re: [PR] {title} ({repository})"
- comment_pr: "Re: [PR] {title} ({repository})"
- diffcomment: "Re: [PR] {title} ({repository})"
- merge_pr: "Re: [PR] {title} ({repository})"
- new_issue: "[I] {title} ({repository})"
- comment_issue: "Re: [I] {title} ({repository})"
- close_issue: "Re: [I] {title} ({repository})"
- catchall: "[GH] {title} ({repository})"
- new_discussion: "[D] {title} ({repository})"
- edit_discussion: "Re: [D] {title} ({repository})"
- close_discussion: "Re: [D] {title} ({repository})"
- close_discussion_with_comment: "Re: [D] {title} ({repository})"
- reopen_discussion: "Re: [D] {title} ({repository})"
- new_comment_discussion: "Re: [D] {title} ({repository})"
- edit_comment_discussion: "Re: [D] {title} ({repository})"
- delete_comment_discussion: "Re: [D] {title} ({repository})"
+ custom_subjects:
+new_pr: "[PR] {title} ({repository})"
+close_pr: "Re: [PR] {title} ({repository})"
+comment_pr: "Re: [PR] {title} ({repository})"
+diffcomment: "Re: [PR] {title} ({repository})"
+merge_pr: "Re: [PR] {title} ({repository})"
+new_issue: "[I] {title} ({repository})"
+comment_issue: "Re: [I] {title} ({repository})"
+close_issue: "Re: [I] {title} ({repository})"
+catchall: "[GH] {title} ({repository})"
+new_discussion: "[D] {title} ({repository})"
+edit_discussion: "Re: [D] {title} ({repository})"
+close_discussion: "Re: [D] {title} ({repository})"
+close_discussion_with_comment: "Re: [D] {title} ({repository})"
+reopen_discussion: "Re: [D] {title} ({repository})"
+new_comment_discussion: "Re: [D] {title} ({repository})"
+edit_comment_discussion: "Re: [D] {title} ({repository})"
+delete_comment_discussion: "Re: [D] {title} ({repository})"
notifications:
commits: commits@community.apache.org
svn commit: r1909513 - /comdev/projects.apache.org/trunk/data/projects.xml
Author: humbedooh Date: Sun Apr 30 17:47:34 2023 New Revision: 1909513 URL: http://svn.apache.org/viewvc?rev=1909513=rev Log: fix raw URL for polygene Modified: comdev/projects.apache.org/trunk/data/projects.xml Modified: comdev/projects.apache.org/trunk/data/projects.xml URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/data/projects.xml?rev=1909513=1909512=1909513=diff == --- comdev/projects.apache.org/trunk/data/projects.xml (original) +++ comdev/projects.apache.org/trunk/data/projects.xml Sun Apr 30 17:47:34 2023 @@ -273,7 +273,7 @@ http://svn.apache.org/repos/asf/pivot/infra/doap/doap_Pivot.rdf http://plc4x.apache.org/plc4x-doap.rdf http://svn.apache.org/repos/asf/poi/trunk/doap_POI.rdf - https://gitbox.apache.org/repos/asf?p=polygene-java.git;f=doap.rdf;a=blob_plain;hb=develop + https://gitbox.apache.org/repos/asf?p=polygene-java.git;f=doap.rdf;a=blob_plain;hb=refs/heads/develop http://svn.apache.org/repos/asf/portals/doap_portals.rdf https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects-override/predictionio.rdf
svn commit: r1908988 - /comdev/reporter.apache.org/trunk/scripts/mailglomper2.py
Author: humbedooh
Date: Wed Apr 5 17:44:33 2023
New Revision: 1908988
URL: http://svn.apache.org/viewvc?rev=1908988=rev
Log:
fix up mailglomper to work with lists.a.o. initial work, more to be done
Modified:
comdev/reporter.apache.org/trunk/scripts/mailglomper2.py
Modified: comdev/reporter.apache.org/trunk/scripts/mailglomper2.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/mailglomper2.py?rev=1908988=1908987=1908988=diff
==
--- comdev/reporter.apache.org/trunk/scripts/mailglomper2.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/mailglomper2.py Wed Apr 5
17:44:33 2023
@@ -1,27 +1,27 @@
-# OBSOLETE OBSOLETE OBSOLETE OBSOLETE OBSOLETE OBSOLETE OBSOLETE OBSOLETE
-
"""
Reads public mailing list data from
- http://mail-archives.us.apache.org/mod_mbox/
+ https://lists.apache.org/
- listing of mailboxes
and from each:
- http://mail-archives.us.apache.org/mod_mbox//mm.mbox
+
https://lists.apache.org/api/stats.json?list={listpart}={project}.apache.org=-mm
- messages per week and per last two rolling quarters (92 days)
-
+
Updates:
data/maildata_extended.json - output data for display
data/cache/maildata_weekly.json - cache of weekly email stats
"""
import sys
+
if sys.hexversion < 0x0300:
raise ImportError("This script requires Python 3")
-import re, json, os, time, email.utils, signal, calendar
+import json
+import time
+import signal
from datetime import datetime
-import urlutils
-import urllib.error
import traceback
-import errtee
-import committee_info
+import asyncio
+import aiohttp
+import requests
SECS_PER_DAY = 86400
SECS_PER_WEEK = 604800
@@ -32,33 +32,37 @@ __RAO_HOME = "../"
__MAILDATA_EXTENDED = __RAO_HOME + "data/maildata_extended.json"
-__MAILDATA_CACHE= __RAO_HOME + "data/cache/maildata_weekly.json"
+__MAILDATA_CACHE = __RAO_HOME + "data/cache/maildata_weekly.json"
-def tsprint(s): # print with timestamp
+
+def tsprint(s): # print with timestamp
msg = "%s %s" % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), s)
if isinstance(s, Exception):
print(msg, file=sys.stderr)
-type, value, tb = sys.exc_info()
-traceback.print_exception(type, value, tb)
+etype, value, tb = sys.exc_info()
+traceback.print_exception(etype, value, tb)
else:
print(msg)
+
interrupted = False
+
def handle(signum, frame):
"""
Handles signals, e.g. ^C (SIGINT) and kill (SIGTERM)
Sets the interrupted flag on first signal (graceful shutdown)
Raises KeyboardInterrupt on second signal (abrupt shutdown)
"""
-global interrupted # otherwise handler does not set the same variable
+global interrupted # otherwise handler does not set the same variable
if signum == 2:
-print("") # ensure newline after ^C
+print("") # ensure newline after ^C
tsprint("Interrupted with %d" % signum)
-if interrupted: # second interrupt
-raise KeyboardInterrupt # not generated by Python because we catch its
signal
+if interrupted: # second interrupt
+raise KeyboardInterrupt # not generated by Python because we catch
its signal
interrupted = True
+
tsprint("Start")
startTime = time.time()
@@ -66,7 +70,7 @@ startTime = time.time()
mls = {}
try:
-with open(__MAILDATA_CACHE,'r') as f:
+with open(__MAILDATA_CACHE, "r") as f:
mldcache = json.loads(f.read())
tsprint("Read maildata cache successfully")
except:
@@ -78,11 +82,11 @@ currentMonth = DTNOW.month
currentYear = DTNOW.year
NOW = time.time()
-after = NOW - (SECS_PER_DAY*92)
-wayafter = NOW - (SECS_PER_DAY*92*2)
+after = NOW - (SECS_PER_DAY * 92)
+wayafter = NOW - (SECS_PER_DAY * 92 * 2)
months = []
-for i in range(0,7):
+for i in range(0, 7):
date = "%04u%02u" % (currentYear, currentMonth)
currentMonth -= 1
if currentMonth == 0:
@@ -91,7 +95,7 @@ for i in range(0,7):
months.append(date)
# Remove any stale entries
-obsolete = [] # list of keys to remove (cannot do it while iterating)
+obsolete = [] # list of keys to remove (cannot do it while iterating)
for mld in mldcache.keys():
mm = mld[-6:]
if mm not in months:
@@ -101,104 +105,36 @@ for key in obsolete:
tsprint("Dropping obsolete cache entry: " + key)
del mldcache[key]
-fc = urlutils.UrlCache(interval=30, silent=True) # generates too much output
if not silent
# Get the index of mailing lists
# Not strictly necessary to cache this, but it makes testing easier
-data = fc.get("http://mail-archives.us.apache.org/mod_mbox/;, "mod_mbox.html",
encoding='utf-8').read()
+dat
svn commit: r1908442 - /comdev/projects.apache.org/trunk/site/js/projects.js
Author: humbedooh
Date: Thu Mar 16 15:13:48 2023
New Revision: 1908442
URL: http://svn.apache.org/viewvc?rev=1908442=rev
Log:
COMDEV-481: Applying Jan Høydahl's patch for project listings
Modified:
comdev/projects.apache.org/trunk/site/js/projects.js
Modified: comdev/projects.apache.org/trunk/site/js/projects.js
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/js/projects.js?rev=1908442=1908441=1908442=diff
==
--- comdev/projects.apache.org/trunk/site/js/projects.js (original)
+++ comdev/projects.apache.org/trunk/site/js/projects.js Thu Mar 16 15:13:48
2023
@@ -263,6 +263,24 @@ function appendLiInnerHTML(ul,html) {
return appendElementWithInnerHTML(ul,'li',html);
}
+function projectIdToUnixGroup(projectId, pmcName) {
+// Rerig the unix name and committee id
+var unixgroup = projectId.split("-")[0];
+/*
+ Temp hack for podling names. TODO need to sort out generated names
+*/
+if (projectId.indexOf("incubator-") === 0) {
+ unixgroup = projectId.split("-")[1]
+}
+// special cases
+if (unixgroup === "empire") unixgroup = "empire-db";
+if (unixgroup === "community") unixgroup = "comdev";
+if (pmcName === "attic") {
+ unixgroup = "attic";
+}
+return unixgroup;
+}
+
function renderProjectPage(project, projectId) {
var obj = document.getElementById('contents');
@@ -278,20 +296,7 @@ function renderProjectPage(project, proj
fixProjectName(project);
var isIncubating = project && (project.podling || (project.pmc ==
'incubator'));
-// Rerig the unix name and committee id
-var unixgroup = projectId.split("-")[0];
-/*
- Temp hack for podling names. TODO need to sort out generated names
-*/
-if (projectId.indexOf("incubator-") == 0) {
-unixgroup = projectId.split("-")[1]
-}
-// special cases
-if (unixgroup == "empire") unixgroup = "empire-db";
-if (unixgroup == "community") unixgroup = "comdev";
-if (project && project.pmc == "attic") {
-unixgroup = "attic";
-}
+var unixgroup = projectIdToUnixGroup(projectId, project && project.pmc);
var committeeId = isIncubating ? 'incubator' : unixgroup;
if (!committees[unixgroup]) {
@@ -825,9 +830,10 @@ function renderProjectsByNumber() {
var lens = [];
var lcount = {};
-for (i in projects) {
-if (unixgroups[i] && i != 'incubator') {
-var len = unixgroups[i].length;
+for (projectId in projects) {
+let unixGroup = projectIdToUnixGroup(projectId);
+if (unixgroups[unixGroup] && projectId !== 'incubator') {
+let len = unixgroups[unixGroup].length;
if (lens.indexOf(len) < 0) {
lens.push(len);
lcount[len] = 0;
@@ -842,15 +848,16 @@ function renderProjectsByNumber() {
for (l in lens) {
var len = lens[l];
-var i;
-for (i in projectsSorted) {
-i = projectsSorted[i];
-if (unixgroups[i]) {
-var xlen = unixgroups[i].length;
+var projectId;
+for (projectId in projectsSorted) {
+projectId = projectsSorted[projectId];
+let unixGroup = projectIdToUnixGroup(projectId);
+if (unixgroups[unixGroup]) {
+var xlen = unixgroups[unixGroup].length;
if (xlen == len) {
-var html = projectIcon(projects[i].name) + projectLink(i)
+ ": " + len + " committers";
-if (unixgroups[i+'-pmc']) {
-html += ", " + unixgroups[i+'-pmc'].length + " PMC
members";
+var html = projectIcon(projects[projectId].name) +
projectLink(projectId) + ": " + len + " committers";
+if (unixgroups[unixGroup+'-pmc']) {
+html += ", " + unixgroups[unixGroup+'-pmc'].length + "
PMC members";
}
appendLiInnerHTML(ul,html);
}
svn commit: r1908418 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Wed Mar 15 17:06:56 2023
New Revision: 1908418
URL: http://svn.apache.org/viewvc?rev=1908418=rev
Log:
Temporary fix to date shifts while we sort out a permanent solution
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1908418=1908417=1908418=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Wed
Mar 15 17:06:56 2023
@@ -1,6 +1,10 @@
// Grabbed from old reporter.a.o
// return all the Wednesdays in the month
+const reporting_date_shifts = { // Dates that are known to have shifted by N
weeks
+"2023-03": 1 // shifted by 1 week
+}
+
function getWednesdays(mo, y) {
var d = new Date();
d.setFullYear(y, mo, 1)
@@ -17,7 +21,12 @@ function getWednesdays(mo, y) {
wednesdays.push(new Date(d.getTime()));
d.setDate(d.getDate() + 7);
}
-
+// Check for shifts, adjust if found
+d.setMonth(mo);
+const caldate = moment(d).format('-MM');
+if (reporting_date_shifts[caldate]) {
+wednesdays = wednesdays.slice(reporting_date_shifts[caldate]);
+}
return wednesdays;
}
// check if the entry is a wildcard month
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=1908418=1908417=1908418=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Wed Mar 15
17:06:56 2023
@@ -1901,6 +1901,10 @@ function prime_steps(state, json) {
// Grabbed from old reporter.a.o
// return all the Wednesdays in the month
+const reporting_date_shifts = { // Dates that are known to have shifted by N
weeks
+"2023-03": 1 // shifted by 1 week
+}
+
function getWednesdays(mo, y) {
var d = new Date();
d.setFullYear(y, mo, 1)
@@ -1917,7 +1921,12 @@ function getWednesdays(mo, y) {
wednesdays.push(new Date(d.getTime()));
d.setDate(d.getDate() + 7);
}
-
+// Check for shifts, adjust if found
+d.setMonth(mo);
+const caldate = moment(d).format('-MM');
+if (reporting_date_shifts[caldate]) {
+wednesdays = wednesdays.slice(reporting_date_shifts[caldate]);
+}
return wednesdays;
}
// check if the entry is a wildcard month
svn commit: r1904499 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/statistics_generator.js wizard.js
Author: humbedooh
Date: Mon Oct 10 16:00:51 2022
New Revision: 1904499
URL: http://svn.apache.org/viewvc?rev=1904499=rev
Log:
tweak look
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js?rev=1904499=1904498=1904499=diff
==
---
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
(original)
+++
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Mon Oct 10 16:00:51 2022
@@ -324,7 +324,7 @@ function statistics_health(data) {
}
});
let txt = "BugZilla activity:";
- txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
+ txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
xhtml.innerHTML = txt;
html.inject(xhtml);
}
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=1904499=1904498=1904499=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Mon Oct 10
16:00:51 2022
@@ -2526,7 +2526,7 @@ function statistics_health(data) {
}
});
let txt = "BugZilla activity:";
- txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
+ txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
xhtml.innerHTML = txt;
html.inject(xhtml);
}
svn commit: r1904498 - /comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Author: humbedooh
Date: Mon Oct 10 15:55:16 2022
New Revision: 1904498
URL: http://svn.apache.org/viewvc?rev=1904498=rev
Log:
regen js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1904498=1904497=1904498=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Mon Oct 10
15:55:16 2022
@@ -2516,10 +2516,20 @@ function statistics_health(data) {
}
-txt = "";
// Bugzilla changes
let bz = data.bugzilla[project];
-if (bz[0] || bz[1]) txt += "%u BugZilla tickets opened and %u closed
in the past quarter.".format(bz[0], bz[1]);
+if (bz[0] || bz[1]) {
+let xhtml = new HTML('div', {
+style: {
+position: 'relative',
+clear: 'both'
+}
+});
+let txt = "BugZilla activity:";
+ txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
+ xhtml.innerHTML = txt;
+html.inject(xhtml);
+}
// JIRA changes
if (data.kibble.timeseries.jira.length > 0) {
svn commit: r1904497 - /comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Author: humbedooh
Date: Mon Oct 10 15:52:51 2022
New Revision: 1904497
URL: http://svn.apache.org/viewvc?rev=1904497=rev
Log:
reintroduce BugZilla stats
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js?rev=1904497=1904496=1904497=diff
==
---
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
(original)
+++
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Mon Oct 10 15:52:51 2022
@@ -314,10 +314,20 @@ function statistics_health(data) {
}
-txt = "";
// Bugzilla changes
let bz = data.bugzilla[project];
-if (bz[0] || bz[1]) txt += "%u BugZilla tickets opened and %u closed
in the past quarter.".format(bz[0], bz[1]);
+if (bz[0] || bz[1]) {
+let xhtml = new HTML('div', {
+style: {
+position: 'relative',
+clear: 'both'
+}
+});
+let txt = "BugZilla activity:";
+ txt += "%u BugZilla tickets opened and %u closed in the past
quarter.".format(bz[0], bz[1]);
+ xhtml.innerHTML = txt;
+html.inject(xhtml);
+}
// JIRA changes
if (data.kibble.timeseries.jira.length > 0) {
svn commit: r1904494 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh
Date: Mon Oct 10 15:38:29 2022
New Revision: 1904494
URL: http://svn.apache.org/viewvc?rev=1904494=rev
Log:
Only grab the project's data, not all projects
Modified:
comdev/reporter.apache.org/trunk/scripts/pdata.py
Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1904494=1904493=1904494=diff
==
--- comdev/reporter.apache.org/trunk/scripts/pdata.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/pdata.py Mon Oct 10 15:38:29 2022
@@ -315,7 +315,7 @@ def generate(user, project, runkibble):
ddata, _, health = getProjectData(group)
rdata = getReleaseData(group)
if group in bugzillastats:
-bdata = bugzillastats
+bdata = bugzillastats[group]
else:
bdata = [0,0,{}]
# a PMC may have projects using Bugzilla *and* JIRA - e.g. Tomcat -
(or neither)
svn commit: r1903977 - /comdev/project-logos/tools/compile.py
Author: humbedooh
Date: Sat Sep 10 15:10:10 2022
New Revision: 1903977
URL: http://svn.apache.org/viewvc?rev=1903977=rev
Log:
skip if not current project
Modified:
comdev/project-logos/tools/compile.py
Modified: comdev/project-logos/tools/compile.py
URL:
http://svn.apache.org/viewvc/comdev/project-logos/tools/compile.py?rev=1903977=1903976=1903977=diff
==
--- comdev/project-logos/tools/compile.py (original)
+++ comdev/project-logos/tools/compile.py Sat Sep 10 15:10:10 2022
@@ -109,6 +109,8 @@ for file in files:
if k.endswith("-%s" % project):
project = k
break
+ if project not in projects:
+continue
ext = m.group(2)
oext = ext
opath = file
svn commit: r1900160 - /comdev/reporter.apache.org/trunk/README.txt
Author: humbedooh Date: Fri Apr 22 16:38:11 2022 New Revision: 1900160 URL: http://svn.apache.org/viewvc?rev=1900160=rev Log: test commit, ignore :) Modified: comdev/reporter.apache.org/trunk/README.txt Modified: comdev/reporter.apache.org/trunk/README.txt URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/README.txt?rev=1900160=1900159=1900160=diff == --- comdev/reporter.apache.org/trunk/README.txt (original) +++ comdev/reporter.apache.org/trunk/README.txt Fri Apr 22 16:38:11 2022 @@ -107,3 +107,4 @@ Data file consumers: site/getjson.py?only=project site/jiraversions.py?project=== site/addrelease.py?json=true=xxx=xxx=xxx +
svn commit: r1899057 - /comdev/projects.apache.org/trunk/site/statistics.html
Author: humbedooh Date: Sat Mar 19 17:08:23 2022 New Revision: 1899057 URL: http://svn.apache.org/viewvc?rev=1899057=rev Log: We don't count downloads now, it's all CDN Modified: comdev/projects.apache.org/trunk/site/statistics.html Modified: comdev/projects.apache.org/trunk/site/statistics.html URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/statistics.html?rev=1899057=1899056=1899057=diff == --- comdev/projects.apache.org/trunk/site/statistics.html (original) +++ comdev/projects.apache.org/trunk/site/statistics.html Sat Mar 19 17:08:23 2022 @@ -120,11 +120,6 @@ - - Worldwide download mirror activity, past 30 days - - - Notice!
svn commit: r1899056 - /comdev/projects.apache.org/trunk/site/statistics.html
Author: humbedooh Date: Sat Mar 19 17:06:55 2022 New Revision: 1899056 URL: http://svn.apache.org/viewvc?rev=1899056=rev Log: Use 2022 data for non-website repositories Modified: comdev/projects.apache.org/trunk/site/statistics.html Modified: comdev/projects.apache.org/trunk/site/statistics.html URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/statistics.html?rev=1899056=1899055=1899056=diff == --- comdev/projects.apache.org/trunk/site/statistics.html (original) +++ comdev/projects.apache.org/trunk/site/statistics.html Sat Mar 19 17:06:55 2022 @@ -63,19 +63,19 @@ Language breakdown across the ASF: This chart shows the languages used by all projects at the ASF, sorted by the number of lines per language (excluding comments and blanks) - + Evolution of codebase over time: This chart shows the lines of code, blanks and comments over time at the ASF (see https://github.com/AlDanial/cloc#Languages;>cloc documentation for details). - + Commits and changes Lines changed, past year: - + @@ -111,13 +111,13 @@ Repositories by Lines of Code: - + Language Treemap - +
svn commit: r1899034 - in /comdev/project-logos/originals: ponymail-1.svg ponymail-2.svg ponymail.svg
Author: humbedooh Date: Fri Mar 18 12:29:20 2022 New Revision: 1899034 URL: http://svn.apache.org/viewvc?rev=1899034=rev Log: Adding alternate logo for Pony Mail Added: comdev/project-logos/originals/ponymail-1.svg comdev/project-logos/originals/ponymail-2.svg Removed: comdev/project-logos/originals/ponymail.svg Added: comdev/project-logos/originals/ponymail-1.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/ponymail-1.svg?rev=1899034=auto == --- comdev/project-logos/originals/ponymail-1.svg (added) +++ comdev/project-logos/originals/ponymail-1.svg Fri Mar 18 12:29:20 2022 @@ -0,0 +1,199 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="85.167679mm" + height="83.958389mm" + viewBox="0 0 85.167679 83.958389" + version="1.1" + id="svg3902" + sodipodi:docname="ponymail v2.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: comdev/project-logos/originals/ponymail-2.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/ponymail-2.svg?rev=1899034=auto == --- comdev/project-logos/originals/ponymail-2.svg (added) +++ comdev/project-logos/originals/ponymail-2.svg Fri Mar 18 12:29:20 2022 @@ -0,0 +1,172 @@ + + + +http://www.inkscape.org/namespaces/inkscape; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns="http://www.w3.org/2000/svg; + xmlns:svg="http://www.w3.org/2000/svg;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r1892402 - /comdev/project-logos/originals/lucene.svg
Author: humbedooh Date: Tue Aug 17 09:23:40 2021 New Revision: 1892402 URL: http://svn.apache.org/viewvc?rev=1892402=rev Log: fix TM Modified: comdev/project-logos/originals/lucene.svg Modified: comdev/project-logos/originals/lucene.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/lucene.svg?rev=1892402=1892401=1892402=diff == --- comdev/project-logos/originals/lucene.svg (original) +++ comdev/project-logos/originals/lucene.svg Tue Aug 17 09:23:40 2021 @@ -6,9 +6,9 @@ id="Layer_1" x="0px" y="0px" - viewBox="0 0 993.5993 214.94516" + viewBox="0 0 997.60064 214.94516" xml:space="preserve" - width="993.5993" + width="997.60065" height="214.94516" xmlns="http://www.w3.org/2000/svg; xmlns:svg="http://www.w3.org/2000/svg;> -TM + class="st0 st4 st5 st6" + style="font-size:19.1466px;font-family:GothamNarrow-Bold;letter-spacing:1;fill:#019b8f">
svn commit: r1892401 - in /comdev/project-logos/originals: lucene.png lucene.svg
Author: humbedooh
Date: Tue Aug 17 09:22:37 2021
New Revision: 1892401
URL: http://svn.apache.org/viewvc?rev=1892401=rev
Log:
fix Lucene logo
Added:
comdev/project-logos/originals/lucene.svg
Removed:
comdev/project-logos/originals/lucene.png
Added: comdev/project-logos/originals/lucene.svg
URL:
http://svn.apache.org/viewvc/comdev/project-logos/originals/lucene.svg?rev=1892401=auto
==
--- comdev/project-logos/originals/lucene.svg (added)
+++ comdev/project-logos/originals/lucene.svg Tue Aug 17 09:22:37 2021
@@ -0,0 +1,100 @@
+
+
+
+http://www.w3.org/2000/svg;
+ xmlns:svg="http://www.w3.org/2000/svg;>
+
+ .st0{fill:#019B8F;}
+ .st1{font-family:'GothamNarrow-Black';}
+ .st2{font-size:65.5016px;}
+ .st3{letter-spacing:12.4;}
+ .st4{font-family:'GothamNarrow-Bold';}
+ .st5{font-size:19.1466px;}
+ .st6{letter-spacing:1;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+TM
+
svn commit: r1890541 - in /comdev/project-logos/originals: cassandra-4.png cassandra-4.svg
Author: humbedooh Date: Mon Jun 7 07:22:30 2021 New Revision: 1890541 URL: http://svn.apache.org/viewvc?rev=1890541=rev Log: Replace with svg Added: comdev/project-logos/originals/cassandra-4.svg Removed: comdev/project-logos/originals/cassandra-4.png Added: comdev/project-logos/originals/cassandra-4.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/cassandra-4.svg?rev=1890541=auto == --- comdev/project-logos/originals/cassandra-4.svg (added) +++ comdev/project-logos/originals/cassandra-4.svg Mon Jun 7 07:22:30 2021 @@ -0,0 +1,203 @@ + + + +http://www.w3.org/2000/svg; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:dc="http://purl.org/dc/elements/1.1/;>Apache Cassandraimage/svg+xmlhttp://purl.org/dc/dcmitype/StillImage; />Apache CassandraApache Software Foundationhttps://svn.apache.org/repos/asf/cassandra/logo/cassandra.svg + +
[comdev-site] branch asf-site updated: trigger refresh
This is an automated email from the ASF dual-hosted git repository. humbedooh pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/comdev-site.git The following commit(s) were added to refs/heads/asf-site by this push: new ed8252a trigger refresh ed8252a is described below commit ed8252a51762f2d86c4f8472d793e7111d4617c8 Author: Daniel Gruno AuthorDate: Mon May 31 18:36:02 2021 +0200 trigger refresh --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 0735550..170e1e3 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,2 +1,3 @@ publish: whoami: asf-site +
[comdev-events-site] branch asf-site updated: Add hostname override
This is an automated email from the ASF dual-hosted git repository. humbedooh pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/comdev-events-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e491a71 Add hostname override e491a71 is described below commit e491a71de38685b5191d14c7ba901a7bd7637b89 Author: Daniel Gruno AuthorDate: Mon May 31 18:34:46 2021 +0200 Add hostname override --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 0735550..0f3fe18 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,2 +1,3 @@ publish: whoami: asf-site + hostname: events.apache.org
svn commit: r1888850 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard.js
Author: humbedooh
Date: Sat Apr 17 09:52:43 2021
New Revision: 150
URL: http://svn.apache.org/viewvc?rev=150=rev
Log:
further tweak wordings
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.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=150=149=150=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sat
Apr 17 09:52:43 2021
@@ -248,7 +248,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -266,7 +266,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -287,7 +287,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -304,7 +304,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -322,7 +322,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -341,7 +341,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -361,7 +361,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -380,7 +380,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
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=150=149=150=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Sat Apr 17
09:52:43 2021
@@ -1462,7 +1462,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1480,7 +1480,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1501,7 +1501,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1518,7 +1518,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1536,7 +1536,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1555,7 +1555,7 @@ function health_tips(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -1575,7 +1575,7 @@
svn commit: r1888849 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/statistics_generator.js wizard.js
Author: humbedooh
Date: Sat Apr 17 09:50:54 2021
New Revision: 149
URL: http://svn.apache.org/viewvc?rev=149=rev
Log:
tweak wording for stats, as per COMDEV-415
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js?rev=149=148=149=diff
==
---
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
(original)
+++
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Sat Apr 17 09:50:54 2021
@@ -337,7 +337,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -355,7 +355,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -473,7 +473,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -572,7 +572,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -590,7 +590,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -700,7 +700,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -718,7 +718,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
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=149=148=149=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Sat Apr 17
09:50:54 2021
@@ -2539,7 +2539,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -2557,7 +2557,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -2675,7 +2675,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -2774,7 +2774,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -2792,7 +2792,7 @@ function statistics_health(data) {
ctxt += ' increase';
} else if (pct < 0) {
if (pct < -10) color = 'maroon';
-ctxt += ' decrease';
+ctxt += ' change';
} else {
ctxt = 'no change';
}
@@ -2902,7 +2902,7 @@ function statistics_health(data) {
ctxt += ' increase';
svn commit: r1886594 - /comdev/project-logos/originals/gobblin.svg
Author: humbedooh Date: Tue Feb 16 14:25:06 2021 New Revision: 1886594 URL: http://svn.apache.org/viewvc?rev=1886594=rev Log: simplify paths Modified: comdev/project-logos/originals/gobblin.svg Modified: comdev/project-logos/originals/gobblin.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/gobblin.svg?rev=1886594=1886593=1886594=diff == --- comdev/project-logos/originals/gobblin.svg (original) +++ comdev/project-logos/originals/gobblin.svg Tue Feb 16 14:25:06 2021 @@ -8,9 +8,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; - width="150.25395mm" - height="125.3294mm" - viewBox="0 0 150.25395 125.3294" + width="151.50539mm" + height="126.58111mm" + viewBox="0 0 151.50538 126.58111" version="1.1" id="svg8" inkscape:version="1.0.2 (1.0.2+r75+1)" @@ -19,25 +19,16 @@ id="defs2"> + id="linearGradient947"> + id="stop943" /> + id="stop945" /> - + + + fit-margin-bottom="0" + inkscape:snap-bbox="true" /> @@ -110,31 +122,35 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-18.259737,-13.434621)"> + transform="translate(-15.521142,-15.917622)"> + - + id="path852" + style="fill:url(#linearGradient949);fill-opacity:1;fill-rule:evenodd;stroke:#525251;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + d="m 86.227009,68.410602 c -34.319084,0.11697 -62.078334,27.97096 -62.078374,62.290248 -4e-5,34.40226 27.888507,62.29081 62.290764,62.29077 31.876961,-3e-5 58.610041,-24.06597 61.948161,-55.76766 v 0 l -61.961591,-6.50606 34.079571,-49.819688 1.06351,-1.63608 c -10.3513,-7.06942 -22.594651,-10.85139 -35.129651,-10.85153 -0.0708,-1.2e-4 -0.14159,-1.2e-4 -0.21239,0 z" + sodipodi:nodetypes="cssccc" /> +
svn commit: r1886593 - /comdev/project-logos/originals/gobblin.svg
Author: humbedooh Date: Tue Feb 16 14:12:09 2021 New Revision: 1886593 URL: http://svn.apache.org/viewvc?rev=1886593=rev Log: replace raster with actual vectors Modified: comdev/project-logos/originals/gobblin.svg Modified: comdev/project-logos/originals/gobblin.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/gobblin.svg?rev=1886593=1886592=1886593=diff == --- comdev/project-logos/originals/gobblin.svg (original) +++ comdev/project-logos/originals/gobblin.svg Tue Feb 16 14:12:09 2021 @@ -1,1060 +1,140 @@ -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" width="633px" height="495px" viewBox="0 0 633 495" enable-background="new 0 0 633 495" xml:space="preserve"> +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="150.25395mm" + height="125.3294mm" + viewBox="0 0 150.25395 125.3294" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (1.0.2+r75+1)" + sodipodi:docname="gobblin.svg"> + + + + + + + + + + + + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + + + +
svn commit: r1883246 [2/2] - in /comdev/project-logos/originals: curator.eps curator.svg
Added: comdev/project-logos/originals/curator.svg URL: http://svn.apache.org/viewvc/comdev/project-logos/originals/curator.svg?rev=1883246=auto == --- comdev/project-logos/originals/curator.svg (added) +++ comdev/project-logos/originals/curator.svg Tue Nov 10 10:36:23 2020 @@ -0,0 +1,7897 @@ + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + version="1.1" + id="svg24281" + xml:space="preserve" + width="642.9" + height="241.3" + viewBox="0 0 642.9 241.3" + sodipodi:docname="curator.svg" + inkscape:version="1.0.1 (1.0.1+r73)">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage; />
svn commit: r1883246 [1/2] - in /comdev/project-logos/originals: curator.eps curator.svg
Author: humbedooh Date: Tue Nov 10 10:36:23 2020 New Revision: 1883246 URL: http://svn.apache.org/viewvc?rev=1883246=rev Log: Converted Curator logo to SVG. Added: comdev/project-logos/originals/curator.svg Removed: comdev/project-logos/originals/curator.eps
svn commit: r1882723 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh
Date: Wed Oct 21 06:23:47 2020
New Revision: 1882723
URL: http://svn.apache.org/viewvc?rev=1882723=rev
Log:
try fixing altname kerfuffle with WS
Modified:
comdev/reporter.apache.org/trunk/scripts/pdata.py
Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1882723=1882722=1882723=diff
==
--- comdev/reporter.apache.org/trunk/scripts/pdata.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/pdata.py Wed Oct 21 06:23:47 2020
@@ -220,17 +220,18 @@ def getProjectData(project = None):
x = {}
y = []
z = {}
+altname = pmap.get(project, project)
for xproject in pmcSummary:
y.append(xproject)
-if xproject == project:
+if xproject in [project, altname]:
x['name'] = pmcSummary[project]['name']
x['chair'] = pmcSummary[project]['chair']
if project:
for entry in dataHealth:
-if entry['group'] == project:
+if entry['group'] in [project, altname]:
z = entry
for xtlp in charters:
-if xtlp.get('id') == project:
+if xtlp.get('id') in [project, altname]:
x['charter'] = xtlp.get('charter', '')
return x, y, z
svn commit: r1878476 - /comdev/reporter.apache.org/trunk/site/addrelease.py
Author: humbedooh Date: Thu Jun 4 14:10:27 2020 New Revision: 1878476 URL: http://svn.apache.org/viewvc?rev=1878476=rev Log: switch to py3 to avoid urllib errors Modified: comdev/reporter.apache.org/trunk/site/addrelease.py Modified: comdev/reporter.apache.org/trunk/site/addrelease.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/addrelease.py?rev=1878476=1878475=1878476=diff == --- comdev/reporter.apache.org/trunk/site/addrelease.py (original) +++ comdev/reporter.apache.org/trunk/site/addrelease.py Thu Jun 4 14:10:27 2020 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os, sys, json import cgi
svn commit: r1878395 - /comdev/reporter.apache.org/trunk/scripts/urlutils.py
Author: humbedooh
Date: Tue Jun 2 13:23:32 2020
New Revision: 1878395
URL: http://svn.apache.org/viewvc?rev=1878395=rev
Log:
temp workaround for ssl verify buggo
Modified:
comdev/reporter.apache.org/trunk/scripts/urlutils.py
Modified: comdev/reporter.apache.org/trunk/scripts/urlutils.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/urlutils.py?rev=1878395=1878394=1878395=diff
==
--- comdev/reporter.apache.org/trunk/scripts/urlutils.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/urlutils.py Tue Jun 2 13:23:32
2020
@@ -25,6 +25,10 @@ except:
import time
import calendar
+# urllib is currently broken and will fail on cert verify. Revert once box has
been upgraded.
+import ssl
+ssl._create_default_https_context = ssl._create_unverified_context
+
# time format used in Last-Modified/If-Modified-Since HTTP headers
_HTTP_TIME_FORMAT = '%a, %d %b %Y %H:%M:%S GMT'
@@ -268,4 +272,4 @@ if __name__ == '__main__':
fc.get(GIT+ASF,ASF)
fc.get("https://svn.apache.org/repos/asf/subversion/README","README;)
print("Done")
-
\ No newline at end of file
+
svn commit: r1878393 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh Date: Tue Jun 2 12:54:51 2020 New Revision: 1878393 URL: http://svn.apache.org/viewvc?rev=1878393=rev Log: urllib2 seems to have broken, downgrade to HTTP till we can find a fix Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1878393=1878392=1878393=diff == --- comdev/reporter.apache.org/trunk/scripts/pdata.py (original) +++ comdev/reporter.apache.org/trunk/scripts/pdata.py Tue Jun 2 12:54:51 2020 @@ -39,7 +39,7 @@ RAOHOME = RAOHOME_FULL COMMITTER_INFO = 'https://whimsy.apache.org/public/public_ldap_people.json' MEMBER_INFO = 'https://whimsy.apache.org/public/member-info.json' PROJECTS = 'https://whimsy.apache.org/public/public_ldap_projects.json' -DESCRIPTIONS = 'https://projects.apache.org/json/foundation/committees.json' +DESCRIPTIONS = 'http://projects.apache.org/json/foundation/committees.json' def has_cache(filename, ttl = 14400): return (os.path.exists(filename) and os.path.getmtime(filename) > (time.time() - ttl))
svn commit: r1877665 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Tue May 12 16:33:09 2020
New Revision: 1877665
URL: http://svn.apache.org/viewvc?rev=1877665=rev
Log:
fix wording
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1877665=1877664=1877665=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Tue
May 12 16:33:09 2020
@@ -101,7 +101,7 @@ function getReportDate(json, pmc, dateOn
if (moment(xdate).diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
if (moment(xdate).diff(rightnow, 'days') > 0) {
- return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
+ return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due
%s)".format(moment(xdate).fromNow()));
}
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
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=1877665=1877664=1877665=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Tue May 12
16:33:09 2020
@@ -2001,7 +2001,7 @@ function getReportDate(json, pmc, dateOn
if (moment(xdate).diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
if (moment(xdate).diff(rightnow, 'days') > 0) {
- return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
+ return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due
%s)".format(moment(xdate).fromNow()));
}
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
svn commit: r1877615 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Tue May 12 01:12:49 2020
New Revision: 1877615
URL: http://svn.apache.org/viewvc?rev=1877615=rev
Log:
wrap in moment
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1877615=1877614=1877615=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Tue
May 12 01:12:49 2020
@@ -98,9 +98,9 @@ function getReportDate(json, pmc, dateOn
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
// If less than 7 days till due date (14 days prior to
meeting), light up the christmas trees
- if (xdate.diff(rightnow, 'days') < 14) {
+ if (moment(xdate).diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
- if (xdate.diff(rightnow, 'days') > 0) {
+ if (moment(xdate).diff(rightnow, 'days') > 0) {
return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
}
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
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=1877615=1877614=1877615=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Tue May 12
01:12:49 2020
@@ -1998,9 +1998,9 @@ function getReportDate(json, pmc, dateOn
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
// If less than 7 days till due date (14 days prior to
meeting), light up the christmas trees
- if (xdate.diff(rightnow, 'days') < 14) {
+ if (moment(xdate).diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
- if (xdate.diff(rightnow, 'days') > 0) {
+ if (moment(xdate).diff(rightnow, 'days') > 0) {
return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
}
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
svn commit: r1877614 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Tue May 12 01:11:57 2020
New Revision: 1877614
URL: http://svn.apache.org/viewvc?rev=1877614=rev
Log:
Display the 'report is due' warning at an earlier point in time.
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1877614=1877613=1877614=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Tue
May 12 01:11:57 2020
@@ -97,8 +97,12 @@ function getReportDate(json, pmc, dateOn
let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (xdate <= rightnow) {
+// If less than 7 days till due date (14 days prior to
meeting), light up the christmas trees
+ if (xdate.diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
+ if (xdate.diff(rightnow, 'days') > 0) {
+ return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
+ }
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
return xdate ? (xdate.toDateString() + " (" +
moment(xdate).fromNow() + ")"): "Unknown(?)";
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=1877614=1877613=1877614=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Tue May 12
01:11:57 2020
@@ -1997,8 +1997,12 @@ function getReportDate(json, pmc, dateOn
let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (xdate <= rightnow) {
+// If less than 7 days till due date (14 days prior to
meeting), light up the christmas trees
+ if (xdate.diff(rightnow, 'days') < 14) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
+ if (xdate.diff(rightnow, 'days') > 0) {
+ return new HTML('span', {style: {
color: '#711'}}, xdate.toDateString() + " (Report is due in
%s)".format(moment(xdate).fromNow()));
+ }
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
return xdate ? (xdate.toDateString() + " (" +
moment(xdate).fromNow() + ")"): "Unknown(?)";
svn commit: r1876954 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh Date: Fri Apr 24 21:52:42 2020 New Revision: 1876954 URL: http://svn.apache.org/viewvc?rev=1876954=rev Log: lower cache retention Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1876954=1876953=1876954=diff == --- comdev/reporter.apache.org/trunk/scripts/pdata.py (original) +++ comdev/reporter.apache.org/trunk/scripts/pdata.py Fri Apr 24 21:52:42 2020 @@ -24,7 +24,7 @@ import os, sys, re, json, time import base64, requests import rapp.kibble -CACHE_TIMEOUT = 14400 +CACHE_TIMEOUT = 7200 import committee_info from urlutils import UrlCache
svn commit: r1876953 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh Date: Fri Apr 24 21:50:52 2020 New Revision: 1876953 URL: http://svn.apache.org/viewvc?rev=1876953=rev Log: globalify Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1876953=1876952=1876953=diff == --- comdev/reporter.apache.org/trunk/scripts/pdata.py (original) +++ comdev/reporter.apache.org/trunk/scripts/pdata.py Fri Apr 24 21:50:52 2020 @@ -93,6 +93,7 @@ charters = loadJson(DESCRIPTIONS) def getPMCs(uid): """Returns the array of LDAP committee groups to which the uid belongs. Excludes incubator""" +global projects groups = [] projects = loadJson(PROJECTS)['projects'] for group in projects:
svn commit: r1876952 - /comdev/reporter.apache.org/trunk/scripts/pdata.py
Author: humbedooh Date: Fri Apr 24 21:49:49 2020 New Revision: 1876952 URL: http://svn.apache.org/viewvc?rev=1876952=rev Log: reload projects on usage here... Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/pdata.py?rev=1876952=1876951=1876952=diff == --- comdev/reporter.apache.org/trunk/scripts/pdata.py (original) +++ comdev/reporter.apache.org/trunk/scripts/pdata.py Fri Apr 24 21:49:49 2020 @@ -94,6 +94,7 @@ charters = loadJson(DESCRIPTIONS) def getPMCs(uid): """Returns the array of LDAP committee groups to which the uid belongs. Excludes incubator""" groups = [] +projects = loadJson(PROJECTS)['projects'] for group in projects: if group != "incubator" and 'pmc' in projects[group]: if uid in projects[group]['owners']:
svn commit: r1876733 - in /comdev/helpwanted.apache.org/site/js: coffee/hw.coffee hw.js
Author: humbedooh
Date: Sun Apr 19 20:54:59 2020
New Revision: 1876733
URL: http://svn.apache.org/viewvc?rev=1876733=rev
Log:
add infra
Modified:
comdev/helpwanted.apache.org/site/js/coffee/hw.coffee
comdev/helpwanted.apache.org/site/js/hw.js
Modified: comdev/helpwanted.apache.org/site/js/coffee/hw.coffee
URL:
http://svn.apache.org/viewvc/comdev/helpwanted.apache.org/site/js/coffee/hw.coffee?rev=1876733=1876732=1876733=diff
==
--- comdev/helpwanted.apache.org/site/js/coffee/hw.coffee (original)
+++ comdev/helpwanted.apache.org/site/js/coffee/hw.coffee Sun Apr 19 20:54:59
2020
@@ -288,6 +288,11 @@ reallyPopulate = (json, state) ->
continue
pro.push(group)
app(obj, mk('option', { value: group}, group ))
+
+# Add Infra
+pro.push('infrastucture')
+app(obj, mk('option', { value: 'infrastructure'}, 'infrastructure' ))
+
if state
return
Modified: comdev/helpwanted.apache.org/site/js/hw.js
URL:
http://svn.apache.org/viewvc/comdev/helpwanted.apache.org/site/js/hw.js?rev=1876733=1876732=1876733=diff
==
--- comdev/helpwanted.apache.org/site/js/hw.js (original)
+++ comdev/helpwanted.apache.org/site/js/hw.js Sun Apr 19 20:54:59 2020
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.3
+// Generated by CoffeeScript 1.12.8
var app, brights, cjson, cog, diff, diff_explanation, displayItem,
displayItems, doForm, fetch, fetchItems, fetchItemsAdmin, genColors, get,
hsl2rgb, hw_weburl, isArray, langs, max_items, mk, pastels, populateAdminForm,
populateForm, post, postJSON, projects, reallyPopulate, renderItem, set,
showSplash, splashOptions, spoken_langs, sw, swi, txt, types, website_langs,
wizard, wstate;
hsl2rgb = function(h, s, l) {
@@ -459,6 +459,10 @@ reallyPopulate = function(json, state) {
value: group
}, group));
}
+ pro.push('infrastucture');
+ app(obj, mk('option', {
+value: 'infrastructure'
+ }, 'infrastructure'));
if (state) {
return;
}
@@ -678,8 +682,8 @@ fetch = function(url, xstate, callback,
try {
response = JSON.parse(xmlHttp.responseText);
return callback(response, xstate);
-} catch (_error) {
- e = _error;
+} catch (error) {
+ e = error;
return callback(JSON.parse(xmlHttp.responseText), xstate);
}
}
@@ -719,8 +723,8 @@ post = function(url, args, xstate, callb
try {
response = JSON.parse(xmlHttp.responseText);
return callback(response, xstate);
-} catch (_error) {
- e = _error;
+} catch (error) {
+ e = error;
return callback(JSON.parse(xmlHttp.responseText), xstate);
}
}
@@ -753,8 +757,8 @@ postJSON = function(url, json, xstate, c
try {
response = JSON.parse(xmlHttp.responseText);
return callback(response, xstate);
-} catch (_error) {
- e = _error;
+} catch (error) {
+ e = error;
return callback(JSON.parse(xmlHttp.responseText), xstate);
}
}
svn commit: r1874859 - /comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Author: humbedooh
Date: Thu Mar 5 22:41:36 2020
New Revision: 1874859
URL: http://svn.apache.org/viewvc?rev=1874859=rev
Log:
adjust behavior to match downloads.a.o
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1874859=1874858=1874859=diff
==
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Thu Mar
5 22:41:36 2020
@@ -44,7 +44,7 @@ x = 0
def getDirList(url):
try:
data = urllib.request.urlopen(url).read().decode('utf-8')
-for entry, xd, xdate in re.findall(r".+(?:<.+?>|\s+)(\d\d\d\d-\d\d-\d\d)", data,
re.MULTILINE | re.UNICODE):
+for entry, xd, xdate in re.findall(r"\S+\s+(\d\d\d\d-\d\d-\d\d)", data, re.MULTILINE |
re.UNICODE):
yield(entry, xdate, xd)
except:
pass
svn commit: r1874520 - /comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Author: humbedooh
Date: Tue Feb 25 16:55:38 2020
New Revision: 1874520
URL: http://svn.apache.org/viewvc?rev=1874520=rev
Log:
add some more ignores
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1874520=1874519=1874520=diff
==
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Tue Feb
25 16:55:38 2020
@@ -86,7 +86,7 @@ def parseDir(committeeId, path):
if ("/%s" % f) not in path and f.lower() not in ['binaries',
'repos', 'updatesite', 'current', 'stable', 'stable1', 'stable2', 'binary',
'notes', 'doc', 'eclipse', 'patches', 'docs', 'changes', 'features', 'tmp',
'cpp', 'php', 'ruby', 'py', 'py3', 'issuesfixed', 'images', 'styles',
'wikipages']:
parseDir(committeeId, "%s/%s" % (path, f))
# Note: this eliminates binary archives; not sure whether that is
intentional or not.
-elif not
re.search(r"(MD5SUM|SHA1SUM|\.md5|\.mds|\.sh1|\.sh2|\.sha|\.asc|\.sig|\.bin|\.pom|\.jar|\.whl|\.pdf|\.xml|\.xsd|\.html|\.txt|\.cfg|\.ish|\.pl|RELEASE.NOTES|LICENSE|KEYS|CHANGELOG|NOTICE|MANIFEST|Changes|readme|x86|amd64|-manual\.|-docs\.|-docs-|-doc-|Announcement|current|-deps|-dependencies|binary|-bin-|-bin\.|-javadoc-|-distro|rat_report)",
f, flags=re.IGNORECASE):
+elif not
re.search(r"(MD5SUM|SHA1SUM|\.md5|\.mds|\.sh1|\.sh2|\.sha|\.asc|\.sig|\.bin|\.pom|\.jar|\.whl|\.pdf|\.xml|\.xsd|\.html|\.txt|\.cfg|\.ish|\.pl|RELEASE.NOTES|LICENSE|KEYS|CHANGELOG|NOTICE|MANIFEST|Changes|readme|x86|amd64|-manual\.|-docs\.|-docs-|-doc-|Announcement|current|-deps|-dependencies|binary|-bin-|-bin\.|-javadoc-|-distro|rat_report|\.png|\.jpg|\.gif|\.sqlite)",
f, flags=re.IGNORECASE):
filename = cleanFilename(f)
if len(filename) > 1:
if filename not in releases[committeeId]:
svn commit: r1874516 - /comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Author: humbedooh
Date: Tue Feb 25 16:46:10 2020
New Revision: 1874516
URL: http://svn.apache.org/viewvc?rev=1874516=rev
Log:
account for both old and new patterns
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1874516=1874515=1874516=diff
==
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Tue Feb
25 16:46:10 2020
@@ -44,7 +44,7 @@ x = 0
def getDirList(url):
try:
data = urllib.request.urlopen(url).read().decode('utf-8')
-for entry, xd, xdate in re.findall(r".+<.+?>(\d\d\d\d-\d\d-\d\d)", data, re.MULTILINE |
re.UNICODE):
+for entry, xd, xdate in re.findall(r".+(?:<.+?>|\s+)(\d\d\d\d-\d\d-\d\d)", data,
re.MULTILINE | re.UNICODE):
yield(entry, xdate, xd)
except:
pass
svn commit: r1874514 - /comdev/projects.apache.org/trunk/site/js/projects.js
Author: humbedooh
Date: Tue Feb 25 16:42:55 2020
New Revision: 1874514
URL: http://svn.apache.org/viewvc?rev=1874514=rev
Log:
force update on reload
Modified:
comdev/projects.apache.org/trunk/site/js/projects.js
Modified: comdev/projects.apache.org/trunk/site/js/projects.js
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/js/projects.js?rev=1874514=1874513=1874514=diff
==
--- comdev/projects.apache.org/trunk/site/js/projects.js (original)
+++ comdev/projects.apache.org/trunk/site/js/projects.js Tue Feb 25 16:42:55
2020
@@ -1670,7 +1670,7 @@ function linkToHere(id) {
// Called by releases.html
function buildReleases() {
-GetAsyncJSON("json/foundation/releases.json", null, renderReleases);
+GetAsyncJSON("json/foundation/releases.json?" + Math.random(), null,
renderReleases);
}
// Async data fetching \\
svn commit: r1874512 - /comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Author: humbedooh
Date: Tue Feb 25 16:35:19 2020
New Revision: 1874512
URL: http://svn.apache.org/viewvc?rev=1874512=rev
Log:
update pattern
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1874512=1874511=1874512=diff
==
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Tue Feb
25 16:35:19 2020
@@ -44,7 +44,7 @@ x = 0
def getDirList(url):
try:
data = urllib.request.urlopen(url).read().decode('utf-8')
-for entry, xd, xdate in re.findall(r".+\s+(\d\d\d\d-\d\d-\d\d)", data, re.MULTILINE |
re.UNICODE):
+for entry, xd, xdate in re.findall(r".+<.+?>(\d\d\d\d-\d\d-\d\d)", data, re.MULTILINE |
re.UNICODE):
yield(entry, xdate, xd)
except:
pass
svn commit: r1874510 - /comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Author: humbedooh
Date: Tue Feb 25 16:26:57 2020
New Revision: 1874510
URL: http://svn.apache.org/viewvc?rev=1874510=rev
Log:
downloads have moved to downloads.a.o
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1874510=1874509=1874510=diff
==
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Tue Feb
25 16:26:57 2020
@@ -29,7 +29,7 @@ Note that rsync excludes hashes, sigs an
releases = {}
files = {}
-mainurl = "http://www.apache.org/dist/;
+mainurl = "https://downloads.apache.org/;
x = 0
@@ -121,4 +121,4 @@ with open("../../site/json/foundation/re
json.dump(files, f, sort_keys=True, indent=0)
f.close()
-print("All done!")
\ No newline at end of file
+print("All done!")
svn commit: r1873733 - /comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Author: humbedooh
Date: Fri Feb 7 09:25:12 2020
New Revision: 1873733
URL: http://svn.apache.org/viewvc?rev=1873733=rev
Log:
tweak private flag color
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1873733=1873732=1873733=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Fri Feb 7 09:25:12 2020
@@ -72,7 +72,7 @@
.hwt-content mark.classified {
-background-color: #3335 !important;
+background-color: #8217 !important;
width: 100%;
margin-left: -2px;
margin-right: -2px;
svn commit: r1873730 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/unified.js wizard.js
Author: humbedooh
Date: Fri Feb 7 08:13:28 2020
New Revision: 1873730
URL: http://svn.apache.org/viewvc?rev=1873730=rev
Log:
highlight ALL private sections
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1873730=1873729=1873730=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Fri Feb
7 08:13:28 2020
@@ -12,7 +12,7 @@ function UnifiedEditor_highlight_section
// Placeholders are grey with red border
hilites.push({highlight: PLACEHOLDER, className: 'none' });
// sections
- hilites.push({highlight: /[\s\S]+?<\/private>/i, className:
'classified' });
+ hilites.push({highlight: /[\s\S]+?<\/private>/ig, className:
'classified' });
// Capture text cursor position(s) before we continue.
let x = $('#unified-report').prop('selectionStart');
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=1873730=1873729=1873730=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Fri Feb 7
08:13:28 2020
@@ -3324,7 +3324,7 @@ function UnifiedEditor_highlight_section
// Placeholders are grey with red border
hilites.push({highlight: PLACEHOLDER, className: 'none' });
// sections
- hilites.push({highlight: /[\s\S]+?<\/private>/i, className:
'classified' });
+ hilites.push({highlight: /[\s\S]+?<\/private>/ig, className:
'classified' });
// Capture text cursor position(s) before we continue.
let x = $('#unified-report').prop('selectionStart');
svn commit: r1872888 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/statistics_generator.js wizard.js
Author: humbedooh
Date: Thu Jan 16 17:34:42 2020
New Revision: 1872888
URL: http://svn.apache.org/viewvc?rev=1872888=rev
Log:
also fix on stats page...
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js?rev=1872888=1872887=1872888=diff
==
---
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
(original)
+++
comdev/reporter.apache.org/trunk/site/wizard/js/source/statistics_generator.js
Thu Jan 16 17:34:42 2020
@@ -942,16 +942,19 @@ function statistics_releases(data) {
ages = ages.splice(0, new_releases >= 3 ? new_releases : 3);
let to_show = ages.length;
let releases_shown = 0;
+let releases_picked = {};
while (ages.length) {
-let ts = ages.shift();
-for (var rel in data.releases[project]) {
-if (releases_shown == to_show) break;
-let reldate = moment(data.releases[project][rel] * 1000.0);
-if (ts == reldate.unix()) {
-rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
-releases_shown++;
-}
-}
+ let ts = ages.shift();
+ for (var rel in data.releases[project]) {
+if (releases_shown >= to_show) break;
+ let reldate = moment(data.releases[project][rel] * 1000.0);
+ if (releases_picked[rel]) continue;
+ if (ts == reldate.unix()) {
+ rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
+ releases_shown++;
+ releases_picked[rel] = true;
+ }
+ }
}
if (rtxt != '') {
rtxt = "Recent releases: " + rtxt + "";
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=1872888=1872887=1872888=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Jan 16
17:34:42 2020
@@ -3142,16 +3142,19 @@ function statistics_releases(data) {
ages = ages.splice(0, new_releases >= 3 ? new_releases : 3);
let to_show = ages.length;
let releases_shown = 0;
+let releases_picked = {};
while (ages.length) {
-let ts = ages.shift();
-for (var rel in data.releases[project]) {
-if (releases_shown == to_show) break;
-let reldate = moment(data.releases[project][rel] * 1000.0);
-if (ts == reldate.unix()) {
-rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
-releases_shown++;
-}
-}
+ let ts = ages.shift();
+ for (var rel in data.releases[project]) {
+if (releases_shown >= to_show) break;
+ let reldate = moment(data.releases[project][rel] * 1000.0);
+ if (releases_picked[rel]) continue;
+ if (ts == reldate.unix()) {
+ rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
+ releases_shown++;
+ releases_picked[rel] = true;
+ }
+ }
}
if (rtxt != '') {
rtxt = "Recent releases: " + rtxt + "";
svn commit: r1872887 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard.js
Author: humbedooh
Date: Thu Jan 16 17:31:56 2020
New Revision: 1872887
URL: http://svn.apache.org/viewvc?rev=1872887=rev
Log:
don't show any releases twice, it messes up things
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.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=1872887=1872886=1872887=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Thu
Jan 16 17:31:56 2020
@@ -488,15 +488,17 @@ function activity_tips(data) {
ages = ages.splice(0,new_releases >= 3 ? new_releases : 3);
let to_show = ages.length;
let releases_shown = 0;
+let releases_picked = {};
while (ages.length) {
let ts = ages.shift();
for (var rel in data.releases[project]) {
-if (releases_shown == to_show) break;
+if (releases_shown >= to_show) break;
let reldate = moment(data.releases[project][rel] * 1000.0);
+ if (releases_picked[rel]) continue;
if (ts == reldate.unix()) {
rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
releases_shown++;
- continue;
+ releases_picked[rel] = true;
}
}
}
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=1872887=1872886=1872887=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Jan 16
17:31:56 2020
@@ -1703,15 +1703,17 @@ function activity_tips(data) {
ages = ages.splice(0,new_releases >= 3 ? new_releases : 3);
let to_show = ages.length;
let releases_shown = 0;
+let releases_picked = {};
while (ages.length) {
let ts = ages.shift();
for (var rel in data.releases[project]) {
-if (releases_shown == to_show) break;
+if (releases_shown >= to_show) break;
let reldate = moment(data.releases[project][rel] * 1000.0);
+ if (releases_picked[rel]) continue;
if (ts == reldate.unix()) {
rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
releases_shown++;
- continue;
+ releases_picked[rel] = true;
}
}
}
svn commit: r1872886 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard.js
Author: humbedooh
Date: Thu Jan 16 17:27:26 2020
New Revision: 1872886
URL: http://svn.apache.org/viewvc?rev=1872886=rev
Log:
continue to next release if we found the TS, so as to not print too many lines
and duplicate items.
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.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=1872886=1872885=1872886=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Thu
Jan 16 17:27:26 2020
@@ -496,6 +496,7 @@ function activity_tips(data) {
if (ts == reldate.unix()) {
rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
releases_shown++;
+ continue;
}
}
}
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=1872886=1872885=1872886=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Jan 16
17:27:26 2020
@@ -1711,6 +1711,7 @@ function activity_tips(data) {
if (ts == reldate.unix()) {
rtxt += "%s was released on %s.".format(rel,
reldate.utc().format('-MM-DD'));
releases_shown++;
+ continue;
}
}
}
svn commit: r1872881 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/unified.js wizard.js
Author: humbedooh
Date: Thu Jan 16 13:23:38 2020
New Revision: 1872881
URL: http://svn.apache.org/viewvc?rev=1872881=rev
Log:
h5 and new window..
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1872881=1872880=1872881=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Thu Jan
16 13:23:38 2020
@@ -282,7 +282,7 @@ function UnifiedEditor_compile() {
else text += " Publish via
Whimsy"
if (this.compiles) {
-text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
+text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
}
return text;
}
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=1872881=1872880=1872881=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Jan 16
13:23:38 2020
@@ -3588,7 +3588,7 @@ function UnifiedEditor_compile() {
else text += " Publish via
Whimsy"
if (this.compiles) {
-text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
+text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
}
return text;
}
svn commit: r1872880 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/unified.js wizard.js
Author: humbedooh
Date: Thu Jan 16 13:21:36 2020
New Revision: 1872880
URL: http://svn.apache.org/viewvc?rev=1872880=rev
Log:
Emphasis on conforming to guidelines
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1872880=1872879=1872880=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Thu Jan
16 13:21:36 2020
@@ -280,6 +280,10 @@ function UnifiedEditor_compile() {
}
else if (this.compiles) text += " Publish via Whimsy"
else text += " Publish via
Whimsy"
+
+if (this.compiles) {
+text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
+}
return text;
}
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=1872880=1872879=1872880=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Jan 16
13:21:36 2020
@@ -3586,6 +3586,10 @@ function UnifiedEditor_compile() {
}
else if (this.compiles) text += " Publish via Whimsy"
else text += " Publish via
Whimsy"
+
+if (this.compiles) {
+text += "PLEASE MAKE SURE YOUR REPORT ADHERES TO THE ASF
REPORTING GUIDELINES BEFORE SUBMITTING!";
+}
return text;
}
svn commit: r1872866 - in /comdev/reporter.apache.org/trunk/site/wizard: index.html statistics.html
Author: humbedooh Date: Thu Jan 16 07:56:27 2020 New Revision: 1872866 URL: http://svn.apache.org/viewvc?rev=1872866=rev Log: happy new year Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html comdev/reporter.apache.org/trunk/site/wizard/statistics.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1872866=1872865=1872866=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Thu Jan 16 07:56:27 2020 @@ -51,7 +51,7 @@ -Powered by the ASF Board Report Wizard. Copyright 2019 Apache Community Development. +Powered by the ASF Board Report Wizard. Copyright 2020 Apache Community Development. Queries or other feedback should go to our mailing list: d...@community.apache.org 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=1872866=1872865=1872866=diff == --- comdev/reporter.apache.org/trunk/site/wizard/statistics.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/statistics.html Thu Jan 16 07:56:27 2020 @@ -50,7 +50,7 @@ -Powered by the ASF Board Report Wizard. Copyright 2019 Apache Community Development. +Powered by the ASF Board Report Wizard. Copyright 2020 Apache Community Development. Queries or other feedback should go to our mailing list: d...@community.apache.org
svn commit: r1872531 - /comdev/reporter.apache.org/trunk/scripts/committee_info.py
Author: humbedooh
Date: Thu Jan 9 07:54:37 2020
New Revision: 1872531
URL: http://svn.apache.org/viewvc?rev=1872531=rev
Log:
move data fetch into functions so it doesn't go stale
Modified:
comdev/reporter.apache.org/trunk/scripts/committee_info.py
Modified: comdev/reporter.apache.org/trunk/scripts/committee_info.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/committee_info.py?rev=1872531=1872530=1872531=diff
==
--- comdev/reporter.apache.org/trunk/scripts/committee_info.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/committee_info.py Thu Jan 9
07:54:37 2020
@@ -32,14 +32,13 @@ def loadJson(url):
resp.close()
return j
-cidata = loadJson(URL) # The data read from the file
-
def PMCmails():
"""
Returns output of the form:
['ace',...'whimsical',...]
"""
+cidata = loadJson(URL)
committees = cidata['committees']
mails=[]
for ctte in committees:
@@ -62,6 +61,7 @@ def PMCnames():
Only includes actual PMC names
Returns 'webservices' rather than 'ws'
"""
+cidata = loadJson(URL)
committees = cidata['committees']
namejson={}
@@ -100,6 +100,7 @@ def PMCsummary():
Only includes actual PMCs
Returns 'webservices' rather than 'ws'
"""
+cidata = loadJson(URL)
committees = cidata['committees']
namejson={}
@@ -125,7 +126,7 @@ def PMCsummary():
def pmcdates():
dates = {}
-
+cidata = loadJson(URL)
cttes = cidata['committees']
for ent in cttes:
ctte = cttes[ent]
@@ -156,7 +157,7 @@ def pmcdates():
return dates
def cycles():
-
+cidata = loadJson(URL)
committees = cidata['committees']
report_cycles={}
@@ -175,6 +176,7 @@ def cycles():
def getPMCs(uid, incubator=False):
"""Returns the array of PMC committees to which the uid belongs. Excludes
incubator by default"""
pmcs = []
+cidata = loadJson(URL)
cttes = cidata['committees']
for ent in cttes:
ctte = cttes[ent]
svn commit: r1872512 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Wed Jan 8 18:49:47 2020
New Revision: 1872512
URL: http://svn.apache.org/viewvc?rev=1872512=rev
Log:
fix equality bug
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1872512=1872511=1872512=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Wed
Jan 8 18:49:47 2020
@@ -97,7 +97,7 @@ function getReportDate(json, pmc, dateOn
let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (xdate < rightnow) {
+ if (xdate <= rightnow) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
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=1872512=1872511=1872512=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Wed Jan 8
18:49:47 2020
@@ -1996,7 +1996,7 @@ function getReportDate(json, pmc, dateOn
let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (xdate < rightnow) {
+ if (xdate <= rightnow) {
if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
svn commit: r1872511 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Wed Jan 8 18:47:48 2020
New Revision: 1872511
URL: http://svn.apache.org/viewvc?rev=1872511=rev
Log:
fix shadowing
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1872511=1872510=1872511=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Wed
Jan 8 18:47:48 2020
@@ -86,7 +86,7 @@ function getReportDate(json, pmc, dateOn
}
}
// find the first Wed that has not been reached
- var nextdate = dates[0];
+ let nextdate = dates[0];
while (nextdate < today && dates.length > 0) {
nextdate = dates.shift();
}
@@ -94,13 +94,14 @@ function getReportDate(json, pmc, dateOn
if (dateOnly) {
// agenda date or due date?
if (dateOnly == "due") {
- nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
+ let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
+ xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (nextdate < rightnow) {
- if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, nextdate.toDateString() + " (Report
filed)");
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
+ if (xdate < rightnow) {
+ if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
+ return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
}
- return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
+ return xdate ? (xdate.toDateString() + " (" +
moment(xdate).fromNow() + ")"): "Unknown(?)";
} else {
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
}
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=1872511=1872510=1872511=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Wed Jan 8
18:47:48 2020
@@ -1985,7 +1985,7 @@ function getReportDate(json, pmc, dateOn
}
}
// find the first Wed that has not been reached
- var nextdate = dates[0];
+ let nextdate = dates[0];
while (nextdate < today && dates.length > 0) {
nextdate = dates.shift();
}
@@ -1993,13 +1993,14 @@ function getReportDate(json, pmc, dateOn
if (dateOnly) {
// agenda date or due date?
if (dateOnly == "due") {
- nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
+ let xdate = new Date(+nextdate); // copy so as to not
decrement multiple times
+ xdate.setDate(xdate.getDate() - 7); // Due one week
prior to meeting.
let rightnow = new Date();
- if (nextdate < rightnow) {
- if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, nextdate.toDateString() + " (Report
filed)");
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
+ if (xdate < rightnow) {
+ if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, xdate.toDateString() + " (Report
filed)");
+ return new HTML('span', {style: { color:
'#711'}}, xdate.toDateString() + " (Report is due)");
svn commit: r1871656 - /comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Author: humbedooh
Date: Mon Dec 16 11:24:18 2019
New Revision: 1871656
URL: http://svn.apache.org/viewvc?rev=1871656=rev
Log:
move down so allpmcs are defined
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871656=1871655=1871656=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16
11:24:18 2019
@@ -48,15 +48,16 @@ def run(environ, user):
dumps['kibble'] =v
-# Check for filed reports
-dumps['filed'] = {}
-for k in allpmcs:
-f = rapp.whimsy.agenda(environ, user, k)
-dumps['filed'][k] = f.get('filed', False)
-
# Set personalized vars, dump
if dumps and user:
_ddata, allpmcs, _health = pdata.getProjectData()
+
+# Check for filed reports
+dumps['filed'] = {}
+for k in allpmcs:
+f = rapp.whimsy.agenda(environ, user, k)
+dumps['filed'][k] = f.get('filed', False)
+
dumps['you'] = committers[user]
dumps['all'] = sorted(allpmcs)
dumps['pmcs'] = sorted(groups)
svn commit: r1871655 - /comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Author: humbedooh
Date: Mon Dec 16 11:22:42 2019
New Revision: 1871655
URL: http://svn.apache.org/viewvc?rev=1871655=rev
Log:
grab filing data for all pmcs, why not..
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871655=1871654=1871655=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16
11:22:42 2019
@@ -50,7 +50,7 @@ def run(environ, user):
# Check for filed reports
dumps['filed'] = {}
-for k in groups:
+for k in allpmcs:
f = rapp.whimsy.agenda(environ, user, k)
dumps['filed'][k] = f.get('filed', False)
svn commit: r1871654 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Mon Dec 16 11:21:06 2019
New Revision: 1871654
URL: http://svn.apache.org/viewvc?rev=1871654=rev
Log:
note if report was already filed this quarter
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1871654=1871653=1871654=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 11:21:06 2019
@@ -97,6 +97,7 @@ function getReportDate(json, pmc, dateOn
nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
let rightnow = new Date();
if (nextdate < rightnow) {
+ if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, nextdate.toDateString() + " (Report
filed)");
return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
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=1871654=1871653=1871654=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Mon Dec 16
11:21:06 2019
@@ -1996,6 +1996,7 @@ function getReportDate(json, pmc, dateOn
nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
let rightnow = new Date();
if (nextdate < rightnow) {
+ if (pdata && pdata.filed[pmc] == true) return
new HTML('span', {style: { color: '#396'}}, nextdate.toDateString() + " (Report
filed)");
return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
svn commit: r1871653 - /comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Author: humbedooh
Date: Mon Dec 16 11:15:37 2019
New Revision: 1871653
URL: http://svn.apache.org/viewvc?rev=1871653=rev
Log:
correct call
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871653=1871652=1871653=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16
11:15:37 2019
@@ -51,7 +51,7 @@ def run(environ, user):
# Check for filed reports
dumps['filed'] = {}
for k in groups:
-f = whimsy.agenda(environ, user, k)
+f = rapp.whimsy.agenda(environ, user, k)
dumps['filed'][k] = f.get('filed', False)
# Set personalized vars, dump
svn commit: r1871652 - /comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Author: humbedooh
Date: Mon Dec 16 11:14:12 2019
New Revision: 1871652
URL: http://svn.apache.org/viewvc?rev=1871652=rev
Log:
use the right list...
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871652=1871651=1871652=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16
11:14:12 2019
@@ -50,7 +50,7 @@ def run(environ, user):
# Check for filed reports
dumps['filed'] = {}
-for k in dumps.get('pmcs', []):
+for k in groups:
f = whimsy.agenda(environ, user, k)
dumps['filed'][k] = f.get('filed', False)
svn commit: r1871651 - /comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Author: humbedooh Date: Mon Dec 16 11:12:52 2019 New Revision: 1871651 URL: http://svn.apache.org/viewvc?rev=1871651=rev Log: fix import Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871651=1871650=1871651=diff == --- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original) +++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16 11:12:52 2019 @@ -7,7 +7,7 @@ import pdata import time import re import committee_info -import whimsy +import rapp.whimsy CACHE_TIMEOUT = 14400
svn commit: r1871650 - in /comdev/reporter.apache.org/trunk/scripts/rapp: overview.py whimsy.py
Author: humbedooh
Date: Mon Dec 16 11:07:47 2019
New Revision: 1871650
URL: http://svn.apache.org/viewvc?rev=1871650=rev
Log:
Weave in whether reports have been filed or not in the overview.
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/overview.py?rev=1871650=1871649=1871650=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Mon Dec 16
11:07:47 2019
@@ -7,6 +7,7 @@ import pdata
import time
import re
import committee_info
+import whimsy
CACHE_TIMEOUT = 14400
@@ -46,6 +47,13 @@ def run(environ, user):
if k == 'kibble' and v:
dumps['kibble'] =v
+
+# Check for filed reports
+dumps['filed'] = {}
+for k in dumps.get('pmcs', []):
+f = whimsy.agenda(environ, user, k)
+dumps['filed'][k] = f.get('filed', False)
+
# Set personalized vars, dump
if dumps and user:
_ddata, allpmcs, _health = pdata.getProjectData()
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py?rev=1871650=1871649=1871650=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py Mon Dec 16 11:07:47
2019
@@ -105,9 +105,9 @@ def agenda_forced(environ, user):
get_whimsy(url, environ, ttl = 0)
return agenda(environ, user)
-def agenda(environ, user):
+def agenda(environ, user, fproject = None):
""" Returns data on the board report for a project, IF present and/or
filed in the current agenda """
-project = environ.get('QUERY_STRING')
+project = fproject or environ.get('QUERY_STRING')
# Kludge for webservices
project = pdata.ldapmap.get(project, project)
report = None
svn commit: r1871649 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard.js
Author: humbedooh
Date: Mon Dec 16 10:57:21 2019
New Revision: 1871649
URL: http://svn.apache.org/viewvc?rev=1871649=rev
Log:
harmonize with board report templates
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
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=1871649=1871648=1871649=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:57:21 2019
@@ -94,12 +94,10 @@ function getReportDate(json, pmc, dateOn
if (dateOnly) {
// agenda date or due date?
if (dateOnly == "due") {
- nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
+ nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
let rightnow = new Date();
- if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
- let fromnow = moment(nextdate).fromNow();
- if (nextdate && Math.abs(rightnow - nextdate) <
(86400*1000)) fromnow = "TODAY";
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + fromnow + ")");
+ if (nextdate < rightnow) {
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
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=1871649=1871648=1871649=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Mon Dec 16
10:57:21 2019
@@ -1993,12 +1993,10 @@ function getReportDate(json, pmc, dateOn
if (dateOnly) {
// agenda date or due date?
if (dateOnly == "due") {
- nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
+ nextdate.setDate(nextdate.getDate() - 7); // Due one
week prior to meeting.
let rightnow = new Date();
- if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
- let fromnow = moment(nextdate).fromNow();
- if (nextdate && Math.abs(rightnow - nextdate) <
(86400*1000)) fromnow = "TODAY";
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + fromnow + ")");
+ if (nextdate < rightnow) {
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (Report is due)");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
svn commit: r1871648 - /comdev/reporter.apache.org/trunk/site/wizard/statistics.html
Author: humbedooh Date: Mon Dec 16 10:35:48 2019 New Revision: 1871648 URL: http://svn.apache.org/viewvc?rev=1871648=rev Log: this is out of beta too Modified: comdev/reporter.apache.org/trunk/site/wizard/statistics.html 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=1871648=1871647=1871648=diff == --- comdev/reporter.apache.org/trunk/site/wizard/statistics.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/statistics.html Mon Dec 16 10:35:48 2019 @@ -65,7 +65,7 @@ - +
svn commit: r1871647 - in /comdev/reporter.apache.org/trunk/site/wizard: beta.html index.html js/source/build.sh js/wizard-beta.js js/wizard.js
Author: humbedooh
Date: Mon Dec 16 10:35:31 2019
New Revision: 1871647
URL: http://svn.apache.org/viewvc?rev=1871647=rev
Log:
We're out of beta, really
Removed:
comdev/reporter.apache.org/trunk/site/wizard/beta.html
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/index.html
comdev/reporter.apache.org/trunk/site/wizard/js/source/build.sh
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1871647=1871646=1871647=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/index.html (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/index.html Mon Dec 16 10:35:31
2019
@@ -64,6 +64,6 @@
https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"</a>;
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous">
https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"</a>;>
-
+
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/build.sh
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/build.sh?rev=1871647=1871646=1871647=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/build.sh (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/build.sh Mon Dec 16
10:35:31 2019
@@ -16,12 +16,12 @@ echo '/*
limitations under the License.
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT source/*.js!!
-' > ../wizard-beta.js
+' > ../wizard.js
# Warning: ls/sort order depends on the locale; this can affect the order of
'.' and '_'
# i.e. statistics.js and statistics_generator.js
# so force the use of 'C'
for f in `LC_ALL=C ls *.js`; do
-printf "\n\n/**\n Fetched from
source/${f}\n**/\n\n" >>
../wizard-beta.js
-perl -0pe 's/\/\*.*?\*\/[\r\n]*//sm' ${f} >> ../wizard-beta.js
+printf "\n\n/**\n Fetched from
source/${f}\n**/\n\n" >> ../wizard.js
+perl -0pe 's/\/\*.*?\*\/[\r\n]*//sm' ${f} >> ../wizard.js
done
echo "Done!"
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=1871647=1871646=1871647=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Mon Dec 16
10:35:31 2019
@@ -91,7 +91,7 @@ async function GET(url, callback, state,
let meta = {method: method, credentials: 'include',
referrerPolicy: 'unsafe-url', headers: {'x-original-referral':
document.referrer}};
if (body) {
meta.body = body;
-meta.headers['Content-Type'] =
'application/x-www-form-urlencoded; charset=UTF-8';
+meta.headers['Content-Type'] = 'application/json;
charset=UTF-8';
}
console.log("putting %s in escrow...".format(url));
async_escrow[pkey] = new Date(); // Log start of request in escrow
dict
@@ -1024,11 +1024,10 @@ function save_draft() {
'project': project,
'action': 'save',
'type': 'unified',
-'report': JSON.stringify(draft_stepper.editor.report),
-'report_compiled': draft_stepper.editor.report
+'report': draft_stepper.editor.report
}
-let formdata = $.param(js);
+let formdata = JSON.stringify(js);
// Enable spinner, hide main wrapper
document.getElementById('loader_text').innerText = "Saving draft...";
@@ -1036,7 +1035,7 @@ function save_draft() {
document.getElementById('wrapper').style.display = 'none';
document.getElementById("pname").style.display = 'none';
-POST('drafts.py', draft_saved, {}, formdata);
+POST('/api/drafts/save', draft_saved, {}, formdata);
}
function draft_saved(state, json) {
@@ -1062,7 +1061,7 @@ function draft_saved(state, json) {
function load_draft(filename) {
-
GET('drafts.py?action=fetch=%s=%s=%s'.format(project,
filename, editor_type), read_draft, {});
+GET('/api/drafts/fetch?%s'.format(filename), read_draft, {});
}
function read_draft(state, json) {
@@ -1081,7 +1080,7 @@ function read_draft(state, json) {
function list_drafts(pdata, editor) {
if (!saved_drafts) {
-GET('drafts.
svn commit: r1871644 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard-beta.js
Author: humbedooh
Date: Mon Dec 16 10:22:40 2019
New Revision: 1871644
URL: http://svn.apache.org/viewvc?rev=1871644=rev
Log:
replace time diff with 'TODAY' if due today.
Modified:
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/reportdate.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js?rev=1871644=1871643=1871644=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:22:40 2019
@@ -97,7 +97,9 @@ function getReportDate(json, pmc, dateOn
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
let rightnow = new Date();
if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
+ let fromnow = moment(nextdate).fromNow();
+ if (nextdate && Math.abs(rightnow - nextdate) <
(86400*1000)) fromnow = "TODAY";
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + fromnow + ")");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
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=1871644=1871643=1871644=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:22:40 2019
@@ -1996,7 +1996,9 @@ function getReportDate(json, pmc, dateOn
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
let rightnow = new Date();
if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
- return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
+ let fromnow = moment(nextdate).fromNow();
+ if (nextdate && Math.abs(rightnow - nextdate) <
(86400*1000)) fromnow = "TODAY";
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + fromnow + ")");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
svn commit: r1871643 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard-beta.js
Author: humbedooh
Date: Mon Dec 16 10:19:36 2019
New Revision: 1871643
URL: http://svn.apache.org/viewvc?rev=1871643=rev
Log:
caso
Modified:
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/reportdate.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js?rev=1871643=1871642=1871643=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:19:36 2019
@@ -96,7 +96,7 @@ function getReportDate(json, pmc, dateOn
if (dateOnly == "due") {
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
let rightnow = new Date();
- if (nextdate && math.abs(rightnow - nextdate) <
(86400*2*1000)) {
+ if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
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=1871643=1871642=1871643=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:19:36 2019
@@ -1995,7 +1995,7 @@ function getReportDate(json, pmc, dateOn
if (dateOnly == "due") {
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
let rightnow = new Date();
- if (nextdate && math.abs(rightnow - nextdate) <
(86400*2*1000)) {
+ if (nextdate && Math.abs(rightnow - nextdate) <
(86400*2*1000)) {
return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
}
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
svn commit: r1871642 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard-beta.js
Author: humbedooh
Date: Mon Dec 16 10:19:10 2019
New Revision: 1871642
URL: http://svn.apache.org/viewvc?rev=1871642=rev
Log:
redden if juuust about due (or overdue!)
Modified:
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/reportdate.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js?rev=1871642=1871641=1871642=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:19:10 2019
@@ -95,6 +95,10 @@ function getReportDate(json, pmc, dateOn
// agenda date or due date?
if (dateOnly == "due") {
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
+ let rightnow = new Date();
+ if (nextdate && math.abs(rightnow - nextdate) <
(86400*2*1000)) {
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
+ }
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
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=1871642=1871641=1871642=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:19:10 2019
@@ -1994,6 +1994,10 @@ function getReportDate(json, pmc, dateOn
// agenda date or due date?
if (dateOnly == "due") {
nextdate.setDate(nextdate.getDate() - 2); // Due 48
hours prior to board meeting.
+ let rightnow = new Date();
+ if (nextdate && math.abs(rightnow - nextdate) <
(86400*2*1000)) {
+ return new HTML('span', {style: { color:
'#711'}}, nextdate.toDateString() + " (" + moment(nextdate).fromNow() + ")");
+ }
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
} else {
return nextdate ? (nextdate.toDateString() + " (" +
moment(nextdate).fromNow() + ")"): "Unknown(?)";
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=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=1871639=1871640=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=1871639=1871640=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('_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 += "Reporting schedule: " + (json[pmc] ? formatRm(json[pmc])
: "Unknown(?)") + ""
txt += "Next report date: " + (nextdate ? nextdate.toDateString() :
"Unknown(?)") + ""
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=1871639=1871640=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'.form
svn commit: r1871036 - /comdev/projects.apache.org/trunk/data/projects.xml
Author: humbedooh Date: Sun Dec 8 10:25:11 2019 New Revision: 1871036 URL: http://svn.apache.org/viewvc?rev=1871036=rev Log: add petri Modified: comdev/projects.apache.org/trunk/data/projects.xml Modified: comdev/projects.apache.org/trunk/data/projects.xml URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/data/projects.xml?rev=1871036=1871035=1871036=diff == --- comdev/projects.apache.org/trunk/data/projects.xml (original) +++ comdev/projects.apache.org/trunk/data/projects.xml Sun Dec 8 10:25:11 2019 @@ -242,6 +242,7 @@ http://parquet.apache.org/doap_Parquet.rdf http://pdfbox.apache.org/doap_PDFBox.rdf http://svn.apache.org/repos/asf/perl/modperl/docs/trunk/doap_Perl.rdf + https://raw.githubusercontent.com/apache/petri-site/master/petri.rdf http://svn.apache.org/repos/asf/phoenix/doap_phoenix.rdf http://svn.apache.org/repos/asf/pig/trunk/doap_Pig.rdf http://svn.apache.org/repos/asf/pivot/infra/doap/doap_Pivot.rdf
svn commit: r1870053 - /comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py
Author: humbedooh
Date: Wed Nov 20 18:19:00 2019
New Revision: 1870053
URL: http://svn.apache.org/viewvc?rev=1870053=rev
Log:
fixups for empire-db et al
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py?rev=1870053=1870052=1870053=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/drafts.py Wed Nov 20 18:19:00
2019
@@ -32,6 +32,7 @@ def index(environ, user):
whence = int(time.time() - (60*86400)) # Max 2 months ago!
for filename in [x for x in os.listdir(DRAFTS_DIR) if
x.startswith(EDITOR_TYPE) and x.endswith('.draft')]:
_e, p, t, u = filename.split('-', 3)
+p = p.replace('_', '-')
t = int(t)
# If a file is way old, try deleting it.
if t < whence:
@@ -92,7 +93,7 @@ def save(environ, user):
if has_access(user, project):
report = js.get('report')
now = int(time.time())
-filename = '%s-%s-%s-%s.draft' % (EDITOR_TYPE, project, now, user)
+filename = '%s-%s-%s-%s.draft' % (EDITOR_TYPE,
project.replace('-', '_'), now, user)
try:
with open(os.path.join(DRAFTS_DIR, filename), "w") as f:
f.write(report)
@@ -154,6 +155,7 @@ def forgotten(environ, user):
for filename in drafts:
_e, p, t, u = filename.split('-', 3)
t = int(t)
+p = p.replace('_', '-')
if p == rid and t > (time.time() - 45*86400):
applicables.append(filename)
if applicables:
svn commit: r1869408 - /comdev/reporter.apache.org/trunk/README.txt
Author: humbedooh Date: Tue Nov 5 15:22:47 2019 New Revision: 1869408 URL: http://svn.apache.org/viewvc?rev=1869408=rev Log: test commit, ignore again Modified: comdev/reporter.apache.org/trunk/README.txt Modified: comdev/reporter.apache.org/trunk/README.txt URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/README.txt?rev=1869408=1869407=1869408=diff == --- comdev/reporter.apache.org/trunk/README.txt (original) +++ comdev/reporter.apache.org/trunk/README.txt Tue Nov 5 15:22:47 2019 @@ -113,4 +113,3 @@ Data file consumers: site/getjson.py?only=project site/jiraversions.py?project=== site/addrelease.py?json=true=xxx=xxx=xxx -
svn commit: r1869405 - /comdev/reporter.apache.org/trunk/README.txt
Author: humbedooh Date: Tue Nov 5 15:02:33 2019 New Revision: 1869405 URL: http://svn.apache.org/viewvc?rev=1869405=rev Log: test commit, ignore Modified: comdev/reporter.apache.org/trunk/README.txt Modified: comdev/reporter.apache.org/trunk/README.txt URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/README.txt?rev=1869405=1869404=1869405=diff == --- comdev/reporter.apache.org/trunk/README.txt (original) +++ comdev/reporter.apache.org/trunk/README.txt Tue Nov 5 15:02:33 2019 @@ -113,3 +113,4 @@ Data file consumers: site/getjson.py?only=project site/jiraversions.py?project=== site/addrelease.py?json=true=xxx=xxx=xxx +
svn commit: r1869020 - /comdev/project-logos/site/index.html
Author: humbedooh Date: Sat Oct 26 21:36:18 2019 New Revision: 1869020 URL: http://svn.apache.org/viewvc?rev=1869020=rev Log: revert whitespace test Modified: comdev/project-logos/site/index.html Modified: comdev/project-logos/site/index.html URL: http://svn.apache.org/viewvc/comdev/project-logos/site/index.html?rev=1869020=1869019=1869020=diff == --- comdev/project-logos/site/index.html (original) +++ comdev/project-logos/site/index.html Sat Oct 26 21:36:18 2019 @@ -124,3 +124,4 @@ +
svn commit: r1869019 - /comdev/project-logos/site/index.html
Author: humbedooh Date: Sat Oct 26 21:34:03 2019 New Revision: 1869019 URL: http://svn.apache.org/viewvc?rev=1869019=rev Log: whitespace test... Modified: comdev/project-logos/site/index.html Modified: comdev/project-logos/site/index.html URL: http://svn.apache.org/viewvc/comdev/project-logos/site/index.html?rev=1869019=1869018=1869019=diff == --- comdev/project-logos/site/index.html (original) +++ comdev/project-logos/site/index.html Sat Oct 26 21:34:03 2019 @@ -124,4 +124,3 @@ -
svn commit: r1868516 - /comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
Author: humbedooh
Date: Wed Oct 16 18:38:08 2019
New Revision: 1868516
URL: http://svn.apache.org/viewvc?rev=1868516=rev
Log:
fixups for webservices pmc (ldap != hostname)
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py?rev=1868516=1868515=1868516=diff
==
--- comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py Wed Oct 16 18:38:08
2019
@@ -108,6 +108,8 @@ def agenda_forced(environ, user):
def agenda(environ, user):
""" Returns data on the board report for a project, IF present and/or
filed in the current agenda """
project = environ.get('QUERY_STRING')
+# Kludge for webservices
+project = pdata.ldapmap.get(project, project)
report = None
_txtfile, url = latest_agenda(environ)
if has_access(user, project):
@@ -185,6 +187,8 @@ def publish(environ, _user):
digest = js.get('digest')
attach = js.get('attach')
print(project, agenda)
+# Kludge for webservices
+project = pdata.ldapmap.get(project, project)
if agenda and project and report:
message = "Publishing report for %s via Reporter" % project
payload = {
svn commit: r1868363 - /comdev/reporter.apache.org/trunk/site/wizard/index.html
Author: humbedooh Date: Sat Oct 12 18:06:44 2019 New Revision: 1868363 URL: http://svn.apache.org/viewvc?rev=1868363=rev Log: This should do it :p Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868363=1868362=1868363=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Oct 12 18:06:44 2019 @@ -67,4 +67,3 @@ -
svn commit: r1868362 - /comdev/reporter.apache.org/trunk/site/wizard/index.html
Author: humbedooh Date: Sat Oct 12 18:02:07 2019 New Revision: 1868362 URL: http://svn.apache.org/viewvc?rev=1868362=rev Log: one really last one... Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868362=1868361=1868362=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Oct 12 18:02:07 2019 @@ -67,3 +67,4 @@ +
svn commit: r1868356 - /comdev/reporter.apache.org/trunk/site/wizard/index.html
Author: humbedooh Date: Sat Oct 12 17:46:11 2019 New Revision: 1868356 URL: http://svn.apache.org/viewvc?rev=1868356=rev Log: one last one... Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868356=1868355=1868356=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Oct 12 17:46:11 2019 @@ -67,4 +67,3 @@ -
svn commit: r1868355 - /comdev/reporter.apache.org/trunk/site/wizard/index.html
Author: humbedooh Date: Sat Oct 12 17:45:14 2019 New Revision: 1868355 URL: http://svn.apache.org/viewvc?rev=1868355=rev Log: another whitespace test Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868355=1868354=1868355=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Oct 12 17:45:14 2019 @@ -67,3 +67,4 @@ +
svn commit: r1868354 - /comdev/reporter.apache.org/trunk/site/wizard/index.html
Author: humbedooh Date: Sat Oct 12 17:38:29 2019 New Revision: 1868354 URL: http://svn.apache.org/viewvc?rev=1868354=rev Log: whitespace test for new svn server Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868354=1868353=1868354=diff == --- comdev/reporter.apache.org/trunk/site/wizard/index.html (original) +++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Oct 12 17:38:29 2019 @@ -67,4 +67,3 @@ -
svn commit: r1868041 - in /comdev/reporter.apache.org/trunk/site/wizard: index.html js/source/generators.js js/wizard-beta.js
Author: humbedooh
Date: Sun Oct 6 04:19:38 2019
New Revision: 1868041
URL: http://svn.apache.org/viewvc?rev=1868041=rev
Log:
bleh, make an outer wrapper so we don't get caught in CSS nightmares
Modified:
comdev/reporter.apache.org/trunk/site/wizard/index.html
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1868041=1868040=1868041=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/index.html (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sun Oct 6 04:19:38
2019
@@ -18,6 +18,7 @@
https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css;
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
crossorigin="anonymous">
+
Loading base data..
@@ -47,6 +48,7 @@
+
Powered by the ASF Board Report Wizard. Copyright
2019 Apache Community
Development.
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=1868041=1868040=1868041=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sun
Oct 6 04:19:38 2019
@@ -165,7 +165,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-let html = document.getElementById('wizard_spinner');
+let html = document.getElementById('outer_wrapper');
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
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=1868041=1868040=1868041=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sun Oct 6
04:19:38 2019
@@ -1380,7 +1380,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-let html = document.getElementById('wizard_spinner');
+let html = document.getElementById('outer_wrapper');
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
svn commit: r1868040 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard-beta.js
Author: humbedooh
Date: Sun Oct 6 04:18:15 2019
New Revision: 1868040
URL: http://svn.apache.org/viewvc?rev=1868040=rev
Log:
easier to just reuse the spinner div, to be frank...
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.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=1868040=1868039=1868040=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sun
Oct 6 04:18:15 2019
@@ -165,9 +165,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-document.getElementById('wizard_spinner').style.display = 'none';
-let html = document.getElementById('wrapper');
-html.style.display = 'block';
+let html = document.getElementById('wizard_spinner');
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
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=1868040=1868039=1868040=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sun Oct 6
04:18:15 2019
@@ -1380,9 +1380,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-document.getElementById('wizard_spinner').style.display = 'none';
-let html = document.getElementById('wrapper');
-html.style.display = 'block';
+let html = document.getElementById('wizard_spinner');
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
svn commit: r1868039 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard-beta.js
Author: humbedooh
Date: Sun Oct 6 04:16:46 2019
New Revision: 1868039
URL: http://svn.apache.org/viewvc?rev=1868039=rev
Log:
remove spinner on load
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.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=1868039=1868038=1868039=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sun
Oct 6 04:16:46 2019
@@ -165,6 +165,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
+document.getElementById('wizard_spinner').style.display = 'none';
let html = document.getElementById('wrapper');
html.style.display = 'block';
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
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=1868039=1868038=1868039=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sun Oct 6
04:16:46 2019
@@ -1380,6 +1380,7 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
+document.getElementById('wizard_spinner').style.display = 'none';
let html = document.getElementById('wrapper');
html.style.display = 'block';
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
svn commit: r1868038 - /comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Author: humbedooh
Date: Sun Oct 6 04:15:41 2019
New Revision: 1868038
URL: http://svn.apache.org/viewvc?rev=1868038=rev
Log:
regen JS
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
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=1868038=1868037=1868038=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sun Oct 6
04:15:41 2019
@@ -1380,8 +1380,8 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-let html = document.body;
-html.style.margin = '16px';
+let html = document.getElementById('wrapper');
+html.style.display = 'block';
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
svn commit: r1868037 - /comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
Author: humbedooh
Date: Sun Oct 6 04:15:27 2019
New Revision: 1868037
URL: http://svn.apache.org/viewvc?rev=1868037=rev
Log:
for splash screen, use the inner wrapper instead of the outer body, preserving
the footer
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.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=1868037=1868036=1868037=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sun
Oct 6 04:15:27 2019
@@ -165,8 +165,8 @@ function pre_splash(state, json) {
function splash(state, json, all) {
pdata = json;
-let html = document.body;
-html.style.margin = '16px';
+let html = document.getElementById('wrapper');
+html.style.display = 'block';
let link = all ? 'All projects (show only your projects):' : 'Your projects (show all projects):'
html.innerHTML = '%s'.format(link);
let tbl = new HTML('table', {cellpadding: '8px', style: {margin: '20px'}});
svn commit: r1868026 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/generators.js wizard-beta.js
Author: humbedooh
Date: Sat Oct 5 15:05:03 2019
New Revision: 1868026
URL: http://svn.apache.org/viewvc?rev=1868026=rev
Log:
test for undefined txt
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.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=1868026=1868025=1868026=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Sat
Oct 5 15:05:03 2019
@@ -516,6 +516,7 @@ function activity_tips(data) {
// Quick check for reflow needs
function should_reflow(txt, chars) {
+ if (typeof txt != 'string') return false;
chars = chars || 80;
let lines = txt.split(/[\r\n]+/g);
for (var i = 0; i < lines.length; i++) {
@@ -525,6 +526,7 @@ function should_reflow(txt, chars) {
}
function reflow(txt, chars) {
+ if (typeof txt != 'string') return "";
chars = chars || 80;
let words = txt.match(/([\S+?]+\s*)/mg);
if (!words) return txt;
@@ -564,4 +566,4 @@ function show_examples(examples, title)
}
title = "Examples for %s:".format(title);
modal(out, title);
-}
\ No newline at end of file
+}
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=1868026=1868025=1868026=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sat Oct 5
15:05:03 2019
@@ -1731,6 +1731,7 @@ function activity_tips(data) {
// Quick check for reflow needs
function should_reflow(txt, chars) {
+ if (typeof txt != 'string') return false;
chars = chars || 80;
let lines = txt.split(/[\r\n]+/g);
for (var i = 0; i < lines.length; i++) {
@@ -1740,6 +1741,7 @@ function should_reflow(txt, chars) {
}
function reflow(txt, chars) {
+ if (typeof txt != 'string') return "";
chars = chars || 80;
let words = txt.match(/([\S+?]+\s*)/mg);
if (!words) return txt;
@@ -1781,6 +1783,7 @@ function show_examples(examples, title)
modal(out, title);
}
+
/**
Fetched from source/init.js
**/
svn commit: r1866276 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/unified.js wizard-beta.js
Author: humbedooh
Date: Mon Sep 2 12:22:53 2019
New Revision: 1866276
URL: http://svn.apache.org/viewvc?rev=1866276=rev
Log:
revert now that CSS is fixed
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1866276=1866275=1866276=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Mon Sep
2 12:22:53 2019
@@ -48,7 +48,7 @@ function UnifiedEditor_highlight_section
// Sections are marked light green
hilites.push({
-highlight: additional_text.replace(/\r?\n$/, ''),
+highlight: additional_text,
className: color
});
}
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=1866276=1866275=1866276=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 Sep 2
12:22:53 2019
@@ -3338,7 +3338,7 @@ function UnifiedEditor_highlight_section
// Sections are marked light green
hilites.push({
-highlight: additional_text.replace(/\r?\n$/, ''),
+highlight: additional_text,
className: color
});
}
svn commit: r1866228 - /comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Author: humbedooh
Date: Sun Sep 1 01:26:41 2019
New Revision: 1866228
URL: http://svn.apache.org/viewvc?rev=1866228=rev
Log:
fix box-sizing issue in FF
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1866228=1866227=1866228=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Sun Sep 1 01:26:41 2019
@@ -42,6 +42,7 @@
border-style: solid;
background: none transparent !important;
caret-color: black;
+box-sizing: content-box;
}
.hwt-content mark {
svn commit: r1866227 - /comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Author: humbedooh
Date: Sun Sep 1 01:17:17 2019
New Revision: 1866227
URL: http://svn.apache.org/viewvc?rev=1866227=rev
Log:
nix visibility
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1866227=1866226=1866227=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Sun Sep 1 01:17:17 2019
@@ -80,10 +80,6 @@
}
-mark.green {
- visibility: hidden;
-}
-
.hwt-content mark.none {
/* color: red !important;*/
svn commit: r1866226 - in /comdev/reporter.apache.org/trunk/site/wizard/highlighter: highlighter.css highlighter.js
Author: humbedooh
Date: Sun Sep 1 01:13:41 2019
New Revision: 1866226
URL: http://svn.apache.org/viewvc?rev=1866226=rev
Log:
ditch divs, stick with marks but tweak greens to be inline-block
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1866226=1866225=1866226=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Sun Sep 1 01:13:41 2019
@@ -63,7 +63,7 @@
background-color: #ffec99;
}
-.hwt-content div.green {
+.hwt-content mark.green {
background-color: #afa3;
width: 100%;
display: inline-block;
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.js?rev=1866226=1866225=1866226=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.js
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.js Sun
Sep 1 01:13:41 2019
@@ -393,7 +393,6 @@
input = input.replace(/\{\{hwt-mark-start\|(\d+)\}\}/g,
function(match, submatch) {
var className = boundaries[+submatch].className;
if (className) {
- if (className == 'green') return ''
return '';
} else {
return '';
@@ -401,7 +400,7 @@
});
// replace stop tokens with closing tags
- input = input.replace(/\{\{hwt-mark-stop\}\}/g,
'');
+ input = input.replace(/\{\{hwt-mark-stop\}\}/g,
'');
this.$highlights.html(input);
},
svn commit: r1866178 - /comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Author: humbedooh
Date: Sat Aug 31 02:51:50 2019
New Revision: 1866178
URL: http://svn.apache.org/viewvc?rev=1866178=rev
Log:
move box sizing to parent
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1866178=1866177=1866178=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Sat Aug 31 02:51:50 2019
@@ -26,6 +26,7 @@
word-wrap: break-word !important;
color: transparent !important;
overflow: hidden !important;
+ box-sizing: content-box !important;
}
.hwt-input {
@@ -66,7 +67,6 @@
background-color: #afa3;
width: 100%;
display: inline-block;
- box-sizing: content-box !important;
}
svn commit: r1866177 - /comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Author: humbedooh Date: Sat Aug 31 02:46:02 2019 New Revision: 1866177 URL: http://svn.apache.org/viewvc?rev=1866177=rev Log: pin box sizing for green divs Modified: comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css Modified: comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1866177=1866176=1866177=diff == --- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css (original) +++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css Sat Aug 31 02:46:02 2019 @@ -66,6 +66,7 @@ background-color: #afa3; width: 100%; display: inline-block; + box-sizing: content-box !important; }
svn commit: r1866176 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/unified.js wizard-beta.js
Author: humbedooh
Date: Sat Aug 31 02:28:18 2019
New Revision: 1866176
URL: http://svn.apache.org/viewvc?rev=1866176=rev
Log:
don't highlight last newline, causes CSS weirdness
Modified:
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1866176=1866175=1866176=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Sat Aug
31 02:28:18 2019
@@ -48,7 +48,7 @@ function UnifiedEditor_highlight_section
// Sections are marked light green
hilites.push({
-highlight: additional_text,
+highlight: additional_text.replace(/\r?\n$/, ''),
className: color
});
}
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=1866176=1866175=1866176=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sat Aug 31
02:28:18 2019
@@ -3338,7 +3338,7 @@ function UnifiedEditor_highlight_section
// Sections are marked light green
hilites.push({
-highlight: additional_text,
+highlight: additional_text.replace(/\r?\n$/, ''),
className: color
});
}
svn commit: r1865817 - /comdev/reporter.apache.org/trunk/site/getjson.py
Author: humbedooh Date: Sat Aug 24 07:42:40 2019 New Revision: 1865817 URL: http://svn.apache.org/viewvc?rev=1865817=rev Log: remove old json api Removed: comdev/reporter.apache.org/trunk/site/getjson.py
svn commit: r1865816 - in /comdev/reporter.apache.org/trunk/site: index.html ng.html old.html
Author: humbedooh Date: Sat Aug 24 07:41:44 2019 New Revision: 1865816 URL: http://svn.apache.org/viewvc?rev=1865816=rev Log: Remove old reporter, redirect to new. Removed: comdev/reporter.apache.org/trunk/site/ng.html comdev/reporter.apache.org/trunk/site/old.html Modified: comdev/reporter.apache.org/trunk/site/index.html Modified: comdev/reporter.apache.org/trunk/site/index.html URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/index.html?rev=1865816=1865815=1865816=diff == --- comdev/reporter.apache.org/trunk/site/index.html (original) +++ comdev/reporter.apache.org/trunk/site/index.html Sat Aug 24 07:41:44 2019 @@ -2,41 +2,8 @@ - - - - - - - - - + ASF Board Report Tools -https://fontlibrary.org/face/selawik; type="text/css"/> - - - - - - -ASF Board Report Tools -Hi there!We're introducing a new tool for preparing board reports and gathering information on project activity, slated to replace the current reporter.a.o tool after the August board meeting. -You can start using our new tool right away, or you can opt to continue using the old reporter for now. - - Go to the new ASF Board Report Wizard - Go to the legacy reporter tool - - - - - -Powered by the ASF Board Report Wizard. Copyright 2019 Apache Community Development. -Queries or other feedback should go to our mailing list: d...@community.apache.org - - - -https://kit.fontawesome.com/a250232153.js"</a>;> -
svn commit: r1865598 - in /comdev/reporter.apache.org/trunk/site/wizard: fonts/ fonts/selawik.css fonts/selawk.woff fonts/selawkb.woff fonts/selawkl.woff fonts/selawksb.woff fonts/selawksl.woff index.
Author: humbedooh
Date: Wed Aug 21 05:22:16 2019
New Revision: 1865598
URL: http://svn.apache.org/viewvc?rev=1865598=rev
Log:
Add fonts locally, CDN is having issues.
Added:
comdev/reporter.apache.org/trunk/site/wizard/fonts/
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawik.css
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawk.woff (with
props)
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkb.woff (with
props)
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkl.woff (with
props)
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksb.woff (with
props)
comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksl.woff (with
props)
Modified:
comdev/reporter.apache.org/trunk/site/wizard/index.html
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawik.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawik.css?rev=1865598=auto
==
--- comdev/reporter.apache.org/trunk/site/wizard/fonts/selawik.css (added)
+++ comdev/reporter.apache.org/trunk/site/wizard/fonts/selawik.css Wed Aug 21
05:22:16 2019
@@ -0,0 +1,40 @@
+/* Generated By: http://www.cufonfonts.com */
+
+@font-face {
+font-family: 'SelawikRegular';
+font-style: normal;
+font-weight: normal;
+src: local('Selawik Regular'), url('selawk.woff') format('woff');
+}
+
+
+@font-face {
+font-family: 'Selawik Light';
+font-style: normal;
+font-weight: normal;
+src: local('Selawik Light'), url('selawkl.woff') format('woff');
+}
+
+
+@font-face {
+font-family: 'Selawik Semilight';
+font-style: normal;
+font-weight: normal;
+src: local('Selawik Semilight'), url('selawksl.woff') format('woff');
+}
+
+
+@font-face {
+font-family: 'Selawik Semibold';
+font-style: normal;
+font-weight: normal;
+src: local('Selawik Semibold'), url('selawksb.woff') format('woff');
+}
+
+
+@font-face {
+font-family: 'Selawik Bold';
+font-style: normal;
+font-weight: normal;
+src: local('Selawik Bold'), url('selawkb.woff') format('woff');
+}
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawk.woff
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawk.woff?rev=1865598=auto
==
Binary file - no diff available.
Propchange: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawk.woff
--
svn:mime-type = application/octet-stream
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkb.woff
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkb.woff?rev=1865598=auto
==
Binary file - no diff available.
Propchange: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkb.woff
--
svn:mime-type = application/octet-stream
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkl.woff
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkl.woff?rev=1865598=auto
==
Binary file - no diff available.
Propchange: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawkl.woff
--
svn:mime-type = application/octet-stream
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksb.woff
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksb.woff?rev=1865598=auto
==
Binary file - no diff available.
Propchange: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksb.woff
--
svn:mime-type = application/octet-stream
Added: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksl.woff
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksl.woff?rev=1865598=auto
==
Binary file - no diff available.
Propchange: comdev/reporter.apache.org/trunk/site/wizard/fonts/selawksl.woff
--
svn:mime-type = application/octet-stream
Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1865598=1865597=1865598=diff
==
--- comdev/reporter.apache.org/trunk/site/wizard/index.html (original)
+++ comdev/reporter.apache.org
