history rework #1502
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ | |
| vendor/ | ||
| .phpunit.result.cache | ||
| .php-cs-fixer.cache | ||
| /.idea/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @var rex_fragment $this | ||
| * @psalm-scope-this rex_fragment | ||
| */ | ||
|
|
||
| $historyId = $this->getVar('history_id', null); | ||
| $datasetId = $this->getVar('dataset_id', null); | ||
| $currentDataset = $this->getVar('current_dataset', null); | ||
|
|
||
| /** @var rex_yform_manager_table|null $table */ | ||
| $table = $this->getVar('table', null); | ||
|
|
||
| $sql = rex_sql::factory(); | ||
| $timestamp = $sql->setQuery(sprintf('SELECT `timestamp` FROM %s WHERE id = :id', rex::getTable('yform_history')), [':id' => $historyId])->getValue('timestamp'); | ||
|
|
||
| $data = $sql->getArray(sprintf('SELECT * FROM %s WHERE history_id = :history_id', rex::getTable('yform_history_field')), [':history_id' => $historyId]); | ||
| $data = array_column($data, 'value', 'field'); | ||
|
|
||
| if(null !== $historyId && null !== $table): | ||
|
|
||
| $diffs = [ | ||
| 'changed' => ['icon' => 'fas fa-not-equal', 'count' => 0, 'rows' => ''], | ||
| 'added' => ['icon' => 'fas fa-layer-plus', 'count' => 0, 'rows' => ''], | ||
| 'removed' => ['icon' => 'far fa-layer-minus', 'count' => 0, 'rows' => ''], | ||
| 'unchanged' => ['icon' => 'fas fa-equals', 'count' => 0, 'rows' => ''], | ||
| // 'prev_changed' => ['icon' => 'fas fa-not-equal', 'count' => 0, 'rows' => ''], | ||
| ]; | ||
|
|
||
| $fieldsInDataset = []; | ||
|
|
||
| $tableFields = $table->getFields(); | ||
|
|
||
| foreach ($table->getValueFields() as $field) { | ||
| if (!array_key_exists($field->getName(), $data)) { | ||
| if($currentDataset->hasValue($field->getName())) { | ||
| ++$diffs['added']['count']; | ||
| $diffs['added']['rows'] .= ' | ||
| <tr> | ||
| <th>' . rex_yform_history_helper::getFieldTypeIcon($field) . ' ' . $field->getLabel() . '</th> | ||
| <td>' . rex_yform_history_helper::getFieldValue($field, $currentDataset, $table) . '</td> | ||
| <td><em>' . rex_i18n::msg('yform_history_diff_not_yet_existing') . '</em></td> | ||
| </tr>'; | ||
| } | ||
|
|
||
| continue; | ||
| } | ||
|
|
||
| $change = 'unchanged'; | ||
|
|
||
| $fieldsInDataset[] = $field->getName(); | ||
| $historyValue = $data[$field->getName()]; | ||
| $currentValue = ($currentDataset->hasValue($field->getName()) ? $currentDataset->getValue($field->getName()) : '-'); | ||
|
|
||
| $class = 'rex_yform_value_' . $field->getTypeName(); | ||
|
|
||
| // count diffs | ||
| if(!$currentDataset->hasValue($field->getName())) { | ||
| $change = 'deleted'; | ||
| } elseif('' . $historyValue !== '' . $currentValue) { | ||
| $change = 'changed'; | ||
| } | ||
|
|
||
| ++$diffs[$change]['count']; | ||
|
|
||
| if (is_callable([$class, 'getListValue']) && !in_array($field->getTypeName(), ['text', 'textarea'], true)) { | ||
| // to ensure correct replacement with list value, ensure datatype by current dataset | ||
| if(gettype($currentValue) !== gettype($historyValue)) { | ||
| settype($historyValue, gettype($currentValue)); | ||
| } | ||
|
|
||
| // get (formatted) value for history entry | ||
| $historyValue = $class::getListValue([ | ||
| 'value' => $historyValue, | ||
| 'subject' => $historyValue, | ||
| 'field' => $field->getName(), | ||
| 'params' => [ | ||
| 'field' => $field->toArray(), | ||
| 'fields' => $this->table->getFields(), | ||
| ], | ||
| ]); | ||
|
|
||
| // get (formatted) value for current entry | ||
| if($currentDataset->hasValue($field->getName())) { | ||
| $currentValue = $class::getListValue([ | ||
| 'value' => $currentValue, | ||
| 'subject' => $currentValue, | ||
| 'field' => $field->getName(), | ||
| 'params' => [ | ||
| 'field' => $field->toArray(), | ||
| 'fields' => $tableFields, | ||
| ], | ||
| ]); | ||
| } else { | ||
| $currentValue = '-'; | ||
| } | ||
| } else { | ||
| $historyValue = rex_escape($historyValue); | ||
| $currentValue = rex_escape($currentValue); | ||
| } | ||
|
|
||
| // diff values for specific fields | ||
| if('changed' === $change) { | ||
| switch($field->getTypeName()) { | ||
| case 'text': | ||
| case 'textarea': | ||
| $diff = rex_yform_history_helper::diffStringsToHtml($currentValue, $historyValue); | ||
| $historyValue = $diff; | ||
| break; | ||
|
|
||
| default: | ||
| if($historyValue !== $currentValue) { | ||
| $historyValue = '<span class="diff">' . $historyValue . '</span>'; | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| $diffs[$change]['rows'] .= ' | ||
| <tr> | ||
| <th>' . rex_yform_history_helper::getFieldTypeIcon($field) . ' ' . $field->getLabel() . '</th> | ||
| <td>' . $currentValue . '</td> | ||
| <td>' . $historyValue . '</td> | ||
| </tr>'; | ||
|
|
||
| // remove field from dataset to collect meanwhile deleted fields | ||
| unset($data[$field->getName()]); | ||
| } | ||
|
|
||
| foreach ($data as $field => $value) { | ||
| ++$diffs['removed']['count']; | ||
| $diffs['removed']['rows'] .= ' | ||
| <tr> | ||
| <th><i data-toggle="tooltip" data-placement="top" title="" class="rex-icon fas fa-question" data-original-title="' . | ||
| rex_i18n::msg('yform_manager_type_name') . ': ' . rex_i18n::msg('yform_manager_type_unknown') . '"></i> ' . $field . '</th> | ||
| <td><em>' . rex_i18n::msg('yform_history_diff_no_longer_existing') . '</em></td> | ||
| <td>' . $value . '</td> | ||
| </tr>'; | ||
| } | ||
|
|
||
| // build restore url | ||
| $restoreUrl = http_build_query([ | ||
| 'table_name' => $table->getTableName(), | ||
| 'func' => 'history', | ||
| 'subfunc' => 'restore', | ||
| 'data_id' => $datasetId, | ||
| 'history_id' => $historyId, | ||
| ]) . http_build_query(rex_csrf_token::factory($this->getVar('csrf_key', ''))->getUrlParams()); | ||
|
|
||
| $content = ' | ||
| <div class="modal-header"> | ||
| <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> | ||
| <h4 class="modal-title"> | ||
| ' . rex_i18n::msg('yform_history_dataset_id') . ': ' . $datasetId . ' | ||
| <small>[' . date('d.m.Y H:i:s', strtotime($timestamp)) . ']</small> | ||
| </h4> | ||
| </div> | ||
| <div class="modal-body panel-default"> | ||
| '; | ||
|
|
||
| foreach ($diffs as $change => $diff) { | ||
| $content .= ' | ||
| <header class="panel-heading" ' . ('' !== $diff['rows'] ? 'data-toggle="collapse" data-target="#collapse-history-table-' . $change . '"' : '') . '> | ||
| <div class="panel-title"><i class="rex-icon ' . $diff['icon'] . '"></i> ' . rex_i18n::msg('yform_history_diff_headline_' . $change) . | ||
| ' [' . ($diff['count'] > 0 ? '<b>' : '') . $diff['count'] . ($diff['count'] > 0 ? '</b>' : '') . ']' . ' | ||
| </div> | ||
| </header> | ||
| <div id="collapse-history-table-' . $change . '" ' . ('' !== $diff['rows'] ? 'class="panel-collapse collapse ' . ('changed' === $change ? 'in' : '') . '"' : '') . '>'; | ||
|
|
||
| if('' !== $diff['rows']) { | ||
| $content .= ' | ||
| <table class="table history-diff-table" data-change-mode="' . $change . '"> | ||
| <thead> | ||
| <tr> | ||
| <th class="rex-table-width-7 field-name"><i class="rex-icon-"></i>' . rex_i18n::msg('yform_tablefield') . '</th> | ||
| <th class="rex-table-width-10">' . rex_i18n::msg('yform_history_dataset_current') . '</th> | ||
| <th class="rex-table-width-10">' . date('d.m.Y H:i:s', strtotime($timestamp)) . '</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody>' . $diff['rows'] . '</tbody> | ||
| </table>'; | ||
| } | ||
|
|
||
| $content .= '</div>'; | ||
| } | ||
|
|
||
| $content .= ' | ||
| </div> | ||
| <div class="modal-footer"> | ||
| <a href="index.php?page=yform/manager/data_edit?' . $restoreUrl . '" class="btn btn-warning" onclick="return confirm(\'' . rex_i18n::msg('yform_history_restore_confirm') . '\')">' . | ||
| rex_i18n::msg('yform_history_restore_this') . | ||
| '</a> | ||
| <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">×</button> | ||
| </div> | ||
| <script> | ||
|
There was a problem hiding this comment. Hier müsste noch There was a problem hiding this comment. Ich leg ne .js an |
||
| // init bootstrap tooltips | ||
| $(".modal#rex-yform-history-modal [data-toggle=\"tooltip\"]").tooltip({ | ||
| html: true | ||
| }) | ||
| </script> | ||
| '; | ||
|
|
||
| echo $content; | ||
| endif; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kein onclick bitte, sondern js in Dateien auslagern. CSP macht da sonst Probleme
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wird gemacht