Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merge changes from @elysch related to marriages, burials, photos #525

Merged
merged 24 commits into from
Nov 15, 2024

Conversation

Neriderc
Copy link
Owner

@Neriderc Neriderc commented Nov 15, 2024

Thanks to @elysch in #514 we now have a bunch of new features!

  • Added options to show the first image from a birth, death, marriage, or burial record
  • Added option to show the type of marriage (religious, civil, registered partnership)
  • Added option to show the burial (or cremation) date, place, image

These are all off by default as i like to keep the default settings stable, but they can be found in the appearance section under various areas.

As part of the above work, I've also made the following changes:

  • Added the burial prefix option in the control panel (default is '_', from @elysch's contribution)
  • Added ↑ and ↓ as allowed symbols for birth, death, marriage, burial prefixes.
  • Added help information for new functions
  • SVG now always uses browser to render download if page links are enabled. For some reason server-side Graphviz doesn't like to include the links anymore.
  • Fixed issue where some options that show/hide weren't loaded in the correct state when loading via saved settings list or logged out user (i.e. loaded via javascript)

Closes #514, #523

This commit merges in a range of changes from a patch provided by elysch in #514
Moved image options to photo section

Added burial prefix option to admin panel
Removed and changed various redundant code as highlighted by IDE
Swapped the option to show sex on indi times and the option to include similar events. Now option to include similar events is on it's own to make it a bit clearer it applies to multiple of the options above it.
Updated help for new functions
Updated default of show_only_first_marriage to true to keep this in line with current functionality.
Returned display of families to previous style to be more compact. This commit for combined mode only.
Removed extra table in family record so marriage details would return to being centred
Fixed issue where burial date failed to load when user is logged out.

Also fixed where burial date labels were pointing to death date radio boxes
Fixing issue where clicking the photo of an individual would cause the URL for the photo to open instead of the webtrees page. Handed control of click action from SVG URL to javascript.
Changed option 'Show when type is not specified' to show or hide based on 'Show marriage type'

Fixed issue where show/hide wasn't working for any show/hide boxes when settings were loaded via javascript (saved settings list or users logged out)
Removed some settings from cookie for logged out users as these are not displayed on page load and are better loaded via javascript.
Fixed links in PDF so clicking on person's main photo opens the individual's page as before, but if you click other photos (e.g. birth photo, if enabled), then this opens the specific media object.
Adjusted option to add links to individuals and families. It previously stated that links were in browser, SVG, and PDF however this is not true.

Browser output has been changed so the behaviour is based on the specific option for what happens when a user clicks a record.

Links in SVG output have been broken for many years, and it seems you cannot have both images and links because different Graphviz renderers are used for each.

Links in PDF output only work for server-side output.

Therefore, I have updated this to only state it works for PDFs, and if Graphviz is not installed then the function is not available at all.
Removed some unused functions and unnecessary checks
Created function for repeated code, and some other minor changes based on IDE feedback
If links are enabled and SVG output selected, use browser output even when Graphviz installed on server as server Graphviz doesn't include links.
Update to help text to inform user that if they choose to include links in SVG format, the browser will render the diagram even if they have Graphviz on their server
Copy link

github-actions bot commented Nov 15, 2024

Qodana for PHP

10 new problems were found

Inspection name Severity Problems
Undefined class 🔶 Warning 10

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Detected 84 dependencies

Third-party software list

This page lists the third-party software dependencies used in project

Dependency Version Licenses
aura/router 3.3.0 MIT
brick/math 0.9.3 MIT
carbonphp/carbon-doctrine-types 2.1.0 MIT
dflydev/dot-access-data v3.0.2 MIT
doctrine/cache 2.2.0 MIT
doctrine/dbal 3.8.3 MIT
doctrine/deprecations 1.1.3 MIT
doctrine/event-manager 2.0.1 MIT
doctrine/inflector 2.0.10 MIT
doctrine/lexer 3.0.1 MIT
egulias/email-validator 4.0.2 MIT
ezyang/htmlpurifier v4.17.0 LGPL-2.1-or-later
fig/http-message-util 1.1.5 MIT
fisharebest/algorithm 1.6.0 GPL-3.0-or-later
fisharebest/ext-calendar 2.6.0 GPL-3.0-or-later
fisharebest/flysystem-chroot-adapter 2.0.0 MIT
fisharebest/localization 1.17.0 GPL-3.0-or-later
fisharebest/webtrees 2.1.20 GPL-3.0-or-later
guzzlehttp/guzzle 7.8.1 MIT
guzzlehttp/promises 2.0.2 MIT
guzzlehttp/psr7 2.6.2 MIT
illuminate/collections v8.83.27 MIT
illuminate/container v8.83.27 MIT
illuminate/contracts v8.83.27 MIT
illuminate/database v8.83.27 MIT
illuminate/macroable v8.83.27 MIT
illuminate/support v8.83.27 MIT
intervention/image 2.7.2 MIT
io-developer/php-whois 4.1.10 MIT
league/commonmark 2.4.2 BSD-3-Clause
league/config v1.2.0 BSD-3-Clause
league/flysystem-ziparchive 2.3.1 MIT
league/flysystem 2.5.0 MIT
league/mime-type-detection 1.15.0 MIT
middlewares/client-ip v2.0.1 MIT
mlocati/ip-lib 1.18.0 MIT
nesbot/carbon 2.72.3 MIT
nette/schema v1.3.0 BSD-3-Clause
GPL-2.0-only
GPL-3.0-only
nette/utils v4.0.4 BSD-3-Clause
GPL-2.0-only
GPL-3.0-only
nyholm/psr7-server 1.1.0 MIT
nyholm/psr7 1.8.1 MIT
oscarotero/middleland v1.0.1 MIT
psr/cache 1.0.1 MIT
psr/clock 1.0.0 MIT
psr/container 1.1.2 MIT
psr/event-dispatcher 1.0.0 MIT
psr/http-client 1.0.3 MIT
psr/http-factory 1.1.0 MIT
psr/http-message 1.1 MIT
psr/http-server-handler 1.0.2 MIT
psr/http-server-middleware 1.0.2 MIT
psr/log 2.0.0 MIT
psr/simple-cache 1.0.1 MIT
ralouphie/getallheaders 3.0.3 MIT
ramsey/collection 1.3.0 MIT
ramsey/uuid 4.2.3 MIT
sabre/uri 3.0.1 BSD-3-Clause
sabre/vobject 4.5.4 BSD-3-Clause
sabre/xml 4.0.5 BSD-3-Clause
symfony/cache-contracts v2.5.3 MIT
symfony/cache v5.4.36 MIT
symfony/console v5.4.40 MIT
symfony/deprecation-contracts v3.5.0 MIT
symfony/event-dispatcher-contracts v3.5.0 MIT
symfony/event-dispatcher v6.4.8 MIT
symfony/expression-language v5.4.35 MIT
symfony/mailer v5.4.36 MIT
symfony/mime v6.4.8 MIT
symfony/polyfill-ctype v1.29.0 MIT
symfony/polyfill-intl-grapheme v1.29.0 MIT
symfony/polyfill-intl-idn v1.29.0 MIT
symfony/polyfill-intl-normalizer v1.29.0 MIT
symfony/polyfill-mbstring v1.29.0 MIT
symfony/polyfill-php72 v1.29.0 MIT
symfony/polyfill-php73 v1.29.0 MIT
symfony/polyfill-php80 v1.29.0 MIT
symfony/polyfill-php81 v1.29.0 MIT
symfony/service-contracts v3.5.0 MIT
symfony/string v6.4.8 MIT
symfony/translation-contracts v3.5.0 MIT
symfony/translation v6.4.8 MIT
symfony/var-exporter v6.4.8 MIT
tecnickcom/tcpdf 6.7.4 LGPL-3.0-or-later
voku/portable-ascii 1.6.1 MIT
Contact Qodana team

Contact us at [email protected]

Small corrections to code picked up by quality tests
@Neriderc Neriderc merged commit c948ad5 into main Nov 15, 2024
2 checks passed
@Neriderc Neriderc deleted the patch-changes branch November 15, 2024 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Added marriages and photos to GVExport
1 participant