Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NFC] Cleanup CRM_Report_Form #17141

Merged
merged 1 commit into from
Apr 22, 2020
Merged

[NFC] Cleanup CRM_Report_Form #17141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions CRM/Report/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ class CRM_Report_Form extends CRM_Core_Form {

protected $groupConcatTested = FALSE;

/**
* Are we in print mode. Can be set by another outputMode, ex: sendmail.
*
* @var bool
*/
public $printOnly = FALSE;

/**
* An attribute for checkbox/radio form field layout
*
Expand All @@ -217,9 +224,6 @@ class CRM_Report_Form extends CRM_Core_Form {

protected $_instanceButtonName = NULL;
protected $_createNewButtonName = NULL;
protected $_printButtonName = NULL;
protected $_pdfButtonName = NULL;
protected $_csvButtonName = NULL;
protected $_groupButtonName = NULL;
protected $_chartButtonName = NULL;
protected $_csvSupported = TRUE;
Expand Down Expand Up @@ -280,7 +284,13 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $_sections = NULL;
protected $_autoIncludeIndexedFieldsAsOrderBys = 0;
protected $_absoluteUrl = FALSE;

/**
* Whether to generate absolute URLs (ex: in report emails).
*
* @var bool
*/
public $_absoluteUrl = FALSE;

/**
* Flag to indicate if result-set is to be stored in a class variable which could be retrieved using getResultSet() method.
Expand Down Expand Up @@ -1094,6 +1104,15 @@ public function setID($instanceID) {
$this->_id = $instanceID;
}

/**
* Getter for $_id.
*
* @return int
*/
public function getID() {
return $this->_id;
}

/**
* Setter for $_force.
*
Expand Down Expand Up @@ -2816,46 +2835,36 @@ public function processReportMode() {
CRM_Core_DAO::$_nullObject
);

$this->_absoluteUrl = FALSE;
$printOnly = FALSE;
$this->assign('printOnly', FALSE);
$this->assign('printOnly', $this->printOnly);

if ($this->_outputMode == 'print' ||
($this->_sendmail && !$this->_outputMode)
) {
$this->assign('printOnly', TRUE);
$printOnly = TRUE;
$this->printOnly = TRUE;
$this->addPaging = FALSE;
$this->assign('outputMode', 'print');
$this->_outputMode = 'print';
if ($this->_sendmail) {
$this->_absoluteUrl = TRUE;
}
}
elseif ($this->_outputMode == 'pdf') {
$printOnly = TRUE;
$this->printOnly = TRUE;
$this->addPaging = FALSE;
$this->_absoluteUrl = TRUE;
}
elseif ($this->_outputMode == 'csv') {
$printOnly = TRUE;
$this->printOnly = TRUE;
$this->_absoluteUrl = TRUE;
$this->addPaging = FALSE;
}
elseif ($this->_outputMode == 'group') {
$this->assign('outputMode', 'group');
}
elseif ($this->_outputMode == 'create_report' && $this->_criteriaForm) {
$this->assign('outputMode', 'create_report');
}
elseif ($this->_outputMode == 'copy' && $this->_criteriaForm) {
$this->_createNew = TRUE;
}

$this->assign('outputMode', $this->_outputMode);
$this->assign('printOnly', $printOnly);
$this->assign('printOnly', $this->printOnly);
// Get today's date to include in printed reports
if ($printOnly) {
if ($this->printOnly) {
$reportDate = CRM_Utils_Date::customFormat(date('Y-m-d H:i'));
$this->assign('reportDate', $reportDate);
}
Expand Down