From commits-return-10814-apmail-community-commits-archive=community.apache.org@community.apache.org Mon Dec 16 10:22:42 2019 Return-Path: X-Original-To: apmail-community-commits-archive@minotaur.apache.org Delivered-To: apmail-community-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id C1F9119E95 for ; Mon, 16 Dec 2019 10:22:41 +0000 (UTC) Received: (qmail 92773 invoked by uid 500); 16 Dec 2019 10:22:41 -0000 Delivered-To: apmail-community-commits-archive@community.apache.org Received: (qmail 92748 invoked by uid 500); 16 Dec 2019 10:22:41 -0000 Mailing-List: contact commits-help@community.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@community.apache.org Delivered-To: mailing list commits@community.apache.org Received: (qmail 92729 invoked by uid 99); 16 Dec 2019 10:22:41 -0000 Received: from Unknown (HELO svn01-us-east.apache.org) (13.90.137.153) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Dec 2019 10:22:41 +0000 Received: from svn01-us-east.apache.org (svn01-us-east.apache.org [127.0.0.1]) by svn01-us-east.apache.org (ASF Mail Server at svn01-us-east.apache.org) with ESMTP id 0F66F17BB9F for ; Mon, 16 Dec 2019 10:22:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1871644 - in /comdev/reporter.apache.org/trunk/site/wizard/js: source/reportdate.js wizard-beta.js Date: Mon, 16 Dec 2019 10:22:41 -0000 To: commits@community.apache.org From: humbedooh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20191216102241.0F66F17BB9F@svn01-us-east.apache.org> Author: humbedooh Date: Mon Dec 16 10:22:40 2019 New Revision: 1871644 URL: http://svn.apache.org/viewvc?rev=1871644&view=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&r1=1871643&r2=1871644&view=diff ============================================================================== --- comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js (original) +++ comdev/reporter.apache.org/trunk/site/wizard/js/source/reportdate.js Mon Dec 16 10: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&r1=1871643&r2=1871644&view=diff ============================================================================== --- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original) +++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Mon Dec 16 10: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 {