Inspection of "Merge branch 'develop' into console-installer" - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — console-installer ( 3d54e5...e2b50d )

by Adam

created 2016-05-10 07:51 UTC

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,37 +42,37 @@  discard block
 block discarded – undo
 
 
 $listViewDefs ['Project'] =
-array (
+array(
   'NAME' => 
-  array (
+  array(
     'width' => '25%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
     'default' => true,
   ),
   'PRIORITY' => 
-  array (
+  array(
     'type' => 'enum',
     'label' => 'LBL_PRIORITY',
     'width' => '10%',
     'default' => true,
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_STATUS',
     'link' => false,
     'default' => true,
   ),
   'ESTIMATED_START_DATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DATE_START',
     'link' => false,
     'default' => true,
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_ASSIGNED_USER_ID',
     'module' => 'Employees',
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
     'default' => true,
   ),
   'ESTIMATED_END_DATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DATE_END',
     'link' => false,

Please login to merge, or discard this patch.

modules/ProjectTask/updateDependencies.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -40,26 +40,26 @@  discard block
 block discarded – undo
 
 class updateDependencies {
 
-    function update_dependency(&$bean, $event, $arguments){
+    function update_dependency(&$bean, $event, $arguments) {
         //Get all tasks that are dependant on the current task being saved.
         $Task = BeanFactory::getBean('ProjectTask');
         $tasks = $Task->get_full_list("", "project_task.project_id = '".$bean->project_id."' AND project_task.predecessors = '".$bean->project_task_id."'");
 
-        if($bean->date_finish != $bean->fetched_row['date_finish']){ //if the end date of a current task is changed
+        if ($bean->date_finish != $bean->fetched_row['date_finish']) { //if the end date of a current task is changed
 
             $diff = $this->count_days($bean->date_finish, $bean->fetched_row['date_finish']); //Gets the difference in days
 
-            foreach($tasks as $task){ //loop through all dependant tasks
+            foreach ($tasks as $task) { //loop through all dependant tasks
 
-                $rel_type = $task->relationship_type;//Determine their dependency type
+                $rel_type = $task->relationship_type; //Determine their dependency type
 
-                if($rel_type == 'FS'){//if its a Finish to start
+                if ($rel_type == 'FS') {//if its a Finish to start
                     //Modify the task's start and end date dependant on the difference in days
                     $start = new DateTime($task->date_start);
                     $start = $start->modify($diff);
                     $startdate = $start->format('Y-m-d');
 
-                    $duration = $task->duration - 1;//take one off to maintain correct gantt bar length
+                    $duration = $task->duration - 1; //take one off to maintain correct gantt bar length
 
                     $enddate = $start->modify('+'.$duration.' days');
                     $enddate = $enddate->format('Y-m-d');
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
                     $task->save();
 
                 }
-                else if($rel_type == 'SS'){//if its a start to start
+                else if ($rel_type == 'SS') {//if its a start to start
                     //check if the tasks duration has not been changed so that it does not update when the parent tasks duration is changed
-                    if($bean->fetched_row['duration'] == $bean->duration){
+                    if ($bean->fetched_row['duration'] == $bean->duration) {
 
                         $start = new DateTime($task->date_start);
                         $start = $start->modify($diff);
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
     }
 
     //Gets the difference in days between two dates
-    function count_days($start_date, $end_date){
+    function count_days($start_date, $end_date) {
 
         $d1 = new DateTime($start_date);
         $d2 = new DateTime($end_date);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
         if ($difference->invert == 1) {
             return '+'.$difference->d.' days'; //returns positive days
         } else {
-            return -$difference->d.' days';//returns negative days
+            return -$difference->d.' days'; //returns negative days
         }
 
     }

Please login to merge, or discard this patch.

modules/ProjectTask/MyProjectTasks.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
 	$current_module_strings);
 $header_text = '';
 
-if(is_admin($current_user)
+if (is_admin($current_user)
 	&& $_REQUEST['module'] != 'DynamicLayout'
 	&& !empty($_SESSION['editinplace']))
 {	
 	$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=MyTasks&from_module=Tasks'>"
-		. SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])
+		. SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDITLAYOUT'])
 		. '</a>';
 }
 $ListView->setHeaderTitle($current_module_strings['LBL_LIST_MY_PROJECT_TASKS'].$header_text);

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/additionalDetails.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,22 +43,22 @@  discard block
 block discarded – undo
 
 function additionalDetailsProjectTask($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'ProjectTask');
 	}
 		
 	$overlib_string = '';
-	if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>' . $mod_strings['LBL_PRIORITY'] . '</b> ' . $fields['PRIORITY'] . '<br>';
-	if(!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>' . $mod_strings['LBL_PERCENT_COMPLETE'] . '</b> ' . $fields['PERCENT_COMPLETE'] . '%<br>';	
-	if(!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ESTIMATED_EFFORT'] . '</b> ' . $fields['ESTIMATED_EFFORT'] . '<br>';	
-	if(!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ACTUAL_EFFORT'] . '</b> ' . $fields['ACTUAL_EFFORT'] . '<br>';
-	if(!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>' . $mod_strings['LBL_TASK_NUMBER'] . '</b> ' . $fields['TASK_NUMBER'] . '<br>';
-	if(!empty($fields['DATE_START'])) $overlib_string .= '<b>' . $mod_strings['LBL_DATE_START'] . '</b> ' . $fields['DATE_START'] . ' ' . $fields['TIME_START'] . '<br>';
+	if (!empty($fields['PRIORITY'])) $overlib_string .= '<b>'.$mod_strings['LBL_PRIORITY'].'</b> '.$fields['PRIORITY'].'<br>';
+	if (!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>'.$mod_strings['LBL_PERCENT_COMPLETE'].'</b> '.$fields['PERCENT_COMPLETE'].'%<br>';	
+	if (!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>'.$mod_strings['LBL_ESTIMATED_EFFORT'].'</b> '.$fields['ESTIMATED_EFFORT'].'<br>';	
+	if (!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>'.$mod_strings['LBL_ACTUAL_EFFORT'].'</b> '.$fields['ACTUAL_EFFORT'].'<br>';
+	if (!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>'.$mod_strings['LBL_TASK_NUMBER'].'</b> '.$fields['TASK_NUMBER'].'<br>';
+	if (!empty($fields['DATE_START'])) $overlib_string .= '<b>'.$mod_strings['LBL_DATE_START'].'</b> '.$fields['DATE_START'].' '.$fields['TIME_START'].'<br>';
 		
-	if(!empty($fields['DESCRIPTION'])) {
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) {
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 
 	return array('fieldToAddTo' => 'NAME', 

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/acldefs.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
  ********************************************************************************/
 
 // created: 2005-11-04 15:39:46
-$acldefs['ProjectTask'] = array (
+$acldefs['ProjectTask'] = array(
   'forms' => 
-  array (
+  array(
     'by_name' => 
-    array (
+    array(
       'change_project' => 
-      array (
+      array(
         'display_option' => 'disabled',
         'action_option' => 'list',
         'app_action' => 'EditView',
         'module' => 'Project',
       ),
       'change_parent' => 
-      array (
+      array(
         'display_option' => 'disabled',
         'action_option' => 'list',
         'app_action' => 'EditView',
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
     ),
   ),
   'form_names' => 
-  array (
+  array(
     'by_id' => 'by_id',
     'by_name' => 'by_name',
     'DetailView' => 'DetailView',

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/editviewdefs.php 1 patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -1,41 +1,41 @@  discard block
 block discarded – undo
 <?php
 $viewdefs ['ProjectTask'] = 
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'includes' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'file' => 'modules/ProjectTask/ProjectTask.js',
         ),
       ),
       'useTabs' => false,
       'tabDefs' => 
-      array (
+      array(
         'DEFAULT' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_TIMELINE' =>
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
@@ -43,78 +43,78 @@  discard block
 block discarded – undo
       'syncDetailEditViews' => false,
     ),
     'panels' => 
-    array (
+    array(
       'default' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'name',
             'label' => 'LBL_NAME',
           ),
           1 => 
-          array (
+          array(
             'name' => 'status',
             'customCode' => '<select name="{$fields.status.name}" id="{$fields.status.name}" title="" tabindex="s" onchange="update_percent_complete(this.value);">{if isset($fields.status.value) && $fields.status.value != ""}{html_options options=$fields.status.options selected=$fields.status.value}{else}{html_options options=$fields.status.options selected=$fields.status.default}{/if}</select>',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_start',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_finish',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 'priority',
           1 => 
-          array (
+          array(
             'name' => 'percent_complete',
             'customCode' => '<input type="text" name="{$fields.percent_complete.name}" id="{$fields.percent_complete.name}" size="30" value="{$fields.percent_complete.value}" title="" tabindex="0" onChange="update_status(this.value);" /></tr>',
           ),
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'project_name',
             'label' => 'LBL_PROJECT_NAME',
           ),
           1 => 'task_number',
         ),
         4 => 
-        array (
+        array(
           0 => 'assigned_user_name',
         ),
         5 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'description',
           ),
         ),
       ),
       'LBL_PANEL_TIMELINE' =>
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'estimated_effort',
           1 => 
-          array (
+          array(
             'name' => 'actual_effort',
             'label' => 'LBL_ACTUAL_EFFORT',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'relationship_type',
             'studio' => 'visible',
             'label' => 'LBL_RELATIONSHIP_TYPE',
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
           1 => 'utilization',
         ),
         2 => 
-        array (
+        array(
           0 => 'order_number',
           1 => 'milestone_flag',
         ),

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/searchdefs.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -52,7 +52,7 @@
 block discarded – undo
 						),
 						'advanced_search' => array(
 							'name',
-							array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME' ), 
+							array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME'), 
 							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
 							
 						),

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/SearchFields.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,26 +39,26 @@  discard block
 block discarded – undo
  ********************************************************************************/
 
 $searchFields['ProjectTask'] = 
-    array (
-        'name' => array( 'query_type'=>'default'),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-        'project_name' => array('query_type'=>'default','db_field'=>array('project.name')),
+    array(
+        'name' => array('query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'project_name' => array('query_type'=>'default', 'db_field'=>array('project.name')),
 		'assigned_user_id' => array('query_type'=>'default'),
         //'status'=> array('query_type'=>'default', 'options' => 'project_task_status_options', 'template_var' => 'STATUS_FILTER')
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_finish' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_finish' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_finish' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_finish' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_finish' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_finish' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 		                
     );
 ?>

Please login to merge, or discard this patch.

modules/ProjectTask/metadata/detailviewdefs.php 1 patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -1,35 +1,35 @@  discard block
 block discarded – undo
 <?php
 $viewdefs ['ProjectTask'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'includes' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'file' => 'modules/ProjectTask/ProjectTask.js',
         ),
       ),
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
@@ -38,14 +38,14 @@  discard block
 block discarded – undo
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'DEFAULT' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_TIMELINE' =>
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
@@ -53,28 +53,28 @@  discard block
 block discarded – undo
       'syncDetailEditViews' => true,
     ),
     'panels' => 
-    array (
+    array(
       'default' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'name',
           1 => 'status',
         ),
         1 => 
-        array (
+        array(
           0 => 'date_start',
           1 => 'date_finish',
         ),
         2 => 
-        array (
+        array(
           0 => 'priority',
           1 => 'percent_complete',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'project_name',
             'customCode' => '<a href="index.php?module=Project&action=DetailView&record={$fields.project_id.value}">{$fields.project_name.value}&nbsp;</a>',
             'label' => 'LBL_PARENT_ID',
@@ -82,69 +82,69 @@  discard block
 block discarded – undo
           1 => 'task_number',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_USER_ID',
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'description',
           ),
         ),
       ),
       'LBL_PANEL_TIMELINE' =>
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'estimated_effort',
           1 => 
-          array (
+          array(
             'name' => 'actual_effort',
             'label' => 'LBL_ACTUAL_EFFORT',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'predecessors',
             'label' => 'LBL_PREDECESSORS',
           ),
           1 => 
-          array (
+          array(
             'name' => 'relationship_type',
             'studio' => 'visible',
             'label' => 'LBL_RELATIONSHIP_TYPE',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 'order_number',
           1 => 
-          array (
+          array(
             'name' => 'milestone_flag',
             'label' => 'LBL_MILESTONE_FLAG',
           ),
         ),
         3 => 
-        array (
+        array(
           0 => 'utilization',
           1 => '',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'duration',
             'label' => 'LBL_DURATION',
           ),
           1 => 
-          array (
+          array(
             'name' => 'duration_unit',
             'label' => 'LBL_DURATION_UNIT',
           ),

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3	/*********************************************************************************
4	4	* SugarCRM Community Edition is a customer relationship management program developed by
5	5	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -42,37 +42,37 @@ discard block
		block discarded – undo
42	42
43	43
44	44	$listViewDefs ['Project'] =
45		-array (
	45	+array(
46	46	'NAME' =>
47		- array (
	47	+ array(
48	48	'width' => '25%',
49	49	'label' => 'LBL_LIST_NAME',
50	50	'link' => true,
51	51	'default' => true,
52	52	),
53	53	'PRIORITY' =>
54		- array (
	54	+ array(
55	55	'type' => 'enum',
56	56	'label' => 'LBL_PRIORITY',
57	57	'width' => '10%',
58	58	'default' => true,
59	59	),
60	60	'STATUS' =>
61		- array (
	61	+ array(
62	62	'width' => '10%',
63	63	'label' => 'LBL_STATUS',
64	64	'link' => false,
65	65	'default' => true,
66	66	),
67	67	'ESTIMATED_START_DATE' =>
68		- array (
	68	+ array(
69	69	'width' => '10%',
70	70	'label' => 'LBL_DATE_START',
71	71	'link' => false,
72	72	'default' => true,
73	73	),
74	74	'ASSIGNED_USER_NAME' =>
75		- array (
	75	+ array(
76	76	'width' => '10%',
77	77	'label' => 'LBL_LIST_ASSIGNED_USER_ID',
78	78	'module' => 'Employees',
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	'default' => true,
81	81	),
82	82	'ESTIMATED_END_DATE' =>
83		- array (
	83	+ array(
84	84	'width' => '10%',
85	85	'label' => 'LBL_DATE_END',
86	86	'link' => false,

		@@ -40,26 +40,26 @@ discard block
		block discarded – undo
40	40
41	41	class updateDependencies {
42	42
43		- function update_dependency(&$bean, $event, $arguments){
	43	+ function update_dependency(&$bean, $event, $arguments) {
44	44	//Get all tasks that are dependant on the current task being saved.
45	45	$Task = BeanFactory::getBean('ProjectTask');
46	46	$tasks = $Task->get_full_list("", "project_task.project_id = '".$bean->project_id."' AND project_task.predecessors = '".$bean->project_task_id."'");
47	47
48		- if($bean->date_finish != $bean->fetched_row['date_finish']){ //if the end date of a current task is changed
	48	+ if ($bean->date_finish != $bean->fetched_row['date_finish']) { //if the end date of a current task is changed
49	49
50	50	$diff = $this->count_days($bean->date_finish, $bean->fetched_row['date_finish']); //Gets the difference in days
51	51
52		- foreach($tasks as $task){ //loop through all dependant tasks
	52	+ foreach ($tasks as $task) { //loop through all dependant tasks
53	53
54		- $rel_type = $task->relationship_type;//Determine their dependency type
	54	+ $rel_type = $task->relationship_type; //Determine their dependency type
55	55
56		- if($rel_type == 'FS'){//if its a Finish to start
	56	+ if ($rel_type == 'FS') {//if its a Finish to start
57	57	//Modify the task's start and end date dependant on the difference in days
58	58	$start = new DateTime($task->date_start);
59	59	$start = $start->modify($diff);
60	60	$startdate = $start->format('Y-m-d');
61	61
62		- $duration = $task->duration - 1;//take one off to maintain correct gantt bar length
	62	+ $duration = $task->duration - 1; //take one off to maintain correct gantt bar length
63	63
64	64	$enddate = $start->modify('+'.$duration.' days');
65	65	$enddate = $enddate->format('Y-m-d');
		@@ -69,9 +69,9 @@ discard block
		block discarded – undo
69	69	$task->save();
70	70
71	71	}
72		- else if($rel_type == 'SS'){//if its a start to start
	72	+ else if ($rel_type == 'SS') {//if its a start to start
73	73	//check if the tasks duration has not been changed so that it does not update when the parent tasks duration is changed
74		- if($bean->fetched_row['duration'] == $bean->duration){
	74	+ if ($bean->fetched_row['duration'] == $bean->duration) {
75	75
76	76	$start = new DateTime($task->date_start);
77	77	$start = $start->modify($diff);
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	}
97	97
98	98	//Gets the difference in days between two dates
99		- function count_days($start_date, $end_date){
	99	+ function count_days($start_date, $end_date) {
100	100
101	101	$d1 = new DateTime($start_date);
102	102	$d2 = new DateTime($end_date);
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	if ($difference->invert == 1) {
105	105	return '+'.$difference->d.' days'; //returns positive days
106	106	} else {
107		- return -$difference->d.' days';//returns negative days
	107	+ return -$difference->d.' days'; //returns negative days
108	108	}
109	109
110	110	}

		@@ -1,41 +1,41 @@ discard block
		block discarded – undo
1	1	<?php
2	2	$viewdefs ['ProjectTask'] =
3		-array (
	3	+array(
4	4	'EditView' =>
5		- array (
	5	+ array(
6	6	'templateMeta' =>
7		- array (
	7	+ array(
8	8	'maxColumns' => '2',
9	9	'widths' =>
10		- array (
	10	+ array(
11	11	0 =>
12		- array (
	12	+ array(
13	13	'label' => '10',
14	14	'field' => '30',
15	15	),
16	16	1 =>
17		- array (
	17	+ array(
18	18	'label' => '10',
19	19	'field' => '30',
20	20	),
21	21	),
22	22	'includes' =>
23		- array (
	23	+ array(
24	24	0 =>
25		- array (
	25	+ array(
26	26	'file' => 'modules/ProjectTask/ProjectTask.js',
27	27	),
28	28	),
29	29	'useTabs' => false,
30	30	'tabDefs' =>
31		- array (
	31	+ array(
32	32	'DEFAULT' =>
33		- array (
	33	+ array(
34	34	'newTab' => false,
35	35	'panelDefault' => 'expanded',
36	36	),
37	37	'LBL_PANEL_TIMELINE' =>
38		- array (
	38	+ array(
39	39	'newTab' => false,
40	40	'panelDefault' => 'expanded',
41	41	),
		@@ -43,78 +43,78 @@ discard block
		block discarded – undo
43	43	'syncDetailEditViews' => false,
44	44	),
45	45	'panels' =>
46		- array (
	46	+ array(
47	47	'default' =>
48		- array (
	48	+ array(
49	49	0 =>
50		- array (
	50	+ array(
51	51	0 =>
52		- array (
	52	+ array(
53	53	'name' => 'name',
54	54	'label' => 'LBL_NAME',
55	55	),
56	56	1 =>
57		- array (
	57	+ array(
58	58	'name' => 'status',
59	59	'customCode' => '<select name="{$fields.status.name}" id="{$fields.status.name}" title="" tabindex="s" onchange="update_percent_complete(this.value);">{if isset($fields.status.value) && $fields.status.value != ""}{html_options options=$fields.status.options selected=$fields.status.value}{else}{html_options options=$fields.status.options selected=$fields.status.default}{/if}</select>',
60	60	),
61	61	),
62	62	1 =>
63		- array (
	63	+ array(
64	64	0 =>
65		- array (
	65	+ array(
66	66	'name' => 'date_start',
67	67	),
68	68	1 =>
69		- array (
	69	+ array(
70	70	'name' => 'date_finish',
71	71	),
72	72	),
73	73	2 =>
74		- array (
	74	+ array(
75	75	0 => 'priority',
76	76	1 =>
77		- array (
	77	+ array(
78	78	'name' => 'percent_complete',
79	79	'customCode' => '<input type="text" name="{$fields.percent_complete.name}" id="{$fields.percent_complete.name}" size="30" value="{$fields.percent_complete.value}" title="" tabindex="0" onChange="update_status(this.value);" /></tr>',
80	80	),
81	81	),
82	82	3 =>
83		- array (
	83	+ array(
84	84	0 =>
85		- array (
	85	+ array(
86	86	'name' => 'project_name',
87	87	'label' => 'LBL_PROJECT_NAME',
88	88	),
89	89	1 => 'task_number',
90	90	),
91	91	4 =>
92		- array (
	92	+ array(
93	93	0 => 'assigned_user_name',
94	94	),
95	95	5 =>
96		- array (
	96	+ array(
97	97	0 =>
98		- array (
	98	+ array(
99	99	'name' => 'description',
100	100	),
101	101	),
102	102	),
103	103	'LBL_PANEL_TIMELINE' =>
104		- array (
	104	+ array(
105	105	0 =>
106		- array (
	106	+ array(
107	107	0 => 'estimated_effort',
108	108	1 =>
109		- array (
	109	+ array(
110	110	'name' => 'actual_effort',
111	111	'label' => 'LBL_ACTUAL_EFFORT',
112	112	),
113	113	),
114	114	1 =>
115		- array (
	115	+ array(
116	116	0 =>
117		- array (
	117	+ array(
118	118	'name' => 'relationship_type',
119	119	'studio' => 'visible',
120	120	'label' => 'LBL_RELATIONSHIP_TYPE',
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	1 => 'utilization',
123	123	),
124	124	2 =>
125		- array (
	125	+ array(
126	126	0 => 'order_number',
127	127	1 => 'milestone_flag',
128	128	),

		@@ -52,7 +52,7 @@
		block discarded – undo
52	52	),
53	53	'advanced_search' => array(
54	54	'name',
55		- array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME' ),
	55	+ array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME'),
56	56	array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
57	57
58	58	),

		@@ -1,35 +1,35 @@ discard block
		block discarded – undo
1	1	<?php
2	2	$viewdefs ['ProjectTask'] =
3		-array (
	3	+array(
4	4	'DetailView' =>
5		- array (
	5	+ array(
6	6	'templateMeta' =>
7		- array (
	7	+ array(
8	8	'maxColumns' => '2',
9	9	'widths' =>
10		- array (
	10	+ array(
11	11	0 =>
12		- array (
	12	+ array(
13	13	'label' => '10',
14	14	'field' => '30',
15	15	),
16	16	1 =>
17		- array (
	17	+ array(
18	18	'label' => '10',
19	19	'field' => '30',
20	20	),
21	21	),
22	22	'includes' =>
23		- array (
	23	+ array(
24	24	0 =>
25		- array (
	25	+ array(
26	26	'file' => 'modules/ProjectTask/ProjectTask.js',
27	27	),
28	28	),
29	29	'form' =>
30		- array (
	30	+ array(
31	31	'buttons' =>
32		- array (
	32	+ array(
33	33	0 => 'EDIT',
34	34	1 => 'DUPLICATE',
35	35	2 => 'DELETE',
		@@ -38,14 +38,14 @@ discard block
		block discarded – undo
38	38	),
39	39	'useTabs' => true,
40	40	'tabDefs' =>
41		- array (
	41	+ array(
42	42	'DEFAULT' =>
43		- array (
	43	+ array(
44	44	'newTab' => true,
45	45	'panelDefault' => 'expanded',
46	46	),
47	47	'LBL_PANEL_TIMELINE' =>
48		- array (
	48	+ array(
49	49	'newTab' => true,
50	50	'panelDefault' => 'expanded',
51	51	),
		@@ -53,28 +53,28 @@ discard block
		block discarded – undo
53	53	'syncDetailEditViews' => true,
54	54	),
55	55	'panels' =>
56		- array (
	56	+ array(
57	57	'default' =>
58		- array (
	58	+ array(
59	59	0 =>
60		- array (
	60	+ array(
61	61	0 => 'name',
62	62	1 => 'status',
63	63	),
64	64	1 =>
65		- array (
	65	+ array(
66	66	0 => 'date_start',
67	67	1 => 'date_finish',
68	68	),
69	69	2 =>
70		- array (
	70	+ array(
71	71	0 => 'priority',
72	72	1 => 'percent_complete',
73	73	),
74	74	3 =>
75		- array (
	75	+ array(
76	76	0 =>
77		- array (
	77	+ array(
78	78	'name' => 'project_name',
79	79	'customCode' => '<a href="index.php?module=Project&action=DetailView&record={$fields.project_id.value}">{$fields.project_name.value} </a>',
80	80	'label' => 'LBL_PARENT_ID',
		@@ -82,69 +82,69 @@ discard block
		block discarded – undo
82	82	1 => 'task_number',
83	83	),
84	84	4 =>
85		- array (
	85	+ array(
86	86	0 =>
87		- array (
	87	+ array(
88	88	'name' => 'assigned_user_name',
89	89	'label' => 'LBL_ASSIGNED_USER_ID',
90	90	),
91	91	),
92	92	5 =>
93		- array (
	93	+ array(
94	94	0 =>
95		- array (
	95	+ array(
96	96	'name' => 'description',
97	97	),
98	98	),
99	99	),
100	100	'LBL_PANEL_TIMELINE' =>
101		- array (
	101	+ array(
102	102	0 =>
103		- array (
	103	+ array(
104	104	0 => 'estimated_effort',
105	105	1 =>
106		- array (
	106	+ array(
107	107	'name' => 'actual_effort',
108	108	'label' => 'LBL_ACTUAL_EFFORT',
109	109	),
110	110	),
111	111	1 =>
112		- array (
	112	+ array(
113	113	0 =>
114		- array (
	114	+ array(
115	115	'name' => 'predecessors',
116	116	'label' => 'LBL_PREDECESSORS',
117	117	),
118	118	1 =>
119		- array (
	119	+ array(
120	120	'name' => 'relationship_type',
121	121	'studio' => 'visible',
122	122	'label' => 'LBL_RELATIONSHIP_TYPE',
123	123	),
124	124	),
125	125	2 =>
126		- array (
	126	+ array(
127	127	0 => 'order_number',
128	128	1 =>
129		- array (
	129	+ array(
130	130	'name' => 'milestone_flag',
131	131	'label' => 'LBL_MILESTONE_FLAG',
132	132	),
133	133	),
134	134	3 =>
135		- array (
	135	+ array(
136	136	0 => 'utilization',
137	137	1 => '',
138	138	),
139	139	4 =>
140		- array (
	140	+ array(
141	141	0 =>
142		- array (
	142	+ array(
143	143	'name' => 'duration',
144	144	'label' => 'LBL_DURATION',
145	145	),
146	146	1 =>
147		- array (
	147	+ array(
148	148	'name' => 'duration_unit',
149	149	'label' => 'LBL_DURATION_UNIT',
150	150	),

adamjakab / SuiteCRM

Push — console-installer ( 3d54e5...e2b50d )

Category

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch