Patch to correct dependancy on jpgraph for OPT_1.2.6_MAX

gentoo-jpgraph.patch (text/plain), 10.82 KB, created by Gunnar Wrobel (RETIRED) on 2005-08-01 11:54:49 UTC

diff -Naur outreach.orig/overview/gantt/gantt_image.php outreach/overview/gantt/gantt_image.php
--- outreach.orig/overview/gantt/gantt_image.php	2005-08-01 19:36:27.000000000 +0200
+++ outreach/overview/gantt/gantt_image.php	2005-08-01 19:43:58.000000000 +0200
@@ -15,8 +15,8 @@
         exit;
     }
 }
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_gantt.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_gantt.php");
 include("$CRM_path/rt/reports/req_gantt_calc.inc");
 
 // If we didn't get all the variables we'd like, retrieve them from user_settings;
diff -Naur outreach.orig/people/admin/gantt_image.php outreach/people/admin/gantt_image.php
--- outreach.orig/people/admin/gantt_image.php	2005-08-01 19:36:27.000000000 +0200
+++ outreach/people/admin/gantt_image.php	2005-08-01 19:43:58.000000000 +0200
@@ -11,8 +11,8 @@
     }
 }
 
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_gantt.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_gantt.php");
 
 $person = $id;
 include("$CRM_path/rt/reports/req_gantt_calc.inc");
diff -Naur outreach.orig/rt/reports/counts_by_category.php outreach/rt/reports/counts_by_category.php
--- outreach.orig/rt/reports/counts_by_category.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/counts_by_category.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/reports/counts_by_owner.php outreach/rt/reports/counts_by_owner.php
--- outreach.orig/rt/reports/counts_by_owner.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/counts_by_owner.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/reports/deadlines_by_category.php outreach/rt/reports/deadlines_by_category.php
--- outreach.orig/rt/reports/deadlines_by_category.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/deadlines_by_category.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/reports/deadlines_by_owner.php outreach/rt/reports/deadlines_by_owner.php
--- outreach.orig/rt/reports/deadlines_by_owner.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/deadlines_by_owner.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/reports/gantt_image.php outreach/rt/reports/gantt_image.php
--- outreach.orig/rt/reports/gantt_image.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/gantt_image.php	2005-08-01 19:43:55.000000000 +0200
@@ -9,8 +9,8 @@
         exit;
     }
 }
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_gantt.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_gantt.php");
 include ("$CRM_path/rt/reports/req_gantt_calc.inc");
 
 // Setup Gantt graph
diff -Naur outreach.orig/rt/reports/resolve_time_by_category.php outreach/rt/reports/resolve_time_by_category.php
--- outreach.orig/rt/reports/resolve_time_by_category.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/resolve_time_by_category.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/reports/resolve_time_by_owner.php outreach/rt/reports/resolve_time_by_owner.php
--- outreach.orig/rt/reports/resolve_time_by_owner.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/reports/resolve_time_by_owner.php	2005-08-01 19:43:55.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
   include ("../../include/OPT_lib.php");
-  include ("$CRM_inc/jpgraph/jpgraph.php");
-  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+  include ("jpgraph/jpgraph.php");
+  include ("jpgraph/jpgraph_bar.php");
   auth_open();
 
 // Ensure we got a project
diff -Naur outreach.orig/rt/req_view/gantt_image.php outreach/rt/req_view/gantt_image.php
--- outreach.orig/rt/req_view/gantt_image.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/req_view/gantt_image.php	2005-08-01 19:43:56.000000000 +0200
@@ -11,8 +11,8 @@
         exit;
     }
 }
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_gantt.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_gantt.php");
 
 // Setup Gantt graph
 $graph = new GanttGraph(700,0,'auto');
diff -Naur outreach.orig/rt/req_view/req_progress.php outreach/rt/req_view/req_progress.php
--- outreach.orig/rt/req_view/req_progress.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/rt/req_view/req_progress.php	2005-08-01 19:43:55.000000000 +0200
@@ -4,8 +4,8 @@
 
 include ("../../include/OPT_lib.php");
 auth_open();
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_line.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_line.php");
 
 // First we determine all the timestamps when a progress change occured for a task associated with this request
 $prog_sql="select unix_timestamp(task_progress_history.date) from task_progress_history, request2task
diff -Naur outreach.orig/setup/test_graph.php outreach/setup/test_graph.php
--- outreach.orig/setup/test_graph.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/setup/test_graph.php	2005-08-01 19:44:46.000000000 +0200
@@ -1,8 +1,8 @@
 <?php
 
 $CRM_inc = "../include/";
-include ("../include/jpgraph/jpgraph.php");
-include ("../include/jpgraph/jpgraph_bar.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_bar.php");
 
 // Some data
 $datay1=array(140,110,50,60);
diff -Naur outreach.orig/setup/test_graph.php~ outreach/setup/test_graph.php~
--- outreach.orig/setup/test_graph.php~	1970-01-01 01:00:00.000000000 +0100
+++ outreach/setup/test_graph.php~	2005-08-01 19:43:56.000000000 +0200
@@ -0,0 +1,75 @@
+<?php
+
+$CRM_inc = "../include/";
+include ("../include/jpgraph/jpgraph.php");
+include ("../include/jpgraph/jpgraph_bar.php");
+
+// Some data
+$datay1=array(140,110,50,60);
+$datay2=array(35,90,190,190);
+$datay3=array(20,60,70,140);
+
+// Create the basic graph
+$graph = new Graph(450,250,'auto');    
+$graph->SetScale("textlin");
+$graph->img->SetMargin(40,80,30,40);
+
+// Adjust the position of the legend box
+$graph->legend->Pos(0.02,0.15);
+
+// Adjust the color for theshadow of the legend
+$graph->legend->SetShadow('darkgray@0.5');
+$graph->legend->SetFillColor('lightblue@0.3');
+
+// Get localised version of the month names
+$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
+
+// Set a nice summer (in Stockholm) image
+$graph->SetBackgroundImage('../images/stship.jpg',BGIMG_COPY);
+
+// Set axis titles and fonts
+$graph->xaxis->title->Set('Year 2002');
+$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
+$graph->xaxis->title->SetColor('white');
+
+$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
+$graph->xaxis->SetColor('white');
+
+$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
+$graph->yaxis->SetColor('white');
+
+//$graph->ygrid->Show(false);
+$graph->ygrid->SetColor('white@0.5');
+
+// Setup graph title
+$graph->title->Set('Congratulations!  JpGraph succcessfully installed.');
+// Some extra margin (from the top)
+$graph->title->SetMargin(3);
+$graph->title->SetFont(FF_COMIC,FS_NORMAL,12);
+
+// Create the three var series we will combine
+$bplot1 = new BarPlot($datay1);
+$bplot2 = new BarPlot($datay2);
+$bplot3 = new BarPlot($datay3);
+
+// Setup the colors with 40% transparency (alpha channel)
+$bplot1->SetFillColor('orange@0.4');
+$bplot2->SetFillColor('brown@0.4');
+$bplot3->SetFillColor('darkgreen@0.4');
+
+// Setup legends
+$bplot1->SetLegend('Label 1');
+$bplot2->SetLegend('Label 2');
+$bplot3->SetLegend('Label 3');
+
+// Setup each bar with a shadow of 50% transparency
+$bplot1->SetShadow('black@0.4');
+$bplot2->SetShadow('black@0.4');
+$bplot3->SetShadow('black@0.4');
+
+$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
+$gbarplot->SetWidth(0.6);
+$graph->Add($gbarplot);
+
+$graph->Stroke();
+?>
\ Kein Zeilenumbruch am Dateiende.
diff -Naur outreach.orig/tasks/report/gantt_image.php outreach/tasks/report/gantt_image.php
--- outreach.orig/tasks/report/gantt_image.php	2005-08-01 19:36:27.000000000 +0200
+++ outreach/tasks/report/gantt_image.php	2005-08-01 19:43:56.000000000 +0200
@@ -9,8 +9,8 @@
         exit;
     }
 }
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_gantt.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_gantt.php");
 
 // Setup Gantt graph
 $graph = new GanttGraph(700,0,'auto');
diff -Naur outreach.orig/tasks/task/estimate_bar_graph.php outreach/tasks/task/estimate_bar_graph.php
--- outreach.orig/tasks/task/estimate_bar_graph.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/tasks/task/estimate_bar_graph.php	2005-08-01 19:43:56.000000000 +0200
@@ -3,8 +3,8 @@
 //  When they happened and who changed them
 include ("../../include/OPT_lib.php");
 auth_open();
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_bar.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_bar.php");
 
 $est_sql="select date, TIME_TO_SEC(estimated)/3600, fname, lname, task_estimate_history.id
           from task_estimate_history, people where estimator = people.id and taskID = $task";
diff -Naur outreach.orig/tasks/task/task_progress.php outreach/tasks/task/task_progress.php
--- outreach.orig/tasks/task/task_progress.php	2005-08-01 19:36:26.000000000 +0200
+++ outreach/tasks/task/task_progress.php	2005-08-01 19:43:56.000000000 +0200
@@ -4,8 +4,8 @@
 
 include ("../../include/OPT_lib.php");
 auth_open();
-include ("$CRM_inc/jpgraph/jpgraph.php");
-include ("$CRM_inc/jpgraph/jpgraph_line.php");
+include ("jpgraph/jpgraph.php");
+include ("jpgraph/jpgraph_line.php");
 
 // Determine whether to show Y axis as hours remaining or percentage complete
 if (get_project_setting($proj, "task_status_hours_remaining") == "1")