Remove now-unused summary forms
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 10 Aug 2022 00:35:43 +0000 (12:35 +1200)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 10 Aug 2022 01:56:33 +0000 (13:56 +1200)
12 files changed:
CRM/Activity/Import/Form/Summary.php [deleted file]
CRM/Contact/Import/Form/DataSource.php
CRM/Contribute/Import/Form/Summary.php [deleted file]
CRM/Custom/Import/Form/Summary.php [deleted file]
CRM/Event/Import/Form/Summary.php [deleted file]
CRM/Import/StateMachine.php
CRM/Member/Import/Form/Summary.php [deleted file]
templates/CRM/Activity/Import/Form/Summary.tpl [deleted file]
templates/CRM/Contribute/Import/Form/Summary.tpl [deleted file]
templates/CRM/Custom/Import/Form/Summary.tpl [deleted file]
templates/CRM/Event/Import/Form/Summary.tpl [deleted file]
templates/CRM/Member/Import/Form/Summary.tpl [deleted file]

diff --git a/CRM/Activity/Import/Form/Summary.php b/CRM/Activity/Import/Form/Summary.php
deleted file mode 100644 (file)
index 0aab950..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | 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       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class summarizes the import results.
- */
-class CRM_Activity_Import_Form_Summary extends CRM_Import_Form_Summary {
-
-}
index bd71da375ca03c8412f449bd1dd0a3b72b78d6dd..362fd60de586fd688b94bf954fb88db9243eab78 100644 (file)
@@ -186,7 +186,6 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource {
     // @todo - this params are being set here because they were / possibly still
     // are in some places being accessed by forms later in the flow
     // ie CRM_Contact_Import_Form_MapField, CRM_Contact_Import_Form_Preview
-    // or CRM_Contact_Import_Form_Summary using `$this->get()
     // which was the old way of saving values submitted on this form such that
     // the other forms could access them. Now they should use
     // `getSubmittedValue` or simply not get them if the only
diff --git a/CRM/Contribute/Import/Form/Summary.php b/CRM/Contribute/Import/Form/Summary.php
deleted file mode 100644 (file)
index 3d01d46..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | 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       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class summarizes the import results.
- */
-class CRM_Contribute_Import_Form_Summary extends CRM_Import_Form_Summary {
-
-}
diff --git a/CRM/Custom/Import/Form/Summary.php b/CRM/Custom/Import/Form/Summary.php
deleted file mode 100644 (file)
index e0f0896..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/**
- * Class CRM_Custom_Import_Form_Summary
- */
-class CRM_Custom_Import_Form_Summary extends CRM_Import_Form_Summary {
-
-}
diff --git a/CRM/Event/Import/Form/Summary.php b/CRM/Event/Import/Form/Summary.php
deleted file mode 100644 (file)
index 024c735..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | 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       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class summarizes the import results
- */
-class CRM_Event_Import_Form_Summary extends CRM_Import_Form_Summary {
-
-}
index fbe013ae0f9bcc2c5b0b8ad8d170a70d8956ac14..4a06c6f91ba0838a5a2d5c436ed4bdf7e6b2734f 100644 (file)
@@ -34,7 +34,6 @@ class CRM_Import_StateMachine extends CRM_Core_StateMachine {
       $classType . '_Form_DataSource' => NULL,
       $classType . '_Form_MapField' => NULL,
       $classType . '_Form_Preview' => NULL,
-      $classType . '_Form_Summary' => NULL,
     ];
 
     $this->addSequentialPages($this->_pages, $action);
diff --git a/CRM/Member/Import/Form/Summary.php b/CRM/Member/Import/Form/Summary.php
deleted file mode 100644 (file)
index de46749..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | 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       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class summarizes the import results
- * @todo - this class is no longer used - it just needs to
- * be removed when the other summary classes are removed from the
- * import controller.
- */
-class CRM_Member_Import_Form_Summary extends CRM_Import_Form_Summary {
-
-}
diff --git a/templates/CRM/Activity/Import/Form/Summary.tpl b/templates/CRM/Activity/Import/Form/Summary.tpl
deleted file mode 100644 (file)
index 65c07d9..0000000
+++ /dev/null
@@ -1,57 +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       |
- +--------------------------------------------------------------------+
-*}
-{* Activity Import Wizard - Step 4 (summary of import results AFTER actual data loading) *}
-{* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}
-<div class="crm-block crm-form-block crm-activity-import-summary-form-block">
-
- {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
- {include file="CRM/common/WizardHeader.tpl"}
-
- <div class="help">
-    <p>
-    {ts}<strong>Import has completed successfully.</strong> The information below summarizes the results.{/ts}
-    </p>
-
-    {if $invalidRowCount }
-        <p class="error">
-        {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record have not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadErrorRecordsUrl}You can <a href='%1'>Download Errors</a>. You may then correct them, and import the new file with the corrected data.{/ts}
-        </p>
-    {/if}
- </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
- {* Summary of Import Results (record counts) *}
- <table id="summary-counts" class="report">
-    <tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
-        <td class="data">{$totalRowCount}</td>
-        <td class="explanation">{ts}Total rows (activity records) in uploaded file.{/ts}</td>
-    </tr>
-
-    {if $invalidRowCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
-        <td class="data">{$invalidRowCount}</td>
-        <td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
-            {if $invalidRowCount}
-                <p><a href="{$downloadErrorRecordsUrl}">{ts}Download Errors{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-    <tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
-        <td class="data">{$validRowCount}</td>
-        <td class="explanation">{ts}Rows imported successfully.{/ts}</td>
-    </tr>
-
- </table>
-
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
- </div>
diff --git a/templates/CRM/Contribute/Import/Form/Summary.tpl b/templates/CRM/Contribute/Import/Form/Summary.tpl
deleted file mode 100644 (file)
index 8e05fcb..0000000
+++ /dev/null
@@ -1,112 +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       |
- +--------------------------------------------------------------------+
-*}
-{* Contribution Import Wizard - Step 4 (summary of import results AFTER actual data loading) *}
-{* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}
-<div class="crm-block crm-form-block  crm-contribution-import-summary-form-block" id="upload-file">
- {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
- {include file="CRM/common/WizardHeader.tpl"}
-
- <div class="help">
-    <p>
-    <strong>{ts}Import has completed successfully.{/ts}</strong> {ts}The information below summarizes the results.{/ts}
-    </p>
-
-    {if $invalidRowCount }
-        <p class="error">
-        {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record has not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadErrorRecordsUrl}You can <a href="%1">Download Errors</a>. You may then correct them, and import the new file with the corrected data.{/ts}
-        </p>
-    {/if}
-
-    {if $duplicateRowCount}
-        <p {if $dupeError}class="error"{/if}>
-        {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM contribution records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM contribution record.{/ts} {$dupeActionString}
-        </p>
-        <p {if $dupeError}class="error"{/if}>
-        {ts 1=$downloadDuplicateRecordsUrl}You can <a href="%1">Download Duplicates</a>. You may then review these records to determine if they are actually duplicates, and correct the transaction IDs for those that are not.{/ts}
-        </p>
-    {/if}
- </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
- {* Summary of Import Results (record counts) *}
- <table id="summary-counts" class="report">
-    <tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
-        <td class="data">{$totalRowCount}</td>
-        <td class="explanation">{ts}Total rows (contribution records) in uploaded file.{/ts}</td>
-    </tr>
-
-    {if $invalidRowCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
-        <td class="data">{$invalidRowCount}</td>
-        <td class="explanation">{ts}Rows with invalid data in one or more fields. These rows have been skipped (not imported).{/ts}
-            {if $invalidRowCount}
-                <p><a href="{$downloadErrorRecordsUrl}">{ts}Download Errors{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
-    {if $validSoftCreditRowCount }
-    <tr><td class="label crm-grid-cell">{ts}Soft Credits{/ts}</td>
-        <td class="data">{$validSoftCreditRowCount}</td>
-        <td class="explanation">{ts}Rows where a soft credit was successfully assigned to a contact.{/ts}</td>
-    </tr>
-    {/if}
-
-    {if $invalidSoftCreditRowCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Unmatched Soft Credit Rows (skipped){/ts}</td>
-        <td class="data">{$invalidSoftCreditRowCount}</td>
-        <td class="explanation">{ts}Rows with a requested soft credit assignment where no matching contact was found (based on the supplied soft credit contact data). These contribution rows have been skipped (not imported).{/ts}
-            {if $invalidSoftCreditRowCount}
-                <p><a href="{$downloadSoftCreditErrorRecordsUrl}">{ts}Download Errors{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
-    {if $validPledgePaymentRowCount }
-    <tr><td class="label crm-grid-cell">{ts}Pledge Payments Applied{/ts}</td>
-        <td class="data">{$validPledgePaymentRowCount}</td>
-        <td class="explanation">{ts}Rows with a pledge payment successfully applied.{/ts}</td>
-    </tr>
-    {/if}
-
-    {if $invalidPledgePaymentRowCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Invalid Pledge Payment Rows (skipped){/ts}</td>
-        <td class="data">{$invalidPledgePaymentRowCount}</td>
-        <td class="explanation">{ts}Rows marked as pledge payments where the contributor and / or contribution amount could not be matched to a pending pledge payment. These contribution rows have been skipped (not imported).{/ts}
-            {if $invalidPledgePaymentRowCount}
-                <p><a href="{$downloadPledgePaymentErrorRecordsUrl}">{ts}Download Errors{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
-    {if $duplicateRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
-        <td class="data">{$duplicateRowCount}</td>
-        <td class="explanation">{ts}Rows which are duplicates of existing CiviCRM contribution records.{/ts} {$dupeActionString}
-            {if $duplicateRowCount}
-                <p><a href="{$downloadDuplicateRecordsUrl}">{ts}Download Duplicates{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
-    <tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
-        <td class="data">{$validRowCount}</td>
-        <td class="explanation">{ts}Total number of rows imported successfully.{/ts}</td>
-    </tr>
-
- </table>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
- </div>
diff --git a/templates/CRM/Custom/Import/Form/Summary.tpl b/templates/CRM/Custom/Import/Form/Summary.tpl
deleted file mode 100644 (file)
index 7481dab..0000000
+++ /dev/null
@@ -1,10 +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       |
- +--------------------------------------------------------------------+
-*}
-{include file="CRM/Contact/Import/Form/Summary.tpl"}
diff --git a/templates/CRM/Event/Import/Form/Summary.tpl b/templates/CRM/Event/Import/Form/Summary.tpl
deleted file mode 100644 (file)
index 77d9320..0000000
+++ /dev/null
@@ -1,80 +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       |
- +--------------------------------------------------------------------+
-*}
-{* Event Import Wizard - Step 4 (summary of import results AFTER actual data loading) *}
-{* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}
-
-<div class="crm-block crm-form-block crm-event-import-summary-form-block">
-
- {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
- {include file="CRM/common/WizardHeader.tpl"}
-
-<div class="help">
-    <p>
-    <strong>{ts}Import has completed successfully.{/ts}</strong> {ts}The information below summarizes the results.{/ts}
-    </p>
-
-    {if $invalidRowCount }
-        <p class="error">
-        {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record has not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadErrorRecordsUrl}You can <a href="%1">Download Errors</a>. You may then correct them, and import the new file with the corrected data.{/ts}
-        </p>
-    {/if}
-
-    {if $duplicateRowCount}
-        <p {if $dupeError}class="error"{/if}>
-        {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM participant records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM participant record.{/ts} {$dupeActionString}
-        </p>
-        <p {if $dupeError}class="error"{/if}>
-        {ts 1=$downloadDuplicateRecordsUrl}You can <a href="%1">Download Duplicates</a>. You may then review these records to determine if they are actually duplicates, and correct the participant IDs for those that are not.{/ts}
-        </p>
-    {/if}
- </div>
-
-<div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="top"}
-</div>
- {* Summary of Import Results (record counts) *}
- <table id="summary-counts" class="report">
-    <tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
-        <td class="data">{$totalRowCount}</td>
-        <td class="explanation">{ts}Total rows (participant records) in uploaded file.{/ts}</td>
-    </tr>
-
-    {if $invalidRowCount}
-      <tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
-        <td class="data">{$invalidRowCount}</td>
-        <td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
-          <p><a href="{$downloadErrorRecordsUrl}">{ts}Download Errors{/ts}</a></p>
-        </td>
-    </tr>
-    {/if}
-
-    {if $duplicateRowCount}
-      <tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
-        <td class="data">{$duplicateRowCount}</td>
-        <td class="explanation">{ts}Rows which are duplicates of existing CiviCRM participant records.{/ts} {$dupeActionString}
-          <p><a href="{$downloadDuplicateRecordsUrl}">{ts}Download Duplicates{/ts}</a></p>
-        </td>
-    </tr>
-    {/if}
-
-    <tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
-        <td class="data">{$validRowCount}</td>
-        <td class="explanation">{ts}Rows imported successfully.{/ts}</td>
-    </tr>
-
- </table>
-
- <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="bottom"}
- </div>
-</div>
diff --git a/templates/CRM/Member/Import/Form/Summary.tpl b/templates/CRM/Member/Import/Form/Summary.tpl
deleted file mode 100644 (file)
index 8bdd72d..0000000
+++ /dev/null
@@ -1,12 +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       |
- +--------------------------------------------------------------------+
-*}
-{* Membership Import Wizard - no longer used - needs to be removed form the
-{* controller & this can be deleted *}
-{* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}