mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-08-29 08:17:18 +08:00
5a66316965 SuiteCRM 7.12.3 Release 1cfaf51831 Fix #9454 - Avoid duplicate results in basic search 7eb52791f1 Fix #9455 - Popup metadata override removed when filtered a21463bee1 Fix #8155 - Removed Unused PDF Settings 7f3c59f382 Fix #8948 - Make Project Tasks Importable ac4a1e79a7 Fix #9191 - Add utf normalization repair command bcb784eef7 Fix #9434 - Cron notion unit test fails 2e4aa8f594 Fix #8309 - Delete button showing for users with no delete access bf5fe39148 Fix #8525 - Bulk Action label not showing for users without delete access 1a45a93b5c Fix #9398 - Consistently store dropdowns in $app_list_strings rather than $GLOBALS 664b2d5c74 Fix #9406 - Validation displayed static message isn't correct de192fa845 Fix #9271 - Primary Email property is kept after ading an extra Email address 206db24eaa Fix #9378 - Filter by Email1 Field Through the API 6c39d73580 Fix #9312 - Declaring object within StudioClass to remove Strict Warnings be2044b341 Fix #9387 - Correct Variable Names 7e3c96d5b4 Fix #9387 - Clean Cron Historic and Failed Jobs b3e0556482 Fix #9387 - Display Actual Job Result in Subpanel 90b4e0423a Fix issue #9380 where date action in workflow fails to save Add check on if value is array, if is array don't attempt date formatting 864d614945 Fix #9408 - adding fix for deleting emails 7b442f10ca Merge next into suite 8 b522a5acf3 [Legacy] Meeting Module Styling Fixes 4e4d4e7d86 [Legacy] Admin Import Styling Fixes e320acd63c [Legacy] Popup Selector Styling Fixes 60acfc36f5 [Legacy] Backup Modules Styling Fixes 73cc52ce14 [Legacy] Jotpad Dashlet Styling Fixes 0128df2e63 [Legacy] User Name Longtext styling fixes f12c72e8f6 [Legacy] Diagnostic Tool Whitespace Styling Fixes 841b16e033 [Legacy] Dashboard Dashlet Styling Fixes e274de5a58 [Legacy] Scheduler Styling Fixes 0c330bc280 [Legacy] Reports Subpanels Styling Fixes 0730d433b2 [Legacy] Meeting Popup Selector Styling Fixes a22626df09 [Legacy] Bump version to 8.0.0 ebde6fb8cc [Legacy] Apply set-timezone styling ot the the users set-timezone page 55f1e360df [Legacy] Add name mapping for SetTimezone action 44fa660c65 [Legacy] Define summary templates for contacts, leads, prospects f363b741f9 [Legacy] Change Contacts detailviewdefs to use full name 8afde55218 [Legacy] Fix .htaccess build to take the full CRM url into account 8373995c26 [Legacy] Admin diagnostic tool styling fixes 03593b259c [Legacy] Disable upgrade wizard in admin 66c9fe4d8f [Legacy] Remove lucene and AOD_index 21f9844286 [Legacy] Fix event invite mod_strings handling 04bdfd8975 [Legacy] Forgot Password Page Styling Fixes ba459af407 [Legacy] fix redirect from projects subpanel 0f19a141d1 [Legacy] Add Default Link Item Mapper - add relate module injection on backend bean field_defs efc2083eaf [Legacy] Email Body Styling Fixes 648a1d9350 Merge next into suite 8 a0cfd72ab3 [Legacy] Remove deprecated spots module 103fd1076f [Legacy] Fix capitalized url on user profile calendar options 97fca254bd [Legacy] Re-add user module reset password modal 864c35c4ad [Legacy] Remove echo on user save 169a15a6c9 [Legacy] Close user action dropdown on password reset e8c400ab24 [Legacy] Fix user triggered password reset e38f48c6d4 [Legacy] Fix password recovery templates setup on install 927969c9a3 [Legacy] Bump version to 8.0.0-rc.2 b27584577d [Legacy] UserProfile Settings Modal Styling Fixes 2aba88dfe8 [Legacy] Meetings Styling Fixes 13d743e598 [Legacy] Password & System Settings Action Button Fixes cfb0bcc86d [Legacy] User Setup Modal Styling Fixes d05f3aa4f5 [Legacy] Fix legacy widget acl definitions e469e337f8 [Legacy] Suite 8 extensions to legacy plugins 41e84b1d17 [Legacy] Override server variables when doing kernel bypass 7f5d03f280 Merge commit '75ea167930
' into suite7merge c5f43d6c88 [Legacy] Popup Selector Styling Fixes 0445c1c0ab [Legacy] update install language label eb3fe0472b [Legacy] Dashlet Settings Modal Styling Fixes 6f0918b73d [Legacy] User Profile Mobile Styling Fixes 5af790f7fa [Legacy] Add acls calculation on legacy list data calls 096a59a7cf [Legacy] Get list of visible modules from module name mapper c2d618e631 Fix valid module check aa79de3a31 [Legacy] add widget acl metadata - update acl config for top widget 315b554b7e [Legacy] Subpanels Action Button Styling Fixes c87e66a262 remove photo widgets for contacts and leads 433940a72f [Legacy] Admin Release Styling Fixes c0a1378873 Suite8 ChangeLog ModalPopup Styling Fixes aa484f3f9e [Legacy] Add close menu label 8f81b47c65 [Legacy] Add not module selected label 36a0b05eb2 [Legacy] Add parent type ApiBeanMapper 7e02d1d23c [Legacy] Fix username display for unauthorized users 2ea8f210a1 [Legacy] DetailView Header Title Overlaps fixes 2a25edd6c4 [Legacy] Fix htaccess generation 34500ba791 Fix Date Filed for Targets 211ce6bfbb [Legacy] Remove Button Hover Fixes 223adf26bc [Legacy] Reports footer button removed fixes c567777afe [Legacy] Reports Styling Fixes 6f71ed31c2 [Legacy] Maps Button Position Fixes c5d5936c22 [Legacy] Add Tab Dashlet Sapcing Fixes 018c11c562 [Legacy] Dashlet Setting Modal Label Fix & Button Fixes 9645c68ca6 [Legacy] Activity Stream Post Button Hover color fixes 445ab52dae [Legacy] Bump version to 8.0.0-rc e10b872b21 [Legacy] Remove license from install app strings e5c21ca68c Merge commit 'dd455a1c2d
' into legacy_update_2 3886e3cfa6 Fix ignore system checks valitation 415cdd57b0 [Legacy] Add install labels 70ae186de5 [Legacy] add new install labels 7e05e69580 [Legacy] add install validator class 4c4ed83f3d [Legacy] Add Label for Subpanel Edit Line Action 17d8f4e7e9 [Legacy] Dashboard Mobile Styling Fixes abd914702a [Legacy] History Subpanel Button Styling Fixes 34a0dac449 [Legacy] Workflow Stying Fixes 32c4827895 [Legacy] Convert Lead Styling Fixes f1ca14c009 [Legacy] Roles Styling Fixes 3dbdce8055 [Legacy] Admin Modules label font fixes 36a38a1c44 [Legacy] HomePage Mobile Fixes a5b451ab12 update legacy handlers to apply new logic considering - base actions - action resolvers - fix url navigation issue in classic view 87e6e239ce [Legacy] Module framework - move suite 8 module config to legacy ee973e74f6 [Legacy] Add support for more metadata on listviewdefs ad312c45fd [Legacy] Add Support for all modules with parent css classes a409d81e2b [Legacy] Security Group Styling Fixes 5171ae319f [Legacy] Password Management Mobile Fixes d0eca8193d [Leagcy] Email Settings Fixes 766af5f4e6 [Legacy] Products Modules Buttons fixes 99ec9e30f9 [Legacy] OAUTH2 Clients and tokens fixes 54c962a532 [Legacy] adapt legacy install scripts to work with Suite8 install d6f20e38e6 [Legacy] add labels for S8 Installer 83b00b6a94 [Legacy] Add widget not found label 3ac807db61 Merge commit '114b895b6d
' into merge_develop 1feeb409f8 [Legacy] Email Action DropDown Styling Fixes git-subtree-dir: public/legacy git-subtree-split: 5a663169652b57bb561de74a7e3a8051c9330a83
538 lines
21 KiB
PHP
Executable file
538 lines
21 KiB
PHP
Executable file
<?php
|
|
/**
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* along with this program; if not, see http://www.gnu.org/licenses
|
|
* or write to the Free Software Foundation,Inc., 51 Franklin Street,
|
|
* Fifth Floor, Boston, MA 02110-1301 USA
|
|
* @copyright Andrew Mclaughlan 2014
|
|
* @author Andrew Mclaughlan <andrew@mclaughlan.info>
|
|
*/
|
|
|
|
|
|
if (!defined('sugarEntry') || !sugarEntry) {
|
|
die('Not A Valid Entry Point');
|
|
}
|
|
|
|
class ProjectController extends SugarController
|
|
{
|
|
//Loads the gantt view
|
|
public function action_view_GanttChart()
|
|
{
|
|
$this->view = 'GanttChart';
|
|
}
|
|
|
|
public function action_generate_chart()
|
|
{
|
|
$db = DBManagerFactory::getInstance();
|
|
|
|
include_once('modules/Project/gantt.php');
|
|
include_once('modules/Project/project_table.php');
|
|
|
|
$project = BeanFactory::newBean('Project');
|
|
$project->retrieve($_POST["pid"]);
|
|
|
|
//Get project tasks
|
|
$Task = BeanFactory::getBean('ProjectTask');
|
|
$tasks = $Task->get_full_list("order_number", "project_task.project_id = '".$project->id."'");
|
|
|
|
//Get the start and end date of the project in database format
|
|
$query = "SELECT min(date_start) FROM project_task WHERE project_id = '{$project->id}'";
|
|
$start_date = $db->getOne($query);
|
|
|
|
$query = "SELECT max(date_finish) FROM project_task WHERE project_id = '{$project->id}'";
|
|
$end_date = $db->getOne($query);
|
|
|
|
$duration = $this->count_days($start_date, $end_date);
|
|
if ($duration < 30) {
|
|
$query = "SELECT max(date_finish) + INTERVAL " . (30 - $duration) . " DAY FROM project_task WHERE project_id = '{$project->id}'";
|
|
$end_date = $db->getOne($query);
|
|
} ?>
|
|
|
|
<script type="text/javascript">
|
|
//Get the height if the #gantt div and add 18px
|
|
var size = $('#gantt').height() +18;
|
|
//Call jquery splitter function
|
|
$('#project').splitter({
|
|
outline: true
|
|
});
|
|
//Set height of gantt wrapping divs to make sure it shows
|
|
$('#project').css('height', size+'px');
|
|
$('.splitter-bar').css('height', size+'px');
|
|
|
|
</script>
|
|
<div id="project">
|
|
<div id="left_pane">
|
|
<?php new ProjectTable($tasks); ?>
|
|
</div>
|
|
<div id="right_pane">
|
|
<div id="gantt">
|
|
<?php new Gantt($start_date, $end_date, $tasks); ?>
|
|
</div>
|
|
<div id="arrow_divs" style=""></div>
|
|
</div>
|
|
</div>
|
|
|
|
<?php
|
|
die();
|
|
}
|
|
|
|
//Create new project task
|
|
public function action_update_GanttChart()
|
|
{
|
|
global $current_user;
|
|
$db = DBManagerFactory::getInstance();
|
|
|
|
$task_name = $_POST['task_name'];
|
|
$project_id = $_POST['project_id'];
|
|
$override_business_hours = (int)$_POST['override_business_hours'];
|
|
$task_id = $_POST['task_id'];
|
|
$predecessor = $_POST['predecessor'];
|
|
$rel_type = $_POST['rel_type'];
|
|
$resource = $_POST['resource'];
|
|
$percent = $_POST['percent'];
|
|
$note = $_POST['note'];
|
|
$actual_duration = $_POST['actual_duration'];
|
|
|
|
if ($_POST['milestone'] == 'Milestone') {
|
|
$milestone_flag = '1';
|
|
} else {
|
|
if ($_POST['milestone'] == 'Task') {
|
|
$milestone_flag = '0';
|
|
}
|
|
}
|
|
|
|
$dateformat = $current_user->getPreference('datef');
|
|
|
|
$startdate = DateTime::createFromFormat($dateformat, $_POST['start']);
|
|
$start = $startdate->format('Y-m-d');
|
|
|
|
//Take 1 off duration so that task displays in correct number of table cells in gantt chart.
|
|
$duration = $_POST['duration'] -1;
|
|
|
|
$duration_unit = $_POST['unit'];
|
|
|
|
//Compensate for resulting negative number when a 0 duration is passed in above
|
|
if ($duration < 0) {
|
|
$duration = 0;
|
|
}
|
|
|
|
|
|
//------ build business hours array
|
|
$days = array("Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday");
|
|
$businessHours = BeanFactory::getBean("AOBH_BusinessHours");
|
|
$bhours = array();
|
|
foreach ($days as $day) {
|
|
$bh = $businessHours->getBusinessHoursForDay($day);
|
|
|
|
if ($bh) {
|
|
$bh = $bh[0];
|
|
if ($bh->open_status) {
|
|
$open_h = $bh ? $bh->opening_hours : 9;
|
|
$close_h = $bh ? $bh->closing_hours : 17;
|
|
|
|
$start_time = DateTime::createFromFormat($dateformat, $_POST['start']);
|
|
$start_time = $start_time->modify('+'.$open_h.' Hours');
|
|
|
|
$end_time = DateTime::createFromFormat($dateformat, $_POST['start']);
|
|
$end_time = $end_time->modify('+'.$close_h.' Hours');
|
|
|
|
$hours = ($end_time->getTimestamp() - $start_time->getTimestamp())/(60*60);
|
|
if ($hours < 0) {
|
|
$hours = 0 - $hours ;
|
|
}
|
|
|
|
//$hours = $bh->diffBusinessHours($start_time, $end_time);
|
|
$bhours[$day] = $hours;
|
|
} else {
|
|
$bhours[$day] = 0;
|
|
}
|
|
}
|
|
}
|
|
//-----------------------------------
|
|
|
|
|
|
//default business hours array
|
|
if ($override_business_hours != 1 || empty($bhours)) {
|
|
$bhours = array('Monday' => 8,'Tuesday' => 8,'Wednesday' => 8, 'Thursday' => 8, 'Friday' => 8, 'Saturday' => 0, 'Sunday' => 0);
|
|
}
|
|
//---------------------------
|
|
|
|
|
|
//
|
|
//code block to calculate end date based on user's business hours
|
|
//
|
|
|
|
$enddate = $startdate;
|
|
|
|
$h = 0;
|
|
$d = 0;
|
|
if ($duration_unit == 'Hours') {
|
|
while ($duration > $h) {
|
|
$day = $enddate->format('l');
|
|
|
|
$h += $bhours[$day];
|
|
$enddate = $enddate->modify('+1 Days');
|
|
}
|
|
|
|
$enddate = $enddate->format('Y-m-d');
|
|
} else {
|
|
while ($duration >= $d) {
|
|
$day = $enddate->format('l');
|
|
|
|
if ($bhours[$day] != 0) {
|
|
$d += 1;
|
|
}
|
|
$enddate = $enddate->modify('+1 Days');
|
|
}
|
|
$enddate = $enddate->modify('-1 Days');//readjust it back to remove 1 additional day added
|
|
$enddate = $enddate->format('Y-m-d');
|
|
}
|
|
|
|
//----------------------------------
|
|
|
|
if ($percent > 0) {
|
|
$status = 'In Progress';
|
|
} else {
|
|
$status = 'Not Started';
|
|
}
|
|
|
|
//count tasks
|
|
$query = "SELECT COUNT(*) FROM project_task WHERE project_id = '{$project_id}' AND deleted = '0'";
|
|
$count = $db->getOne($query);
|
|
$tid = $count+1;
|
|
|
|
if ($this->IsNullOrEmptyString($task_id)) {
|
|
$this->create_task($task_name, $start, $enddate, $project_id, $milestone_flag, $status, $tid, $predecessor, $rel_type, $duration, $duration_unit, $resource, $percent, $note, $actual_duration, $tid);
|
|
} else {
|
|
$this->update_task($task_id, $task_name, $start, $enddate, $project_id, $milestone_flag, $status, $predecessor, $rel_type, $duration, $duration_unit, $resource, $percent, $note, $actual_duration);
|
|
}
|
|
}
|
|
|
|
//mark project task as deleted
|
|
public function action_delete_task()
|
|
{
|
|
$id = $_POST['task_id'];
|
|
$task = BeanFactory::newBean('ProjectTask');
|
|
$task->retrieve($id);
|
|
$task->deleted = '1';
|
|
$task->save();
|
|
}
|
|
|
|
//Returns new task start date including any lag via ajax call
|
|
public function action_get_end_date()
|
|
{
|
|
global $timeDate;
|
|
$db = DBManagerFactory::getInstance();
|
|
|
|
$timeDate = new TimeDate();
|
|
$id = $_POST['task_id'];
|
|
$lag = $_POST['lag'];
|
|
|
|
//Get the end date of the projectTask in raw database format
|
|
$query = "SELECT date_finish FROM project_task WHERE id = '{$id}'";
|
|
$end_date = $db->getOne($query);
|
|
//Add 1 day onto end date for first day of new task
|
|
$start_date = date('Y-m-d', strtotime($end_date. ' + 1 days'));
|
|
//Add lag onto start date
|
|
$start_date = date('Y-m-d', strtotime($start_date. ' + '.$lag.' days'));
|
|
|
|
echo $timeDate->to_display_date($start_date, true);
|
|
die();
|
|
}
|
|
|
|
|
|
//updates the order of the tasks
|
|
public function action_update_order()
|
|
{
|
|
|
|
//convert quotes in json string back to normal
|
|
$jArray = htmlspecialchars_decode($_POST['orderArray']);
|
|
|
|
//create object/array from json data
|
|
$orderArray = json_decode($jArray, true);
|
|
|
|
foreach ($orderArray as $id => $order_number) {
|
|
$task = BeanFactory::newBean('ProjectTask');
|
|
$task->retrieve($id);
|
|
$task->order_number = $order_number;
|
|
$task->save();
|
|
}
|
|
}
|
|
//returns tasks for predecessor in the add task pop-up form
|
|
public function action_get_predecessors()
|
|
{
|
|
global $mod_strings;
|
|
$project = BeanFactory::newBean('Project');
|
|
$project->retrieve($_REQUEST["project_id"]);
|
|
//Get project tasks
|
|
$Task = BeanFactory::getBean('ProjectTask');
|
|
$tasks = $Task->get_full_list("order_number", "project_task.project_id = '".$project->id."'");
|
|
echo '<option rel="0" value="0">'.$mod_strings['LBL_PROJECT_PREDECESSOR_NONE'].'</option>';
|
|
foreach ($tasks as $task) {
|
|
echo '<option rel="'.$task->id.'" value="'.$task->project_task_id.'">'.$task->name.'</opion>';
|
|
}
|
|
die();
|
|
}
|
|
|
|
|
|
public function create_task($name, $start, $end, $project_id, $milestone_flag, $status, $project_task_id, $predecessors, $rel_type, $duration, $duration_unit, $resource, $percent_complete, $description, $actual_duration, $order_number)
|
|
{
|
|
$task = BeanFactory::newBean('ProjectTask');
|
|
$task->name = $name;
|
|
$task->date_start = $start;
|
|
$task->date_finish = $end;
|
|
$task->project_id = $project_id;
|
|
$task->milestone_flag = $milestone_flag;
|
|
$task->status = $status;
|
|
$task->project_task_id = $project_task_id;
|
|
$task->predecessors = $predecessors;
|
|
$task->relationship_type = $rel_type;
|
|
$task->duration = $duration + 1; //+1 to make duration appear correct in project table
|
|
$task->duration_unit = $duration_unit;
|
|
$task->assigned_user_id = $resource;
|
|
$task->percent_complete = $percent_complete;
|
|
$task->description = $description;
|
|
$task->actual_duration = $actual_duration;
|
|
$task->order_number = $order_number;
|
|
$task->save();
|
|
}
|
|
|
|
public function update_task($id, $name, $start, $end, $project_id, $milestone_flag, $status, $predecessors, $rel_type, $duration, $duration_unit, $resource, $percent_complete, $description, $actual_duration)
|
|
{
|
|
$task = BeanFactory::newBean('ProjectTask');
|
|
$task->retrieve($id);
|
|
$task->name = $name;
|
|
$task->date_start = $start;
|
|
$task->date_finish = $end;
|
|
$task->project_id = $project_id;
|
|
$task->milestone_flag = $milestone_flag;
|
|
$task->status = $status;
|
|
// $task->parent_task_id = $parent_task_id;
|
|
$task->predecessors = $predecessors;
|
|
$task->relationship_type = $rel_type;
|
|
$task->duration = $duration + 1; //+1 to make duration appear correct in project table
|
|
$task->duration_unit = $duration_unit;
|
|
$task->assigned_user_id = $resource;
|
|
$task->percent_complete = $percent_complete;
|
|
$task->actual_duration = $actual_duration;
|
|
$task->description = $description;
|
|
$task->save();
|
|
}
|
|
|
|
|
|
/*********************************** Resource chart functions **************************************/
|
|
|
|
//Loads the resource chart view
|
|
public function action_ResourceList()
|
|
{
|
|
$this->view = 'ResourceList';
|
|
}
|
|
|
|
//Updates the resource chart based on specified dates and users
|
|
public function action_update_chart()
|
|
{
|
|
$db = DBManagerFactory::getInstance();
|
|
include('modules/Project/chart.php');
|
|
|
|
//Get specified dates and users
|
|
$start = $_POST['start'];
|
|
//$end = $_POST['end'];
|
|
$projects = explode(',', $db->quote($_POST['projects']));
|
|
$users = explode(',', $db->quote($_POST['users']));
|
|
$contacts = explode(',', $db->quote($_POST['contacts']));
|
|
$month = is_numeric($_POST['month']) ? $_POST['month'] : '1' ;
|
|
$flag = $_POST['flag'];
|
|
$chart_type = $db->quote($_POST['chart_type']);
|
|
//$type = $_POST['type'];
|
|
|
|
$start = new DateTime($start);
|
|
|
|
if ($month == '-1') {
|
|
$start->modify($month.' month');
|
|
$start->modify('+2 week');
|
|
} elseif ($month == '1') {
|
|
$start->modify($month.' month');
|
|
$start->modify('+1 week');
|
|
}
|
|
|
|
if ($flag == '0') {
|
|
$start->sub(new DateInterval('P1W'));
|
|
}
|
|
|
|
$first_day = $start->modify('this week');
|
|
$start = $start->format('Y-m-d');
|
|
|
|
$end = $first_day->add(new DateInterval('P66D'));
|
|
|
|
if ($chart_type == "monthly") {
|
|
$end = $first_day->add(new DateInterval('P365D'));
|
|
} elseif ($chart_type == "quarterly") {
|
|
$end = $first_day->add(new DateInterval('P1460D'));
|
|
}
|
|
|
|
|
|
$end->modify('this week');
|
|
$end->add(new DateInterval('P1D'));
|
|
$end = $end->format('Y-m-d');
|
|
|
|
$project_where = "";
|
|
$project_user_where = "";
|
|
$project_contact_where = "";
|
|
if (count($projects) > 1 || $projects[0] != '') {
|
|
$project_where = " AND project_id IN( '" . implode("','", $projects) . "' )";
|
|
$project_user_where = " AND project_users_1project_ida IN( '" . implode("','", $projects) . "' )";
|
|
$project_contact_where = " AND project_contacts_1project_ida IN( '" . implode("','", $projects) . "' )";
|
|
}
|
|
|
|
$user_where = "";
|
|
if (count($users) > 1 || $users[0] != '') {
|
|
$user_where = " AND project_users_1users_idb IN( '" . implode("','", $users) . "' )";
|
|
}
|
|
|
|
$contacts_where = "";
|
|
if (count($contacts) > 1 || $contacts[0] != '') {
|
|
$contacts_where = " AND project_contacts_1contacts_idb IN( '" . implode("','", $contacts) . "' )";
|
|
}
|
|
|
|
//Get the users data from the database
|
|
|
|
$users_resource_query = "SELECT distinct project_users_1users_idb as id, first_name, last_name, 'project_users_1_c' AS type
|
|
FROM project_users_1_c
|
|
JOIN users ON users.id = project_users_1users_idb
|
|
WHERE project_users_1_c.deleted =0 " . $user_where . $project_user_where ;
|
|
|
|
|
|
$contacts_resource_query = "SELECT distinct project_contacts_1contacts_idb AS id, first_name, last_name, 'project_contacts_1_c' AS type
|
|
FROM project_contacts_1_c
|
|
JOIN contacts ON contacts.id = project_contacts_1contacts_idb
|
|
WHERE project_contacts_1_c.deleted =0 " . $contacts_where . $project_contact_where;
|
|
|
|
|
|
if ($users[0] != 'none' && $contacts[0] != 'none') {
|
|
$resource_query = $users_resource_query . ' UNION ' . $contacts_resource_query;
|
|
} elseif ($users[0] == 'none') {
|
|
$resource_query = $contacts_resource_query;
|
|
} elseif ($contacts[0] == 'none') {
|
|
$resource_query = $users_resource_query ;
|
|
} else {
|
|
$resource_query = "SELECT '0' as id, ' ' as first_name, ' ' as last_name, 'project_users_1_c' AS type";
|
|
}
|
|
|
|
$resources = $db->query($resource_query);
|
|
|
|
|
|
//create array to hold the users
|
|
$resource_list = array();
|
|
//Loop through users
|
|
while ($row = $db->fetchByAssoc($resources)) { //get each users associated project tasks
|
|
$Task = BeanFactory::getBean('ProjectTask');
|
|
$tasks = $Task->get_full_list("date_start", "project_task.assigned_user_id = '".$row['id']."' AND (project_task.project_id is not null AND project_task.project_id <> '') " . $project_where);
|
|
//put users tasks in an array
|
|
$taskarr = array();
|
|
$t = 0;
|
|
$skipped = 0;
|
|
if (!is_null($tasks)) {
|
|
foreach ($tasks as $task) {
|
|
if ($this->count_days($start, $task->date_start) == -1 && $this->count_days($start, $task->date_finish) == -1) {
|
|
$skipped++;
|
|
} else {
|
|
$taskarr[$t]['id'] = $task->id;
|
|
$taskarr[$t]['name'] = $task->name;
|
|
$taskarr[$t]['status'] = $task->status;
|
|
$taskarr[$t]['% cpl'] = $task->percent_complete;
|
|
$taskarr[$t]['start_day'] = $this->count_days($start, $task->date_start);//Works out how many days into the chart the task starts
|
|
$taskarr[$t]['duration'] = $task->duration;//how many days long is the task
|
|
$taskarr[$t]['end_day'] = $this->count_days($start, $task->date_finish);//Works out how many days from start of the chart the task end day is.
|
|
$taskarr[$t]['start_date'] = $task->date_start;
|
|
$taskarr[$t]['end_date'] = $task->date_finish;
|
|
$taskarr[$t]['project_id'] = $task->project_id;//parent projects id
|
|
//get the project name (don't think this is really necessary)
|
|
$project = BeanFactory::newBean('Project');
|
|
$project->retrieve($task->project_id);
|
|
$taskarr[$t]['project_name'] = $project->name;//parent projects id
|
|
|
|
$t ++;
|
|
}
|
|
}
|
|
}
|
|
|
|
$row['task_count'] = $t;//the number of tasks for the user
|
|
$row['tasks'] = $taskarr;//add users tasks to main user array
|
|
//convert user array to an array of user objects
|
|
$resource_list[] = (object)$row;
|
|
}
|
|
|
|
//Generate the resource chart by passing in the start date, end date and the array of user objects
|
|
new chart($start, $end, $projects, $users, $contacts, $resource_list, $chart_type);
|
|
/* echo '<pre>';
|
|
print_r($resource_list);
|
|
echo '</pre>';*/
|
|
die();
|
|
}
|
|
|
|
|
|
//Get tasks for resource chart tooltips
|
|
public function action_Tooltips()
|
|
{
|
|
global $mod_strings;
|
|
|
|
$db = DBManagerFactory::getInstance();
|
|
|
|
$start_date = $db->quote($_REQUEST['start_date']);
|
|
$end_date = $db->quote($_REQUEST['end_date']);
|
|
$resource_id = $db->quote($_REQUEST['resource_id']);
|
|
|
|
$projects = explode(",", $db->quote($_REQUEST['projects']));
|
|
$project_where = "";
|
|
if (count($projects) > 1 || $projects[0] != '') {
|
|
$project_where = " AND project_id IN( '" . implode("','", $projects) . "' )";
|
|
}
|
|
|
|
$Task = BeanFactory::getBean('ProjectTask');
|
|
|
|
$tasks = $Task->get_full_list("date_start", "project_task.assigned_user_id = '".$resource_id."' AND ( ( project_task.date_start BETWEEN '".$start_date."' AND '".$end_date."' ) OR ( project_task.date_finish BETWEEN '".$start_date."' AND '".$end_date."' ) OR ( '".$start_date."' BETWEEN project_task.date_start AND project_task.date_finish ) OR ( '".$end_date."' BETWEEN project_task.date_start AND project_task.date_finish ) ) AND (project_id is not null AND project_id <> '') " . $project_where);
|
|
|
|
echo '<table class="qtip_table">';
|
|
echo '<tr><th>'.$mod_strings['LBL_TOOLTIP_PROJECT_NAME'].'</th><th>'.$mod_strings['LBL_TOOLTIP_TASK_NAME'].'</th><th>'.$mod_strings['LBL_TOOLTIP_TASK_DURATION'].'</th></tr>';
|
|
if (is_array($tasks)) {
|
|
foreach ($tasks as $task) {
|
|
echo '<tr><td><a target="_blank" href="index.php?module=Project&action=DetailView&record='.$task->project_id.'">'.$task->project_name.'</a></td><td>'.$task->name.'</td><td>'.$task->duration.' '.$task->duration_unit.'</td></tr>';
|
|
}
|
|
}
|
|
echo '</table>';
|
|
|
|
die();
|
|
}
|
|
|
|
/*********************************** Utility functions **************************************/
|
|
|
|
|
|
//Returns the total number of days between two dates
|
|
public function count_days($start_date, $end_date)
|
|
{
|
|
$d1 = new DateTime($start_date);
|
|
$d2 = new DateTime($end_date);
|
|
//If the task's end date is before chart's start date return -1 to make sure task starts on first day of the chart
|
|
if ($d2 < $d1) {
|
|
return -1;
|
|
}
|
|
$difference = $d1->diff($d2);
|
|
return $difference->days;
|
|
}
|
|
|
|
// Function for basic field validation (present and neither empty nor only white space
|
|
public function IsNullOrEmptyString($question)
|
|
{
|
|
return (!isset($question) || trim($question)==='');
|
|
}
|
|
}
|