[Bps-public-commit] rt-extension-jsgantt branch, master, updated. ed4d93d28dad940b4fbc7cc390c928bd4c331fa5
? sunnavy
sunnavy at bestpractical.com
Fri Apr 15 23:19:39 EDT 2011
The branch, master has been updated
via ed4d93d28dad940b4fbc7cc390c928bd4c331fa5 (commit)
via 5f85a1248a875611e9f7df28260ef759b81052d6 (commit)
via 163f05541ce30151732109ae3ee51a3d72b76129 (commit)
from d0ccca1a3cdb9e8094ef101b57969e02ab11a099 (commit)
Summary of changes:
META.yml | 2 +
Makefile.PL | 2 +
etc/jsgantt.diff | 51 ++++++++++++++++++++++++++++++++++----------
html/NoAuth/js/jsgantt.js | 4 +++
4 files changed, 47 insertions(+), 12 deletions(-)
- Log -----------------------------------------------------------------
commit 163f05541ce30151732109ae3ee51a3d72b76129
Author: sunnavy <sunnavy at gmail.com>
Date: Sat Apr 16 10:26:27 2011 +0800
respect DateDayBeforeMonth
diff --git a/html/NoAuth/js/jsgantt.js b/html/NoAuth/js/jsgantt.js
index abc72da..9232df6 100755
--- a/html/NoAuth/js/jsgantt.js
+++ b/html/NoAuth/js/jsgantt.js
@@ -573,7 +573,11 @@ JSGantt.GanttChart = function(pGanttVar, pDiv, pFormat)
* @type String
* @default "mm/dd/yy"
* @private
+% if ( RT->Config->Get('DateDayBeforeMonth') ) {
+*/var vDateDisplayFormat = "dd/mm/yy";
+% } else {
*/var vDateDisplayFormat = "mm/dd/yy";
+% }
var vNumUnits = 0;
var vCaptionType;
commit 5f85a1248a875611e9f7df28260ef759b81052d6
Author: sunnavy <sunnavy at gmail.com>
Date: Sat Apr 16 10:26:36 2011 +0800
add repository
diff --git a/META.yml b/META.yml
index 6723050..222cea4 100644
--- a/META.yml
+++ b/META.yml
@@ -20,4 +20,6 @@ no_index:
- inc
requires:
JSON: 0
+resources:
+ repository: git://github.com/bestpractical/rt-extension-jsgantt.git
version: 0.11
diff --git a/Makefile.PL b/Makefile.PL
index fd67c8b..9e9fcdb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,6 +5,8 @@ author ('sunnavy <sunnavy at bestpractical.com>');
version_from ('lib/RT/Extension/JSGantt.pm');
abstract_from('lib/RT/Extension/JSGantt.pm');
license('GPLv2');
+repository 'git://github.com/bestpractical/rt-extension-jsgantt.git';
+
requires( 'JSON' );
&WriteAll;
commit ed4d93d28dad940b4fbc7cc390c928bd4c331fa5
Author: sunnavy <sunnavy at gmail.com>
Date: Sat Apr 16 11:13:10 2011 +0800
update diff
diff --git a/etc/jsgantt.diff b/etc/jsgantt.diff
index f030968..3718599 100644
--- a/etc/jsgantt.diff
+++ b/etc/jsgantt.diff
@@ -10,10 +10,22 @@ index 683fcad..5845df1 100755
+DIV.scroll2 { position:relative; PADDING-RIGHT: 0px; overflow:auto ;overflow-x:scroll;overflow-y:hidden; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; WIDTH: 720px; PADDING-TOP: 0px; BACKGROUND-COLOR: #ffffff }
diff --git b/html/NoAuth/js/jsgantt.js a/html/NoAuth/js/jsgantt.js
-index 81012fb..abc72da 100755
+index fe99c57..9232df6 100755
--- b/html/NoAuth/js/jsgantt.js
+++ a/html/NoAuth/js/jsgantt.js
-@@ -1113,7 +1113,7 @@ Complete-Displays task percent complete</p>
+@@ -573,7 +573,11 @@ JSGantt.GanttChart = function(pGanttVar, pDiv, pFormat)
+ * @type String
+ * @default "mm/dd/yy"
+ * @private
++% if ( RT->Config->Get('DateDayBeforeMonth') ) {
++*/var vDateDisplayFormat = "dd/mm/yy";
++% } else {
+ */var vDateDisplayFormat = "mm/dd/yy";
++% }
+
+ var vNumUnits = 0;
+ var vCaptionType;
+@@ -1113,7 +1117,7 @@ Complete-Displays task percent complete</p>
while(Date.parse(vTmpDate) <= Date.parse(vMaxDate))
{
vStr = vTmpDate.getFullYear() + '';
@@ -22,7 +34,22 @@ index 81012fb..abc72da 100755
if(vFormat == 'minute')
-@@ -1140,12 +1140,12 @@ Complete-Displays task percent complete</p>
+@@ -1132,25 +1136,20 @@ Complete-Displays task percent complete</p>
+
+ if(vFormat == 'day')
+ {
+- vRightTable += '<td class=gdatehead style="FONT-SIZE: 12px; HEIGHT: 19px;" align=center colspan=7>';
+-
+- if(vDateDisplayFormat=='yyyy-mm-dd')
+- {vRightTable += (vTmpDate.getMonth()+1) + '-' + (vTmpDate.getDate()) + ' - ';}
+- else
+- {vRightTable += JSGantt.formatDateStr(vTmpDate,vDateDisplayFormat.substring(0,5)) + ' - ';}
+-
++ vRightTable += '<td class=gdatehead style="FONT-SIZE: 12px; HEIGHT: 19px;" align=center colspan=7>' +
++ JSGantt.formatDateStr(vTmpDate,vDateDisplayFormat.substring(0,5)) + ' - ';
+ vTmpDate.setDate(vTmpDate.getDate()+6);
+ vRightTable += JSGantt.formatDateStr(vTmpDate, vDateDisplayFormat) + '</td>';
+ vTmpDate.setDate(vTmpDate.getDate()+1);
}
else if(vFormat == 'week')
{
@@ -37,7 +64,7 @@ index 81012fb..abc72da 100755
vTmpDate.setDate(vTmpDate.getDate() + 1);
while(vTmpDate.getDate() > 1)
{
-@@ -1154,7 +1154,7 @@ Complete-Displays task percent complete</p>
+@@ -1159,7 +1158,7 @@ Complete-Displays task percent complete</p>
}
else if(vFormat == 'quarter')
{
@@ -46,37 +73,37 @@ index 81012fb..abc72da 100755
vTmpDate.setDate(vTmpDate.getDate() + 81);
while(vTmpDate.getDate() > 1)
{
-@@ -1905,9 +1905,9 @@ JSGantt.folder= function (pID,ganttObj) {
+@@ -1910,9 +1909,9 @@ JSGantt.folder= function (pID,ganttObj) {
JSGantt.show(pID, 1, ganttObj);
if (JSGantt.isIE())
-- {JSGantt.findObj('group_'+pID).innerText = '?';}
+- {JSGantt.findObj('group_'+pID).innerText = '-';}
+ {JSGantt.findObj('group_'+pID).innerText = '–';}
else
-- {JSGantt.findObj('group_'+pID).textContent = '?';}
+- {JSGantt.findObj('group_'+pID).textContent = '-';}
+ {JSGantt.findObj('group_'+pID).textContent = '–';}
}
-@@ -1979,7 +1979,7 @@ JSGantt.show = function (pID, pTop, ganttObj) {
+@@ -1984,7 +1983,7 @@ JSGantt.show = function (pID, pTop, ganttObj) {
} else {
if (JSGantt.isIE()) { // IE;
-- if( JSGantt.findObj('group_'+pID).innerText == '?') {
+- if( JSGantt.findObj('group_'+pID).innerText == '-') {
+ if( JSGantt.findObj('group_'+pID).innerText == '–') {
JSGantt.findObj('child_'+vID).style.display = "";
JSGantt.findObj('childgrid_'+vID).style.display = "";
vList[i].setVisible(1);
-@@ -1987,7 +1987,7 @@ JSGantt.show = function (pID, pTop, ganttObj) {
+@@ -1992,7 +1991,7 @@ JSGantt.show = function (pID, pTop, ganttObj) {
} else {
-- if( JSGantt.findObj('group_'+pID).textContent == '?') {
+- if( JSGantt.findObj('group_'+pID).textContent == '-') {
+ if( JSGantt.findObj('group_'+pID).textContent == '–') {
JSGantt.findObj('child_'+vID).style.display = "";
JSGantt.findObj('childgrid_'+vID).style.display = "";
vList[i].setVisible(1);
-@@ -2014,10 +2014,11 @@ JSGantt.taskLink = function(pRef,pWidth,pHeight)
+@@ -2019,10 +2018,11 @@ JSGantt.taskLink = function(pRef,pWidth,pHeight)
{
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list