diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index b8d6b1c4c6a1..b613455438fa 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -278,160 +278,6 @@ public static function isCampaignEnable(): bool { return self::isComponentEnabled(); } - /** - * Retrieve campaigns for dashboard. - * - * @param array $params - * @param bool $onlyCount - * - * @return array|int - */ - public static function getCampaignSummary($params = [], $onlyCount = FALSE) { - $campaigns = []; - - //build the limit and order clause. - $limitClause = $orderByClause = $lookupTableJoins = NULL; - if (!$onlyCount) { - $sortParams = [ - 'sort' => 'start_date', - 'offset' => 0, - 'rowCount' => 10, - 'sortOrder' => 'desc', - ]; - foreach ($sortParams as $name => $default) { - if (!empty($params[$name])) { - $sortParams[$name] = $params[$name]; - } - } - - //need to lookup tables. - $orderOnCampaignTable = TRUE; - if ($sortParams['sort'] === 'status') { - $orderOnCampaignTable = FALSE; - $lookupTableJoins = " - LEFT JOIN civicrm_option_value status ON ( status.value = campaign.status_id OR campaign.status_id IS NULL ) -INNER JOIN civicrm_option_group grp ON ( status.option_group_id = grp.id AND grp.name = 'campaign_status' )"; - $orderByClause = "ORDER BY status.label {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] === 'campaign_type') { - $orderOnCampaignTable = FALSE; - $lookupTableJoins = " - LEFT JOIN civicrm_option_value campaign_type ON ( campaign_type.value = campaign.campaign_type_id - OR campaign.campaign_type_id IS NULL ) -INNER JOIN civicrm_option_group grp ON ( campaign_type.option_group_id = grp.id AND grp.name = 'campaign_type' )"; - $orderByClause = "ORDER BY campaign_type.label {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] === 'isActive') { - $sortParams['sort'] = 'is_active'; - } - if ($orderOnCampaignTable) { - $orderByClause = "ORDER BY campaign.{$sortParams['sort']} {$sortParams['sortOrder']}"; - } - $orderByClause = ($orderByClause) ? $orderByClause . ", campaign.id {$sortParams['sortOrder']}" : $orderByClause; - $limitClause = "LIMIT {$sortParams['offset']}, {$sortParams['rowCount']}"; - } - - //build the where clause. - $queryParams = $where = []; - if (!empty($params['id'])) { - $where[] = "( campaign.id = %1 )"; - $queryParams[1] = [$params['id'], 'Positive']; - } - if (!empty($params['name'])) { - $where[] = "( campaign.name LIKE %2 )"; - $queryParams[2] = ['%' . trim($params['name']) . '%', 'String']; - } - if (!empty($params['title'])) { - $where[] = "( campaign.title LIKE %3 )"; - $queryParams[3] = ['%' . trim($params['title']) . '%', 'String']; - } - if (!empty($params['start_date'])) { - $startDate = CRM_Utils_Date::processDate($params['start_date']); - $where[] = "( campaign.start_date >= %4 OR campaign.start_date IS NULL )"; - $queryParams[4] = [$startDate, 'String']; - } - if (!empty($params['end_date'])) { - $endDate = CRM_Utils_Date::processDate($params['end_date'], '235959'); - $where[] = "( campaign.end_date <= %5 OR campaign.end_date IS NULL )"; - $queryParams[5] = [$endDate, 'String']; - } - if (!empty($params['description'])) { - $where[] = "( campaign.description LIKE %6 )"; - $queryParams[6] = ['%' . trim($params['description']) . '%', 'String']; - } - if (!empty($params['campaign_type_id'])) { - $where[] = "( campaign.campaign_type_id IN ( %7 ) )"; - $queryParams[7] = [implode(',', (array) $params['campaign_type_id']), 'CommaSeparatedIntegers']; - } - if (!empty($params['status_id'])) { - $where[] = "( campaign.status_id IN ( %8 ) )"; - $queryParams[8] = [implode(',', (array) $params['status_id']), 'CommaSeparatedIntegers']; - } - if (array_key_exists('is_active', $params)) { - $active = "( campaign.is_active = 1 )"; - if (!empty($params['is_active'])) { - $active = "campaign.is_active = 0"; - } - $where[] = $active; - } - $whereClause = NULL; - if (!empty($where)) { - $whereClause = ' WHERE ' . implode(" \nAND ", $where); - } - - $properties = [ - 'id', - 'name', - 'title', - 'start_date', - 'end_date', - 'status_id', - 'is_active', - 'description', - 'campaign_type_id', - ]; - - $selectClause = ' -SELECT campaign.id as id, - campaign.name as name, - campaign.title as title, - campaign.is_active as is_active, - campaign.status_id as status_id, - campaign.end_date as end_date, - campaign.start_date as start_date, - campaign.description as description, - campaign.campaign_type_id as campaign_type_id'; - if ($onlyCount) { - $selectClause = 'SELECT COUNT(*)'; - } - $fromClause = 'FROM civicrm_campaign campaign'; - - $query = "{$selectClause} {$fromClause} {$lookupTableJoins} {$whereClause} {$orderByClause} {$limitClause}"; - - //in case of only count. - if ($onlyCount) { - return (int) CRM_Core_DAO::singleValueQuery($query, $queryParams); - } - - $campaign = CRM_Core_DAO::executeQuery($query, $queryParams); - while ($campaign->fetch()) { - foreach ($properties as $property) { - $campaigns[$campaign->id][$property] = $campaign->$property; - } - } - - return $campaigns; - } - - /** - * Get the campaign count. - * - * @return int - */ - public static function getCampaignCount(): int { - return (int) CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) FROM civicrm_campaign'); - } - /** * Get Campaigns groups. * diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php index d75e2b612f09..887370953fa3 100644 --- a/CRM/Campaign/BAO/Petition.php +++ b/CRM/Campaign/BAO/Petition.php @@ -34,136 +34,6 @@ public function __construct() { $this->cookieExpire = (1 * 60 * 60 * 24); } - /** - * Get Petition Details for dashboard. - * - * @param array $params - * @param bool $onlyCount - * - * @return array|int - */ - public static function getPetitionSummary($params = [], $onlyCount = FALSE) { - //build the limit and order clause. - $limitClause = $orderByClause = $lookupTableJoins = NULL; - if (!$onlyCount) { - $sortParams = [ - 'sort' => 'created_date', - 'offset' => 0, - 'rowCount' => 10, - 'sortOrder' => 'desc', - ]; - foreach ($sortParams as $name => $default) { - if (!empty($params[$name])) { - $sortParams[$name] = $params[$name]; - } - } - - //need to lookup tables. - $orderOnPetitionTable = TRUE; - if ($sortParams['sort'] == 'campaign') { - $orderOnPetitionTable = FALSE; - $lookupTableJoins = ' - LEFT JOIN civicrm_campaign campaign ON ( campaign.id = petition.campaign_id )'; - $orderByClause = "ORDER BY campaign.title {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] == 'activity_type') { - $orderOnPetitionTable = FALSE; - $lookupTableJoins = " - LEFT JOIN civicrm_option_value activity_type ON ( activity_type.value = petition.activity_type_id - OR petition.activity_type_id IS NULL ) -INNER JOIN civicrm_option_group grp ON ( activity_type.option_group_id = grp.id AND grp.name = 'activity_type' )"; - $orderByClause = "ORDER BY activity_type.label {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] == 'isActive') { - $sortParams['sort'] = 'is_active'; - } - if ($orderOnPetitionTable) { - $orderByClause = "ORDER BY petition.{$sortParams['sort']} {$sortParams['sortOrder']}"; - } - $limitClause = "LIMIT {$sortParams['offset']}, {$sortParams['rowCount']}"; - } - - //build the where clause. - $queryParams = $where = []; - - //we only have activity type as a - //difference between survey and petition. - $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition'); - if ($petitionTypeID) { - $where[] = "( petition.activity_type_id = %1 )"; - $queryParams[1] = [$petitionTypeID, 'Positive']; - } - if (!empty($params['title'])) { - $where[] = "( petition.title LIKE %2 )"; - $queryParams[2] = ['%' . trim($params['title']) . '%', 'String']; - } - if (!empty($params['campaign_id'])) { - $where[] = '( petition.campaign_id = %3 )'; - $queryParams[3] = [$params['campaign_id'], 'Positive']; - } - $whereClause = NULL; - if (!empty($where)) { - $whereClause = ' WHERE ' . implode(" \nAND ", $where); - } - - $selectClause = ' -SELECT petition.id as id, - petition.title as title, - petition.is_active as is_active, - petition.result_id as result_id, - petition.is_default as is_default, - petition.campaign_id as campaign_id, - petition.activity_type_id as activity_type_id'; - - if ($onlyCount) { - $selectClause = 'SELECT COUNT(*)'; - } - $fromClause = 'FROM civicrm_survey petition'; - - $query = "{$selectClause} {$fromClause} {$whereClause} {$orderByClause} {$limitClause}"; - - if ($onlyCount) { - return (int) CRM_Core_DAO::singleValueQuery($query, $queryParams); - } - - $petitions = []; - $properties = [ - 'id', - 'title', - 'campaign_id', - 'is_active', - 'is_default', - 'result_id', - 'activity_type_id', - ]; - - $petition = CRM_Core_DAO::executeQuery($query, $queryParams); - while ($petition->fetch()) { - foreach ($properties as $property) { - $petitions[$petition->id][$property] = $petition->$property; - } - } - - return $petitions; - } - - /** - * Get the petition count. - * - */ - public static function getPetitionCount() { - $whereClause = 'WHERE ( 1 )'; - $queryParams = []; - $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition'); - if ($petitionTypeID) { - $whereClause = "WHERE ( petition.activity_type_id = %1 )"; - $queryParams[1] = [$petitionTypeID, 'Positive']; - } - $query = "SELECT COUNT(*) FROM civicrm_survey petition {$whereClause}"; - - return (int) CRM_Core_DAO::singleValueQuery($query, $queryParams); - } - /** * Takes an associative array and creates a petition signature activity. * diff --git a/CRM/Campaign/BAO/Survey.php b/CRM/Campaign/BAO/Survey.php index 5f9ee274931a..c6aa2dc2cbe9 100644 --- a/CRM/Campaign/BAO/Survey.php +++ b/CRM/Campaign/BAO/Survey.php @@ -63,141 +63,6 @@ public static function create(&$params) { return $dao; } - /** - * Retrieve surveys for dashboard. - * - * @param array $params - * @param bool $onlyCount - * - * @return array|int - */ - public static function getSurveySummary($params = [], $onlyCount = FALSE) { - //build the limit and order clause. - $limitClause = $orderByClause = $lookupTableJoins = NULL; - if (!$onlyCount) { - $sortParams = [ - 'sort' => 'created_date', - 'offset' => 0, - 'rowCount' => 10, - 'sortOrder' => 'desc', - ]; - foreach ($sortParams as $name => $default) { - if (!empty($params[$name])) { - $sortParams[$name] = $params[$name]; - } - } - - //need to lookup tables. - $orderOnSurveyTable = TRUE; - if ($sortParams['sort'] == 'campaign') { - $orderOnSurveyTable = FALSE; - $lookupTableJoins = ' - LEFT JOIN civicrm_campaign campaign ON ( campaign.id = survey.campaign_id )'; - $orderByClause = "ORDER BY campaign.title {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] == 'activity_type') { - $orderOnSurveyTable = FALSE; - $lookupTableJoins = " - LEFT JOIN civicrm_option_value activity_type ON ( activity_type.value = survey.activity_type_id - OR survey.activity_type_id IS NULL ) -INNER JOIN civicrm_option_group grp ON ( activity_type.option_group_id = grp.id AND grp.name = 'activity_type' )"; - $orderByClause = "ORDER BY activity_type.label {$sortParams['sortOrder']}"; - } - elseif ($sortParams['sort'] == 'isActive') { - $sortParams['sort'] = 'is_active'; - } - if ($orderOnSurveyTable) { - $orderByClause = "ORDER BY survey.{$sortParams['sort']} {$sortParams['sortOrder']}"; - } - $limitClause = "LIMIT {$sortParams['offset']}, {$sortParams['rowCount']}"; - } - - //build the where clause. - $queryParams = $where = []; - - //we only have activity type as a - //difference between survey and petition. - $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition'); - if ($petitionTypeID) { - $where[] = "( survey.activity_type_id != %1 )"; - $queryParams[1] = [$petitionTypeID, 'Positive']; - } - - if (!empty($params['title'])) { - $where[] = "( survey.title LIKE %2 )"; - $queryParams[2] = ['%' . trim($params['title']) . '%', 'String']; - } - if (!empty($params['campaign_id'])) { - $where[] = '( survey.campaign_id = %3 )'; - $queryParams[3] = [$params['campaign_id'], 'Positive']; - } - if (!empty($params['activity_type_id'])) { - $typeId = $params['activity_type_id']; - if (is_array($params['activity_type_id'])) { - $typeId = implode(' , ', $params['activity_type_id']); - } - $where[] = "( survey.activity_type_id IN ( {$typeId} ) )"; - } - $whereClause = NULL; - if (!empty($where)) { - $whereClause = ' WHERE ' . implode(" \nAND ", $where); - } - - $selectClause = ' -SELECT survey.id as id, - survey.title as title, - survey.is_active as is_active, - survey.result_id as result_id, - survey.is_default as is_default, - survey.campaign_id as campaign_id, - survey.activity_type_id as activity_type_id, - survey.release_frequency as release_frequency, - survey.max_number_of_contacts as max_number_of_contacts, - survey.default_number_of_contacts as default_number_of_contacts'; - if ($onlyCount) { - $selectClause = 'SELECT COUNT(*)'; - } - $fromClause = 'FROM civicrm_survey survey'; - - $query = "{$selectClause} {$fromClause} {$lookupTableJoins} {$whereClause} {$orderByClause} {$limitClause}"; - - //return only count. - if ($onlyCount) { - return (int) CRM_Core_DAO::singleValueQuery($query, $queryParams); - } - - $surveys = []; - $properties = [ - 'id', - 'title', - 'campaign_id', - 'is_active', - 'is_default', - 'result_id', - 'activity_type_id', - 'release_frequency', - 'max_number_of_contacts', - 'default_number_of_contacts', - ]; - - $survey = CRM_Core_DAO::executeQuery($query, $queryParams); - while ($survey->fetch()) { - foreach ($properties as $property) { - $surveys[$survey->id][$property] = $survey->$property; - } - } - - return $surveys; - } - - /** - * Get the survey count. - * - */ - public static function getSurveyCount() { - return (int) CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) FROM civicrm_survey'); - } - /** * Get Surveys. * diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php index cbf590c94370..8343227f3855 100644 --- a/CRM/Campaign/DAO/Survey.php +++ b/CRM/Campaign/DAO/Survey.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/Survey.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:754f9a2e62e86ff340afea563b561dec) + * (GenCodeChecksum:b517a686715877b8cde6af69122dcc0d) */ /** @@ -45,6 +45,17 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { */ public static $_log = FALSE; + /** + * Paths for accessing this entity in the UI. + * + * @var string[] + */ + protected static $_paths = [ + 'add' => 'civicrm/survey/add?reset=1', + 'update' => 'civicrm/survey/configure/main?reset=1&action=update&id=[id]', + 'delete' => 'civicrm/survey/delete?reset=1&id=[id]', + ]; + /** * Survey id. * diff --git a/CRM/Campaign/Form/Search/Campaign.php b/CRM/Campaign/Form/Search/Campaign.php deleted file mode 100644 index 3778ccea929b..000000000000 --- a/CRM/Campaign/Form/Search/Campaign.php +++ /dev/null @@ -1,119 +0,0 @@ -_search = $_GET['search'] ?? NULL; - $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE, FALSE); - $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'campaign'); - - //when we do load tab, lets load the default objects. - $this->assign('force', $this->_force || $this->_searchTab); - $this->assign('searchParams', json_encode($this->get('searchParams'))); - $this->assign('buildSelector', $this->_search); - $this->assign('searchFor', $this->_searchTab); - $this->assign('campaignTypes', json_encode($this->get('campaignTypes'))); - $this->assign('campaignStatus', json_encode($this->get('campaignStatus'))); - $this->assign('suppressForm', TRUE); - - //set the form title. - $this->setTitle(ts('Find Campaigns')); - } - - /** - * Build the form object. - */ - public function buildQuickForm() { - if ($this->_search) { - return; - } - - $attributes = CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Campaign'); - $this->add('text', 'campaign_title', ts('Title'), $attributes['title']); - - //campaign description. - $this->add('text', 'description', ts('Description'), $attributes['description']); - - $this->add('datepicker', 'start_date', ts('Campaign Start Date'), [], FALSE, ['time' => FALSE]); - $this->add('datepicker', 'end_date', ts('Campaign End Date'), [], FALSE, ['time' => FALSE]); - - //campaign type. - $campaignTypes = CRM_Campaign_PseudoConstant::campaignType(); - $this->add('select', 'campaign_type_id', ts('Campaign Type'), - [ - '' => ts('- select -'), - ] + $campaignTypes - ); - - $this->set('campaignTypes', $campaignTypes); - $this->assign('campaignTypes', json_encode($campaignTypes)); - - //campaign status - $campaignStatus = CRM_Campaign_PseudoConstant::campaignStatus(); - $this->addElement('select', 'status_id', ts('Campaign Status'), - [ - '' => ts('- select -'), - ] + $campaignStatus - ); - $this->set('campaignStatus', $campaignStatus); - $this->assign('campaignStatus', json_encode($campaignStatus)); - - //active campaigns - $this->addElement('select', 'is_active', ts('Is Active?'), [ - '' => ts('- select -'), - '0' => ts('Yes'), - '1' => ts('No'), - ]); - - //build the array of all search params. - $this->_searchParams = []; - foreach ($this->_elements as $element) { - $name = $element->_attributes['name']; - $label = $element->_label; - if ($name == 'qfKey') { - continue; - } - $this->_searchParams[$name] = ($label) ? $label : $name; - } - $this->set('searchParams', $this->_searchParams); - $this->assign('searchParams', json_encode($this->_searchParams)); - } - -} diff --git a/CRM/Campaign/Form/Search/Petition.php b/CRM/Campaign/Form/Search/Petition.php deleted file mode 100644 index 49b94a12265f..000000000000 --- a/CRM/Campaign/Form/Search/Petition.php +++ /dev/null @@ -1,81 +0,0 @@ -_search = $_GET['search'] ?? NULL; - $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE, FALSE); - $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'petition'); - - //when we do load tab, lets load the default objects. - $this->assign('force', $this->_force || $this->_searchTab); - $this->assign('searchParams', json_encode($this->get('searchParams'))); - $this->assign('buildSelector', $this->_search); - $this->assign('searchFor', $this->_searchTab); - $this->assign('petitionCampaigns', json_encode($this->get('petitionCampaigns'))); - $this->assign('suppressForm', TRUE); - - //set the form title. - $this->setTitle(ts('Find Petition')); - } - - /** - * Build the form object. - */ - public function buildQuickForm() { - if ($this->_search) { - return; - } - - $attributes = CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey'); - $this->add('text', 'petition_title', ts('Title'), $attributes['title']); - - //campaigns - $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); - $this->add('select', 'petition_campaign_id', ts('Campaign'), ['' => ts('- select -')] + $campaigns); - $this->set('petitionCampaigns', $campaigns); - $this->assign('petitionCampaigns', json_encode($campaigns)); - - //build the array of all search params. - $this->_searchParams = []; - foreach ($this->_elements as $element) { - $name = $element->_attributes['name']; - $label = $element->_label; - if ($name == 'qfKey') { - continue; - } - $this->_searchParams[$name] = ($label) ? $label : $name; - } - $this->set('searchParams', $this->_searchParams); - $this->assign('searchParams', json_encode($this->_searchParams)); - } - -} diff --git a/CRM/Campaign/Form/Search/Survey.php b/CRM/Campaign/Form/Search/Survey.php deleted file mode 100644 index 6ad51606c772..000000000000 --- a/CRM/Campaign/Form/Search/Survey.php +++ /dev/null @@ -1,92 +0,0 @@ -_search = $_GET['search'] ?? NULL; - $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE, FALSE); - $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'survey'); - - //when we do load tab, lets load the default objects. - $this->assign('force', $this->_force || $this->_searchTab); - $this->assign('searchParams', json_encode($this->get('searchParams'))); - $this->assign('buildSelector', $this->_search); - $this->assign('searchFor', $this->_searchTab); - $this->assign('surveyTypes', json_encode($this->get('surveyTypes'))); - $this->assign('surveyCampaigns', json_encode($this->get('surveyCampaigns'))); - $this->assign('suppressForm', TRUE); - - //set the form title. - $this->setTitle(ts('Find Survey')); - } - - /** - * Build the form object. - */ - public function buildQuickForm() { - if ($this->_search) { - return; - } - - $attributes = CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey'); - $this->add('text', 'survey_title', ts('Title'), $attributes['title']); - - //activity Type id - $surveyTypes = CRM_Campaign_BAO_Survey::getSurveyActivityType(); - $this->add('select', 'activity_type_id', - ts('Activity Type'), [ - '' => ts('- select -'), - ] + $surveyTypes - ); - $this->set('surveyTypes', $surveyTypes); - $this->assign('surveyTypes', json_encode($surveyTypes)); - - //campaigns - $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); - $this->add('select', 'survey_campaign_id', ts('Campaign'), ['' => ts('- select -')] + $campaigns); - $this->set('surveyCampaigns', $campaigns); - $this->assign('surveyCampaigns', json_encode($campaigns)); - - //build the array of all search params. - $this->_searchParams = []; - foreach ($this->_elements as $element) { - $name = $element->_attributes['name']; - $label = $element->_label; - if ($name == 'qfKey') { - continue; - } - $this->_searchParams[$name] = ($label) ? $label : $name; - } - $this->set('searchParams', $this->_searchParams); - $this->assign('searchParams', json_encode($this->_searchParams)); - } - -} diff --git a/CRM/Campaign/Form/Survey.php b/CRM/Campaign/Form/Survey.php index e06367831d00..e299f192e90e 100644 --- a/CRM/Campaign/Form/Survey.php +++ b/CRM/Campaign/Form/Survey.php @@ -58,6 +58,9 @@ public function getEntityId() { } public function preProcess() { + // Multistep form doesn't play well with popups + $this->preventAjaxSubmit(); + if (!CRM_Campaign_BAO_Campaign::accessCampaign()) { CRM_Utils_System::permissionDenied(); } diff --git a/CRM/Campaign/Page/AJAX.php b/CRM/Campaign/Page/AJAX.php index f5e857c2d358..6236287a3030 100644 --- a/CRM/Campaign/Page/AJAX.php +++ b/CRM/Campaign/Page/AJAX.php @@ -501,312 +501,4 @@ public static function campaignGroups() { CRM_Utils_JSON::output($results); } - /** - * This function uses the deprecated v1 datatable api and needs updating. See CRM-16353. - * @deprecated - */ - public static function campaignList() { - //get the search criteria params. - $searchCriteria = CRM_Utils_Request::retrieve('searchCriteria', 'String', CRM_Core_DAO::$_nullObject, FALSE, NULL, 'POST'); - $searchParams = explode(',', $searchCriteria); - - $params = $searchRows = []; - foreach ($searchParams as $param) { - if (isset($_POST[$param])) { - $params[$param] = $_POST[$param]; - } - } - - //this is sequence columns on datatable. - $selectorCols = [ - 'id', - 'name', - 'title', - 'description', - 'start_date', - 'end_date', - 'campaign_type_id', - 'campaign_type', - 'status_id', - 'status', - 'is_active', - 'isActive', - 'action', - ]; - - // get the data table params. - $dataTableParams = [ - 'sEcho' => [ - 'name' => 'sEcho', - 'type' => 'Integer', - 'default' => 0, - ], - 'offset' => [ - 'name' => 'iDisplayStart', - 'type' => 'Integer', - 'default' => 0, - ], - 'rowCount' => [ - 'name' => 'iDisplayLength', - 'type' => 'Integer', - 'default' => 25, - ], - 'sort' => [ - 'name' => 'iSortCol_0', - 'type' => 'Integer', - 'default' => 'start_date', - ], - 'sortOrder' => [ - 'name' => 'sSortDir_0', - 'type' => 'String', - 'default' => 'desc', - ], - ]; - foreach ($dataTableParams as $pName => $pValues) { - $$pName = $pValues['default']; - if (!empty($_POST[$pValues['name']])) { - $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']); - if ($pName == 'sort') { - $$pName = $selectorCols[$$pName]; - } - } - } - foreach ([ - 'sort', - 'offset', - 'rowCount', - 'sortOrder', - ] as $sortParam) { - $params[$sortParam] = $$sortParam; - } - - $searchCount = CRM_Campaign_BAO_Campaign::getCampaignSummary($params, TRUE); - $campaigns = CRM_Campaign_Page_DashBoard::getCampaignSummary($params); - $iTotal = $searchCount; - - if ($searchCount > 0) { - if ($searchCount < $offset) { - $offset = 0; - } - foreach ($campaigns as $campaignID => $values) { - foreach ($selectorCols as $col) { - $searchRows[$campaignID][$col] = $values[$col] ?? NULL; - } - } - } - - $selectorElements = $selectorCols; - - $iFilteredTotal = $iTotal; - - CRM_Utils_System::setHttpHeader('Content-Type', 'application/json'); - echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements); - CRM_Utils_System::civiExit(); - } - - /** - * This function uses the deprecated v1 datatable api and needs updating. See CRM-16353. - * @deprecated - */ - public static function surveyList() { - //get the search criteria params. - $searchCriteria = CRM_Utils_Request::retrieve('searchCriteria', 'String', CRM_Core_DAO::$_nullObject, FALSE, NULL, 'POST'); - $searchParams = explode(',', $searchCriteria); - - $params = $searchRows = []; - foreach ($searchParams as $param) { - if (!empty($_POST[$param])) { - $params[$param] = $_POST[$param]; - } - } - - //this is sequence columns on datatable. - $selectorCols = [ - 'id', - 'title', - 'campaign_id', - 'campaign', - 'activity_type_id', - 'activity_type', - 'release_frequency', - 'default_number_of_contacts', - 'max_number_of_contacts', - 'is_default', - 'is_active', - 'isActive', - 'result_id', - 'action', - 'voterLinks', - ]; - - // get the data table params. - $dataTableParams = [ - 'sEcho' => [ - 'name' => 'sEcho', - 'type' => 'Integer', - 'default' => 0, - ], - 'offset' => [ - 'name' => 'iDisplayStart', - 'type' => 'Integer', - 'default' => 0, - ], - 'rowCount' => [ - 'name' => 'iDisplayLength', - 'type' => 'Integer', - 'default' => 25, - ], - 'sort' => [ - 'name' => 'iSortCol_0', - 'type' => 'Integer', - 'default' => 'created_date', - ], - 'sortOrder' => [ - 'name' => 'sSortDir_0', - 'type' => 'String', - 'default' => 'desc', - ], - ]; - foreach ($dataTableParams as $pName => $pValues) { - $$pName = $pValues['default']; - if (!empty($_POST[$pValues['name']])) { - $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']); - if ($pName == 'sort') { - $$pName = $selectorCols[$$pName]; - } - } - } - foreach ([ - 'sort', - 'offset', - 'rowCount', - 'sortOrder', - ] as $sortParam) { - $params[$sortParam] = $$sortParam; - } - - $surveys = CRM_Campaign_Page_DashBoard::getSurveySummary($params); - $searchCount = CRM_Campaign_BAO_Survey::getSurveySummary($params, TRUE); - $iTotal = $searchCount; - - if ($searchCount > 0) { - if ($searchCount < $offset) { - $offset = 0; - } - foreach ($surveys as $surveyID => $values) { - foreach ($selectorCols as $col) { - $searchRows[$surveyID][$col] = $values[$col] ?? NULL; - } - } - } - - $selectorElements = $selectorCols; - - $iFilteredTotal = $iTotal; - - CRM_Utils_System::setHttpHeader('Content-Type', 'application/json'); - echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements); - CRM_Utils_System::civiExit(); - } - - /** - * This function uses the deprecated v1 datatable api and needs updating. See CRM-16353. - * @deprecated - */ - public static function petitionList() { - //get the search criteria params. - $searchCriteria = CRM_Utils_Request::retrieve('searchCriteria', 'String', CRM_Core_DAO::$_nullObject, FALSE, NULL, 'POST'); - $searchParams = explode(',', $searchCriteria); - - $params = $searchRows = []; - foreach ($searchParams as $param) { - if (!empty($_POST[$param])) { - $params[$param] = $_POST[$param]; - } - } - - //this is sequence columns on datatable. - $selectorCols = [ - 'id', - 'title', - 'campaign_id', - 'campaign', - 'activity_type_id', - 'activity_type', - 'is_default', - 'is_active', - 'isActive', - 'action', - ]; - - // get the data table params. - $dataTableParams = [ - 'sEcho' => [ - 'name' => 'sEcho', - 'type' => 'Integer', - 'default' => 0, - ], - 'offset' => [ - 'name' => 'iDisplayStart', - 'type' => 'Integer', - 'default' => 0, - ], - 'rowCount' => [ - 'name' => 'iDisplayLength', - 'type' => 'Integer', - 'default' => 25, - ], - 'sort' => [ - 'name' => 'iSortCol_0', - 'type' => 'Integer', - 'default' => 'created_date', - ], - 'sortOrder' => [ - 'name' => 'sSortDir_0', - 'type' => 'String', - 'default' => 'desc', - ], - ]; - foreach ($dataTableParams as $pName => $pValues) { - $$pName = $pValues['default']; - if (!empty($_POST[$pValues['name']])) { - $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']); - if ($pName == 'sort') { - $$pName = $selectorCols[$$pName]; - } - } - } - foreach ([ - 'sort', - 'offset', - 'rowCount', - 'sortOrder', - ] as $sortParam) { - $params[$sortParam] = $$sortParam; - } - - $petitions = CRM_Campaign_Page_DashBoard::getPetitionSummary($params); - $searchCount = CRM_Campaign_BAO_Petition::getPetitionSummary($params, TRUE); - $iTotal = $searchCount; - - if ($searchCount > 0) { - if ($searchCount < $offset) { - $offset = 0; - } - foreach ($petitions as $petitionID => $values) { - foreach ($selectorCols as $col) { - $searchRows[$petitionID][$col] = $values[$col] ?? NULL; - } - } - } - - $selectorElements = $selectorCols; - - $iFilteredTotal = $iTotal; - - CRM_Utils_System::setHttpHeader('Content-Type', 'application/json'); - echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements); - CRM_Utils_System::civiExit(); - } - } diff --git a/CRM/Campaign/Page/DashBoard.php b/CRM/Campaign/Page/DashBoard.php deleted file mode 100644 index 013ebcec4da8..000000000000 --- a/CRM/Campaign/Page/DashBoard.php +++ /dev/null @@ -1,499 +0,0 @@ - [ - 'name' => ts('Edit'), - 'url' => 'civicrm/campaign/add', - 'qs' => 'reset=1&action=update&id=%%id%%', - 'title' => ts('Update Campaign'), - ], - CRM_Core_Action::DISABLE => [ - 'name' => ts('Disable'), - 'title' => ts('Disable Campaign'), - 'ref' => 'crm-enable-disable', - ], - CRM_Core_Action::ENABLE => [ - 'name' => ts('Enable'), - 'title' => ts('Enable Campaign'), - 'ref' => 'crm-enable-disable', - ], - CRM_Core_Action::DELETE => [ - 'name' => ts('Delete'), - 'url' => 'civicrm/campaign/add', - 'qs' => 'action=delete&reset=1&id=%%id%%', - 'title' => ts('Delete Campaign'), - ], - ]; - } - - return self::$_campaignActionLinks; - } - - /** - * @return array - */ - public static function surveyActionLinks() { - // check if variable _actionsLinks is populated - if (!isset(self::$_surveyActionLinks)) { - self::$_surveyActionLinks = [ - CRM_Core_Action::UPDATE => [ - 'name' => ts('Edit'), - 'url' => 'civicrm/survey/configure/main', - 'qs' => 'action=update&id=%%id%%&reset=1', - 'title' => ts('Update Survey'), - ], - CRM_Core_Action::DISABLE => [ - 'name' => ts('Disable'), - 'ref' => 'crm-enable-disable', - 'title' => ts('Disable Survey'), - ], - CRM_Core_Action::ENABLE => [ - 'name' => ts('Enable'), - 'ref' => 'crm-enable-disable', - 'title' => ts('Enable Survey'), - ], - CRM_Core_Action::DELETE => [ - 'name' => ts('Delete'), - 'url' => 'civicrm/survey/delete', - 'qs' => 'id=%%id%%&reset=1', - 'title' => ts('Delete Survey'), - ], - ]; - } - - return self::$_surveyActionLinks; - } - - /** - * @return array - */ - public static function petitionActionLinks() { - if (!isset(self::$_petitionActionLinks)) { - self::$_petitionActionLinks = self::surveyActionLinks(); - self::$_petitionActionLinks[CRM_Core_Action::UPDATE] = [ - 'name' => ts('Edit'), - 'url' => 'civicrm/petition/add', - 'qs' => 'action=update&id=%%id%%&reset=1', - 'title' => ts('Update Petition'), - ]; - self::$_petitionActionLinks[CRM_Core_Action::DISABLE] = [ - 'name' => ts('Disable'), - 'ref' => 'crm-enable-disable', - 'title' => ts('Disable Petition'), - ]; - self::$_petitionActionLinks[CRM_Core_Action::ENABLE] = [ - 'name' => ts('Enable'), - 'ref' => 'crm-enable-disable', - 'title' => ts('Enable Petition'), - ]; - self::$_petitionActionLinks[CRM_Core_Action::DELETE] = [ - 'name' => ts('Delete'), - 'url' => 'civicrm/petition/add', - 'qs' => 'action=delete&id=%%id%%&reset=1', - 'title' => ts('Delete Petition'), - ]; - self::$_petitionActionLinks[CRM_Core_Action::PROFILE] = [ - 'name' => ts('Sign'), - 'url' => 'civicrm/petition/sign', - 'qs' => 'sid=%%id%%&reset=1', - 'title' => ts('Sign Petition'), - 'fe' => TRUE, - //CRM_Core_Action::PROFILE is used because there isn't a specific action for sign - ]; - self::$_petitionActionLinks[CRM_Core_Action::BROWSE] = [ - 'name' => ts('Signatures'), - 'url' => 'civicrm/activity/search', - 'qs' => 'survey=%%id%%&force=1', - 'title' => ts('List the signatures'), - //CRM_Core_Action::PROFILE is used because there isn't a specific action for sign - ]; - } - - return self::$_petitionActionLinks; - } - - /** - * @return mixed - */ - public function browseCampaign() { - // ensure valid javascript (these must have a value set) - $this->assign('searchParams', json_encode(NULL)); - $this->assign('campaignTypes', json_encode(NULL)); - $this->assign('campaignStatus', json_encode(NULL)); - - $this->assign('addCampaignUrl', CRM_Utils_System::url('civicrm/campaign/add', 'reset=1&action=add')); - $campaignCount = CRM_Campaign_BAO_Campaign::getCampaignCount(); - //don't load find interface when no campaigns in db. - if (!$campaignCount) { - $this->assign('hasCampaigns', FALSE); - return; - } - $this->assign('hasCampaigns', TRUE); - - //build the ajaxify campaign search and selector. - $controller = new CRM_Core_Controller_Simple('CRM_Campaign_Form_Search_Campaign', ts('Search Campaigns')); - $controller->set('searchTab', 'campaign'); - $controller->setEmbedded(TRUE); - $controller->process(); - return $controller->run(); - } - - /** - * @param array $params - * - * @return array - */ - public static function getCampaignSummary($params = []) { - $campaignsData = []; - - //get the campaigns. - $campaigns = CRM_Campaign_BAO_Campaign::getCampaignSummary($params); - if (!empty($campaigns)) { - $config = CRM_Core_Config::singleton(); - $campaignType = CRM_Campaign_PseudoConstant::campaignType(); - $campaignStatus = CRM_Campaign_PseudoConstant::campaignStatus(); - $properties = [ - 'id', - 'name', - 'title', - 'status_id', - 'description', - 'campaign_type_id', - 'is_active', - 'start_date', - 'end_date', - ]; - foreach ($campaigns as $cmpid => $campaign) { - foreach ($properties as $prop) { - $campaignsData[$cmpid][$prop] = $campaign[$prop] ?? NULL; - } - $statusId = $campaign['status_id'] ?? NULL; - $campaignsData[$cmpid]['status'] = $campaignStatus[$statusId] ?? NULL; - $campaignsData[$cmpid]['campaign_id'] = $campaign['id']; - $campaignsData[$cmpid]['campaign_type'] = $campaignType[$campaign['campaign_type_id']]; - - $action = array_sum(array_keys(self::campaignActionLinks())); - if ($campaign['is_active']) { - $action -= CRM_Core_Action::ENABLE; - } - else { - $action -= CRM_Core_Action::DISABLE; - } - - $isActive = ts('No'); - if ($campaignsData[$cmpid]['is_active']) { - $isActive = ts('Yes'); - } - $campaignsData[$cmpid]['isActive'] = $isActive; - - if (!empty($campaignsData[$cmpid]['start_date'])) { - $campaignsData[$cmpid]['start_date'] = CRM_Utils_Date::customFormat($campaignsData[$cmpid]['start_date'], - $config->dateformatFull - ); - } - if (!empty($campaignsData[$cmpid]['end_date'])) { - $campaignsData[$cmpid]['end_date'] = CRM_Utils_Date::customFormat($campaignsData[$cmpid]['end_date'], - $config->dateformatFull - ); - } - $campaignsData[$cmpid]['action'] = CRM_Core_Action::formLink(self::campaignActionLinks(), - $action, - ['id' => $campaign['id']], - ts('more'), - FALSE, - 'campaign.dashboard.row', - 'Campaign', - $campaign['id'] - ); - } - } - - return $campaignsData; - } - - /** - * @return mixed - */ - public function browseSurvey() { - // ensure valid javascript - this must have a value set - $this->assign('searchParams', json_encode(NULL)); - $this->assign('surveyTypes', json_encode(NULL)); - $this->assign('surveyCampaigns', json_encode(NULL)); - - $this->assign('addSurveyUrl', CRM_Utils_System::url('civicrm/survey/add', 'reset=1&action=add')); - - $surveyCount = CRM_Campaign_BAO_Survey::getSurveyCount(); - //don't load find interface when no survey in db. - if (!$surveyCount) { - $this->assign('hasSurveys', FALSE); - return; - } - $this->assign('hasSurveys', TRUE); - - //build the ajaxify survey search and selector. - $controller = new CRM_Core_Controller_Simple('CRM_Campaign_Form_Search_Survey', ts('Search Survey')); - $controller->set('searchTab', 'survey'); - $controller->setEmbedded(TRUE); - $controller->process(); - return $controller->run(); - } - - /** - * @param array $params - * - * @return array - */ - public static function getSurveySummary($params = []) { - $surveysData = []; - - //get the survey. - $config = CRM_Core_Config::singleton(); - $surveys = CRM_Campaign_BAO_Survey::getSurveySummary($params); - if (!empty($surveys)) { - $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); - $surveyType = CRM_Campaign_BAO_Survey::getSurveyActivityType(); - foreach ($surveys as $sid => $survey) { - $surveysData[$sid] = $survey; - $campaignId = $survey['campaign_id'] ?? NULL; - $surveysData[$sid]['campaign'] = $campaigns[$campaignId] ?? NULL; - $surveysData[$sid]['activity_type'] = $surveyType[$survey['activity_type_id']]; - if (!empty($survey['release_frequency'])) { - $surveysData[$sid]['release_frequency'] = ts('1 Day', ['plural' => '%count Days', 'count' => $survey['release_frequency']]); - } - - $action = array_sum(array_keys(self::surveyActionLinks($surveysData[$sid]['activity_type']))); - if ($survey['is_active']) { - $action -= CRM_Core_Action::ENABLE; - } - else { - $action -= CRM_Core_Action::DISABLE; - } - - $isActive = ts('No'); - if ($surveysData[$sid]['is_active']) { - $isActive = ts('Yes'); - } - $surveysData[$sid]['isActive'] = $isActive; - - // For some reason, 'is_default' is coming as a string. - $surveysData[$sid]['is_default'] = boolval($surveysData[$sid]['is_default']); - - if ($surveysData[$sid]['result_id']) { - $resultSet = '' . ts('Result Set') . ''; - $surveysData[$sid]['result_id'] = $resultSet; - } - else { - $resultUrl = CRM_Utils_System::url("civicrm/survey/configure/results", "action=update&id={$sid}&reset=1"); - $surveysData[$sid]['result_id'] = "(" . ts('Incomplete. Click to configure result set.') . ')'; - } - $surveysData[$sid]['action'] = CRM_Core_Action::formLink(self::surveyActionLinks($surveysData[$sid]['activity_type']), - $action, - ['id' => $sid], - ts('more'), - FALSE, - 'survey.dashboard.row', - 'Survey', - $sid - ); - - if (($surveysData[$sid]['activity_type'] ?? NULL) != 'Petition') { - $surveysData[$sid]['voterLinks'] = CRM_Campaign_BAO_Survey::buildPermissionLinks($sid, - TRUE, - ts('more') - ); - } - - if ($reportID = CRM_Campaign_BAO_Survey::getReportID($sid)) { - $url = CRM_Utils_System::url("civicrm/report/instance/{$reportID}", 'reset=1'); - $surveysData[$sid]['title'] = "{$surveysData[$sid]['title']}"; - } - } - } - - return $surveysData; - } - - /** - * Browse petitions. - * - * @return mixed|null - */ - public function browsePetition() { - // Ensure valid javascript - this must have a value set - $this->assign('searchParams', json_encode(NULL)); - $this->assign('petitionCampaigns', json_encode(NULL)); - - $this->assign('addPetitionUrl', CRM_Utils_System::url('civicrm/petition/add', 'reset=1&action=add')); - - $petitionCount = CRM_Campaign_BAO_Petition::getPetitionCount(); - //don't load find interface when no petition in db. - if (!$petitionCount) { - $this->assign('hasPetitions', FALSE); - return NULL; - } - $this->assign('hasPetitions', TRUE); - - // Build the ajax petition search and selector. - $controller = new CRM_Core_Controller_Simple('CRM_Campaign_Form_Search_Petition', ts('Search Petition')); - $controller->set('searchTab', 'petition'); - $controller->setEmbedded(TRUE); - $controller->process(); - return $controller->run(); - } - - /** - * @param array $params - * - * @return array - */ - public static function getPetitionSummary($params = []) { - $config = CRM_Core_Config::singleton(); - $petitionsData = []; - - //get the petitions. - $petitions = CRM_Campaign_BAO_Petition::getPetitionSummary($params); - if (!empty($petitions)) { - $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); - $petitionType = CRM_Campaign_BAO_Survey::getSurveyActivityType('label', TRUE); - foreach ($petitions as $pid => $petition) { - $petitionsData[$pid] = $petition; - $camapignId = $petition['campaign_id'] ?? NULL; - $petitionsData[$pid]['campaign'] = $campaigns[$camapignId] ?? NULL; - $petitionsData[$pid]['activity_type'] = $petitionType[$petition['activity_type_id']]; - - $action = array_sum(array_keys(self::petitionActionLinks())); - - if ($petition['is_active']) { - $action -= CRM_Core_Action::ENABLE; - } - else { - $action -= CRM_Core_Action::DISABLE; - } - - $isActive = ts('No'); - if ($petitionsData[$pid]['is_active']) { - $isActive = ts('Yes'); - } - $petitionsData[$pid]['isActive'] = $isActive; - - // For some reason, 'is_default' is coming as a string. - $petitionsData[$pid]['is_default'] = boolval($petitionsData[$pid]['is_default']); - - $petitionsData[$pid]['action'] = CRM_Core_Action::formLink(self::petitionActionLinks(), - $action, - ['id' => $pid], - ts('more'), - FALSE, - 'petition.dashboard.row', - 'Petition', - $pid - ); - } - } - - return $petitionsData; - } - - public function browse() { - $this->_tabs = [ - 'campaign' => ts('Campaigns'), - 'survey' => ts('Surveys'), - 'petition' => ts('Petitions'), - ]; - - $subPageType = CRM_Utils_Request::retrieve('type', 'String', $this); - // Load the data for a specific tab - if ($subPageType) { - if (!isset($this->_tabs[$subPageType])) { - CRM_Utils_System::permissionDenied(); - } - //load the data in tabs. - $this->{'browse' . ucfirst($subPageType)}(); - } - // Initialize tabs - else { - $this->buildTabs(); - } - $this->assign('subPageType', ucfirst($subPageType)); - } - - /** - * @return string - */ - public function run() { - if (!CRM_Campaign_BAO_Campaign::accessCampaign()) { - CRM_Utils_System::permissionDenied(); - } - - $this->browse(); - - return parent::run(); - } - - public function buildTabs() { - $allTabs = []; - foreach ($this->_tabs as $name => $title) { - $allTabs[$name] = [ - 'title' => $title, - 'valid' => TRUE, - 'active' => TRUE, - 'link' => CRM_Utils_System::url('civicrm/campaign', "reset=1&type=$name"), - 'extra' => NULL, - 'template' => NULL, - 'count' => NULL, - 'icon' => NULL, - 'class' => NULL, - ]; - } - $allTabs['campaign']['class'] = 'livePage'; - $this->assign('tabHeader', $allTabs); - CRM_Core_Resources::singleton() - ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header') - ->addSetting([ - 'tabSettings' => [ - // Tabs should use selectedChild, but Campaign has many legacy links - 'active' => strtolower($_GET['subPage'] ?? $_GET['selectedChild'] ?? 'campaign'), - ], - ]); - } - -} diff --git a/CRM/Campaign/xml/Menu/Campaign.xml b/CRM/Campaign/xml/Menu/Campaign.xml index 5d051df2493b..9e4be74c218b 100644 --- a/CRM/Campaign/xml/Menu/Campaign.xml +++ b/CRM/Campaign/xml/Menu/Campaign.xml @@ -1,13 +1,6 @@ - - civicrm/campaign - Campaign Dashboard - CRM_Campaign_Page_DashBoard - administer CiviCampaign;manage campaign - CiviCampaign - civicrm/campaign/add New Campaign diff --git a/CRM/Upgrade/Incremental/sql/5.67.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.67.alpha1.mysql.tpl index 4b47ee98b060..54afcfc924a4 100644 --- a/CRM/Upgrade/Incremental/sql/5.67.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.67.alpha1.mysql.tpl @@ -5,7 +5,9 @@ UPDATE civicrm_note SET privacy = 0 WHERE privacy IS NULL; {* NULL values would be nonsensical and useless - no reason to keep them *} DELETE FROM civicrm_entity_file WHERE entity_table IS NULL; -SELECT @country_id := id from civicrm_country where name = 'India' AND iso_code = 'IN'; +{* Delete navigation links to old campaign dashboard *} +DELETE FROM `civicrm_navigation` WHERE `url` LIKE 'civicrm/campaign?reset=1%'; +SELECT @country_id := id from civicrm_country where name = 'India' AND iso_code = 'IN'; UPDATE `civicrm_state_province` SET abbreviation = 'MH' WHERE name = 'Maharashtra' AND country_id = @country_id; UPDATE `civicrm_state_province` SET abbreviation = 'CG' WHERE name = 'Chhattisgarh' AND country_id = @country_id; diff --git a/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html b/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html new file mode 100644 index 000000000000..b429bdd53947 --- /dev/null +++ b/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html @@ -0,0 +1,25 @@ +
+
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+ + +
+ +
+
diff --git a/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.php b/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.php new file mode 100644 index 000000000000..2134c1f285b7 --- /dev/null +++ b/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.php @@ -0,0 +1,16 @@ + 'search', + 'title' => E::ts('Campaign Dashboard'), + 'icon' => 'fa-table', + 'server_route' => 'civicrm/campaign', + 'permission' => ['administer CiviCampaign', 'manage campaign'], + 'permission_operator' => 'OR', + 'navigation' => [ + 'parent' => 'Campaigns', + 'label' => E::ts('Campaign Dashboard'), + 'weight' => -1, + ], +]; diff --git a/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.html b/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.html new file mode 100644 index 000000000000..999b0d246953 --- /dev/null +++ b/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.php b/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.php new file mode 100644 index 000000000000..7f5a56948f7d --- /dev/null +++ b/ext/civi_campaign/ang/afsearchSurveyOptionGroup.aff.php @@ -0,0 +1,10 @@ + 'search', + 'title' => '', + 'icon' => 'fa-list-alt', + 'server_route' => 'civicrm/survey/option-group', + 'permission' => ['access CiviCRM'], +]; diff --git a/ext/civi_campaign/info.xml b/ext/civi_campaign/info.xml index bdbdcaa6ed76..0bb2e5872e27 100644 --- a/ext/civi_campaign/info.xml +++ b/ext/civi_campaign/info.xml @@ -29,6 +29,7 @@ scan-classes@1.0.0 + mgd-php@1.0.0 CRM/Campaign diff --git a/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php b/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php new file mode 100644 index 000000000000..fa6f5fbe1930 --- /dev/null +++ b/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php @@ -0,0 +1,205 @@ + 'SavedSearch_Administer_Campaigns', + 'entity' => 'SavedSearch', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Administer_Campaigns', + 'label' => E::ts('Administer Campaigns'), + 'form_values' => NULL, + 'mapping_id' => NULL, + 'search_custom_id' => NULL, + 'api_entity' => 'Campaign', + 'api_params' => [ + 'version' => 4, + 'select' => [ + 'id', + 'title', + 'description', + 'is_active', + 'start_date', + 'end_date', + 'campaign_type_id:label', + 'status_id:label', + ], + 'orderBy' => [], + 'where' => [], + 'groupBy' => [], + 'join' => [], + 'having' => [], + ], + 'expires_date' => NULL, + 'description' => NULL, + ], + 'match' => [ + 'name', + ], + ], + ], + [ + 'name' => 'SavedSearch_Administer_Campaigns_SearchDisplay_Campaigns_Table', + 'entity' => 'SearchDisplay', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Campaigns_Table', + 'label' => E::ts('Administer Campaigns'), + 'saved_search_id.name' => 'Administer_Campaigns', + 'type' => 'table', + 'settings' => [ + 'actions' => FALSE, + 'limit' => 50, + 'classes' => [ + 'table', + 'table-striped', + ], + 'pager' => [ + 'show_count' => FALSE, + 'expose_limit' => TRUE, + 'hide_single' => TRUE, + ], + 'placeholder' => 5, + 'sort' => [ + ['is_active', 'DESC'], + ['title', 'ASC'], + ], + 'columns' => [ + [ + 'type' => 'field', + 'key' => 'title', + 'dataType' => 'String', + 'label' => E::ts('Title'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'description', + 'dataType' => 'String', + 'label' => E::ts('Description'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'start_date', + 'dataType' => 'Date', + 'label' => E::ts('Start Date'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'end_date', + 'dataType' => 'Date', + 'label' => E::ts('End Date'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'campaign_type_id:label', + 'dataType' => 'String', + 'label' => E::ts('Type'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'status_id:label', + 'dataType' => 'String', + 'label' => E::ts('Status'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'is_active', + 'dataType' => 'Boolean', + 'label' => E::ts('Enabled'), + 'sortable' => TRUE, + ], + [ + 'size' => 'btn-xs', + 'links' => [ + [ + 'path' => '', + 'icon' => 'fa-pencil', + 'text' => E::ts('Edit'), + 'style' => 'default', + 'condition' => [], + 'entity' => 'Campaign', + 'action' => 'update', + 'join' => '', + 'target' => 'crm-popup', + ], + [ + 'task' => 'enable', + 'entity' => 'Campaign', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-on', + 'text' => E::ts('Enable'), + 'style' => 'default', + 'condition' => ['is_active', '=', FALSE], + ], + [ + 'task' => 'disable', + 'entity' => 'Campaign', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-off', + 'text' => E::ts('Disable'), + 'style' => 'default', + 'condition' => ['is_active', '=', TRUE], + ], + [ + 'entity' => 'Campaign', + 'action' => 'delete', + 'join' => '', + 'target' => 'crm-popup', + 'icon' => 'fa-trash', + 'text' => E::ts('Delete'), + 'style' => 'danger small-popup', + 'path' => '', + 'condition' => [], + ], + ], + 'type' => 'buttons', + 'alignment' => 'text-right', + ], + ], + 'toolbar' => [ + [ + 'entity' => 'Campaign', + 'action' => 'add', + 'target' => 'crm-popup', + 'icon' => 'fa-plus', + 'text' => E::ts('Add Campaign'), + 'style' => 'primary', + ], + ], + 'cssRules' => [ + [ + 'disabled', + 'is_active', + '=', + FALSE, + ], + ], + ], + 'acl_bypass' => FALSE, + ], + 'match' => [ + 'name', + 'saved_search_id', + ], + ], + ], +]; diff --git a/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php b/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php new file mode 100644 index 000000000000..fa36a617cf29 --- /dev/null +++ b/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php @@ -0,0 +1,218 @@ + 'SavedSearch_Administer_Petitions', + 'entity' => 'SavedSearch', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Administer_Petitions', + 'label' => E::ts('Administer Petitions'), + 'form_values' => NULL, + 'mapping_id' => NULL, + 'search_custom_id' => NULL, + 'api_entity' => 'Survey', + 'api_params' => [ + 'version' => 4, + 'select' => [ + 'id', + 'title', + 'campaign_id:label', + 'is_active', + 'is_default', + ], + 'orderBy' => [], + 'where' => [ + ['activity_type_id:name', '=', 'Petition'], + ], + 'groupBy' => [], + 'join' => [], + 'having' => [], + ], + 'expires_date' => NULL, + 'description' => NULL, + ], + 'match' => [ + 'name', + ], + ], + ], + [ + 'name' => 'SavedSearch_Administer_Petitions_SearchDisplay_Petitions_Table', + 'entity' => 'SearchDisplay', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Petitions_Table', + 'label' => E::ts('Administer Petitions'), + 'saved_search_id.name' => 'Administer_Petitions', + 'type' => 'table', + 'settings' => [ + 'actions' => FALSE, + 'limit' => 50, + 'classes' => [ + 'table', + 'table-striped', + ], + 'pager' => [ + 'show_count' => FALSE, + 'expose_limit' => TRUE, + 'hide_single' => TRUE, + ], + 'placeholder' => 5, + 'sort' => [ + ['is_active', 'DESC'], + ['title', 'ASC'], + ], + 'columns' => [ + [ + 'type' => 'field', + 'key' => 'title', + 'dataType' => 'String', + 'label' => E::ts('Title'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'campaign_id:label', + 'dataType' => 'Integer', + 'label' => E::ts('Survey'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'is_default', + 'dataType' => 'Boolean', + 'label' => E::ts('Default'), + 'sortable' => TRUE, + 'rewrite' => ' ', + 'icons' => [ + [ + 'icon' => 'fa-check-square-o', + 'side' => 'left', + 'if' => [ + 'is_default', + '=', + TRUE, + ], + ], + ], + ], + [ + 'type' => 'field', + 'key' => 'is_active', + 'dataType' => 'Boolean', + 'label' => E::ts('Enabled'), + 'sortable' => TRUE, + ], + [ + 'size' => 'btn-xs', + 'type' => 'buttons', + 'alignment' => 'text-right', + 'links' => [ + [ + 'path' => 'civicrm/petition/add?reset=1&action=update&id=[id]', + 'icon' => 'fa-pencil', + 'text' => E::ts('Edit'), + 'style' => 'default', + 'condition' => [], + 'target' => 'crm-popup', + ], + [ + 'task' => 'enable', + 'entity' => 'Survey', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-on', + 'text' => E::ts('Enable'), + 'style' => 'default', + 'condition' => ['is_active', '=', FALSE], + ], + [ + 'task' => 'disable', + 'entity' => 'Survey', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-off', + 'text' => E::ts('Disable'), + 'style' => 'default', + 'condition' => ['is_active', '=', TRUE], + ], + [ + 'entity' => 'Survey', + 'action' => 'delete', + 'join' => '', + 'target' => 'crm-popup', + 'icon' => 'fa-trash', + 'text' => E::ts('Delete'), + 'style' => 'danger small-popup', + 'path' => '', + 'condition' => [], + ], + ], + ], + [ + 'text' => E::ts('Signatures'), + 'style' => 'default', + 'size' => 'btn-xs', + 'icon' => 'fa-bars', + 'type' => 'menu', + 'alignment' => 'text-right', + 'links' => [ + [ + 'path' => 'civicrm/petition/sign?reset=1&sid=[id]', + 'icon' => 'fa-clipboard', + 'text' => E::ts('Sign'), + 'style' => 'default', + 'condition' => [], + 'target' => '_blank', + ], + [ + 'path' => 'civicrm/activity/search?force=1&survey=[id]', + 'icon' => 'fa-list-alt', + 'text' => E::ts('View Signatures'), + 'style' => 'default', + 'condition' => [], + 'target' => '_blank', + ], + ], + ], + ], + 'toolbar' => [ + [ + 'path' => 'civicrm/petition/add?reset=1', + 'text' => E::ts('Add Petition'), + 'target' => 'crm-popup', + 'icon' => 'fa-plus', + 'style' => 'primary', + 'condition' => [ + 'check user permission', + 'CONTAINS', + ['administer CiviCampaign', 'manage campaign'], + ], + ], + ], + 'cssRules' => [ + [ + 'disabled', + 'is_active', + '=', + FALSE, + ], + ], + ], + 'acl_bypass' => FALSE, + ], + 'match' => [ + 'name', + 'saved_search_id', + ], + ], + ], +]; diff --git a/ext/civi_campaign/managed/SavedSearch_Administer_Survey_Options.mgd.php b/ext/civi_campaign/managed/SavedSearch_Administer_Survey_Options.mgd.php new file mode 100644 index 000000000000..6615e5437451 --- /dev/null +++ b/ext/civi_campaign/managed/SavedSearch_Administer_Survey_Options.mgd.php @@ -0,0 +1,101 @@ + 'SavedSearch_Administer_Survey_Options', + 'entity' => 'SavedSearch', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Administer_Survey_Options', + 'label' => E::ts('Administer Survey Options'), + 'form_values' => NULL, + 'mapping_id' => NULL, + 'search_custom_id' => NULL, + 'api_entity' => 'OptionValue', + 'api_params' => [ + 'version' => 4, + 'select' => [ + 'label', + 'value', + 'filter', + ], + 'orderBy' => [], + 'where' => [], + 'groupBy' => [], + 'join' => [], + 'having' => [], + ], + 'expires_date' => NULL, + 'description' => NULL, + ], + 'match' => [ + 'name', + ], + ], + ], + [ + 'name' => 'SavedSearch_Administer_Survey_Options_SearchDisplay_Administer_Survey_Options_Table', + 'entity' => 'SearchDisplay', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Administer_Survey_Options_Table', + 'label' => E::ts('Administer Survey Options'), + 'saved_search_id.name' => 'Administer_Survey_Options', + 'type' => 'table', + 'settings' => [ + 'description' => NULL, + 'sort' => [], + 'limit' => 50, + 'actions' => FALSE, + 'classes' => [ + 'table', + 'table-striped', + ], + 'draggable' => 'weight', + 'pager' => [ + 'hide_single' => TRUE, + ], + 'placeholder' => 5, + 'columns' => [ + [ + 'type' => 'field', + 'key' => 'label', + 'dataType' => 'String', + 'label' => E::ts('Label'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'value', + 'dataType' => 'String', + 'label' => E::ts('Value'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'filter', + 'dataType' => 'Integer', + 'label' => E::ts('Recontact Interval'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + ], + ], + 'acl_bypass' => FALSE, + ], + 'match' => [ + 'name', + 'saved_search_id', + ], + ], + ], +]; diff --git a/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php b/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php new file mode 100644 index 000000000000..98eafea94093 --- /dev/null +++ b/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php @@ -0,0 +1,303 @@ + 'SavedSearch_Administer_Surveys', + 'entity' => 'SavedSearch', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Administer_Surveys', + 'label' => E::ts('Administer Surveys'), + 'form_values' => NULL, + 'mapping_id' => NULL, + 'search_custom_id' => NULL, + 'api_entity' => 'Survey', + 'api_params' => [ + 'version' => 4, + 'select' => [ + 'id', + 'title', + 'campaign_id:label', + 'activity_type_id:label', + 'release_frequency', + 'default_number_of_contacts', + 'max_number_of_contacts', + 'is_active', + 'is_default', + 'result_id:label', + ], + 'orderBy' => [], + 'where' => [ + ['activity_type_id:name', '!=', 'Petition'], + ], + 'groupBy' => [], + 'join' => [], + 'having' => [], + ], + 'expires_date' => NULL, + 'description' => NULL, + ], + 'match' => [ + 'name', + ], + ], + ], + [ + 'name' => 'SavedSearch_Administer_Surveys_SearchDisplay_Surveys_Table', + 'entity' => 'SearchDisplay', + 'cleanup' => 'always', + 'update' => 'unmodified', + 'params' => [ + 'version' => 4, + 'values' => [ + 'name' => 'Surveys_Table', + 'label' => E::ts('Administer Surveys'), + 'saved_search_id.name' => 'Administer_Surveys', + 'type' => 'table', + 'settings' => [ + 'actions' => FALSE, + 'limit' => 50, + 'classes' => [ + 'table', + 'table-striped', + ], + 'pager' => [ + 'show_count' => FALSE, + 'expose_limit' => TRUE, + 'hide_single' => TRUE, + ], + 'placeholder' => 5, + 'sort' => [ + ['is_active', 'DESC'], + ['title', 'ASC'], + ], + 'columns' => [ + [ + 'type' => 'field', + 'key' => 'title', + 'dataType' => 'String', + 'label' => E::ts('Title'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'campaign_id:label', + 'dataType' => 'Integer', + 'label' => E::ts('Survey'), + 'sortable' => TRUE, + 'editable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'activity_type_id:label', + 'dataType' => 'Integer', + 'label' => E::ts('Type'), + 'sortable' => TRUE, + 'editable' => TRUE, + 'icons' => [ + [ + 'field' => 'activity_type_id:icon', + 'side' => 'left', + ], + ], + ], + [ + 'type' => 'field', + 'key' => 'release_frequency', + 'dataType' => 'Integer', + 'label' => E::ts('Release Frequency'), + 'sortable' => TRUE, + 'empty_value' => '', + 'rewrite' => '[release_frequency] Days', + ], + [ + 'type' => 'field', + 'key' => 'default_number_of_contacts', + 'dataType' => 'Integer', + 'label' => E::ts('Reserve Each Time'), + 'sortable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'max_number_of_contacts', + 'dataType' => 'Integer', + 'label' => E::ts('Total Reserve'), + 'sortable' => TRUE, + ], + [ + 'type' => 'field', + 'key' => 'result_id:label', + 'dataType' => 'Integer', + 'label' => E::ts('Result Set'), + 'sortable' => TRUE, + 'link' => [ + 'path' => 'civicrm/survey/option-group#?option_group_id=[result_id]', + 'entity' => '', + 'action' => '', + 'join' => '', + 'target' => 'crm-popup', + ], + 'empty_value' => E::ts('Incomplete'), + 'cssRules' => [ + [ + 'bg-danger', + 'result_id:label', + 'IS EMPTY', + ], + ], + 'rewrite' => E::ts('View Options'), + 'icons' => [], + ], + [ + 'type' => 'field', + 'key' => 'is_default', + 'dataType' => 'Boolean', + 'label' => E::ts('Default'), + 'sortable' => TRUE, + 'rewrite' => ' ', + 'icons' => [ + [ + 'icon' => 'fa-check-square-o', + 'side' => 'left', + 'if' => [ + 'is_default', + '=', + TRUE, + ], + ], + ], + ], + [ + 'type' => 'field', + 'key' => 'is_active', + 'dataType' => 'Boolean', + 'label' => E::ts('Enabled'), + 'sortable' => TRUE, + ], + [ + 'size' => 'btn-xs', + 'links' => [ + [ + 'path' => '', + 'icon' => 'fa-pencil', + 'text' => E::ts('Edit'), + 'style' => 'default', + 'condition' => [], + 'entity' => 'Survey', + 'action' => 'update', + 'join' => '', + 'target' => '', + ], + [ + 'task' => 'enable', + 'entity' => 'Survey', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-on', + 'text' => E::ts('Enable'), + 'style' => 'default', + 'condition' => ['is_active', '=', FALSE], + ], + [ + 'task' => 'disable', + 'entity' => 'Survey', + 'target' => 'crm-popup', + 'icon' => 'fa-toggle-off', + 'text' => E::ts('Disable'), + 'style' => 'default', + 'condition' => ['is_active', '=', TRUE], + ], + [ + 'entity' => 'Survey', + 'action' => 'delete', + 'join' => '', + 'target' => 'crm-popup', + 'icon' => 'fa-trash', + 'text' => E::ts('Delete'), + 'style' => 'danger small-popup', + 'path' => '', + 'condition' => [], + ], + ], + 'type' => 'buttons', + 'alignment' => 'text-right', + ], + [ + 'text' => E::ts('Respondents'), + 'style' => 'default', + 'size' => 'btn-xs', + 'icon' => 'fa-bars', + 'type' => 'menu', + 'alignment' => 'text-right', + 'links' => [ + [ + 'entity' => '', + 'action' => '', + 'join' => '', + 'target' => '_blank', + 'icon' => 'fa-user-plus', + 'text' => E::ts('Reserve'), + 'style' => 'default', + 'path' => 'civicrm/survey/search?sid=[id]&reset=1&op=reserve', + 'task' => '', + 'condition' => [], + ], + [ + 'path' => 'civicrm/survey/search?sid=[id]&reset=1&op=interview&force=1', + 'icon' => 'fa-clipboard', + 'text' => E::ts('Interview'), + 'style' => 'default', + 'condition' => [], + 'task' => '', + 'entity' => '', + 'action' => '', + 'join' => '', + 'target' => '_blank', + ], + [ + 'path' => 'civicrm/survey/search?sid=[id]&reset=1&op=release&force=1', + 'icon' => 'fa-user-times', + 'text' => E::ts('Release'), + 'style' => 'default', + 'condition' => [], + 'task' => '', + 'entity' => '', + 'action' => '', + 'join' => '', + 'target' => '_blank', + ], + ], + ], + ], + 'toolbar' => [ + [ + 'entity' => 'Survey', + 'action' => 'add', + 'target' => 'crm-popup', + 'icon' => 'fa-plus', + 'text' => E::ts('Add Survey'), + 'style' => 'primary', + ], + ], + 'cssRules' => [ + [ + 'disabled', + 'is_active', + '=', + FALSE, + ], + ], + ], + 'acl_bypass' => FALSE, + ], + 'match' => [ + 'name', + 'saved_search_id', + ], + ], + ], +]; diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl deleted file mode 100644 index 95d4f9a73fdf..000000000000 --- a/templates/CRM/Campaign/Form/Search/Campaign.tpl +++ /dev/null @@ -1,271 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} - -{if !$hasCampaigns} -
- {icon icon="fa-info-circle"}{/icon} -   - {ts}None found.{/ts} -
-
- {crmButton p="civicrm/campaign/add" q="reset=1" icon="plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton} -
-{elseif $buildSelector} - -{* load campaign selector *} - - {include file="CRM/common/enableDisableApi.tpl"} - - {literal} - - {/literal} - - - - - - - - - - - - - - - - - - - -
{ts}ID{/ts}{ts}Campaign Name{/ts}{ts}Title{/ts}{ts}Description{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Type ID{/ts}{ts}Type{/ts}{ts}Status ID{/ts}{ts}Status{/ts}{ts}Is Active?{/ts}{ts}Active?{/ts}
-{else} -
- {crmButton p="civicrm/campaign/add" q="reset=1" icon="plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton} -
-{* build search form here *} - -{* Search form and results for campaigns *} -
- - {assign var='searchForm' value="search_form_$searchFor"} - -
-
- {ts}Search Campaigns{/ts} -
- - -
- {strip} - - - - - - - - - - - - - - - - - - - - -
{$form.campaign_title.label}
- {$form.campaign_title.html}   - 		- {$form.description.label}
- {$form.description.html|crmAddClass:huge} -
{$form.start_date.label}
- {$form.start_date.html} - 		{$form.end_date.label}
- {$form.end_date.html} -
{$form.campaign_type_id.label}
- {$form.campaign_type_id.html} - 		{$form.status_id.label}
- {$form.status_id.html} - 		{$form.is_active.label}
- {$form.is_active.html} -
- {if $context eq 'search'} - {$form.buttons.html} - {else} - {ts}Search{/ts} - {/if} -
- {/strip} -
-
-
-{* search form ends here *} -
-{/if} {* end of search form build *} - - -{literal} - -{/literal} diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl deleted file mode 100644 index 9c14d98d608f..000000000000 --- a/templates/CRM/Campaign/Form/Search/Petition.tpl +++ /dev/null @@ -1,241 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} - -{if !$hasPetitions} -
- {icon icon="fa-info-circle"}{/icon} - {ts}None found.{/ts} -
- -
- {crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton} -
- -{elseif $buildSelector} - - {* use to display result set of petition *} -
- - {* load petition selector *} - - {include file="CRM/common/enableDisableApi.tpl"} - - {literal} - - {/literal} - - - - - - - - - - - - - - - - - -
{ts}Petition ID{/ts}{ts}Title{/ts}{ts}Campaign ID{/ts}{ts}Campaign{/ts}{ts}Petition Type ID{/ts}{ts}Petition Type{/ts}{ts}Default?{/ts}{ts}Is Active?{/ts}{ts}Active?{/ts}
- -{else} - -
- {crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton} -
- - {* build search form here *} - - {* Search form and results for petitions *} -
- - {assign var='searchForm' value="search_form_$searchFor"} - -
-
- {ts}Search Petitions{/ts} -
- -
- {strip} - - - - - - - - -
{$form.petition_title.label}
- {$form.petition_title.html} - 		{$form.petition_campaign_id.label}
- {$form.petition_campaign_id.html} -
- {if $context eq 'search'} - {$form.buttons.html} - {else} - {ts}Search{/ts} - {/if} -
- {/strip} -
-
-
- {* search form ends here *} - -
- -{/if} {* end of search form build *} - - -{literal} - -{/literal} diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl deleted file mode 100644 index 91ec99f30be2..000000000000 --- a/templates/CRM/Campaign/Form/Search/Survey.tpl +++ /dev/null @@ -1,290 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} - -{if !$hasSurveys} -
- {icon icon="fa-info-circle"}{/icon} - {ts}None found.{/ts} -
- -
- {crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton} -
- -{elseif $buildSelector} - - {* use to display result set of survey *} -
- - {* load survey selector *} - {include file="CRM/common/enableDisableApi.tpl"} - - {literal} - - {/literal} - - - - - - - - - - - - - - - - - - - - - - -
{ts}Survey ID{/ts}{ts}Title{/ts}{ts}Campaign ID{/ts}{ts}Campaign{/ts}{ts}Survey Type ID{/ts}{ts}Survey Type{/ts}{ts}Release Frequency{/ts}{ts}Reserve Each Time{/ts}{ts}Total Reserve{/ts}{ts}Default?{/ts}{ts}Is Active?{/ts}{ts}Active?{/ts}
- -{else} - -
- {crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton} -
- - {* build search form here *} - - {* Search form and results for surveys *} -
- {assign var='searchForm' value="search_form_$searchFor"} - -
-
- {ts}Search Surveys{/ts} -
- -
- {strip} - - - - - - - - - - - -
{$form.survey_title.label}
- {$form.survey_title.html} -
{$form.activity_type_id.label}
- {$form.activity_type_id.html} - 		{$form.survey_campaign_id.label}
- {$form.survey_campaign_id.html} -
- {if $context eq 'search'} - {$form.buttons.html} - {else} - {ts}Search{/ts} - {/if} -
- {/strip} -
-
-
- {* search form ends here *} - -
- -{/if} {* end of search form build *} - - -{literal} - -{/literal} diff --git a/templates/CRM/Campaign/Page/DashBoard.tpl b/templates/CRM/Campaign/Page/DashBoard.tpl deleted file mode 100644 index 18d26d1e83d7..000000000000 --- a/templates/CRM/Campaign/Page/DashBoard.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{* CiviCampaign DashBoard (launch page) *} - - -{if $subPageType} - {* load campaign/survey/petition tab *} - {include file="CRM/Campaign/Form/Search/$subPageType.tpl"} -{else} - {include file="CRM/common/TabHeader.tpl"} -
-{/if} - - - - diff --git a/tests/phpunit/CRM/Campaign/BAO/CampaignTest.php b/tests/phpunit/CRM/Campaign/BAO/CampaignTest.php deleted file mode 100644 index 47b6046e8915..000000000000 --- a/tests/phpunit/CRM/Campaign/BAO/CampaignTest.php +++ /dev/null @@ -1,41 +0,0 @@ -createLoggedInUser(); - $contact = $this->individualCreate(); - $this->callAPISuccess('Campaign', 'create', [ - 'title' => 'CiviCRM Unit Test Campaign', - 'campaign_type_id' => 'Direct Mail', - 'status_id' => 'In Progress', - ]); - try { - CRM_Campaign_BAO_Campaign::getCampaignSummary(['status_id' => '0))+and+0+--+-f']); - $this->fail('Campaign Summary should have validated the status_id'); - } - catch (Exception $e) { - if ($e->getMessage() === 'DB Error: syntax error') { - $this->fail('Campaign Summary should have validated the status_id'); - } - } - $this->assertEquals(1, CRM_Campaign_BAO_Campaign::getCampaignSummary(['status_id' => 2], TRUE)); - $this->assertEquals(1, CRM_Campaign_BAO_Campaign::getCampaignSummary(['status_id' => [2, 3]], TRUE)); - } - -} diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index 8a2fe3627ca5..5bbd296b44a8 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -8,6 +8,11 @@ fa-clipboard title CiviCampaign + + civicrm/survey/add?reset=1 + civicrm/survey/configure/main?reset=1&action=update&id=[id] + civicrm/survey/delete?reset=1&id=[id] + id Survey ID diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index 33f02e768abd..f3428eeb3e9c 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -211,14 +211,6 @@ SET @campaignlastID:=LAST_INSERT_ID(); INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) VALUES - ( @domainID, 'civicrm/campaign?reset=1', '{ts escape="sql" skip="true"}Dashboard{/ts}', 'Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 1 ); -SET @campaigndashboardlastID:=LAST_INSERT_ID(); -INSERT INTO civicrm_navigation - ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES - ( @domainID, 'civicrm/campaign?reset=1&subPage=survey', '{ts escape="sql" skip="true"}Surveys{/ts}', 'Survey Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 1 ), - ( @domainID, 'civicrm/campaign?reset=1&subPage=petition', '{ts escape="sql" skip="true"}Petitions{/ts}', 'Petition Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 2 ), - ( @domainID, 'civicrm/campaign?reset=1&subPage=campaign', '{ts escape="sql" skip="true"}Campaigns{/ts}', 'Campaign Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 3 ), ( @domainID, 'civicrm/campaign/add?reset=1', '{ts escape="sql" skip="true"}New Campaign{/ts}', 'New Campaign', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 2 ), ( @domainID, 'civicrm/survey/add?reset=1', '{ts escape="sql" skip="true"}New Survey{/ts}', 'New Survey', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 3 ), ( @domainID, 'civicrm/petition/add?reset=1', '{ts escape="sql" skip="true"}New Petition{/ts}', 'New Petition', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 4 ),